Working with @injection.shebang

tgross35 · Jan 8, 2024 · 44be759 · 44be759
1 parent 7ee36dc
commit 44be759
Show file tree

Hide file tree

Showing 11 changed files with 3,848 additions and 4,076 deletions.
diff --git a/build-flavored-queries.py b/build-flavored-queries.py
@@ -12,6 +12,7 @@
     
 """
 
+import re
 from glob import glob
 from pathlib import Path
 
@@ -26,6 +27,11 @@
     ("@constant.character.escape", "@string.escape"),
 ]
 
+REPLACEMENTS_RE = [
+    (r";\s*NVIM-DISABLE-START.*;\s*NVIM-DISABLE-END", "", re.MULTILINE | re.DOTALL),
+    ("^.*NVIM-ENABLE(?P<content>.*)$", r"\g<content>", re.MULTILINE),
+]
+
 
 def main():
     sources = glob("queries-src/*.scm")
@@ -35,8 +41,11 @@ def main():
         with open(fname) as f:
             contents += f.read()
 
-        for x, to in REPLACEMENTS:
-            contents = contents.replace(x, to)
+        for query, sub in REPLACEMENTS:
+            contents = contents.replace(query, sub)
+
+        for query, sub, flags in REPLACEMENTS_RE:
+            contents = re.sub(query, sub, contents, flags=flags)
 
         dest = Path("queries") / "just" / Path(fname).name
         with open(dest, "w") as f:

diff --git a/grammar.js b/grammar.js
@@ -297,22 +297,7 @@ module.exports = grammar({
 
     recipe_line_prefix: (_) => choice("@-", "-@", "@", "-"),
 
-    shebang: ($) =>
-      prec.left(
-        seq(
-          choice($.shebang_executable, field("unrecognized_shebang", /#!.*/)),
-          optional($._newline),
-        ),
-      ),
-
-    // Rule is never used directly
-    shebang_executable: ($) =>
-      token.immediate(seq(
-        "#!",
-        /\S*[/ ]/,
-        field("cmd", /\S+/),
-        /.*/,
-      )),
+    shebang: ($) => prec.left(seq(/#!.*/, optional($._newline))),
 
     // prec(
     //   4,

diff --git a/queries-src/injections.scm b/queries-src/injections.scm
@@ -3,23 +3,23 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
 
-; FIXME: read default from shebang
+; NVIM-DISABLE-START
 (recipe_body
-    (shebang
-        (shebang_executable
-            _
-        )
-        ; "#!"
-        ; _
-        )
+    (shebang) @injection.shebang 
     (recipe_line
-        (text) @injection.content
-        (#set! injection.language "bash")))
+        (text) @injection.content))
+; NVIM-DISABLE-END
 
 (recipe_line
     (text) @injection.content
     (#set! injection.language "bash"))
 
+; NVIM-ENABLE (recipe_body
+; NVIM-ENABLE     (shebang) @injection.shebang 
+; NVIM-ENABLE     (recipe_line
+; NVIM-ENABLE         (text) @injection.content
+; NVIM-ENABLE         (#set! injection.language "python")))
+
 (external_command
     (command_body) @injection.content
     (#set! injection.language "bash"))

diff --git a/queries/just/injections.scm b/queries/just/injections.scm
@@ -5,23 +5,18 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
 
-; FIXME: read default from shebang
-(recipe_body
-    (shebang
-        (shebang_executable
-            _
-        )
-        ; "#!"
-        ; _
-        )
-    (recipe_line
-        (text) @injection.content
-        (#set! injection.language "bash")))
+
 
 (recipe_line
     (text) @injection.content
     (#set! injection.language "bash"))
 
+ (recipe_body
+     (shebang) @injection.shebang 
+     (recipe_line
+         (text) @injection.content
+         (#set! injection.language "python")))
+
 (external_command
     (command_body) @injection.content
     (#set! injection.language "bash"))

diff --git a/src/grammar.json b/src/grammar.json
@@ -1258,21 +1258,8 @@
         "type": "SEQ",
         "members": [
           {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "shebang_executable"
-              },
-              {
-                "type": "FIELD",
-                "name": "unrecognized_shebang",
-                "content": {
-                  "type": "PATTERN",
-                  "value": "#!.*"
-                }
-              }
-            ]
+            "type": "PATTERN",
+            "value": "#!.*"
           },
           {
             "type": "CHOICE",
@@ -1289,34 +1276,6 @@
         ]
       }
     },
-    "shebang_executable": {
-      "type": "IMMEDIATE_TOKEN",
-      "content": {
-        "type": "SEQ",
-        "members": [
-          {
-            "type": "STRING",
-            "value": "#!"
-          },
-          {
-            "type": "PATTERN",
-            "value": "\\S*[/ ]"
-          },
-          {
-            "type": "FIELD",
-            "name": "cmd",
-            "content": {
-              "type": "PATTERN",
-              "value": "\\S+"
-            }
-          },
-          {
-            "type": "PATTERN",
-            "value": ".*"
-          }
-        ]
-      }
-    },
     "shebang_language": {
       "type": "PATTERN",
       "value": ".+"

diff --git a/src/node-types.json b/src/node-types.json
@@ -765,17 +765,7 @@
   {
     "type": "shebang",
     "named": true,
-    "fields": {},
-    "children": {
-      "multiple": false,
-      "required": false,
-      "types": [
-        {
-          "type": "shebang_executable",
-          "named": true
-        }
-      ]
-    }
+    "fields": {}
   },
   {
     "type": "source_file",
@@ -1038,10 +1028,6 @@
     "type": "set",
     "named": false
   },
-  {
-    "type": "shebang_executable",
-    "named": true
-  },
   {
     "type": "shell",
     "named": false