From a25b6352848cc737ec04fedcc22300911087f941 Mon Sep 17 00:00:00 2001
From: Rahul Yadav <rahulkyadav57@gmail.com>
Date: Fri, 21 Jun 2024 22:18:52 +0530
Subject: [PATCH] chore: update @tact-lang/compiler to version 1.4 (#46)

---
 package-lock.json                   |  14 +--
 package.json                        |   2 +-
 src/assets/ton/tact/tmLanguage.json | 137 +++++++++++++++++++---------
 3 files changed, 100 insertions(+), 53 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8bdf851..f9b9573 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,7 @@
         "@minoru/react-dnd-treeview": "^3.4.1",
         "@monaco-editor/react": "^4.5.1",
         "@orbs-network/ton-access": "^2.3.0",
-        "@tact-lang/compiler": "^1.3.1",
+        "@tact-lang/compiler": "^1.4.0",
         "@ton-community/func-js": "^0.5.0",
         "@ton/core": "^0.56.3",
         "@ton/sandbox": "^0.16.0",
@@ -881,9 +881,9 @@
       }
     },
     "node_modules/@tact-lang/compiler": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@tact-lang/compiler/-/compiler-1.3.1.tgz",
-      "integrity": "sha512-XAKgO5DMUzP1Ya6lMv5tIPYhQKYmeb26aK4TpcI4GW6dHyyV7jpmbH2DJgdwJvGCAbombmq0FGhwM3zKoTITwQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@tact-lang/compiler/-/compiler-1.4.0.tgz",
+      "integrity": "sha512-MUZ8ulTrIs0sgs1tdNww7yan6ozMGNO7xR6S0yKZc57E0EN9o72vRqKdQW7k3iS3+MvltKPt6RVbNamtuVJ1tQ==",
       "dependencies": {
         "@ipld/dag-pb": "2.1.18",
         "@tact-lang/opcode": "^0.0.14",
@@ -9218,9 +9218,9 @@
       }
     },
     "@tact-lang/compiler": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@tact-lang/compiler/-/compiler-1.3.1.tgz",
-      "integrity": "sha512-XAKgO5DMUzP1Ya6lMv5tIPYhQKYmeb26aK4TpcI4GW6dHyyV7jpmbH2DJgdwJvGCAbombmq0FGhwM3zKoTITwQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@tact-lang/compiler/-/compiler-1.4.0.tgz",
+      "integrity": "sha512-MUZ8ulTrIs0sgs1tdNww7yan6ozMGNO7xR6S0yKZc57E0EN9o72vRqKdQW7k3iS3+MvltKPt6RVbNamtuVJ1tQ==",
       "requires": {
         "@ipld/dag-pb": "2.1.18",
         "@tact-lang/opcode": "^0.0.14",
diff --git a/package.json b/package.json
index 77ac1d9..3650f93 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "@minoru/react-dnd-treeview": "^3.4.1",
     "@monaco-editor/react": "^4.5.1",
     "@orbs-network/ton-access": "^2.3.0",
-    "@tact-lang/compiler": "^1.3.1",
+    "@tact-lang/compiler": "^1.4.0",
     "@ton-community/func-js": "^0.5.0",
     "@ton/core": "^0.56.3",
     "@ton/sandbox": "^0.16.0",
diff --git a/src/assets/ton/tact/tmLanguage.json b/src/assets/ton/tact/tmLanguage.json
index 0f90a51..d50db9d 100644
--- a/src/assets/ton/tact/tmLanguage.json
+++ b/src/assets/ton/tact/tmLanguage.json
@@ -18,11 +18,14 @@
             "include": "#literal"
         },
         {
-            "include": "#type"
+            "include": "#invalid"
         },
         {
             "include": "#constant"
         },
+        {
+            "include": "#type"
+        },
         {
             "include": "#expression"
         },
@@ -62,7 +65,7 @@
                     "begin": "\\s*/\\*",
                     "beginCaptures": {
                         "0": {
-                            "name": "comment.block.begin.tact"
+                            "name": "comment.block.begin.tact punctuation.definition.comment.begin.tact"
                         }
                     },
                     "patterns": [
@@ -73,7 +76,7 @@
                     "end": "\\*/",
                     "endCaptures": {
                         "0": {
-                            "name": "comment.block.end.tact"
+                            "name": "comment.block.end.tact punctuation.definition.comment.end.tact"
                         }
                     }
                 }
