fixed the tree-sitter grammar to allow any primary term on rhs of IN (t…

…ree-sitter#9) * fixed the tree-sitter grammar to allow any primary term on rhs of keyword IN * bump the codeql sha for tree-sitter CI to the current HEAD Co-authored-by: Timothy Clem <[email protected]>
tausbn · Sep 16, 2020 · a0d688d · a0d688d
1 parent 8474d90
commit a0d688d
Show file tree

Hide file tree

Showing 6 changed files with 29,450 additions and 29,113 deletions.
diff --git a/grammar.js b/grammar.js
@@ -151,7 +151,7 @@ module.exports = grammar({
     in_expr: $ => prec.left(7, seq(
       field('left', $._exprOrTerm),
       'in',
-      field('right', $.range)
+      field('right', $._primary)
     )),
     comp_term: $ => prec.left(6, seq(
       field('left', $._exprOrTerm),

diff --git a/script/fetch-examples b/script/fetch-examples
@@ -14,4 +14,4 @@ function checkout() {
   popd
 }
 
-checkout examples/codeql github/codeql 39137510ba9d47f517bebcfc9770f6219cfd397d
+checkout examples/codeql github/codeql 86404af50100b409b18e62651295e79393a6016a
diff --git a/src/grammar.json b/src/grammar.json
@@ -1081,7 +1081,7 @@
             "name": "right",
             "content": {
               "type": "SYMBOL",
-              "name": "range"
+              "name": "_primary"
             }
           }
         ]
@@ -2443,7 +2443,7 @@
     },
     "qldoc": {
       "type": "PATTERN",
-      "value": "\\/\\*\\*[^*]*\\*+([^\\/*][^*]*\\*+)*\\/"
+      "value": "\\/\\*\\*[^*]*\\*+([^/*][^*]*\\*+)*\\/"
     },
     "literalId": {
       "type": "CHOICE",
@@ -2865,7 +2865,7 @@
     },
     "block_comment": {
       "type": "PATTERN",
-      "value": "\\/\\*([^*]+\\*+([^\\/*][^*]*\\*+)*|\\*)\\/"
+      "value": "\\/\\*([^*]+\\*+([^/*][^*]*\\*+)*|\\*)\\/"
     },
     "false": {
       "type": "STRING",

diff --git a/src/node-types.json b/src/node-types.json
@@ -2674,9 +2674,41 @@
         "multiple": false,
         "required": true,
         "types": [
+          {
+            "type": "aggregate",
+            "named": true
+          },
+          {
+            "type": "call_or_unqual_agg_expr",
+            "named": true
+          },
+          {
+            "type": "literal",
+            "named": true
+          },
+          {
+            "type": "par_expr",
+            "named": true
+          },
+          {
+            "type": "qualified_expr",
+            "named": true
+          },
           {
             "type": "range",
             "named": true
+          },
+          {
+            "type": "set_literal",
+            "named": true
+          },
+          {
+            "type": "super_ref",
+            "named": true
+          },
+          {
+            "type": "variable",
+            "named": true
           }
         ]
       }
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,4 +14,4 @@ function checkout() { @@
       popd
     }
-    checkout examples/codeql github/codeql 39137510ba9d47f517bebcfc9770f6219cfd397d
+    checkout examples/codeql github/codeql 86404af50100b409b18e62651295e79393a6016a