Add logic for setting recipe body language with shebangs

tgross35 · Jan 8, 2024 · 60f1f7b · 60f1f7b
1 parent e4e2405
commit 60f1f7b
Show file tree

Hide file tree

Showing 12 changed files with 3,539 additions and 3,522 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
@@ -51,6 +51,8 @@ module.exports = grammar({
     // justfile      : item* EOF
     source_file: ($) => seq(optional($.shebang), repeat($.item)),
 
+    // _sheb: ($) => ,
+
     // item          : recipe
     //               | alias
     //               | assignment
@@ -295,7 +297,7 @@ module.exports = grammar({
 
     recipe_line_prefix: (_) => choice("@-", "-@", "@", "-"),
 
-    shebang: ($) => seq(/\s*#!.*/, $._newline),
+    shebang: ($) => prec.left(seq(/#!.*/, optional($._newline))),
 
     // `# ...` comment
     comment: ($) => seq(/#.*/, $._newline),

diff --git a/queries-src/injections.scm b/queries-src/injections.scm
@@ -3,12 +3,23 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
 
+; NVIM-DISABLE-START
+(recipe_body
+    (shebang) @injection.shebang 
+    (recipe_line
+        (text) @injection.content))
+; NVIM-DISABLE-END
 
-; FIXME: read default from shebang
 (recipe_line
     (text) @injection.content
     (#set! injection.language "bash"))
 
+; NVIM-ENABLE (recipe_body
+; NVIM-ENABLE     (shebang) @injection.language
+; NVIM-ENABLE     (recipe_line
+; NVIM-ENABLE         (text) @injection.content)
+; NVIM-ENABLE     (#gsub! injection.language "/#!%*[\/ ](%S+)/" "%1"))
+
 (external_command
     (command_body) @injection.content
     (#set! injection.language "bash"))

diff --git a/queries/just/injections.scm b/queries/just/injections.scm
@@ -6,25 +6,24 @@
   (#set! injection.language "comment"))
 
 
+
 (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"))
 
 ((regex_literal
-    [(string_literal)
-        (raw_string_literal)] @injection.content)
+    [
+        (string_literal)
+        (raw_string_literal)
+    ] @injection.content)
     (#set! injection.language "regex"))
-
-; ; FIXME: read default from shebang
-; ([
-;     (recipe_body 
-;       (recipe_line (text)))
-;     (external_command
-;         body: (_)*)
-;   ] @injection.content
-;   (#set! injection.language "bash")
-;   )
diff --git a/src/grammar.json b/src/grammar.json
@@ -1252,17 +1252,33 @@
       ]
     },
     "shebang": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "PATTERN",
-          "value": "\\s*#!.*"
-        },
-        {
-          "type": "SYMBOL",
-          "name": "_newline"
-        }
-      ]
+      "type": "PREC_LEFT",
+      "value": 0,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "PATTERN",
+            "value": "#!.*"
+          },
+          {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "_newline"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "shebang_language": {
+      "type": "PATTERN",
+      "value": ".+"
     },
     "comment": {
       "type": "SEQ",

diff --git a/src/node-types.json b/src/node-types.json
@@ -822,6 +822,11 @@
       }
     }
   },
+  {
+    "type": "text",
+    "named": true,
+    "fields": {}
+  },
   {
     "type": "value",
     "named": true,
@@ -1027,10 +1032,6 @@
     "type": "shell",
     "named": false
   },
-  {
-    "type": "text",
-    "named": true
-  },
   {
     "type": "true",
     "named": false