feat: TSQL WHILE with blocks

Author: stackmystack

grammar.js

@@ -704,7 +704,14 @@ module.exports = grammar({
     while_statement: $ => seq(
       $.keyword_while,
       optional_parenthesis($._expression),
-      $.statement,
+      choice(
+        $.statement,
+        seq(
+          $.keyword_begin,
+          repeat($.statement),
+          $.keyword_end,
+        ),
+      ),
     ),
 
     var_declarations: $ => seq($.keyword_declare, repeat1($.var_declaration)),
@@ -1501,7 +1508,7 @@ module.exports = grammar({
           field('value', choice($.identifier, alias($._single_quote_string, $.literal))),
     ),
 
-    create_database: $ => seq(
+    create_database: $ => prec.left(seq(
       $.keyword_create,
       $.keyword_database,
       optional($._if_not_exists),
@@ -1510,9 +1517,9 @@ module.exports = grammar({
       repeat(
         $._with_settings
       ),
-    ),
+    )),
 
-    create_role: $ => seq(
+    create_role: $ => prec.left(seq(
       $.keyword_create,
       choice(
         $.keyword_user,
@@ -1527,7 +1534,7 @@ module.exports = grammar({
           $._role_options,
         ),
       ),
-    ),
+    )),
 
     _role_options: $ => choice(
       field("option", $.identifier),
@@ -1588,7 +1595,7 @@ module.exports = grammar({
       ),
     ),
 
-    create_extension: $ => seq(
+    create_extension: $ => prec.left(seq(
       $.keyword_create,
       $.keyword_extension,
       optional($._if_not_exists),
@@ -1597,7 +1604,7 @@ module.exports = grammar({
       optional(seq($.keyword_schema, $.identifier)),
       optional(seq($.keyword_version, choice($.identifier, alias($._literal_string, $.literal)))),
       optional($.keyword_cascade),
-    ),
+    )),
 
     create_trigger: $ => seq(
       $.keyword_create,
@@ -1661,7 +1668,7 @@ module.exports = grammar({
       $.keyword_truncate,
     ),
 
-    create_type: $ => seq(
+    create_type: $ => prec.left(seq(
       $.keyword_create,
       $.keyword_type,
       $.object_reference,
@@ -1692,7 +1699,7 @@ module.exports = grammar({
           ),
         ),
       ),
-    ),
+    )),
 
     enum_elements: $ => seq(
       paren_list(field("enum_element", alias($._literal_string, $.literal))),
@@ -1966,7 +1973,7 @@ module.exports = grammar({
         ),
       ),
 
-    alter_role: $ => seq(
+    alter_role: $ => prec.left(seq(
       $.keyword_alter,
       choice(
         $.keyword_role,
@@ -1993,7 +2000,7 @@ module.exports = grammar({
           ),
         )
       ),
-    ),
+    )),
 
     set_configuration: $ => seq(
       field("option", $.identifier),
@@ -2173,14 +2180,14 @@ module.exports = grammar({
       optional($._drop_behavior)
     ),
 
-    drop_database: $ => seq(
+    drop_database: $ => prec.left(seq(
       $.keyword_drop,
       $.keyword_database,
       optional($._if_exists),
       $.identifier,
       optional($.keyword_with),
       optional($.keyword_force),
-    ),
+    )),
 
     drop_role: $ => seq(
       $.keyword_drop,
@@ -2468,7 +2475,7 @@ module.exports = grammar({
       repeat1($.when_clause)
     ),
 
-    when_clause: $ => seq(
+    when_clause: $ => prec.left(seq(
       $.keyword_when,
       optional($.keyword_not),
       $.keyword_matched,
@@ -2491,7 +2498,7 @@ module.exports = grammar({
         ),
         optional($.where)
       )
-    ),
+    )),
 
     _optimize_statement: $ => choice(
       $._compute_stats,
@@ -2500,7 +2507,7 @@ module.exports = grammar({
     ),
 
     // Compute stats for Impala and Hive
-    _compute_stats: $ => choice(
+    _compute_stats: $ => prec.left(choice(
       // Hive
       seq(
         $.keyword_analyze,
@@ -2538,7 +2545,7 @@ module.exports = grammar({
           )
         )
       ),
-    ),
+    )),
 
     _optimize_table: $ => choice(
       // Athena/Iceberg
@@ -2568,14 +2575,14 @@ module.exports = grammar({
       ),
     ),
 
-    _vacuum_table: $ => seq(
+    _vacuum_table: $ => prec.left(seq(
       $.keyword_vacuum,
       optional($._vacuum_option),
       $.object_reference,
       optional(
         paren_list($.field)
       ),
-    ),
+    )),
 
     _vacuum_option: $ => choice(
       seq($.keyword_full, optional(choice($.keyword_true, $.keyword_false))),
@@ -2759,11 +2766,11 @@ module.exports = grammar({
       ')',
     ),
 
-    column_definition: $ => seq(
+    column_definition: $ => prec.left(seq(
       field('name', $._column),
       field('type', $._type),
       repeat($._column_constraint),
-    ),
+    )),
 
     _column_comment: $ => seq(
       $.keyword_comment,

queries/highlights.scm

@@ -320,6 +320,7 @@
   (keyword_storage)
   (keyword_compression)
   (keyword_duplicate)
+  (keyword_while)
 ] @keyword
 
 [

test/corpus/while.txt

@@ -73,3 +73,79 @@ WHILE (
           (relation
             (object_reference
               (identifier))))))))
+
+================================================================================
+While in TSQL with SELECT many statements
+================================================================================
+
+WHILE (
+        SELECT AVG(ListPrice)
+        FROM Production.Product
+        ) < $300
+BEGIN
+    UPDATE Production.Product
+    SET ListPrice = ListPrice * 2
+
+    SELECT MAX(ListPrice)
+    FROM Production.Product
+END
+
+--------------------------------------------------------------------------------
+
+(program
+  (statement
+    (while_statement
+      (keyword_while)
+      (binary_expression
+        (subquery
+          (select
+            (keyword_select)
+            (select_expression
+              (term
+                (invocation
+                  (object_reference
+                    (identifier))
+                  (term
+                    (field
+                      (identifier)))))))
+          (from
+            (keyword_from)
+            (relation
+              (object_reference
+                (identifier)
+                (identifier)))))
+        (parameter))
+      (keyword_begin)
+      (statement
+        (update
+          (keyword_update)
+          (relation
+            (object_reference
+              (identifier)
+              (identifier)))
+          (keyword_set)
+          (assignment
+            (field
+              (identifier))
+            (binary_expression
+              (field
+                (identifier))
+              (literal)))))
+      (statement
+        (select
+          (keyword_select)
+          (select_expression
+            (term
+              (invocation
+                (object_reference
+                  (identifier))
+                (term
+                  (field
+                    (identifier)))))))
+        (from
+          (keyword_from)
+          (relation
+            (object_reference
+              (identifier)
+              (identifier)))))
+      (keyword_end))))