Try to figure out global settings

I think we really need some form of regex to handle this
tgross35 · Jan 8, 2024 · a6d75f8 · a6d75f8
1 parent 7765fb3
commit a6d75f8
Show file tree

Hide file tree

Showing 10 changed files with 3,702 additions and 4,240 deletions.
diff --git a/grammar.js b/grammar.js
@@ -8,7 +8,7 @@ function comma_sep1(item) {
 }
 
 // Create an array with the given item as contents
-function array(item) {
+function make_array(item) {
   const array_item = field("array_item", item);
   return field(
     "array",
@@ -119,26 +119,17 @@ module.exports = grammar({
         seq(
           "set",
           field("left", $.identifier),
-          field(
-            "right",
-            optional(
-              seq(":=", choice($.boolean, $._string, array($._string))),
-            ),
-          ),
-          $.eol,
-        ),
-        seq(
-          "set",
-          "shell",
-          ":=",
-          field(
-            "right",
-            array($._string),
+          optional(
+            seq(":=", field("right", choice($.boolean, $._string, $.array))),
           ),
           $.eol,
         ),
       ),
 
+    // Our only use of arrays (setting) only accepts strings. We may want to figure
+    // out how to better reuse `array` while specifying a type.
+    array: ($) => make_array($._string),
+
     // boolean       : ':=' ('true' | 'false')
     boolean: (_) => choice("true", "false"),
 

diff --git a/queries-src/highlights.scm b/queries-src/highlights.scm
@@ -7,13 +7,14 @@
 (alias left: (identifier) @variable)
 (assignment
   left: (identifier) @variable
-  [":="] @operator)
+  ":=" @operator)
 
 (module mod_name: (identifier) @namespace)
 
 ; highlight known settings (filtering does not always work)
 (setting
   left: ((identifier) @keyword
+  ":="? @operator
   (#any-of? @keyword
     "allow-duplicate-recipes"
     "dotenv-filename"

diff --git a/queries-src/injections.scm b/queries-src/injections.scm
@@ -3,26 +3,34 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
 
-; NVIM-DISABLE-START
-(recipe_body
-    (shebang) @injection.shebang 
-    (recipe_line
-        (text) @injection.content))
-; NVIM-DISABLE-END
+(source_file
+  (item
+    (setting
+      left: "shell")))
+      right: (array
+                )
 
-(recipe_line
-    (text) @injection.content
-    (#set! injection.language "bash"))
+; TODO reenable
+; ; NVIM-DISABLE-START
+; (recipe_body
+;     (shebang) @injection.shebang 
+;     (recipe_line
+;         (text) @injection.content))
+; ; NVIM-DISABLE-END
 
-; 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"))
+; (recipe_line
+;     (text) @injection.content
+;     (#set! injection.language "bash"))
 
-(external_command
-    (command_body) @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"))
 
 ((regex_literal
     [

diff --git a/queries/just/highlights.scm b/queries/just/highlights.scm
@@ -9,13 +9,14 @@
 (alias left: (identifier) @variable)
 (assignment
   left: (identifier) @variable
-  [":="] @operator)
+  ":=" @operator)
 
 (module mod_name: (identifier) @namespace)
 
 ; highlight known settings (filtering does not always work)
 (setting
   left: ((identifier) @keyword
+  ":="? @operator
   (#any-of? @keyword
     "allow-duplicate-recipes"
     "dotenv-filename"

diff --git a/queries/just/injections.scm b/queries/just/injections.scm
@@ -5,21 +5,28 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
 
+(source_file
+  (item
+    (setting
+      left: "shell")))
+      right: (array
+                )
 
+; 
 
-(recipe_line
-    (text) @injection.content
-    (#set! injection.language "bash"))
+; (recipe_line
+;     (text) @injection.content
+;     (#set! injection.language "bash"))
 
  (recipe_body
-     (shebang) @injection.shebang 
+     (shebang) @injection.language
      (recipe_line
-         (text) @injection.content
-         (#set! injection.language "python")))
+         (text) @injection.content)
+     (#gsub! injection.language "/#!%*[\/ ](%S+)/" "%1"))
 
-(external_command
-    (command_body) @injection.content
-    (#set! injection.language "bash"))
+; (external_command
+;     (command_body) @injection.content
+;     (#set! injection.language "bash"))
 
 ((regex_literal
     [