From 275515a428f113ba19e7a083fba43f3007025f1b Mon Sep 17 00:00:00 2001 From: Luni-4 Date: Thu, 12 Nov 2020 16:24:08 +0100 Subject: [PATCH] Bump tree-sitter-java --- src/languages/language_java.rs | 464 ++++++++++++++++----------------- tree-sitter-java | 2 +- 2 files changed, 233 insertions(+), 233 deletions(-) diff --git a/src/languages/language_java.rs b/src/languages/language_java.rs index 9cd1bef7d..db91ac42b 100644 --- a/src/languages/language_java.rs +++ b/src/languages/language_java.rs @@ -137,7 +137,7 @@ pub enum Java { TernaryExpression = 132, UnaryExpression = 133, UpdateExpression = 134, - Primary = 135, + PrimaryExpression = 135, ArrayCreationExpression = 136, DimensionsExpr = 137, ParenthesizedExpression = 138, @@ -405,7 +405,7 @@ impl Into<&'static str> for Java { Java::Comment => "comment", Java::Program => "program", Java::Literal => "_literal", - Java::Expression => "_expression", + Java::Expression => "expression", Java::CastExpression => "cast_expression", Java::AssignmentExpression => "assignment_expression", Java::BinaryExpression => "binary_expression", @@ -415,7 +415,7 @@ impl Into<&'static str> for Java { Java::TernaryExpression => "ternary_expression", Java::UnaryExpression => "unary_expression", Java::UpdateExpression => "update_expression", - Java::Primary => "_primary", + Java::PrimaryExpression => "primary_expression", Java::ArrayCreationExpression => "array_creation_expression", Java::DimensionsExpr => "dimensions_expr", Java::ParenthesizedExpression => "parenthesized_expression", @@ -431,7 +431,7 @@ impl Into<&'static str> for Java { Java::Wildcard => "wildcard", Java::WildcardBounds => "_wildcard_bounds", Java::Dimensions => "dimensions", - Java::Statement => "_statement", + Java::Statement => "statement", Java::Block => "block", Java::ExpressionStatement => "expression_statement", Java::LabeledStatement => "labeled_statement", @@ -464,7 +464,7 @@ impl Into<&'static str> for Java { Java::ElementValuePair => "element_value_pair", Java::ElementValue => "_element_value", Java::ElementValueArrayInitializer => "element_value_array_initializer", - Java::Declaration => "_declaration", + Java::Declaration => "declaration", Java::ModuleDeclaration => "module_declaration", Java::ModuleBody => "module_body", Java::ModuleDirective => "module_directive", @@ -561,135 +561,135 @@ impl Into<&'static str> for Java { static KEYS: phf::Map<&'static str, Java> = ::phf::Map { key: 3213172566270843353, disps: ::phf::Slice::Static(&[ - (0, 8), - (0, 9), - (0, 2), - (2, 205), - (1, 143), - (0, 18), - (0, 155), - (3, 62), - (0, 56), (0, 4), - (0, 7), - (0, 31), (0, 9), - (2, 140), + (0, 15), + (1, 260), + (0, 91), + (0, 18), + (0, 63), + (0, 49), + (0, 142), + (0, 11), + (0, 19), + (0, 28), + (0, 1), + (0, 36), (0, 1), (0, 0), (0, 2), - (0, 237), - (0, 27), - (7, 152), + (1, 106), + (0, 37), + (7, 86), (0, 0), - (0, 43), - (2, 95), - (2, 261), + (1, 36), + (12, 94), + (0, 5), (0, 2), - (4, 251), - (5, 198), - (0, 207), - (11, 91), - (0, 11), - (3, 90), - (0, 183), - (3, 35), + (5, 56), + (2, 62), + (0, 25), + (6, 158), + (6, 7), + (2, 75), + (0, 53), + (2, 115), (0, 1), - (16, 128), - (10, 182), - (4, 158), - (0, 17), - (14, 72), - (1, 39), - (0, 60), - (1, 138), + (3, 243), + (12, 216), + (2, 245), + (0, 6), + (4, 190), + (38, 170), + (0, 79), + (11, 103), (0, 3), (0, 0), - (3, 258), - (3, 238), - (0, 85), - (0, 132), - (23, 197), + (2, 38), + (24, 69), + (1, 225), + (0, 48), + (120, 76), (0, 8), (0, 31), - (58, 78), + (71, 167), (0, 3), - (1, 219), + (0, 187), (0, 206), ]), entries: ::phf::Slice::Static(&[ ("field_declaration", Java::FieldDeclaration), - ("&&", Java::AMPAMP), - ("enum", Java::Enum), - ( - "explicit_constructor_invocation", - Java::ExplicitConstructorInvocation, - ), - ("class_body", Java::ClassBody), - ("scoped_identifier", Java::ScopedIdentifier), - ("long", Java::Long), - ("]", Java::RBRACK), + (":", Java::COLON), + ("switch_block", Java::SwitchBlock), ("class_literal", Java::ClassLiteral), - ("module_directive", Java::ModuleDirective), - ("module_directive_repeat2", Java::ModuleDirectiveRepeat2), + ("_variable_declarator_list", Java::VariableDeclaratorList), + ("scoped_identifier", Java::ScopedIdentifier), + ("if_statement", Java::IfStatement), + ("@interface", Java::ATinterface), + ("-", Java::DASH), ( - "enum_body_declarations_repeat1", - Java::EnumBodyDeclarationsRepeat1, + "annotation_argument_list_repeat1", + Java::AnnotationArgumentListRepeat1, ), - ("do", Java::Do), + ("module_directive_repeat2", Java::ModuleDirectiveRepeat2), + ("block", Java::Block), + ("implements", Java::Implements), ("%", Java::PERCENT), - ("module", Java::Module), + ("formal_parameters_repeat1", Java::FormalParametersRepeat1), ("char", Java::Char), - ("octal_integer_literal", Java::OctalIntegerLiteral), + ("type_parameters", Java::TypeParameters), ("interface_body", Java::InterfaceBody), ("static_initializer", Java::StaticInitializer), - ("_type", Java::Type), - ("_literal", Java::Literal), - ("import_declaration", Java::ImportDeclaration), - ("transient", Java::Transient), - ( - "annotation_type_declaration", - Java::AnnotationTypeDeclaration, - ), - ("package_declaration", Java::PackageDeclaration), + ("%=", Java::PERCENTEQ), + ("dimensions_repeat1", Java::DimensionsRepeat1), + ("~", Java::TILDE), + ("type_parameters_repeat1", Java::TypeParametersRepeat1), + ("continue_statement", Java::ContinueStatement), + ("continue", Java::Continue), ("comment", Java::Comment), - ("_constructor_declarator", Java::ConstructorDeclarator), + ("enum_body_declarations", Java::EnumBodyDeclarations), ("short", Java::Short), ("requires_modifier", Java::RequiresModifier), - ("catch", Java::Catch), - (":", Java::COLON), + ("unary_expression", Java::UnaryExpression), + ("catch_clause", Java::CatchClause), ("type_bound_repeat1", Java::TypeBoundRepeat1), - ("::", Java::COLONCOLON), - ("field_access", Java::FieldAccess), + ("element_value_pair", Java::ElementValuePair), + ("formal_parameters", Java::FormalParameters), ("switch", Java::Switch), (">>>", Java::GTGTGT), - ("array_initializer", Java::ArrayInitializer), - ("assignment_expression", Java::AssignmentExpression), - ("default", Java::Default), - ("asterisk", Java::Asterisk), - ("*", Java::STAR), + ("cast_expression_repeat1", Java::CastExpressionRepeat1), + ("to", Java::To), + ( + "explicit_constructor_invocation", + Java::ExplicitConstructorInvocation, + ), + ("argument_list", Java::ArgumentList), + ("scoped_type_identifier", Java::ScopedTypeIdentifier), ("character_literal", Java::CharacterLiteral), - ("protected", Java::Protected), - ("element_value_pair", Java::ElementValuePair), - ("!=", Java::BANGEQ), - ("unary_expression", Java::UnaryExpression), - ("_declaration", Java::Declaration), - ("{", Java::LBRACE), - ("+", Java::PLUS), + ("type_arguments_repeat1", Java::TypeArgumentsRepeat1), + ("assert_statement", Java::AssertStatement), + ("?", Java::QMARK), + ("switch_label", Java::SwitchLabel), + ("native", Java::Native), + ("_type", Java::Type), + ("module_body_repeat1", Java::ModuleBodyRepeat1), ("end", Java::End), ("break", Java::Break), - ("assert_statement", Java::AssertStatement), - ("integral_type", Java::IntegralType), - ("catch_type_repeat1", Java::CatchTypeRepeat1), - ("@interface", Java::ATinterface), - ("method_reference", Java::MethodReference), + ("]", Java::RBRACK), + ( + "annotation_type_element_declaration", + Java::AnnotationTypeElementDeclaration, + ), + ("with", Java::With), + (")", Java::RPAREN), + ("+", Java::PLUS), ("++", Java::PLUSPLUS), ("super", Java::Super), ("&", Java::AMP), ("marker_annotation", Java::MarkerAnnotation), - ("variable_declarator", Java::VariableDeclarator), + ("module", Java::Module), ("throw", Java::Throw), - ("_expression", Java::Expression), + ("exports", Java::Exports), ("/=", Java::SLASHEQ), ( "array_creation_expression_repeat1", @@ -697,17 +697,17 @@ static KEYS: phf::Map<&'static str, Java> = ::phf::Map { ), ("update_expression", Java::UpdateExpression), ("annotation_argument_list", Java::AnnotationArgumentList), - ("to", Java::To), - ("<<", Java::LTLT), - ("provides", Java::Provides), + ("method_reference", Java::MethodReference), + ("_wildcard_bounds", Java::WildcardBounds), + ("enum", Java::Enum), ("enum_constant", Java::EnumConstant), - ("switch_statement", Java::SwitchStatement), - (">>>=", Java::GTGTGTEQ), - ("+=", Java::PLUSEQ), + ("integral_type", Java::IntegralType), + ("_constructor_declarator", Java::ConstructorDeclarator), + ("<<", Java::LTLT), ("else", Java::Else), - ("~", Java::TILDE), + ("switch_block_repeat1", Java::SwitchBlockRepeat1), ("|", Java::PIPE), - ("type_arguments_repeat1", Java::TypeArgumentsRepeat1), + ("catch", Java::Catch), ( "_unqualified_object_creation_expression", Java::UnqualifiedObjectCreationExpression, @@ -716,225 +716,225 @@ static KEYS: phf::Map<&'static str, Java> = ::phf::Map { "_variable_declarator_list_repeat1", Java::VariableDeclaratorListRepeat1, ), - ("cast_expression_repeat1", Java::CastExpressionRepeat1), + ("_method_declarator", Java::MethodDeclarator), ("_default_value", Java::DefaultValue), ("}", Java::RBRACE), - ("switch_block", Java::SwitchBlock), + ("constructor_declaration", Java::ConstructorDeclaration), ("--", Java::DASHDASH), - ("==", Java::EQEQ), - ("switch_block_repeat1", Java::SwitchBlockRepeat1), - ("catch_clause", Java::CatchClause), - ("_method_declarator", Java::MethodDeclarator), + (">>>=", Java::GTGTGTEQ), + ("+=", Java::PLUSEQ), + ("switch_statement", Java::SwitchStatement), + ("provides", Java::Provides), ("inferred_parameters", Java::InferredParameters), - ( - "annotation_type_body_repeat1", - Java::AnnotationTypeBodyRepeat1, - ), + ("class_body", Java::ClassBody), ("expression_statement", Java::ExpressionStatement), - ("array_creation_expression", Java::ArrayCreationExpression), - ("native", Java::Native), + ("synchronized_statement", Java::SynchronizedStatement), + ("do_statement", Java::DoStatement), ("decimal_integer_literal", Java::DecimalIntegerLiteral), - ("true", Java::True), + ("long", Java::Long), (".", Java::DOT), ("instanceof_expression", Java::InstanceofExpression), - ("formal_parameters_repeat1", Java::FormalParametersRepeat1), - ("new", Java::New), - ("final", Java::Final), - ("requires", Java::Requires), - ("while", Java::While), - ("hex_integer_literal", Java::HexIntegerLiteral), - ("%=", Java::PERCENTEQ), - ("extends_interfaces", Java::ExtendsInterfaces), ( "element_value_array_initializer", Java::ElementValueArrayInitializer, ), - ("annotated_type", Java::AnnotatedType), - ("class", Java::Class), - ("|=", Java::PIPEEQ), - ("array_access", Java::ArrayAccess), + ("new", Java::New), + ( + "annotation_type_body_repeat1", + Java::AnnotationTypeBodyRepeat1, + ), + ("requires", Java::Requires), + ("catch_formal_parameter", Java::CatchFormalParameter), + ("while", Java::While), + ("==", Java::EQEQ), + ("extends_interfaces", Java::ExtendsInterfaces), + ("modifiers_repeat1", Java::ModifiersRepeat1), + ("string_literal", Java::StringLiteral), + ("hex_floating_point_literal", Java::HexFloatingPointLiteral), + ("parenthesized_expression", Java::ParenthesizedExpression), + ("instanceof", Java::Instanceof), (";", Java::SEMI), - ("scoped_type_identifier", Java::ScopedTypeIdentifier), + ("constructor_body", Java::ConstructorBody), ("for_statement_repeat1", Java::ForStatementRepeat1), - ("import", Java::Import), - ("-", Java::DASH), + ("true", Java::True), + ("class", Java::Class), ("if", Java::If), - ("...", Java::DOTDOTDOT), + ("annotated_type", Java::AnnotatedType), ("=", Java::EQ), - ("ternary_expression", Java::TernaryExpression), - ("parenthesized_expression", Java::ParenthesizedExpression), - ("generic_type", Java::GenericType), - ("continue_statement", Java::ContinueStatement), - ("constructor_declaration", Java::ConstructorDeclaration), - ("formal_parameters", Java::FormalParameters), - (">", Java::GT), - ("for_statement", Java::ForStatement), - ("resource_specification", Java::ResourceSpecification), - ("constant_declaration", Java::ConstantDeclaration), - ("instanceof", Java::Instanceof), ("local_variable_declaration", Java::LocalVariableDeclaration), + ("array_access", Java::ArrayAccess), + ( + "annotation_type_declaration", + Java::AnnotationTypeDeclaration, + ), + ("-=", Java::DASHEQ), + ("formal_parameter", Java::FormalParameter), + ("_literal", Java::Literal), + ("program", Java::Program), + ("class_declaration", Java::ClassDeclaration), + ("resource_specification", Java::ResourceSpecification), + ("array_creation_expression", Java::ArrayCreationExpression), + ("primary_expression", Java::PrimaryExpression), + ("|=", Java::PIPEEQ), ("<", Java::LT), - ("@", Java::AT), - ("catch_formal_parameter", Java::CatchFormalParameter), + ("ternary_expression", Java::TernaryExpression), + ("generic_type", Java::GenericType), ("byte", Java::Byte), - ("enum_body_repeat1", Java::EnumBodyRepeat1), + ("[", Java::LBRACK), ("dimensions_expr", Java::DimensionsExpr), ("extends", Java::Extends), ("uses", Java::Uses), ("modifiers", Java::Modifiers), ("interface_body_repeat1", Java::InterfaceBodyRepeat1), - ("boolean_type", Java::BooleanType), + ("try", Java::Try), ("type_bound", Java::TypeBound), ("volatile", Java::Volatile), ("object_creation_expression", Java::ObjectCreationExpression), - ("->", Java::DASHGT), + ( + "decimal_floating_point_literal", + Java::DecimalFloatingPointLiteral, + ), ("^", Java::CARET), ( "element_value_array_initializer_repeat1", Java::ElementValueArrayInitializerRepeat1, ), - ("formal_parameter", Java::FormalParameter), - ("try", Java::Try), - ("module_body", Java::ModuleBody), - ("superclass", Java::Superclass), + ("{", Java::LBRACE), ( - "decimal_floating_point_literal", - Java::DecimalFloatingPointLiteral, + "resource_specification_repeat1", + Java::ResourceSpecificationRepeat1, ), - ("case", Java::Case), - ("finally_clause", Java::FinallyClause), + ("module_body", Java::ModuleBody), + ("private", Java::Private), + ("transient", Java::Transient), + ("do", Java::Do), + ("boolean_type", Java::BooleanType), ("int", Java::Int), - (",", Java::COMMA), - (">>", Java::GTGT), + ("/", Java::SLASH), + ("->", Java::DASHGT), ("abstract", Java::Abstract), - ("labeled_statement", Java::LabeledStatement), + ("_annotation", Java::Annotation), ("enum_declaration", Java::EnumDeclaration), ("wildcard", Java::Wildcard), ("method_invocation", Java::MethodInvocation), ("argument_list_repeat1", Java::ArgumentListRepeat1), - ("<<=", Java::LTLTEQ), + ("throws", Java::Throws), ("||", Java::PIPEPIPE), ("finally", Java::Finally), ("type_parameter", Java::TypeParameter), - ("throws", Java::Throws), + ("void_type", Java::VoidType), ("!", Java::BANG), ("interface", Java::Interface), - ("void_type", Java::VoidType), + ("<<=", Java::LTLTEQ), ("type_arguments", Java::TypeArguments), - ("try_statement", Java::TryStatement), - ("return_statement", Java::ReturnStatement), - (">>=", Java::GTGTEQ), - ("catch_type", Java::CatchType), - ("_statement", Java::Statement), + ("statement", Java::Statement), + ("field_access", Java::FieldAccess), ("*=", Java::STAREQ), - ("?", Java::QMARK), ("_variable_declarator_id", Java::VariableDeclaratorId), - ("with", Java::With), - ("binary_integer_literal", Java::BinaryIntegerLiteral), + ("(", Java::LPAREN), + ("floating_point_type", Java::FloatingPointType), (">=", Java::GTEQ), ("module_declaration", Java::ModuleDeclaration), + ("*", Java::STAR), + (">>=", Java::GTGTEQ), + ("opens", Java::Opens), + ("enum_body_repeat1", Java::EnumBodyRepeat1), ("double", Java::Double), - ("floating_point_type", Java::FloatingPointType), + ("catch_type", Java::CatchType), ("for", Java::For), ("dimensions_expr_repeat1", Java::DimensionsExprRepeat1), - ("_variable_declarator_list", Java::VariableDeclaratorList), - ("exports", Java::Exports), + ("_element_value", Java::ElementValue), + ("declaration", Java::Declaration), ("interface_declaration", Java::InterfaceDeclaration), - ("strictfp", Java::Strictfp), - ("modifiers_repeat1", Java::ModifiersRepeat1), - ( - "annotation_argument_list_repeat1", - Java::AnnotationArgumentListRepeat1, - ), - ("transitive", Java::Transitive), + ("finally_clause", Java::FinallyClause), + ("constant_declaration", Java::ConstantDeclaration), + ("binary_integer_literal", Java::BinaryIntegerLiteral), + ("asterisk", Java::Asterisk), ("synchronized", Java::Synchronized), ("annotation_type_body", Java::AnnotationTypeBody), - ("break_statement", Java::BreakStatement), - ("identifier", Java::Identifier), - ("hex_floating_point_literal", Java::HexFloatingPointLiteral), ("float", Java::Float), - ("dimensions_repeat1", Java::DimensionsRepeat1), - ("continue", Java::Continue), + ("identifier", Java::Identifier), + ("import_declaration", Java::ImportDeclaration), + ("cast_expression", Java::CastExpression), + ("enhanced_for_statement", Java::EnhancedForStatement), + ("octal_integer_literal", Java::OctalIntegerLiteral), ("interface_type_list", Java::InterfaceTypeList), - ( - "annotation_type_element_declaration", - Java::AnnotationTypeElementDeclaration, - ), + ("transitive", Java::Transitive), ("public", Java::Public), ( "interface_type_list_repeat1", Java::InterfaceTypeListRepeat1, ), - ("enum_body", Java::EnumBody), - ("program", Java::Program), + ("resource", Java::Resource), + ("module_directive", Java::ModuleDirective), ("spread_parameter", Java::SpreadParameter), + ("strictfp", Java::Strictfp), + ("method_declaration", Java::MethodDeclaration), + ("...", Java::DOTDOTDOT), + (">", Java::GT), + ("array_initializer", Java::ArrayInitializer), ( - "resource_specification_repeat1", - Java::ResourceSpecificationRepeat1, + "enum_body_declarations_repeat1", + Java::EnumBodyDeclarationsRepeat1, ), - ("method_declaration", Java::MethodDeclaration), - ("enhanced_for_statement", Java::EnhancedForStatement), - ("enum_body_declarations", Java::EnumBodyDeclarations), - ("module_body_repeat1", Java::ModuleBodyRepeat1), - ("for_statement_repeat2", Java::ForStatementRepeat2), - ("array_type", Java::ArrayType), - ("implements", Java::Implements), - ("[", Java::LBRACK), - ("constructor_body", Java::ConstructorBody), - ("argument_list", Java::ArgumentList), + ("break_statement", Java::BreakStatement), + (",", Java::COMMA), + ("catch_type_repeat1", Java::CatchTypeRepeat1), + (">>", Java::GTGT), + ("protected", Java::Protected), ("while_statement", Java::WhileStatement), ("receiver_parameter", Java::ReceiverParameter), - ("try_statement_repeat1", Java::TryStatementRepeat1), - ("_annotation", Java::Annotation), + ("array_type", Java::ArrayType), + ("default", Java::Default), ("package", Java::Package), - ("switch_label", Java::SwitchLabel), - ("_primary", Java::Primary), - ("open", Java::Open), + ("!=", Java::BANGEQ), + ("for_statement_repeat2", Java::ForStatementRepeat2), + ("try_statement", Java::TryStatement), ("ERROR", Java::Error), - ("_wildcard_bounds", Java::WildcardBounds), + ("return_statement", Java::ReturnStatement), ("binary_expression", Java::BinaryExpression), ("type_identifier", Java::TypeIdentifier), ("_method_header", Java::MethodHeader), - ("synchronized_statement", Java::SynchronizedStatement), + ("case", Java::Case), ("null_literal", Java::NullLiteral), - ("resource", Java::Resource), + ("superclass", Java::Superclass), ("<=", Java::LTEQ), ("dimensions", Java::Dimensions), - ("class_declaration", Java::ClassDeclaration), - ("return", Java::Return), - (")", Java::RPAREN), - ("private", Java::Private), - ("(", Java::LPAREN), + ("expression", Java::Expression), ("&=", Java::AMPEQ), + ("open", Java::Open), + ("this", Java::This), + ("hex_integer_literal", Java::HexIntegerLiteral), + ("labeled_statement", Java::LabeledStatement), ("array_initializer_repeat1", Java::ArrayInitializerRepeat1), - ("cast_expression", Java::CastExpression), - ("do_statement", Java::DoStatement), - ("-=", Java::DASHEQ), - ("throw_statement", Java::ThrowStatement), + ("variable_declarator", Java::VariableDeclarator), ("lambda_expression", Java::LambdaExpression), ( "try_with_resources_statement", Java::TryWithResourcesStatement, ), - ("string_literal", Java::StringLiteral), - ("/", Java::SLASH), - ("_element_value", Java::ElementValue), - ("this", Java::This), - ("super_interfaces", Java::SuperInterfaces), + ("final", Java::Final), + ("@", Java::AT), + ("throw_statement", Java::ThrowStatement), + ("assignment_expression", Java::AssignmentExpression), + ("return", Java::Return), ("assert", Java::Assert), + ("for_statement", Java::ForStatement), + ("super_interfaces", Java::SuperInterfaces), + ("try_statement_repeat1", Java::TryStatementRepeat1), ("^=", Java::CARETEQ), ( "inferred_parameters_repeat1", Java::InferredParametersRepeat1, ), - ("_unannotated_type", Java::UnannotatedType), - ("type_parameters", Java::TypeParameters), - ("block", Java::Block), + ("&&", Java::AMPAMP), + ("enum_body", Java::EnumBody), + ("::", Java::COLONCOLON), ("false", Java::False), - ("if_statement", Java::IfStatement), - ("type_parameters_repeat1", Java::TypeParametersRepeat1), - ("opens", Java::Opens), ("program_repeat1", Java::ProgramRepeat1), + ("package_declaration", Java::PackageDeclaration), + ("import", Java::Import), + ("_unannotated_type", Java::UnannotatedType), ("static", Java::Static), ("module_directive_repeat1", Java::ModuleDirectiveRepeat1), ]), diff --git a/tree-sitter-java b/tree-sitter-java index ee0a2a076..f7b62ac33 160000 --- a/tree-sitter-java +++ b/tree-sitter-java @@ -1 +1 @@ -Subproject commit ee0a2a076785145e350fbd413775d1e003f79315 +Subproject commit f7b62ac33d63bea56ce202ace107aaa4285e50af