Merge pull request #177 from kennyp/main

Support Multiple Args for Attributes

grammar.js

@@ -229,7 +229,12 @@ module.exports = grammar({
         comma_sep1(
           choice(
             $.identifier,
-            seq($.identifier, "(", field("argument", $.string), ")"),
+            seq(
+              $.identifier,
+              "(",
+              comma_sep1(field("argument", $.string)),
+              ")",
+            ),
           ),
         ),
         "]",

queries-flavored/helix/highlights.scm

@@ -115,35 +115,40 @@
   left: (identifier) @keyword
   (#any-of? @keyword
     "allow-duplicate-recipes"
+    "allow-duplicate-variables"
     "dotenv-filename"
     "dotenv-load"
     "dotenv-path"
+    "dotenv-required"
     "export"
     "fallback"
     "ignore-comments"
     "positional-arguments"
     "shell"
-    "tempdi"
+    "shell-interpreter"
+    "tempdir"
     "windows-powershell"
-    "windows-shell"))
+    "windows-shell"
+    "working-directory"))
 
 ; highlight known attributes (filtering does not always work)
 (attribute
   (identifier) @attribute
   (#any-of? @attribute
-    "private"
-    "allow-duplicate-recipes"
-    "dotenv-filename"
-    "dotenv-load"
-    "dotenv-path"
-    "export"
-    "fallback"
-    "ignore-comments"
+    "confirm"
+    "doc"
+    "extension"
+    "group"
+    "linux"
+    "macos"
+    "no-cd"
+    "no-exit-message"
+    "no-quiet"
     "positional-arguments"
-    "shell"
-    "tempdi"
-    "windows-powershell"
-    "windows-shell"))
+    "private"
+    "script"
+    "unix"
+    "windows"))
 
 ; Numbers are part of the syntax tree, even if disallowed
 (numeric_error) @error

queries-flavored/lapce/highlights.scm

@@ -115,35 +115,40 @@
   left: (identifier) @keyword
   (#any-of? @keyword
     "allow-duplicate-recipes"
+    "allow-duplicate-variables"
     "dotenv-filename"
     "dotenv-load"
     "dotenv-path"
+    "dotenv-required"
     "export"
     "fallback"
     "ignore-comments"
     "positional-arguments"
     "shell"
-    "tempdi"
+    "shell-interpreter"
+    "tempdir"
     "windows-powershell"
-    "windows-shell"))
+    "windows-shell"
+    "working-directory"))
 
 ; highlight known attributes (filtering does not always work)
 (attribute
   (identifier) @attribute
   (#any-of? @attribute
-    "private"
-    "allow-duplicate-recipes"
-    "dotenv-filename"
-    "dotenv-load"
-    "dotenv-path"
-    "export"
-    "fallback"
-    "ignore-comments"
+    "confirm"
+    "doc"
+    "extension"
+    "group"
+    "linux"
+    "macos"
+    "no-cd"
+    "no-exit-message"
+    "no-quiet"
     "positional-arguments"
-    "shell"
-    "tempdi"
-    "windows-powershell"
-    "windows-shell"))
+    "private"
+    "script"
+    "unix"
+    "windows"))
 
 ; Numbers are part of the syntax tree, even if disallowed
 (numeric_error) @error

queries-flavored/lapce/injections.scm

