tree-sitter-abl 0.0.50 → 0.0.51

package/grammar.js

@@ -36,13 +36,24 @@ module.exports = grammar({
   conflicts: ($) => [
     [$.sort_clause],
     [$.string_literal],
-    [$.if_statement]
+    [$.if_statement],
+    [$._name, $.radio_set_phrase],
+    [$.radio_set_phrase, $._expression],
+    [$._list_items, $._expression],
+    [$.size_phrase, $.frame_definition],
+    [$.dataset_expression, $.object_access],
+    [$.in_frame_phrase, $._expression],
+    [$.include, $.constant],
+    [$.include_argument],
+    [$.include_argument, $._constant_value],
+    [$._literal, $._expression]
   ],
 
   rules: {
-    source_code: ($) => repeat(choice($._statement, $.class_statement, $._definition, $.do_block, $.interface_statement)),
+    source_code: ($) => repeat(choice($._statement, $.class_statement, $._definition, $.do_block, $.interface_statement, $.method_statement, $.constant)),
 
-    body: ($) => seq(":", repeat(choice($._statement, $._definition, $.do_block))),
+    
+    body: ($) => seq(":", repeat(choice($._statement, $._definition, $.do_block, prec(-1, $.annotation)))),
 
     _statement_body: ($) => choice($.do_block, prec(2, $._statement)),
 
@@ -55,6 +66,7 @@ module.exports = grammar({
           choice(
             $._definition,
             $.var_statement,
+            $.include,
             seq(
               optional($.annotation),
               $.method_statement
@@ -72,13 +84,14 @@ module.exports = grammar({
         repeat(
           choice(
             $._definition,
+            $.annotation,
             $.method_statement
           )
-        )
+        ),
       ),
 
     case_body: ($) =>
-      seq(":", repeat1($.case_when_branch), optional($.case_otherwise_branch)),
+      seq(":", repeat1(prec.right(seq(optional($.annotation), $.case_when_branch, optional($.annotation)))), optional(seq(optional($.annotation), $.case_otherwise_branch, optional($.annotation)))),
 
     enum_body: ($) => seq(":", repeat1($.enum_definition)),
 
@@ -162,7 +175,11 @@ module.exports = grammar({
           kw("TEARDOWN"),
           kw("AFTERALL"),
           kw("AFTER"),
-          kw("IGNORE")
+          kw("IGNORE"),
+          //These are extra annotations that we added for the OpenEdge ABL Formatter.
+          //For more details, please visit: https://marketplace.visualstudio.com/items?itemName=BalticAmadeus.openedge-abl-formatter
+          kw("ABLFORMATTEREXCLUDESTART"),
+          kw("ABLFORMATTEREXCLUDEEND"),
         ),
         $._terminator
       ),
@@ -190,7 +207,8 @@ module.exports = grammar({
     _literal: ($) =>
       choice(
         $.number_literal,
-        $.string_literal
+        $.string_literal,
+        $.date_literal
       ),
 
     boolean_literal: ($) =>
@@ -240,6 +258,7 @@ module.exports = grammar({
         $.number_literal,
         $.string_literal,
         $.boolean_literal,
+        $.null_expression,
         $.function_call,
         $.array_literal,
         $.array_access,
@@ -273,25 +292,46 @@ module.exports = grammar({
         ),
         field("name", $.identifier),
         field("value", $.string_literal),
-        $.constant
+        $.constant,
+        $.identifier
       ),
 
     include: ($) =>
-      seq(
+      prec.right(1, seq(
         "{",
-        $.file_name,
+        choice(
+          $.file_name,
+          prec(1, alias($.include_file_path, $.file_name)),
+          $.identifier
+        ),
         repeat($.include_argument),
         "}"
-      ),
+      )),
+
+    include_file_path: ($) =>
+      prec.right(repeat1(choice(
+        $.constant, 
+        /[A-z-_|0-9|\/\.]+/i
+      ))),
 
     // IDENTIFIERS
 
-    identifier: ($) => /[A-Z|a-z|\-|\\_]{1}[#A-Z|a-z|\-|\\_|0-9]*/i,
+    identifier: ($) => /[A-Z|a-z|\-|\\_]{1}[#+&A-Z|a-z|\-|\\_|0-9]*/i,
+
+    // variable_name: ($) => choice(
+    //   $.identifier,
+    //   seq($.identifier, "&")
+    // ),
 
     constant: ($) =>
       seq("{", optional("&"), $._constant_value, "}"),
 
-    _constant_value: ($) => choice($.identifier, $._integer_literal),
+    _constant_value: ($) => choice(
+      $.identifier, 
+      $._integer_literal,
+      seq($.identifier, "=", choice($.identifier, $._integer_literal, $.string_literal)),
+      seq($.identifier, repeat1(choice(/[\s\-()a-zA-Z0-9]+/)))
+    ),
 
     qualified_name: ($) =>
       seq(
@@ -369,7 +409,6 @@ module.exports = grammar({
 
     field_option: ($) =>
       choice(
-        // $._bgcolor,
         $._column_label,
         // $._dcolor,
         $._label,
@@ -526,8 +565,8 @@ module.exports = grammar({
 
     type_tuning: ($) =>
       choice(
-        seq(kw("AS"), field("type", $._type)),
-        seq(kw("LIKE"), field("type", $._type))
+        seq(kw("AS"), field("type", choice($._type, $.string_literal))),
+        seq(kw("LIKE"), field("type", choice($._type, $.string_literal)))
       ),
 
     using: ($) =>
@@ -650,6 +689,7 @@ module.exports = grammar({
             $.string_literal,
             $.number_literal,
             $.null_expression,
+            $.constant,
             $._binary_expression,
             $.unary_expression,
             $.function_call
@@ -726,13 +766,13 @@ module.exports = grammar({
       ),
 
     object_access: ($) =>
-      seq(
+      prec(2, seq(
         field(
           "object",
           choice($.new_expression, $.function_call, $.constant, $._name)
         ),
         repeat1(seq(alias($._namecolon, ":"), field("property", $.identifier)))
-      ),
+      )),
 
     member_access: ($) =>
       seq(
@@ -743,7 +783,10 @@ module.exports = grammar({
       ),
 
     case_condition: ($) =>
-      seq(optional(seq(kw("OR"), kw("WHEN"))), choice($._literal, $.boolean_literal, $.logical_expression, $.comparison_expression, $.unary_expression, $.object_access)),
+      seq(
+        optional(seq(kw("OR"), kw("WHEN"))),
+        choice($._literal, $.boolean_literal, $.logical_expression, $.comparison_expression, $.unary_expression, $.object_access, $.null_expression, $.function_call)
+      ),
 
     case_when_branch: ($) =>
       seq(kw("WHEN"), repeat1($.case_condition), kw("THEN"), $._statement_body),
@@ -778,18 +821,22 @@ module.exports = grammar({
     variable: ($) => choice(field("name", $.identifier), $.assignment),
 
     enum_member: ($) =>
+      prec.right(
       seq(
+        repeat($.annotation), 
         field("name", $.identifier),
         field(
           "value",
           optional(
             seq(
               kw("="),
-              _list(choice($.identifier, $._literal),",")
+              _list(choice($.identifier, $._literal, $.null_expression),",")
             )
           )
-        )
-      ),
+        ),
+        repeat($.annotation), 
+      )
+    ),
 
     function_call: ($) =>
       prec.right(
@@ -874,24 +921,21 @@ module.exports = grammar({
         optional(seq(kw("BY"), choice($._integer_literal, $.unary_expression)))
       ),
 
-    // combo_box_phrase: ($) =>
-    //   seq(
-    //     kw("COMBO-BOX"),
-    //     repeat(
-    //       choice(
-    //         $._list_items,
-    //         $._inner_lines,
-    //         $.size_phrase,
-    //         kw("SORT"),
-    //         $._tooltip,
-    //         kw("SIMPLE"),
-    //         kw("DROP-DOWN"),
-    //         kw("DROP-DOWN-LIST"),
-    //         $._max_chars,
-    //         seq(kw("AUTO-COMPLETION"), optional(kw("UNIQUE-MATCH")))
-    //       )
-    //     )
-    //   ),
+    combo_box_phrase: ($) =>
+      seq(
+        kw("COMBO-BOX"),
+        repeat(
+          choice(
+            $._list_items,
+            $.size_phrase,
+            kw("SORT"),
+            kw("SIMPLE"),
+            kw("DROP-DOWN"),
+            kw("DROP-DOWN-LIST"),
+            seq(kw("AUTO-COMPLETION"), optional(kw("UNIQUE-MATCH")))
+          )
+        )
+      ),
 
     // editor_phrase: ($) =>
     //   seq(
@@ -913,17 +957,24 @@ module.exports = grammar({
     //     )
     //   ),
 
-    // radio_set_phrase: ($) =>
-    //   seq(
-    //     kw("RADIO-SET"),
-    //     optional(choice(seq(kw("HORIZONTAL"), optional(kw("EXPAND"))), kw("VERTICAL"))),
-    //     seq(
-    //       kw("RADIO-BUTTONS"),
-    //       field("label", $.identifier), ",", field("value", $.identifier),
-    //       repeat(seq(",", field("label", $.identifier), ",", field("value", $.identifier)))
-    //     ),
-    //     optional($._tooltip)
-    //   ),
+    radio_set_phrase: ($) =>
+      seq(
+        kw("RADIO-SET"),
+        optional(choice(seq(kw("HORIZONTAL"), optional(kw("EXPAND"))), kw("VERTICAL"))),
+        seq(
+          kw("RADIO-BUTTONS"),
+          field("label", choice($.string_literal, $.identifier)), 
+          ",", 
+          field("value", choice($.string_literal, $.identifier, $._expression)),
+          repeat(seq(
+            ",", 
+            field("label", choice($.string_literal, $.identifier)), 
+            ",", 
+            field("value", choice($.string_literal, $.identifier, $._expression))
+          ))
+        ),
+        optional($.size_phrase)
+      ),
 
     // selection_list_phrase: ($) =>
     //   seq(
@@ -969,9 +1020,9 @@ module.exports = grammar({
       seq(
         kw("VIEW-AS"),
         choice(
-          // $.combo_box_phrase,
+          $.combo_box_phrase,
           // $.editor_phrase,
-          // $.radio_set_phrase,
+          $.radio_set_phrase,
           // $.selection_list_phrase,
           // $.slider_phrase,
           // seq(
@@ -1042,6 +1093,7 @@ module.exports = grammar({
             // $.at_phrase, // TODO
             seq(kw("CANCEL-BUTTON"), $.identifier),
             kw("CENTERED"),
+            // $._bgcolor,
             // color specification
             $._position,
             seq($.number_literal, kw("COLUMNS")),
@@ -1049,7 +1101,6 @@ module.exports = grammar({
             // seq(kw("CONTEXT-HELP-FILE"), $.identifier),
             seq(kw("DEFAULT-BUTTON"), $.identifier),
             // kw("DROP-TARGET"),
-            seq(optional($._expression), kw("DOWN")),
             // kw("EXPORT"),
             seq(kw("WIDGET-ID"), $.number_literal),
             $._font,
@@ -1123,7 +1174,7 @@ module.exports = grammar({
 
     in_frame_phrase: ($) =>
     seq(
-        $.object_access,
+        choice($.object_access, $.function_call),
         kw("IN"),
         $._frame
     ),
@@ -1175,20 +1226,26 @@ module.exports = grammar({
           choice($.do_block, kw("REVERT"))
         )),
 
-      // _on_statement_widget_phrase: ($) =>
-      //   prec(2, seq(
-      //     _list(choice($.identifier, $.constant), ","),
-      //     $.of_phrase,
-      //     repeat(
-      //       seq(
-      //         kw("OR"),
-      //         _list(choice($.identifier, $.constant), ","),
-      //         $.of_phrase
-      //       )
-      //     ),
-      //     optional(kw("ANYWHERE")),
-      //     choice($.do_block, prec(2, $._statement), kw("REVERT"), seq(kw("PERSISTENT"), $.run_statement))
-      //   )),
+      _on_statement_widget_phrase: ($) =>
+        prec(2, seq(
+          _list(choice($.identifier, $.constant, $.string_literal), ","),
+          choice(
+            seq(kw("OF"), kw("FRAME"), choice($._name, $.constant)),
+            seq(kw("OF"), _list(choice($._name, $.constant), ","), optional(seq(kw("IN"), kw("FRAME"), choice($._name, $.constant))))
+          ),
+          repeat(
+            seq(
+              kw("OR"),
+              _list(choice($.identifier, $.constant, $.string_literal), ","),
+              choice(
+                seq(kw("OF"), kw("FRAME"), choice($._name, $.constant)),
+                seq(kw("OF"), _list(choice($._name, $.constant), ","), optional(seq(kw("IN"), kw("FRAME"), choice($._name, $.constant))))
+              )
+            )
+          ),
+          optional(kw("ANYWHERE")),
+          choice($.do_block, $.run_statement, prec(2, $._statement), kw("REVERT"), seq(kw("PERSISTENT"), $.run_statement))
+        )),
 
         // TODO: Refactor
       // image_phrase: ($) =>
@@ -1300,13 +1357,13 @@ module.exports = grammar({
 
     _label: ($) => seq(kw("LABEL"), _list($.string_literal, ",")),
 
-    // _list_items: ($) =>
-    //   seq(
-    //     choice(
-    //       kw("LIST-ITEMS"),
-    //       kw("LIST-ITEM-PAIRS")),
-    //     _list($.string_literal,",")
-    //   ),
+    _list_items: ($) =>
+      seq(
+        choice(
+          kw("LIST-ITEMS"),
+          kw("LIST-ITEM-PAIRS")),
+        _list(choice($._literal, $._expression), ",")
+      ),
 
     // _max_chars: ($) => seq(kw("MAX-CHARS"), $.number_literal),
 
@@ -1322,8 +1379,10 @@ module.exports = grammar({
       choice(
         $.variable_definition,
         $.buffer_definition,
+        $.browse_definition,
         // $.button_definition,
         $.query_definition,
+        $.rectangle_definition,
         $.temp_table_definition,
         $.workfile_definition,
         $.property_definition,
@@ -1332,7 +1391,7 @@ module.exports = grammar({
         $.dataset_definition,
         $.stream_definition,
         // $.image_definition,
-        // $.frame_definition,
+        $.frame_definition,
         $.parameter_definition
       ),
 
@@ -1409,17 +1468,30 @@ module.exports = grammar({
         $._terminator
       ),
 
-    // frame_definition: ($) =>
-    //   seq(
-    //     $._define,
-    //     repeat($._tuning),
-    //     kw("FRAME"),
-    //     field("name", $.identifier),
-    //     // form item
-    //     seq(optional(choice(kw("HEADER"), kw("BACKGROUND")))), // head item
-    //     optional($.frame_phrase)
-
-    //   ),
+    frame_definition: ($) =>
+      seq(
+        $._define,
+        repeat($._tuning),
+        kw("FRAME"),
+        field("name", choice($.identifier, $.constant)),
+        repeat(choice($.identifier, $.constant, $.object_access)),
+        optional(seq(
+          kw("WITH"),
+          repeat1(choice(
+            $.size_phrase,
+            seq(kw("SIZE-PIXELS"), $.number_literal, kw("BY"), $.number_literal),
+            kw("NO-BOX"),
+            seq(kw("FONT"), $.number_literal),
+            seq(kw("BGCOLOR"), $.number_literal),
+            seq(kw("FGCOLOR"), $.number_literal),
+            kw("SCROLLABLE"),
+            kw("RESIZABLE")
+          ))
+        )),
+        optional(seq(kw("AT"), kw("COLUMN"), field("column", choice($.number_literal, $.identifier)))),
+        optional(seq(kw("ROW"), field("row", choice($.number_literal, $.identifier)))),
+        $._terminator
+      ),
 
     // image_definition: ($) =>
     //   seq(
@@ -1458,10 +1530,10 @@ module.exports = grammar({
 
     _table_option: ($) =>
       choice(
-        kw("TABLE "),
+        kw("TABLE"),
         kw("TABLE-HANDLE"),
         kw("DATASET-HANDLE"),
-        kw("DATASET ")
+        kw("DATASET")
       ),
 
     _parameter_definition_option: ($) =>
@@ -1472,6 +1544,49 @@ module.exports = grammar({
         seq(kw("DATASET"), optional(token.immediate(kw("-HANDLE"))))
       ),
 
+    browse_definition: ($) =>
+      seq(
+        $._define,
+        repeat($._tuning),
+        kw("BROWSE"),
+        field("name", $.identifier),
+        optional(seq(kw("QUERY"), field("query", $.identifier))),
+        optional(seq(
+          kw("DISPLAY"),
+          repeat1(
+            seq(
+              $._expression,
+              optional(seq(kw("COLUMN-LABEL"), $.string_literal))
+            )
+          )
+        )),
+        optional(seq(
+          kw("WITH"),
+          repeat1(choice(
+            seq($.number_literal, kw("DOWN")),
+            seq(kw("WIDTH"), $.number_literal),
+            kw("MULTIPLE"),
+            kw("SINGLE")
+          ))
+        )),
+        $._terminator
+      ),
+
+    rectangle_definition: ($) =>
+      seq(
+        $._define,
+        repeat($._tuning),
+        kw("RECTANGLE"),
+        field("name", $.identifier),
+        optional(seq(
+          kw("SIZE"),
+          $.number_literal,
+          kw("BY"),
+          $.number_literal
+        )),
+        $._terminator
+      ),
+
     property_definition: ($) =>
       seq(
         $._define,
@@ -1642,13 +1757,15 @@ module.exports = grammar({
                 $.object_access,
                 $.member_access,
                 $.function_call,
-                $.array_access
+                $.array_access,
+                $.in_frame_phrase
               )
             )
           ),
           $.assignment_operator,
           prec.right(choice($._expression, $.include)),
-          optional($.when_expression)
+          optional($.when_expression),
+          optional(seq(kw("IN"), $._frame))
         )
       ),
 
@@ -1661,7 +1778,7 @@ module.exports = grammar({
         $.return_type,
         optional($._extent),
         optional(alias($.function_parameters, $.parameters)),
-        $._function_option,
+        $._function_option
       ),
 
     _function_option: ($) =>
@@ -1691,6 +1808,7 @@ module.exports = grammar({
       choice(
         $.to_phrase,
         $.repeat_tuning
+        // $.frame_phrase
       ),
 
     return_statement: ($) =>
@@ -1760,7 +1878,7 @@ module.exports = grammar({
     assign_statement: ($) =>
       seq(
         kw("ASSIGN"),
-        repeat1($.assignment),
+        repeat1(choice($.assignment, $.preprocessor_directive)),
         optional(kw("NO-ERROR")),
         $._terminator
       ),
@@ -1820,7 +1938,7 @@ module.exports = grammar({
       seq(
         kw("ON"),
         choice(
-          // $._on_statement_widget_phrase,
+          $._on_statement_widget_phrase,
           $._on_statement_database_phrase,
           seq(field("label", $.identifier), field("function", $.identifier), $._terminator),
           // seq(alias("\"WEB-NOTIFY\"", $.string_literal), kw("ANYWHERE"), $._statement_body)
@@ -1982,7 +2100,7 @@ module.exports = grammar({
 
     locked_expression: ($) => seq(kw("LOCKED"), $._name),
 
-    dataset_expression: ($) => seq(prec.left(kw("DATASET")), $._name),
+    dataset_expression: ($) => prec(-1, seq(token(seq(/[Dd][Aa][Tt][Aa][Ss][Ee][Tt]/, /\s/)), $._name)),
 
     when_expression: ($) => seq(kw("WHEN"), $._expression),
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-abl",
-  "version": "0.0.50",
+  "version": "0.0.51",
   "description": "ABL grammar for tree-sitter",
   "repository": "https://github.com/eglekaz/tree-sitter-abl",
   "keywords": [
@@ -10,6 +10,7 @@
     "abl"
   ],
   "main": "bindings/node",
+
   "scripts": {
     "generate": "tree-sitter generate",
     "build": "tree-sitter generate && node-gyp build",