tmp

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "test-submodules/tree-sitter-bash"]
+	path = test-submodules/tree-sitter-bash
+	url = https://github.com/tree-sitter/tree-sitter-bash.git
+	shallow = true

build-flavored-queries.py

@@ -28,8 +28,8 @@
 ]
 
 REPLACEMENTS_RE = [
-    (r";\s*NVIM-DISABLE-START.*;\s*NVIM-DISABLE-END", "", re.MULTILINE | re.DOTALL),
-    ("^.*NVIM-ENABLE(?P<content>.*)$", r"\g<content>", re.MULTILINE),
+    (r"^[^;] ?(.*;\s*NVIM-DISABLE)$", "", re.MULTILINE),
+    (r"^; ?(.*;\s*NVIM-ENABLE)$", r"\1", re.MULTILINE),
 ]
 
 

package.json

@@ -42,7 +42,8 @@
       "injection-regex": "^(?i)just(file)?$",
       "first-line-regex": "#!\\S*bin\\S*[/ ]just",
       "highlights": ["queries-src/highlights.scm"],
-      "locals": ["queries-src/locals.scm"]
+      "locals": ["queries-src/locals.scm"],
+      "injections": ["queries-src/injections.scm"]
     }
   ]
 }

queries-src/highlights.scm

@@ -39,24 +39,8 @@
 (function_call
   name: (identifier) @function)
 
-; highlight known attributes (filtering does not always work)
 (attribute
-  attr_item: ((identifier) @attribute
-  (#any-of? @attribute
-    "private"
-    "allow-duplicate-recipes"
-    "dotenv-filename"
-    "dotenv-load"
-    "dotenv-path"
-    "export"
-    "fallback"
-    "ignore-comments"
-    "positional-arguments"
-    "shell"
-    "tempdi"
-    "windows-powershell"
-    "windows-shell"
-    )))
+  attr_item: ((identifier) @attribute))
 
 (recipe_header
   recipe_name: (identifier) @function)

queries-src/injections.scm

@@ -6,35 +6,57 @@
 (source_file
   (item
     (setting
-      left: "shell")))
-      right: (array
-                )
-
-; TODO reenable
-; ; NVIM-DISABLE-START
-; (recipe_body
-;     (shebang) @injection.shebang 
-;     (recipe_line
-;         (text) @injection.content))
-; ; NVIM-DISABLE-END
-
-; (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"))
+    left: (identifier) @setting
+    (#match? @setting "^shell$")
+    right: (array
+      (string_literal) @executable
+      (#match? @executable ".*(powershell|pwsh|cmd).*")
+      (#set! injection.language "powershell")
+      )))
+  (item
+    (recipe
+      (recipe_body
+        (recipe_line
+          (text) @injection.content)))))
+
+
+(source_file
+  (item
+    (setting
+    left: (identifier) @setting
+    (#match? @setting "^shell$")
+    right: (array
+      (string_literal) @injection.language
+      (#not-match? @executable ".*(powershell|pwsh|cmd).*")
+      )))
+  (item
+    (recipe
+      (recipe_body
+        (recipe_line
+          (text) @injection.content)))))
+
+(recipe_body                    ; NVIM-DISABLE
+  (shebang) @injection.shebang  ; NVIM-DISABLE
+  (recipe_line                  ; NVIM-DISABLE
+    (text) @injection.content)) ; NVIM-DISABLE
+
+(recipe_line
+    (text) @injection.content
+    (#set! injection.language "bash"))
+
+;  (recipe_body                                             ; NVIM-ENABLE
+;      (shebang) @injection.language                        ; NVIM-ENABLE
+;      (recipe_line                                         ; NVIM-ENABLE
+;          (text) @injection.content)                       ; NVIM-ENABLE
+;      (#gsub! injection.language "/#!%*[\/ ](%S+)/" "%1")) ; NVIM-ENABLE
+
+(external_command
+    (command_body) @injection.content
+    (#set! injection.language "bash"))
 
 ((regex_literal
-    [
-        (string_literal)
-        (raw_string_literal)
-    ] @injection.content)
-    (#set! injection.language "regex"))
+  [
+    (string_literal)
+    (raw_string_literal)
+  ] @injection.content)
+  (#set! injection.language "regex"))

queries/just/highlights.scm

@@ -41,24 +41,8 @@
 (function_call
   name: (identifier) @function)
 
-; highlight known attributes (filtering does not always work)
 (attribute
-  attr_item: ((identifier) @attribute
-  (#any-of? @attribute
-    "private"
-    "allow-duplicate-recipes"
-    "dotenv-filename"
-    "dotenv-load"
-    "dotenv-path"
-    "export"
-    "fallback"
-    "ignore-comments"
-    "positional-arguments"
-    "shell"
-    "tempdi"
-    "windows-powershell"
-    "windows-shell"
-    )))
+  attr_item: ((identifier) @attribute))
 
 (recipe_header
   recipe_name: (identifier) @function)

queries/just/injections.scm

@@ -8,29 +8,60 @@
 (source_file
   (item
     (setting
-      left: "shell")))
-      right: (array
-                )
+    left: (identifier) @setting
+    (#match? @setting "^shell$")
+    right: (array
+      (string_literal) @executable
+      (#match? @executable ".*(powershell|pwsh|cmd).*")
+      (#set! injection.language "powershell")
+      )))
+  (item
+    (recipe
+      (recipe_body
+        (recipe_line
+          (text) @injection.content)))))
+
+
+(source_file
+  (item
+    (setting
+    left: (identifier) @setting
+    (#match? @setting "^shell$")
+    right: (array
+      (string_literal) @injection.language
+      (#not-match? @executable ".*(powershell|pwsh|cmd).*")
+      )))
+  (item
+    (recipe
+      (recipe_body
+        (recipe_line
+          (text) @injection.content)))))
 
-; 
+; TODO reenable
+; ; NVIM-DISABLE-START
+; (recipe_body
+;     (shebang) @injection.shebang 
+;     (recipe_line
+;         (text) @injection.content))
+; ; NVIM-DISABLE-END
 
 ; (recipe_line
 ;     (text) @injection.content
 ;     (#set! injection.language "bash"))
 
- (recipe_body
-     (shebang) @injection.language
-     (recipe_line
-         (text) @injection.content)
-     (#gsub! injection.language "/#!%*[\/ ](%S+)/" "%1"))
+; ; 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"))
 
 ((regex_literal
-    [
-        (string_literal)
-        (raw_string_literal)
-    ] @injection.content)
-    (#set! injection.language "regex"))
+  [
+    (string_literal)
+    (raw_string_literal)
+  ] @injection.content)
+  (#set! injection.language "regex"))

test/highlight/injections-global-pwsh.just

@@ -0,0 +1,8 @@
+set shell := ["pwsh", "-c"]
+set dotenv-filename := ".env-local"
+set banana := "oiij"
+set dotenv-load
+
+recipe:
+    Write-Host "Hello, world!"
+	Get-ChildItem -Path C:\

test/highlight/injections-global-py.just

@@ -1,4 +1,12 @@
-set shell := ["python3", "-c"]
+set shell := ["python", "-c"]
 set dotenv-filename := ".env-local"
 set banana := "oiij"
 set dotenv-load
+
+recipe:
+	print("foo")
+	if bar:
+		a += b
+	if (baz) {
+		abcd()
+	}