@@ -84,16 +84,16 @@
 (recipe_body ;
   (shebang ;
     (language) @injection.language)
-  (#not-any-of? @injection.language "python3" "nodejs" "node")
+  (#not-any-of? @injection.language "python3" "nodejs" "node" "uv")
   (#set! injection.include-children)) @injection.content
 
 ; Transform some known executables
 
-; python3 -> python
+; python3/uv -> python
 (recipe_body
   (shebang
     (language) @_lang)
-  (#eq? @_lang "python3")
+  (#any-of? @_lang "python3" "uv")
   (#set! injection.language "python")
   (#set! injection.include-children)) @injection.content
 

queries-flavored/zed/highlights.scm

@@ -115,35 +115,40 @@
   left: (identifier) @keyword
   (#any-of? @keyword
     "allow-duplicate-recipes"
+    "allow-duplicate-variables"
     "dotenv-filename"
     "dotenv-load"
     "dotenv-path"
+    "dotenv-required"
     "export"
     "fallback"
     "ignore-comments"
     "positional-arguments"
     "shell"
-    "tempdi"
+    "shell-interpreter"
+    "tempdir"
     "windows-powershell"
-    "windows-shell"))
+    "windows-shell"
+    "working-directory"))
 
 ; highlight known attributes (filtering does not always work)
 (attribute
   (identifier) @attribute
   (#any-of? @attribute
-    "private"
-    "allow-duplicate-recipes"
-    "dotenv-filename"
-    "dotenv-load"
-    "dotenv-path"
-    "export"
-    "fallback"
-    "ignore-comments"
+    "confirm"
+    "doc"
+    "extension"
+    "group"
+    "linux"
+    "macos"
+    "no-cd"
+    "no-exit-message"
+    "no-quiet"
     "positional-arguments"
-    "shell"
-    "tempdi"
-    "windows-powershell"
-    "windows-shell"))
+    "private"
+    "script"
+    "unix"
+    "windows"))
 
 ; Numbers are part of the syntax tree, even if disallowed
 (numeric_error) @error

queries-flavored/zed/injections.scm

@@ -84,16 +84,16 @@
 (recipe_body ;
   (shebang ;
     (language) @injection.language)
-  (#not-any-of? @injection.language "python3" "nodejs" "node")
+  (#not-any-of? @injection.language "python3" "nodejs" "node" "uv")
   (#set! injection.include-children)) @injection.content
 
 ; Transform some known executables
 
-; python3 -> python
+; python3/uv -> python
 (recipe_body
   (shebang
     (language) @_lang)
-  (#eq? @_lang "python3")
+  (#any-of? @_lang "python3" "uv")
   (#set! injection.language "python")
   (#set! injection.include-children)) @injection.content
 

queries-src/highlights.scm

@@ -113,35 +113,40 @@
   left: (identifier) @keyword
   (#any-of? @keyword
     "allow-duplicate-recipes"
+    "allow-duplicate-variables"
     "dotenv-filename"
     "dotenv-load"
     "dotenv-path"
+    "dotenv-required"
     "export"
     "fallback"
     "ignore-comments"
     "positional-arguments"
     "shell"
-    "tempdi"
+    "shell-interpreter"
+    "tempdir"
     "windows-powershell"
-    "windows-shell"))
+    "windows-shell"
+    "working-directory"))
 
 ; highlight known attributes (filtering does not always work)
 (attribute
   (identifier) @attribute
   (#any-of? @attribute
-    "private"
-    "allow-duplicate-recipes"
-    "dotenv-filename"
-    "dotenv-load"
-    "dotenv-path"
-    "export"
-    "fallback"
-    "ignore-comments"
+    "confirm"
+    "doc"
+    "extension"
+    "group"
+    "linux"
+    "macos"
+    "no-cd"
+    "no-exit-message"
+    "no-quiet"
     "positional-arguments"
-    "shell"
-    "tempdi"
-    "windows-powershell"
-    "windows-shell"))
+    "private"
+    "script"
+    "unix"
+    "windows"))
 
 ; Numbers are part of the syntax tree, even if disallowed
 (numeric_error) @error

queries-src/injections.scm

@@ -82,16 +82,16 @@
 (recipe_body ;                                                                          ; SKIP-HELIX
   (shebang ;                                                                            ; SKIP-HELIX
     (language) @injection.language)                                                     ; SKIP-HELIX
-  (#not-any-of? @injection.language "python3" "nodejs" "node")                          ; SKIP-HELIX
+  (#not-any-of? @injection.language "python3" "nodejs" "node" "uv")                     ; SKIP-HELIX
   (#set! injection.include-children)) @injection.content                                ; SKIP-HELIX
                                                                                         ; SKIP-HELIX
 ; Transform some known executables                                                      ; SKIP-HELIX
                                                                                         ; SKIP-HELIX
-; python3 -> python                                                                     ; SKIP-HELIX
+; python3/uv -> python                                                                  ; SKIP-HELIX
 (recipe_body                                                                            ; SKIP-HELIX
   (shebang                                                                              ; SKIP-HELIX
     (language) @_lang)                                                                  ; SKIP-HELIX
-  (#eq? @_lang "python3")                                                               ; SKIP-HELIX
+  (#any-of? @_lang "python3" "uv")                                                      ; SKIP-HELIX
   (#set! injection.language "python")                                                   ; SKIP-HELIX
   (#set! injection.include-children)) @injection.content                                ; SKIP-HELIX
                                                                                         ; SKIP-HELIX

queries/just/highlights.scm

@@ -115,35 +115,40 @@
   left: (identifier) @keyword
   (#any-of? @keyword
     "allow-duplicate-recipes"
+    "allow-duplicate-variables"
     "dotenv-filename"
     "dotenv-load"
     "dotenv-path"
+    "dotenv-required"
     "export"
     "fallback"
     "ignore-comments"
     "positional-arguments"
     "shell"
-    "tempdi"
+    "shell-interpreter"
+    "tempdir"
     "windows-powershell"
-    "windows-shell"))
+    "windows-shell"
+    "working-directory"))
 
 ; highlight known attributes (filtering does not always work)
 (attribute
   (identifier) @attribute
   (#any-of? @attribute
-    "private"
-    "allow-duplicate-recipes"
-    "dotenv-filename"
-    "dotenv-load"
-    "dotenv-path"
-    "export"
-    "fallback"
-    "ignore-comments"
+    "confirm"
+    "doc"
+    "extension"
+    "group"
+    "linux"
+    "macos"
+    "no-cd"
+    "no-exit-message"
+    "no-quiet"
     "positional-arguments"
-    "shell"
-    "tempdi"
-    "windows-powershell"
-    "windows-shell"))
+    "private"
+    "script"
+    "unix"
+    "windows"))
 
 ; Numbers are part of the syntax tree, even if disallowed
 (numeric_error) @error

queries/just/injections.scm

@@ -82,16 +82,16 @@
 (recipe_body ;
   (shebang ;
     (language) @injection.language)
-  (#not-any-of? @injection.language "python3" "nodejs" "node")
+  (#not-any-of? @injection.language "python3" "nodejs" "node" "uv")
   (#set! injection.include-children)) @injection.content
 
 ; Transform some known executables
 
-; python3 -> python
+; python3/uv -> python
 (recipe_body
   (shebang
     (language) @_lang)
-  (#eq? @_lang "python3")
+  (#any-of? @_lang "python3" "uv")
   (#set! injection.language "python")
   (#set! injection.include-children)) @injection.content