diff --git a/Cargo.lock b/Cargo.lock index cefba9266..ed16e48eb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1576,7 +1576,7 @@ dependencies = [ "tree-sitter", "tree-sitter-ccomment", "tree-sitter-java", - "tree-sitter-javascript", + "tree-sitter-javascript 0.20.0", "tree-sitter-mozcpp", "tree-sitter-mozjs", "tree-sitter-preproc", @@ -2118,6 +2118,16 @@ dependencies = [ "tree-sitter", ] +[[package]] +name = "tree-sitter-javascript" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2490fab08630b2c8943c320f7b63473cbf65511c8d83aec551beb9b4375906ed" +dependencies = [ + "cc", + "tree-sitter", +] + [[package]] name = "tree-sitter-mozcpp" version = "0.19.5" @@ -2133,7 +2143,7 @@ version = "0.19.0" dependencies = [ "cc", "tree-sitter", - "tree-sitter-javascript", + "tree-sitter-javascript 0.19.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 26aa3edf9..c7ad53cc5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ walkdir = "^2.3" tree-sitter = ">= 0.19, < 0.21" tree-sitter-java = "=0.19.0" tree-sitter-typescript = "=0.20.0" -tree-sitter-javascript = "=0.19.0" +tree-sitter-javascript = "=0.20.0" tree-sitter-python = "=0.19.0" tree-sitter-rust = "=0.19.0" tree-sitter-preproc = { path = "./tree-sitter-preproc", version = "=0.19.0" } diff --git a/enums/Cargo.lock b/enums/Cargo.lock index a46b5674c..ee18cadd1 100644 --- a/enums/Cargo.lock +++ b/enums/Cargo.lock @@ -119,7 +119,7 @@ dependencies = [ "tree-sitter", "tree-sitter-ccomment", "tree-sitter-java", - "tree-sitter-javascript", + "tree-sitter-javascript 0.20.0", "tree-sitter-mozcpp", "tree-sitter-mozjs", "tree-sitter-preproc", @@ -325,6 +325,16 @@ dependencies = [ "tree-sitter", ] +[[package]] +name = "tree-sitter-javascript" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2490fab08630b2c8943c320f7b63473cbf65511c8d83aec551beb9b4375906ed" +dependencies = [ + "cc", + "tree-sitter", +] + [[package]] name = "tree-sitter-mozcpp" version = "0.19.5" @@ -340,7 +350,7 @@ version = "0.19.0" dependencies = [ "cc", "tree-sitter", - "tree-sitter-javascript", + "tree-sitter-javascript 0.19.0", ] [[package]] diff --git a/enums/Cargo.toml b/enums/Cargo.toml index 59750cccd..971dba25f 100644 --- a/enums/Cargo.toml +++ b/enums/Cargo.toml @@ -11,7 +11,7 @@ askama = "^0.11" tree-sitter = ">= 0.19, < 0.21" tree-sitter-java = "=0.19.0" tree-sitter-typescript = "=0.20.0" -tree-sitter-javascript = "=0.19.0" +tree-sitter-javascript = "=0.20.0" tree-sitter-python = "=0.19.0" tree-sitter-rust = "=0.19.0" tree-sitter-preproc = { path = "../tree-sitter-preproc", version = "=0.19.0" } diff --git a/src/languages/language_javascript.rs b/src/languages/language_javascript.rs index beb925e1d..8bfb62efe 100644 --- a/src/languages/language_javascript.rs +++ b/src/languages/language_javascript.rs @@ -73,46 +73,46 @@ pub enum Javascript { PIPEPIPEEQ = 68, QMARKQMARKEQ = 69, DOTDOTDOT = 70, - QMARK = 71, - AMPAMP = 72, - PIPEPIPE = 73, - GTGT = 74, - GTGTGT = 75, - LTLT = 76, - AMP = 77, - CARET = 78, - PIPE = 79, - PLUS = 80, - DASH = 81, - PERCENT = 82, - STARSTAR = 83, - LTEQ = 84, - EQEQ = 85, - EQEQEQ = 86, - BANGEQ = 87, - BANGEQEQ = 88, - GTEQ = 89, - QMARKQMARK = 90, - Instanceof = 91, - BANG = 92, - TILDE = 93, - Typeof = 94, - Void = 95, - Delete = 96, - PLUSPLUS = 97, - DASHDASH = 98, - DQUOTE = 99, - StringToken1 = 100, - SQUOTE = 101, - StringToken2 = 102, - EscapeSequence = 103, - Comment = 104, - BQUOTE = 105, - DOLLARLBRACE = 106, - SLASH2 = 107, - RegexPattern = 108, - RegexFlags = 109, - Number = 110, + AMPAMP = 71, + PIPEPIPE = 72, + GTGT = 73, + GTGTGT = 74, + LTLT = 75, + AMP = 76, + CARET = 77, + PIPE = 78, + PLUS = 79, + DASH = 80, + PERCENT = 81, + STARSTAR = 82, + LTEQ = 83, + EQEQ = 84, + EQEQEQ = 85, + BANGEQ = 86, + BANGEQEQ = 87, + GTEQ = 88, + QMARKQMARK = 89, + Instanceof = 90, + BANG = 91, + TILDE = 92, + Typeof = 93, + Void = 94, + Delete = 95, + PLUSPLUS = 96, + DASHDASH = 97, + DQUOTE = 98, + SQUOTE = 99, + StringFragment = 100, + StringFragment2 = 101, + EscapeSequence = 102, + Comment = 103, + BQUOTE = 104, + DOLLARLBRACE = 105, + SLASH2 = 106, + RegexPattern = 107, + RegexFlags = 108, + Number = 109, + PrivatePropertyIdentifier = 110, Target = 111, This = 112, Super = 113, @@ -126,129 +126,131 @@ pub enum Javascript { Set = 121, AutomaticSemicolon = 122, TemplateChars = 123, - Program = 124, - ExportStatement = 125, - ExportClause = 126, - ExportSpecifier = 127, - Declaration = 128, - Import = 129, - ImportStatement = 130, - ImportClause = 131, - FromClause = 132, - NamespaceImport = 133, - NamedImports = 134, - ExpressionStatement = 135, - VariableDeclaration = 136, - LexicalDeclaration = 137, - VariableDeclarator = 138, - StatementBlock = 139, - ElseClause = 140, - IfStatement = 141, - SwitchStatement = 142, - ForStatement = 143, - ForInStatement = 144, - ForHeader = 145, - WhileStatement = 146, - DoStatement = 147, - TryStatement = 148, - WithStatement = 149, - BreakStatement = 150, - ContinueStatement = 151, - DebuggerStatement = 152, - ReturnStatement = 153, - ThrowStatement = 154, - EmptyStatement = 155, - LabeledStatement = 156, - SwitchBody = 157, - SwitchCase = 158, - SwitchDefault = 159, - CatchClause = 160, - FinallyClause = 161, - ParenthesizedExpression = 162, - Expression = 163, - PrimaryExpression = 164, - YieldExpression = 165, - Object = 166, - ObjectPattern = 167, - AssignmentPattern = 168, - ObjectAssignmentPattern = 169, - Array = 170, - ArrayPattern = 171, - JsxElement = 172, - JsxFragment = 173, - JsxExpression = 174, - JsxOpeningElement = 175, - NestedIdentifier = 176, - JsxNamespaceName = 177, - JsxClosingElement = 178, - JsxSelfClosingElement = 179, - JsxAttribute = 180, - Class = 181, - ClassDeclaration = 182, - ClassHeritage = 183, - Function = 184, - FunctionDeclaration = 185, - GeneratorFunction = 186, - GeneratorFunctionDeclaration = 187, - ArrowFunction = 188, - CallExpression = 189, - NewExpression = 190, - AwaitExpression = 191, - MemberExpression = 192, - SubscriptExpression = 193, - AssignmentExpression = 194, - AugmentedAssignmentLhs = 195, - AugmentedAssignmentExpression = 196, - Initializer = 197, - DestructuringPattern = 198, - SpreadElement = 199, - TernaryExpression = 200, - BinaryExpression = 201, - UnaryExpression = 202, - UpdateExpression = 203, - SequenceExpression = 204, - String = 205, - TemplateString = 206, - TemplateSubstitution = 207, - Regex = 208, - MetaProperty = 209, - Arguments = 210, - Decorator = 211, - MemberExpression2 = 212, - CallExpression2 = 213, - ClassBody = 214, - PublicFieldDefinition = 215, - FormalParameters = 216, - Pattern = 217, - RestPattern = 218, - MethodDefinition = 219, - Pair = 220, - PairPattern = 221, - PropertyName = 222, - ComputedPropertyName = 223, - ProgramRepeat1 = 224, - ExportStatementRepeat1 = 225, - ExportClauseRepeat1 = 226, - NamedImportsRepeat1 = 227, - VariableDeclarationRepeat1 = 228, - SwitchBodyRepeat1 = 229, - ObjectRepeat1 = 230, - ObjectPatternRepeat1 = 231, - ArrayRepeat1 = 232, - ArrayPatternRepeat1 = 233, - JsxElementRepeat1 = 234, - JsxOpeningElementRepeat1 = 235, - StringRepeat1 = 236, - StringRepeat2 = 237, - TemplateStringRepeat1 = 238, - ClassBodyRepeat1 = 239, - FormalParametersRepeat1 = 240, - ImportSpecifier = 241, - PropertyIdentifier = 242, - ShorthandPropertyIdentifier = 243, - ShorthandPropertyIdentifierPattern = 244, - StatementIdentifier = 245, - Error = 246, + QMARK = 124, + Program = 125, + ExportStatement = 126, + ExportClause = 127, + ExportSpecifier = 128, + Declaration = 129, + Import = 130, + ImportStatement = 131, + ImportClause = 132, + FromClause = 133, + NamespaceImport = 134, + NamedImports = 135, + ExpressionStatement = 136, + VariableDeclaration = 137, + LexicalDeclaration = 138, + VariableDeclarator = 139, + StatementBlock = 140, + ElseClause = 141, + IfStatement = 142, + SwitchStatement = 143, + ForStatement = 144, + ForInStatement = 145, + ForHeader = 146, + WhileStatement = 147, + DoStatement = 148, + TryStatement = 149, + WithStatement = 150, + BreakStatement = 151, + ContinueStatement = 152, + DebuggerStatement = 153, + ReturnStatement = 154, + ThrowStatement = 155, + EmptyStatement = 156, + LabeledStatement = 157, + SwitchBody = 158, + SwitchCase = 159, + SwitchDefault = 160, + CatchClause = 161, + FinallyClause = 162, + ParenthesizedExpression = 163, + Expression = 164, + PrimaryExpression = 165, + YieldExpression = 166, + Object = 167, + ObjectPattern = 168, + AssignmentPattern = 169, + ObjectAssignmentPattern = 170, + Array = 171, + ArrayPattern = 172, + JsxElement = 173, + JsxFragment = 174, + JsxExpression = 175, + JsxOpeningElement = 176, + NestedIdentifier = 177, + JsxNamespaceName = 178, + JsxClosingElement = 179, + JsxSelfClosingElement = 180, + JsxAttribute = 181, + Class = 182, + ClassDeclaration = 183, + ClassHeritage = 184, + Function = 185, + FunctionDeclaration = 186, + GeneratorFunction = 187, + GeneratorFunctionDeclaration = 188, + ArrowFunction = 189, + CallExpression = 190, + NewExpression = 191, + AwaitExpression = 192, + MemberExpression = 193, + SubscriptExpression = 194, + AssignmentExpression = 195, + AugmentedAssignmentLhs = 196, + AugmentedAssignmentExpression = 197, + Initializer = 198, + DestructuringPattern = 199, + SpreadElement = 200, + TernaryExpression = 201, + BinaryExpression = 202, + UnaryExpression = 203, + UpdateExpression = 204, + SequenceExpression = 205, + String = 206, + TemplateString = 207, + TemplateSubstitution = 208, + Regex = 209, + MetaProperty = 210, + Arguments = 211, + Decorator = 212, + MemberExpression2 = 213, + CallExpression2 = 214, + ClassBody = 215, + FieldDefinition = 216, + FormalParameters = 217, + Pattern = 218, + RestPattern = 219, + MethodDefinition = 220, + Pair = 221, + PairPattern = 222, + PropertyName = 223, + ComputedPropertyName = 224, + ProgramRepeat1 = 225, + ExportStatementRepeat1 = 226, + ExportClauseRepeat1 = 227, + NamedImportsRepeat1 = 228, + VariableDeclarationRepeat1 = 229, + SwitchBodyRepeat1 = 230, + ObjectRepeat1 = 231, + ObjectPatternRepeat1 = 232, + ArrayRepeat1 = 233, + ArrayPatternRepeat1 = 234, + JsxElementRepeat1 = 235, + JsxOpeningElementRepeat1 = 236, + StringRepeat1 = 237, + StringRepeat2 = 238, + TemplateStringRepeat1 = 239, + ClassBodyRepeat1 = 240, + FormalParametersRepeat1 = 241, + ImportSpecifier = 242, + NamespaceExport = 243, + PropertyIdentifier = 244, + ShorthandPropertyIdentifier = 245, + ShorthandPropertyIdentifierPattern = 246, + StatementIdentifier = 247, + Error = 248, } impl From for &'static str { @@ -326,7 +328,6 @@ impl From for &'static str { Javascript::PIPEPIPEEQ => "||=", Javascript::QMARKQMARKEQ => "??=", Javascript::DOTDOTDOT => "...", - Javascript::QMARK => "?", Javascript::AMPAMP => "&&", Javascript::PIPEPIPE => "||", Javascript::GTGT => ">>", @@ -355,9 +356,9 @@ impl From for &'static str { Javascript::PLUSPLUS => "++", Javascript::DASHDASH => "--", Javascript::DQUOTE => "\"", - Javascript::StringToken1 => "string_token1", Javascript::SQUOTE => "'", - Javascript::StringToken2 => "string_token2", + Javascript::StringFragment => "string_fragment", + Javascript::StringFragment2 => "string_fragment", Javascript::EscapeSequence => "escape_sequence", Javascript::Comment => "comment", Javascript::BQUOTE => "`", @@ -366,6 +367,7 @@ impl From for &'static str { Javascript::RegexPattern => "regex_pattern", Javascript::RegexFlags => "regex_flags", Javascript::Number => "number", + Javascript::PrivatePropertyIdentifier => "private_property_identifier", Javascript::Target => "target", Javascript::This => "this", Javascript::Super => "super", @@ -379,6 +381,7 @@ impl From for &'static str { Javascript::Set => "set", Javascript::AutomaticSemicolon => "_automatic_semicolon", Javascript::TemplateChars => "_template_chars", + Javascript::QMARK => "?", Javascript::Program => "program", Javascript::ExportStatement => "export_statement", Javascript::ExportClause => "export_clause", @@ -470,7 +473,7 @@ impl From for &'static str { Javascript::MemberExpression2 => "member_expression", Javascript::CallExpression2 => "call_expression", Javascript::ClassBody => "class_body", - Javascript::PublicFieldDefinition => "public_field_definition", + Javascript::FieldDefinition => "field_definition", Javascript::FormalParameters => "formal_parameters", Javascript::Pattern => "pattern", Javascript::RestPattern => "rest_pattern", @@ -497,6 +500,7 @@ impl From for &'static str { Javascript::ClassBodyRepeat1 => "class_body_repeat1", Javascript::FormalParametersRepeat1 => "formal_parameters_repeat1", Javascript::ImportSpecifier => "import_specifier", + Javascript::NamespaceExport => "namespace_export", Javascript::PropertyIdentifier => "property_identifier", Javascript::ShorthandPropertyIdentifier => "shorthand_property_identifier", Javascript::ShorthandPropertyIdentifierPattern => { diff --git a/src/metrics/loc.rs b/src/metrics/loc.rs index b51c526af..88ffead62 100644 --- a/src/metrics/loc.rs +++ b/src/metrics/loc.rs @@ -1169,7 +1169,7 @@ mod tests { [ (sloc, 5, usize), // The number of lines is 5 (ploc, 5, usize), // The number of code lines is 5 - (lloc, 7, usize), // The number of statements is 7 + (lloc, 6, usize), // The number of statements is 6 (cloc, 0, usize), // The number of comments is 0 (blank, 0, usize) // The number of blank lines is 0 ]