Update tree-sitter-mozcpp to 0.20 (#754)

* Pick first grep occurrence * enums: Update tree-sitter deps * Update tree-sitter-mozcpp * Fix grammar enums * Update mozcpp grammar to 0.20 * Add loc test for namespace
mozilla · Jan 12, 2022 · 73f5e1d · 73f5e1d
1 parent 1c3c663
commit 73f5e1d
Show file tree

Hide file tree

Showing 14 changed files with 348,513 additions and 375,681 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -34,7 +34,7 @@ tree-sitter-python = "=0.19.0"
 tree-sitter-rust = "=0.19.0"
 tree-sitter-preproc = { path = "./tree-sitter-preproc", version = "=0.19.0" }
 tree-sitter-ccomment = { path = "./tree-sitter-ccomment", version = "=0.19.0" }
-tree-sitter-mozcpp = { path = "./tree-sitter-mozcpp", version = "=0.19.5" }
+tree-sitter-mozcpp = { path = "./tree-sitter-mozcpp", version = "=0.20.0" }
 tree-sitter-mozjs = { path = "./tree-sitter-mozjs", version = "=0.19.0" }
 
 [dev-dependencies]

diff --git a/enums/Cargo.lock b/enums/Cargo.lock
diff --git a/enums/Cargo.toml b/enums/Cargo.toml
@@ -16,5 +16,5 @@ tree-sitter-python = "=0.19.0"
 tree-sitter-rust = "=0.19.0"
 tree-sitter-preproc = { path = "../tree-sitter-preproc", version = "=0.19.0" }
 tree-sitter-ccomment = { path = "../tree-sitter-ccomment", version = "=0.19.0" }
-tree-sitter-mozcpp = { path = "../tree-sitter-mozcpp", version = "=0.19.5" }
+tree-sitter-mozcpp = { path = "../tree-sitter-mozcpp", version = "=0.20.0" }
 tree-sitter-mozjs = { path = "../tree-sitter-mozjs", version = "=0.19.0" }
diff --git a/generate-grammars/generate-mozcpp.sh b/generate-grammars/generate-mozcpp.sh
@@ -12,7 +12,7 @@ TS_CPP_CRATE="tree-sitter-cpp"
 JSON_CRATE_FILENAME=".cargo_vcs_info.json"
 
 # Get the current tree-sitter-cpp crate version from the tree-sitter-mozcpp grammar
-TS_CPP_VERSION=`grep $TS_CPP_CRATE tree-sitter-mozcpp/Cargo.toml | cut -f2 -d "," | cut -f2 -d "=" | tr -d ' ' | tr -d } | tr -d \"`
+TS_CPP_VERSION=`grep -m 1 $TS_CPP_CRATE tree-sitter-mozcpp/Cargo.toml | cut -f2 -d "," | cut -f2 -d "=" | tr -d ' ' | tr -d } | tr -d \"`
 
 # Name assigned to the compressed binary crate downloaded from crates.io
 CRATE_OUTPUT="$TS_CPP_CRATE-download.gz"

diff --git a/src/checker.rs b/src/checker.rs
@@ -151,8 +151,7 @@ impl Checker for CppCode {
         FunctionDefinition,
         FunctionDefinition2,
         FunctionDefinition3,
-        FunctionDefinition4,
-        FunctionDefinitionRepeat1
+        FunctionDefinition4
     );
     mk_checker!(is_closure, LambdaExpression);
     mk_checker!(

diff --git a/src/getter.rs b/src/getter.rs
@@ -446,10 +446,9 @@ impl Getter for CppCode {
                     }) {
                         if let Some(first) = fd.object().child(0) {
                             match first.kind_id().into() {
-                                Cpp::ScopedIdentifier
+                                Cpp::TypeIdentifier
                                 | Cpp::Identifier
                                 | Cpp::FieldIdentifier
-                                | Cpp::ScopedFieldIdentifier
                                 | Cpp::DestructorName
                                 | Cpp::OperatorName
                                 | Cpp::TemplateFunction