tree-sitter-batch 0.5.0 → 0.7.0

package/grammar.js

@@ -1,6 +1,6 @@
 const ci = (word) => new RegExp(word.split('').map((c) => /[a-zA-Z]/.test(c) ? `[${c.toLowerCase()}${c.toUpperCase()}]` : c).join(''));
 const kw = (word) => token(prec(10, ci(word)));
-const operand = ($) => [$.cond_exec, $.pipe_stmt, $.cmd, $.parenthesized];
+const operand = ($) => [$.cond_exec, $.pipe_stmt, $.redirect_stmt, $.call_stmt, $.cmd, $.parenthesized];
 
 export default grammar({
   name: 'batch',
@@ -23,13 +23,43 @@ export default grammar({
     label: () => token(seq(':', /[a-zA-Z_][a-zA-Z0-9_-]*/)),
     variable_assignment: ($) => prec(8, seq(
       optional('@'), alias(kw('set'), $.set_keyword),
-      optional(seq(/[ \t]+/, alias(/\/[aApP]/, $.set_option))),
-      /[ \t]+/,
       choice(
-        seq('"', alias(/[a-zA-Z_][a-zA-Z0-9_]*/, $.variable_name), '=', optional(alias(/[^"\r\n]+/, $.assignment_value)), '"'),
-        seq(alias(/[a-zA-Z_][a-zA-Z0-9_]*/, $.variable_name), '=', optional(alias(/[^\r\n]+/, $.assignment_value))),
+        $.arithmetic_assignment,
+        $.prompt_assignment,
+        seq(
+          /[ \t]+/,
+          choice(
+            seq('"', alias(/[a-zA-Z_][a-zA-Z0-9_()\[\]]*/, $.variable_name), '=', optional($.quoted_assignment_value), '"'),
+            seq(alias(/[a-zA-Z_][a-zA-Z0-9_()\[\]]*/, $.variable_name), '=', optional($.assignment_value)),
+          ),
+        ),
       ),
     )),
+    arithmetic_assignment: ($) => seq(
+      optional(/[ \t]+/), alias(token(prec(10, ci('/a'))), $.set_option),
+      optional(/[ \t]+/), $.arithmetic_expression,
+    ),
+    prompt_assignment: ($) => seq(
+      optional(/[ \t]+/), alias(token(prec(10, ci('/p'))), $.set_option),
+      optional(/[ \t]+/),
+      alias(/[a-zA-Z_][a-zA-Z0-9_()\[\]]*/, $.variable_name), '=', optional($.assignment_value),
+    ),
+    arithmetic_expression: () => token(choice(
+      seq('"', /[^"\r\n]*/, '"'),
+      /[^\r\n"]+/,
+    )),
+    assignment_value: ($) => prec.right(repeat1(choice(
+      $.variable_reference,
+      alias(/[^%!\r\n]+/, $.assignment_literal),
+      alias('%', $.assignment_literal),
+      alias('!', $.assignment_literal),
+    ))),
+    quoted_assignment_value: ($) => prec.right(repeat1(choice(
+      $.variable_reference,
+      alias(/[^%!"\r\n]+/, $.assignment_literal),
+      alias('%', $.assignment_literal),
+      alias('!', $.assignment_literal),
+    ))),
     if_stmt: ($) => prec.right(8, seq(
       optional('@'), kw('if'),
       optional(kw('not')),
@@ -83,21 +113,28 @@ export default grammar({
       kw('in'), '(', optional($.for_set), ')', kw('do'),
       choice($.parenthesized, $.cmd),
     )),
-    for_options: () => token(prec(10, choice(ci('/d'), seq(ci('/r'), optional(seq(/[ \t]+/, /[^\s]+/))), ci('/l'), seq(ci('/f'), optional(seq(/[ \t]+/, '"', /[^"]*/, '"')))))),
+    for_options: () => token(prec(10, choice(ci('/d'), seq(ci('/r'), optional(seq(/[ \t]+/, /(%[^\s%]|[^\s%])+%?/))), ci('/l'), seq(ci('/f'), optional(seq(/[ \t]+/, '"', /[^"]*/, '"')))))),
     for_variable: () => token(seq('%%', optional('~'), /[a-zA-Z]/)),
-    for_set: () => /[^)\r\n]+/,
+    for_set: ($) => prec.right(repeat1(choice(
+      $.variable_reference,
+      alias(/[^%!)\r\n]+/, $.for_set_literal),
+      alias('%', $.for_set_literal),
+      alias('!', $.for_set_literal),
+    ))),
     parenthesized: ($) => seq('(', repeat(choice(seq($._stmt, /\r?\n/), /\r?\n/)), optional($._stmt), ')'),
-    redirect_stmt: ($) => prec.right(4, seq(choice($.cmd, $.parenthesized), $.redirection)),
-    redirection: ($) => prec.right(seq(
-      optional(/[0-2]/), $.redirect_op, $.redirect_target,
-      optional(seq(optional(/[0-2]/), $.redirect_op, $.redirect_target)),
-    )),
-    redirect_op: () => token(choice('2>&1', '>&1', '2>>', '2>', '>>', '>', '<')),
+    redirect_stmt: ($) => prec.right(4, seq(choice($.call_stmt, $.cmd, $.parenthesized), $.redirection)),
+    redirection: ($) => {
+      const file_redir = seq(optional(/[0-2]/), $.redirect_op, $.redirect_target);
+      const one_redir = choice(file_redir, $.fd_redirect);
+      return prec.right(repeat1(one_redir));
+    },
+    fd_redirect: () => token(choice('2>&1', '>&1')),
+    redirect_op: () => token(choice('2>>', '2>', '>>', '>', '<')),
     redirect_target: () => token(choice(ci('nul'), ci('con'), /[^\s|&><\r\n]+/)),
-    pipe_stmt: ($) => prec.left(3, seq(choice($.cmd, $.parenthesized), '|', choice($.cmd, $.parenthesized))),
+    pipe_stmt: ($) => prec.left(3, seq(choice($.pipe_stmt, $.redirect_stmt, $.call_stmt, $.cmd, $.parenthesized), '|', choice($.redirect_stmt, $.call_stmt, $.cmd, $.parenthesized))),
     cond_exec: ($) => choice(
-      prec.left(1, seq(choice(...operand($)), '&&', choice($.cmd, $.parenthesized))),
-      prec.left(1, seq(choice(...operand($)), '||', choice($.cmd, $.parenthesized))),
+      prec.left(1, seq(choice(...operand($)), '&&', choice($.pipe_stmt, $.redirect_stmt, $.call_stmt, $.cmd, $.parenthesized))),
+      prec.left(1, seq(choice(...operand($)), '||', choice($.pipe_stmt, $.redirect_stmt, $.call_stmt, $.cmd, $.parenthesized))),
     ),
     command_sep: ($) => prec.left(0, seq(
       choice($.command_sep, ...operand($)),
@@ -105,12 +142,12 @@ export default grammar({
       choice(...operand($)),
     )),
     variable_reference: () => token(choice(
-      seq('%', /[a-zA-Z_][a-zA-Z0-9_]*/, '%'),
+      seq('%', /[a-zA-Z_][a-zA-Z0-9_()\[\]]*/, '%'),
       seq('%~', /[a-zA-Z]*/, /[0-9]/),
       seq('%', /[0-9]/),
       seq('%%', optional('~'), /[a-zA-Z]/),
       seq('!', /[a-zA-Z_][a-zA-Z0-9_]*/, '!'),
-      seq('%', /[a-zA-Z_][a-zA-Z0-9_]*/, ':', /[^%]+/, '%'),
+      seq('%', /[a-zA-Z_][a-zA-Z0-9_()\[\]]*/, ':', /[^%]+/, '%'),
     )),
     string: () => token(seq('"', /[^"\r\n]*/, '"')),
     cmd: ($) => prec.right(5, seq(optional('@'), $.command_name, optional($.argument_list))),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-batch",
-  "version": "0.5.0",
+  "version": "0.7.0",
   "description": "A Windows Batch/CMD grammar for tree-sitter",
   "type": "module",
   "repository": {
@@ -37,7 +37,8 @@
     "eslint": "^9.15.0",
     "eslint-config-treesitter": "^1.0.2",
     "prebuildify": "^6.0.1",
-    "tree-sitter-cli": "0.24.7"
+    "tree-sitter-cli": "0.24.7",
+    "tree-sitter-go-types": "^0.1.0"
   },
   "peerDependencies": {
     "tree-sitter": ">=0.25.0"
@@ -51,6 +52,7 @@
     "install": "node-gyp-build",
     "prestart": "tree-sitter build --wasm",
     "start": "tree-sitter playground",
+    "generate": "tree-sitter generate && tree-sitter-go-types",
     "lint": "eslint grammar.js",
     "test": "node --test bindings/node/*_test.js"
   }

package/queries/highlights.scm

@@ -11,7 +11,8 @@
 (set_keyword) @keyword
 (variable_name) @variable
 (set_option) @constant
-(assignment_value) @string
+(assignment_literal) @string
+(arithmetic_expression) @string
 
 ; IF/FOR/GOTO/CALL statements
 (if_stmt) @keyword
@@ -25,6 +26,7 @@
 ; Operators
 (comparison_op) @operator
 (redirect_op) @operator
+(fd_redirect) @operator
 
 ; Commands
 (command_name) @function
@@ -36,6 +38,9 @@
 ; Variables
 (variable_reference) @variable
 
+; FOR set literal content
+(for_set_literal) @string
+
 ; FOR loop variables
 (for_variable) @variable.parameter