Fix arrays and set strings

Temporary break of textobjects.

Fixes IndianBoy42#22

grammar.js

@@ -1,3 +1,23 @@
+// Main grammar for justfiles
+
+// Comma separated list with at least one item
+function comma_sep1(item) {
+  return seq(item, repeat(seq(",", item)));
+}
+
+// Create an array with the given item as contents
+function array(item) {
+  const array_item = field("array_item", item);
+  return field(
+    "array",
+    seq(
+      "[",
+      optional(seq(comma_sep1(array_item), optional(array_item))),
+      "]",
+    ),
+  );
+}
+
 module.exports = grammar({
   name: "just",
 
@@ -42,37 +62,28 @@ module.exports = grammar({
         seq(
           "set",
           field("name", $.NAME),
-          field("right", optional(seq(":=", choice($.boolean, $.settinglist)))),
+          field(
+            "right",
+            optional(
+              seq(":=", choice($.boolean, $.string, array($.string))),
+            ),
+          ),
           $.eol,
         ),
         seq(
           "set",
           "shell",
           ":=",
-          "[",
-          // field("lang", $.string),
-          '"',
-          field("lang", $.NAME),
-          '"',
-          repeat(seq(optional(","), $.string)),
-          "]",
+          array($.string),
           $.eol,
         ),
       ),
 
+    // string_array: ($) => array($.string),
+
     // boolean       : ':=' ('true' | 'false')
     boolean: (_) => choice("true", "false"),
 
-    settinglist: ($) =>
-      seq(
-        "[",
-        $.stringlist,
-        "]",
-        // seq("[", $.string, repeat(seq(",", $.string)), optional(","), "]")
-      ),
-
-    stringlist: ($) => repeat1(seq($.string, optional(","))),
-
     // expression    : 'if' condition '{' expression '}' 'else' '{' expression '}'
     //               | value '/' expression
     //               | value '+' expression
@@ -137,9 +148,9 @@ module.exports = grammar({
       ),
 
     // recipe        : '@'? NAME parameter* variadic_parameters? ':' dependency* body?
-    recipe: ($) => seq($.recipeheader, $.NEWLINE, optional($.body)),
+    recipe: ($) => seq($.recipe_header, $.NEWLINE, optional($.body)),
 
-    recipeheader: ($) =>
+    recipe_header: ($) =>
       seq(
         optional("@"),
         $.NAME,

queries/highlights.scm

@@ -8,7 +8,7 @@
 (call (NAME) @function)
 (dependency (NAME) @function)
 (depcall (NAME) @function)
-(recipeheader (NAME) @function)
+(recipe_header (NAME) @function)
 
 (depcall (expression) @parameter)
 (parameter) @parameter

queries/injections.scm

@@ -7,7 +7,7 @@
 ) 
 
 (source_file 
-    (item (setting lang:(NAME) @language))
+    ; (item (setting lang:(NAME) @language))
     (item (recipe (body (recipe_body) @content)))
 ) 
 

queries/locals.scm

@@ -7,5 +7,5 @@
 (call (NAME) @reference.function)
 (dependency (NAME) @reference.function)
 (depcall (NAME) @reference.function)
-(recipeheader (NAME) @definition.function)
+(recipe_header (NAME) @definition.function)
 

queries/textobjects.scm

@@ -9,7 +9,7 @@
     else:(expression) @block.inner
 ) 
 (interpolation (expression) @block.inner) @block.outer
-(settinglist (stringlist) @block.inner) @block.outer
+; (string_array (stringlist) @block.inner) @block.outer
 
 (call (NAME) @call.inner) @call.outer
 (dependency (NAME) @call.inner) @call.outer
@@ -19,14 +19,16 @@
 (depcall) @parameter.inner
 (depcall (expression) @parameter.inner) 
 
-(stringlist 
-    (string) @parameter.inner
-    . ","? @_end
-    (#make-range! "parameter.outer" @parameter.inner @_end)
-)
+; (stringlist 
+;     (string) @parameter.inner
+;     . ","? @_end
+;     (#make-range! "parameter.outer" @parameter.inner @_end)
+; )
 (parameters 
-    [(parameter) 
-    (variadic_parameters)] @parameter.inner
+    [
+        (parameter) 
+        (variadic_parameters)
+    ] @parameter.inner
     . " "? @_end
     (#make-range! "parameter.outer" @parameter.inner @_end)
 )
@@ -42,7 +44,7 @@
 )
 
 (item [(alias) (assignment) (export) (setting)]) @statement.outer
-(recipeheader) @statement.outer
+(recipe_header) @statement.outer
 (line) @statement.outer
 
 (comment) @comment.outer