feat: match 1.4.0

tact-lang · Jun 12, 2024 · bc4cfce · bc4cfce
1 parent b360d10
commit bc4cfce
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 11 deletions.
diff --git a/package/Snippets/variable.sublime-snippet b/package/Snippets/variable.sublime-snippet
@@ -1,5 +1,5 @@
 <snippet>
-	<content><![CDATA[let ${1:name}: ${2:type} = ${0:value};]]></content>
+	<content><![CDATA[let ${1:name}${2:: type} = ${0:value};]]></content>
 	<tabTrigger>variable</tabTrigger>
 	<scope>source.tact</scope>
 	<description>let …: … = …;</description>

diff --git a/package/Tact.tmLanguage b/package/Tact.tmLanguage
@@ -849,13 +849,26 @@
       </dict>
       <key>variable</key>
       <dict>
-        <key>comment</key>
-        <string>Any valid Tact identifier</string>
-        <key>match</key>
-        <string>\b([a-zA-Z_][a-zA-Z0-9_]*)\b</string>
-        <key>name</key>
-        <string>variable.other.tact</string>
+        <key>patterns</key>
+        <array>
+          <dict>
+            <key>comment</key>
+            <string>Any valid Tact identifier</string>
+            <key>match</key>
+            <string>(?&lt;!\.)\b(_)\b</string>
+            <key>name</key>
+            <string>comment.unused-identifier.tact</string>
+          </dict>
+          <dict>
+            <key>comment</key>
+            <string>Any valid Tact identifier</string>
+            <key>match</key>
+            <string>\b([a-zA-Z_][a-zA-Z0-9_]*)\b</string>
+            <key>name</key>
+            <string>variable.other.tact</string>
+          </dict>
+        </array>
       </dict>
     </dict>
   </dict>
-</plist>
+</plist>
diff --git a/package/Tact.tmLanguage.json b/package/Tact.tmLanguage.json
@@ -556,9 +556,18 @@
       },
 
       "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"
+          }
+        ]
       }
     }
   }
diff --git a/tests/syntax_test_statement.tact b/tests/syntax_test_statement.tact
@@ -52,6 +52,9 @@ extends fun c(self: SomeMessage): Int {
         // ^^ keyword.operator.assignment.tact
         //    ^^ constant.numeric.decimal.tact
         //      ^ punctuation.semi.tact
+
+        let _ = 20;
+        //  ^ comment.unused-identifier.tact
     }
 
     self.description = "Tact is awesome!";