Merge pull request #315 from stackmystack/mssql-function

Mssql function declaration

Author: DerekStride

grammar.js

@@ -265,6 +265,7 @@ module.exports = grammar({
     keyword_main: _ => make_keyword("main"),
     keyword_storage: _ => make_keyword("storage"),
     keyword_compression: _ => make_keyword("compression"),
+    keyword_while: _ => make_keyword("while"),
 
     keyword_trigger: _ => make_keyword('trigger'),
     keyword_function: _ => make_keyword("function"),
@@ -696,9 +697,39 @@ module.exports = grammar({
         $._ddl_statement,
         $._dml_write,
         optional_parenthesis($._dml_read),
+        $.while_statement,
       ),
     ),
 
+    while_statement: $ => prec.left(seq(
+      $.keyword_while,
+      optional_parenthesis($._expression),
+      choice(
+        seq(
+          $.statement,
+          optional(';'),
+        ),
+        seq(
+          $.keyword_begin,
+          repeat($.statement),
+          $.keyword_end,
+        ),
+      ),
+    )),
+
+    var_declarations: $ => seq($.keyword_declare, repeat1($.var_declaration)),
+    var_declaration: $ => seq(
+      $.identifier,
+      $._type,
+      optional(
+        seq(
+          choice($.keyword_default, '='),
+          $.literal,
+        ),
+      ),
+      optional(','),
+    ),
+
     _ddl_statement: $ => choice(
       $._create_statement,
       $._alter_statement,
@@ -1244,6 +1275,22 @@ module.exports = grammar({
       $._function_return,
     ),
 
+    _tsql_function_body_statement: $ => seq(
+      optional($.keyword_as),
+      $.keyword_begin,
+      optional($.var_declarations),
+      choice(
+        repeat($.statement),
+        repeat1(seq(
+          $.keyword_begin,
+          repeat($.statement),
+          $.keyword_end,
+        )),
+      ),
+      $._function_return,
+      $.keyword_end,
+    ),
+
     function_body: $ => choice(
       seq(
         $._function_return,
@@ -1299,6 +1346,7 @@ module.exports = grammar({
         optional(';'),
         alias($._dollar_quoted_string_end_tag, $.dollar_quote),
       ),
+      $._tsql_function_body_statement,
     ),
 
     function_language: $ => seq(
@@ -1453,7 +1501,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),
@@ -1462,9 +1510,9 @@ module.exports = grammar({
       repeat(
         $._with_settings
       ),
-    ),
+    )),
 
-    create_role: $ => seq(
+    create_role: $ => prec.left(seq(
       $.keyword_create,
       choice(
         $.keyword_user,
@@ -1479,7 +1527,7 @@ module.exports = grammar({
           $._role_options,
         ),
       ),
-    ),
+    )),
 
     _role_options: $ => choice(
       field("option", $.identifier),
@@ -1540,7 +1588,7 @@ module.exports = grammar({
       ),
     ),
 
-    create_extension: $ => seq(
+    create_extension: $ => prec.left(seq(
       $.keyword_create,
       $.keyword_extension,
       optional($._if_not_exists),
@@ -1549,7 +1597,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,
@@ -1613,7 +1661,7 @@ module.exports = grammar({
       $.keyword_truncate,
     ),
 
-    create_type: $ => seq(
+    create_type: $ => prec.left(seq(
       $.keyword_create,
       $.keyword_type,
       $.object_reference,
@@ -1644,7 +1692,7 @@ module.exports = grammar({
           ),
         ),
       ),
-    ),
+    )),
 
     enum_elements: $ => seq(
       paren_list(field("enum_element", alias($._literal_string, $.literal))),
@@ -1918,7 +1966,7 @@ module.exports = grammar({
         ),
       ),
 
-    alter_role: $ => seq(
+    alter_role: $ => prec.left(seq(
       $.keyword_alter,
       choice(
         $.keyword_role,
@@ -1945,7 +1993,7 @@ module.exports = grammar({
           ),
         )
       ),
-    ),
+    )),
 
     set_configuration: $ => seq(
       field("option", $.identifier),
@@ -2125,14 +2173,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,
@@ -2420,7 +2468,7 @@ module.exports = grammar({
       repeat1($.when_clause)
     ),
 
-    when_clause: $ => seq(
+    when_clause: $ => prec.left(seq(
       $.keyword_when,
       optional($.keyword_not),
       $.keyword_matched,
@@ -2443,7 +2491,7 @@ module.exports = grammar({
         ),
         optional($.where)
       )
-    ),
+    )),
 
     _optimize_statement: $ => choice(
       $._compute_stats,
@@ -2452,7 +2500,7 @@ module.exports = grammar({
     ),
 
     // Compute stats for Impala and Hive
-    _compute_stats: $ => choice(
+    _compute_stats: $ => prec.left(choice(
       // Hive
       seq(
         $.keyword_analyze,
@@ -2490,7 +2538,7 @@ module.exports = grammar({
           )
         )
       ),
-    ),
+    )),
 
     _optimize_table: $ => choice(
       // Athena/Iceberg
@@ -2520,14 +2568,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))),
@@ -2711,11 +2759,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
 
 [