@@ -178,7 +181,7 @@
                 {
                     "comment": "self",
                     "match": "(?<!\\.)\\b(self)\\b",
-                    "name": "variable.language.self.tact"
+                    "name": "variable.language.this.tact"
                 }
             ]
         },
@@ -187,7 +190,7 @@
             "begin": "\"",
             "beginCaptures": {
                 "0": {
-                    "name": "punctuation.definition.string.tact"
+                    "name": "punctuation.definition.string.begin.tact"
                 }
             },
             "name": "string.quoted.double.tact",
@@ -199,32 +202,80 @@
             "end": "\"",
             "endCaptures": {
                 "0": {
-                    "name": "punctuation.definition.string.tact"
+                    "name": "punctuation.definition.string.end.tact"
                 }
             }
         },
         "escape-sequence": {
             "comment": "Allowed escape sequences in strings",
-            "match": "(\\\\)(([\\\\\"nrtvbf])|(x[a-fA-F0-9]{2})|(u[a-fA-F0-9]{4})|(u\\{[a-fA-F0-9]{1,6}\\}))",
+            "match": "(?:\\\\)(?:(\\\\)|(\")|([nrtvbf])|(x[a-fA-F0-9]{2})|(u[a-fA-F0-9]{4})|(u\\{[a-fA-F0-9]{1,6}\\}))",
             "name": "constant.character.escape.tact",
             "captures": {
                 "1": {
                     "name": "constant.character.escape.backslash.tact"
                 },
                 "2": {
-                    "name": "constant.character.escape.special.tact"
+                    "name": "constant.character.escape.double-quote.tact"
                 },
                 "3": {
-                    "name": "constant.character.escape.hex.tact"
+                    "name": "constant.character.escape.special.tact"
                 },
                 "4": {
-                    "name": "constant.character.escape.unicode.tact"
+                    "name": "constant.character.escape.hex.tact"
                 },
                 "5": {
+                    "name": "constant.character.escape.unicode.tact"
+                },
+                "6": {
                     "name": "constant.character.escape.unicodepoint.tact"
                 }
             }
         },
