fix(completion): fix completion for types of fields

Fixes #369

Author: i582

server/src/e2e/suite/testcases/completion/fields.test

@@ -289,3 +289,51 @@ trait Foo {
 2  name(): String
 14 call  Use as function argument
 14 not  Negate expression
+
+========================================================================
+Contract field type completion
+========================================================================
+primitive Int;
+primitive Address;
+primitive String;
+
+contract Foo {
+    name: <caret>
+
+    fun name(): String {
+        return self.name;
+    }
+
+    fun bar() {
+        return self.<caret>;
+    }
+}
+------------------------------------------------------------------------
+13 map<K, V>
+9  Address
+9  Int
+9  String
+
+========================================================================
+Trait field type completion
+========================================================================
+primitive Int;
+primitive Address;
+primitive String;
+
+trait Foo {
+    name: <caret>
+
+    fun name(): String {
+        return self.name;
+    }
+
+    fun bar() {
+        return self.<caret>;
+    }
+}
+------------------------------------------------------------------------
+13 map<K, V>
+9  Address
+9  Int
+9  String

tree-sitter-tact/grammar.js

@@ -399,11 +399,12 @@ module.exports = grammar({
 
     message_value: ($) => seq("(", $._expression, ")"),
 
-    struct_body: ($) => seq("{", semicolonSepWithTrailing($.field), "}"),
+    struct_body: ($) => seq("{", repeat($.field), "}"),
 
     /* Fields (of messages, structs, contracts, traits) */
 
-    field: ($) => seq(field("name", $.identifier), $._field_after_id),
+    field: ($) =>
+      seq(field("name", $.identifier), $._field_after_id, optional(";")),
 
     // Like _constant, but without a semicolon at the end
     storage_constant: ($) =>
@@ -420,12 +421,14 @@ module.exports = grammar({
       seq(field("name", $.identifier), $._field_after_id),
 
     _field_after_id: ($) =>
-      seq(
-        ":",
-        field("type", $._type),
-        field("_completion_anchor", optional($.identifier)),
-        field("tlb", optional($.tlb_serialization)),
-        optional(seq("=", field("value", $._expression))),
+      prec.left(
+        seq(
+          ":",
+          field("type", $._type),
+          field("_completion_anchor", optional($.identifier)),
+          field("tlb", optional($.tlb_serialization)),
+          optional(seq("=", field("value", $._expression))),
+        ),
       ),
 
     /* Contracts, Traits */
@@ -465,13 +468,13 @@ module.exports = grammar({
         "{",
         repeat(
           choice(
-            seq($._body_item_without_semicolon, ";"),
+            seq($.storage_constant, optional(";")),
+            seq($.storage_variable, optional(";")),
             $.init_function,
             $._receiver_function,
             alias($._function_definition, $.storage_function),
           ),
         ),
-        optional($._body_item_without_semicolon),
         "}",
       ),
 
@@ -480,22 +483,15 @@ module.exports = grammar({
         "{",
         repeat(
           choice(
-            seq($._body_item_without_semicolon, ";"),
+            seq($.storage_constant, optional(";")),
+            seq($.storage_variable, optional(";")),
             $._receiver_function,
             alias($._function_definition, $.storage_function),
           ),
         ),
-        optional($._body_item_without_semicolon),
         "}",
       ),
 
-    _body_item_without_semicolon: ($) =>
-      choice(
-        $.storage_constant,
-        $.storage_variable,
-        alias($._function_declaration, $.storage_function),
-      ),
-
     init_function: ($) =>
       seq(
         "init",