feat[match ohm]: !! as a value expression, trait lists with trailin…

…g commas (#22)

* feat: Promote non-null assert/unbox (`!!`) into a value expression

* fix: Correctly highlight built-in global static functions

* feat: Trailing commas for trait lists + more tests for trailing commas

* fix: Disable Python, Go and Swift binding test (Restored to the defaults)

* fix: Disable flaky binding tests on Windows (until they're fixed upstream)

.github/workflows/ci.yml

@@ -29,8 +29,8 @@ jobs:
         with:
           generate: true
           test-parser: true
-          test-rust: true
-          test-node: true
-          test-python: true
-          test-go: true
-          test-swift: true
+          test-rust: ${{runner.os != 'Windows'}}
+          test-node: ${{runner.os != 'Windows'}}
+          test-python: false # default
+          test-go: false     # default
+          test-swift: false  # default

editor_queries/helix/highlights.scm

@@ -275,7 +275,8 @@
 ; function.builtin
 ; ----------------
 
-((identifier) @function.builtin
+(static_call_expression
+  name: (identifier) @function.builtin
   (#any-of? @function.builtin
     "send" "sender" "require" "now"
     "myBalance" "myAddress" "newAddress"

editor_queries/neovim/highlights.scm

@@ -259,7 +259,8 @@
 ; function.builtin
 ; ----------------
 
-((identifier) @function.builtin
+(static_call_expression
+  name: (identifier) @function.builtin
   (#match? @function.builtin
      "^(log|log2|send|sender|require|now|myBalance|myAddress|newAddress|contractAddress|contractAddressExt|emit|cell|ton|dump|beginString|beginComment|beginTailString|beginStringFromBuilder|beginCell|emptyCell|randomInt|random|checkSignature|checkDataSignature|sha256|min|max|abs|pow|throw|nativeThrowWhen|nativeThrowUnless|getConfigParam|nativeRandomize|nativeRandomizeLt|nativePrepareRandom|nativeRandom|nativeRandomInterval|nativeReserve)$"))
 

grammar.js

@@ -65,13 +65,14 @@ module.exports = grammar({
   /* Each inner array represents a descending ordering of precedence */
   precedences: (_) => [
     [
+      "non_null_assert_expr",
       "method_call_expr",
       "field_access_expr",
       "static_call_expr",
       "parenthesized_expr",
       "instance_expr",
 
-      "unary_suffix_expr",
+      // "unary_suffix_expr",
       "unary_expr",
 
       "binary_multiplication",
@@ -262,7 +263,7 @@ module.exports = grammar({
 
     contract_attributes: ($) => repeat1(seq("@interface", "(", $.string, ")")),
 
-    trait_list: ($) => seq("with", commaSep1($.identifier)),
+    trait_list: ($) => seq("with", commaSepWithTrailing($.identifier)),
 
     contract_body: ($) =>
       seq(
@@ -436,7 +437,7 @@ module.exports = grammar({
         $.ternary_expression, // ExpressionConditional
         $.binary_expression, // ExpressionBinary
         $.unary_expression, // ExpressionUnary
-        $.unary_suffix_expression, // ExpressionUnarySuffix
+        // $.unary_suffix_expression, // ExpressionUnarySuffix
         $.value_expression, // ExpressionValue
       ),
 
@@ -523,14 +524,15 @@ module.exports = grammar({
         ),
       ),
 
-    unary_suffix_expression: ($) =>
-      prec.left(
-        "unary_suffix_expr",
-        seq(field("argument", $._expression), field("operator", choice("!!"))),
-      ),
+    // unary_suffix_expression: ($) =>
+    //   prec.left(
+    //     "unary_suffix_expr",
+    //     seq(field("argument", $._expression), field("operator", choice("!!"))),
+    //   ),
 
     value_expression: ($) =>
       choice(
+        $.non_null_assert_expression, // ExpressionUnboxNonNull
         $.method_call_expression, // ExpressionCall
         $.field_access_expression, // ExpressionField
         $.static_call_expression, // ExpressionStaticCall
@@ -545,6 +547,12 @@ module.exports = grammar({
         $.self, // self
       ),
 
+    non_null_assert_expression: ($) =>
+      prec.left(
+        "non_null_assert_expr",
+        seq(field("argument", $._expression), field("operator", choice("!!"))),
+      ),
+
     method_call_expression: ($) =>
       prec.right(
         "method_call_expr",

queries/highlights.scm

@@ -202,7 +202,8 @@
 ; function.builtin
 ; ----------------
 
-((identifier) @function.builtin
+(static_call_expression
+  name: (identifier) @function.builtin
   (#match? @function.builtin
      "^(log|log2|send|sender|require|now|myBalance|myAddress|newAddress|contractAddress|contractAddressExt|emit|cell|ton|dump|beginString|beginComment|beginTailString|beginStringFromBuilder|beginCell|emptyCell|randomInt|random|checkSignature|checkDataSignature|sha256|min|max|abs|pow|throw|nativeThrowWhen|nativeThrowUnless|getConfigParam|nativeRandomize|nativeRandomizeLt|nativePrepareRandom|nativeRandom|nativeRandomInterval|nativeReserve)$")
   (#is-not? local))