+        "invalid": {
+            "patterns": [
+                {
+                    "comment": "Anything starting with __gen or __tact",
+                    "match": "\\b__(?:gen|tact)[a-zA-Z0-9_]*\\b",
+                    "name": "invalid.illegal.identifier.tact"
+                }
+            ]
+        },
+        "constant": {
+            "patterns": [
+                {
+                    "comment": "self.storageReserve",
+                    "match": "(?<=self\\.)(storageReserve)\\b",
+                    "name": "constant.other.builtin.tact"
+                },
+                {
+                    "comment": "Other constants from the core library",
+                    "match": "(?<!\\.)\\b(SendRemainingValue|SendRemainingBalance|SendPayGasSeparately|SendIgnoreErrors|SendBounceIfActionFail|SendDestroyIfZero|ReserveExact|ReserveAllExcept|ReserveAtMost|ReserveAddOriginalBalance|ReserveInvertSign|ReserveBounceIfActionFail)\\b",
+                    "name": "constant.other.builtin.tact"
+                },
+                {
+                    "comment": "ALL CAPS constants",
+                    "match": "\\b([A-Z]{2}[A-Z0-9_]*)\\b",
+                    "name": "constant.other.caps.tact"
+                },
+                {
+                    "comment": "Constant declaration or definition",
+                    "match": "(?<!\\.)\\b(const)\\s+([a-zA-Z_][A-Za-z0-9_]*)\\b",
+                    "captures": {
+                        "1": {
+                            "name": "keyword.other.tact"
+                        },
+                        "2": {
+                            "name": "constant.other.declaration.tact"
+                        }
+                    }
+                },
+                {
+                    "comment": "null",
+                    "match": "(?<!\\.)\\b(null)\\b",
+                    "name": "constant.language.null.tact"
+                }
+            ]
+        },
         "type": {
             "patterns": [
                 {
@@ -301,13 +352,13 @@
             }
         },
         "as-tlb": {
-            "comment": "Storage modifiers",
+            "comment": "Serialization",
             "patterns": [
                 {
                     "match": "(?<!\\.)\\b(as)\\s+([a-zA-Z_][a-zA-Z0-9_]*)\\b",
                     "captures": {
                         "1": {
-                            "name": "storage.modifier.tact"
+                            "name": "keyword.other.as.tact storage.modifier.tact"
                         },
                         "2": {
                             "name": "entity.name.type.tact"
@@ -316,32 +367,6 @@
                 }
             ]
         },
-        "constant": {
-            "patterns": [
-                {
-                    "comment": "ALL CAPS constants",
-                    "match": "\\b([A-Z]{2}[A-Z0-9_]*)\\b",
-                    "name": "constant.other.caps.tact"
-                },
-                {
-                    "comment": "Constant declaration or definition",
-                    "match": "^\\s*(const)\\s+([A-Z][A-Za-z0-9_]*)\\b",
-                    "captures": {
-                        "1": {
-                            "name": "storage.type.tact"
-                        },
-                        "2": {
-                            "name": "constant.other.caps.tact"
-                        }
-                    }
-                },
-                {
-                    "comment": "null",
-                    "match": "(?<!\\.)\\b(null)\\b",
-                    "name": "constant.language.null.tact"
-                }
-            ]
-        },
         "expression": {
             "patterns": [
                 {
@@ -435,9 +460,14 @@
                     "match": "(?<!\\.)\\b(import)\\b",
                     "name": "keyword.control.import.tact"
                 },
+                {
+                    "comment": "Control flow keywords, prefixed by more than one dot",
+                    "match": "(?<=\\.\\.)\\b(else|catch|until|in(?!\\s*\\())\\b",
+                    "name": "keyword.control.tact"
+                },
                 {
                     "comment": "Control flow keywords",
-                    "match": "(?<!\\.)\\b(if|else|try|catch|repeat|do|until|while|foreach|in|return)\\b",
+                    "match": "(?<!\\.)\\b(if|else|try|catch|repeat|do|until|while|foreach|in(?!\\s*\\()|return)\\b",
                     "name": "keyword.control.tact"
                 },
                 {
@@ -448,7 +478,7 @@
                 {
                     "comment": "Serialization",
                     "match": "(?<!\\.)\\b(as)\\b",
-                    "name": "keyword.other.as.tact"
+                    "name": "keyword.other.as.tact storage.modifier.tact"
                 },
                 {
                     "match": "(?<!\\.)\\b(struct)\\b",
@@ -478,7 +508,12 @@
                 },
                 {
                     "comment": "Function declaration/definition keywords",
-                    "match": "(?<!\\.)\\b(fun|native|init|receive|bounced|external)\\b",
+                    "match": "(?<!\\.)\\b(fun|native)\\b",
+                    "name": "keyword.other.function.tact"
+                },
+                {
+                    "comment": "Special functions",
+                    "match": "(?<!\\.)\\b(init|receive|bounced|external)(?=\\s*\\()",
                     "name": "keyword.other.function.tact"
                 },
                 {
@@ -495,17 +530,29 @@
         },
         "function": {
             "comment": "Function declaration, definition or call",
-            "match": "\\b((?:[a-zA-Z_][a-zA-Z0-9_]*))\\s*\\(",
+            "match": "\\b((?:[a-zA-Z_][a-zA-Z0-9_]*))\\s*(\\()",
             "captures": {
                 "1": {
                     "name": "entity.name.function.tact"
+                },
+                "2": {
+                    "name": "punctuation.brackets.round.tact"
                 }
             }
         },
         "variable": {
-            "comment": "Any valid Tact identifier",
-            "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b",
-            "name": "variable.other.tact"
+            "patterns": [
+                {
+                    "comment": "Any valid Tact identifier",
+                    "match": "(?<!\\.)\\b(_)\\b",
+                    "name": "comment.unused-identifier.tact"
+                },
+                {
+                    "comment": "Any valid Tact identifier",
+                    "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b",
+                    "name": "variable.other.tact"
+                }
+            ]
         }
     }
 }