Fix scanner

IndianBoy42 · Jan 24, 2024 · b0f92eb · b0f92eb
1 parent ce1b349
commit b0f92eb
Show file tree

Hide file tree

Showing 6 changed files with 3,782 additions and 3,509 deletions.
diff --git a/grammar.js b/grammar.js
@@ -102,7 +102,7 @@ module.exports = grammar({
     export: ($) => seq("export", $.assignment),
 
     // import        : 'import' '?'? string?
-    import: ($) => seq("import", optional("?"), $.string_literal),
+    import: ($) => seq("import", optional("?"), $._string),
 
     // module        : 'mod' '?'? string?
     module: ($) =>
@@ -191,7 +191,7 @@ module.exports = grammar({
           $.function_call,
           $.external_command,
           $.identifier,
-          $.string_literal,
+          $._string,
           seq("(", $.expression, ")"),
         ),
       ),
@@ -204,9 +204,6 @@ module.exports = grammar({
         ")",
       ),
 
-    external_command: ($) =>
-      choice(seq($._backticked), seq($._indented_backticked)),
-
     // sequence      : expression ',' sequence
     //               | expression ','?
     sequence: ($) => comma_sep1($.expression),

diff --git a/justfile b/justfile
@@ -1,3 +1,12 @@
+debug_env := env("DEBUG", "default")
+debug_arg := if debug_env == "1" {
+	"--debug-build"
+} else if debug_env == "default" {
+	""
+} else {
+	error("unrecognized DEBUG variable " + debug_env)
+}
+
 # List all recipes
 default:
 	just --list
@@ -14,7 +23,8 @@ format:
 
 # Generate the parser
 gen:
-	npm run gen
+	tree-sitter generate {{ debug_arg }}
+	python3 build-flavored-queries.py
 
 alias t := test-ts
 

diff --git a/src/grammar.json b/src/grammar.json
@@ -168,7 +168,7 @@
         },
         {
           "type": "SYMBOL",
-          "name": "string_literal"
+          "name": "_string"
         }
       ]
     },
@@ -638,7 +638,7 @@
           },
           {
             "type": "SYMBOL",
-            "name": "string_literal"
+            "name": "_string"
           },
           {
             "type": "SEQ",
@@ -697,61 +697,6 @@
         }
       ]
     },
-    "external_command": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "FIELD",
-          "name": "open",
-          "content": {
-            "type": "ALIAS",
-            "content": {
-              "type": "SYMBOL",
-              "name": "_command_start"
-            },
-            "named": false,
-            "value": "(`|```)"
-          }
-        },
-        {
-          "type": "FIELD",
-          "name": "body",
-          "content": {
-            "type": "REPEAT",
-            "content": {
-              "type": "CHOICE",
-              "members": [
-                {
-                  "type": "PREC",
-                  "value": 1,
-                  "content": {
-                    "type": "SYMBOL",
-                    "name": "interpolation"
-                  }
-                },
-                {
-                  "type": "SYMBOL",
-                  "name": "command_body"
-                }
-              ]
-            }
-          }
-        },
-        {
-          "type": "FIELD",
-          "name": "close",
-          "content": {
-            "type": "ALIAS",
-            "content": {
-              "type": "SYMBOL",
-              "name": "_command_end"
-            },
-            "named": false,
-            "value": "(`|```)"
-          }
-        }
-      ]
-    },
     "sequence": {
       "type": "SEQ",
       "members": [
@@ -1379,6 +1324,61 @@
         }
       ]
     },
+    "external_command": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "FIELD",
+          "name": "open",
+          "content": {
+            "type": "ALIAS",
+            "content": {
+              "type": "SYMBOL",
+              "name": "_command_start"
+            },
+            "named": false,
+            "value": "(`|```)"
+          }
+        },
+        {
+          "type": "FIELD",
+          "name": "body",
+          "content": {
+            "type": "REPEAT",
+            "content": {
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "PREC",
+                  "value": 1,
+                  "content": {
+                    "type": "SYMBOL",
+                    "name": "interpolation"
+                  }
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "command_body"
+                }
+              ]
+            }
+          }
+        },
+        {
+          "type": "FIELD",
+          "name": "close",
+          "content": {
+            "type": "ALIAS",
+            "content": {
+              "type": "SYMBOL",
+              "name": "_command_end"
+            },
+            "named": false,
+            "value": "(`|```)"
+          }
+        }
+      ]
+    },
     "command_body": {
       "type": "SYMBOL",
       "name": "_content_component"

diff --git a/src/node-types.json b/src/node-types.json
@@ -407,6 +407,10 @@
       "multiple": false,
       "required": true,
       "types": [
+        {
+          "type": "raw_string_literal",
+          "named": true
+        },
         {
           "type": "string_literal",
           "named": true
@@ -840,6 +844,10 @@
           "type": "identifier",
           "named": true
         },
+        {
+          "type": "raw_string_literal",
+          "named": true
+        },
         {
           "type": "string_literal",
           "named": true