add icon command

ori-community · Sep 30, 2021 · 6fd2717 · 6fd2717
1 parent 85db5f6
commit 6fd2717
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
 	"name": "header-language",
 	"displayName": "Ori WotW Header Language",
 	"description": "Support for the .wotwrh language",
-	"version": "0.2.1",
+	"version": "0.2.2",
 	"publisher": "orirando",
 	"license": "MIT",
 	"repository": {

diff --git a/syntaxes/ori-wotw-header.tmLanguage.json b/syntaxes/ori-wotw-header.tmLanguage.json
@@ -62,7 +62,7 @@
                 { "include": "#progressMessage" },
                 { "include": "#wheelCommand" },
                 { "include": "#shopCommand" },
-                { "include": "placeholder" }
+                { "include": "#placeholder" }
             ]
         },
         "spiritLight": {
@@ -346,14 +346,14 @@
         "icon": {
             "patterns": [
                 {
-                    "match": "\\G((shard|spell|map|opher|lupo|grom|tuley):)\\d+",
+                    "match": "((shard|spell|map|opher|lupo|grom|tuley):)\\d+",
                     "captures": {
                         "0": { "name": "variable" },
                         "1": { "name": "entity.name.type" }
                     }
                 },
                 {
-                    "begin": "\\Gfile:",
+                    "begin": "file:",
                     "end": "$|(?=//)",
                     "name": "entity.name.type",
                     "patterns": [
@@ -406,6 +406,7 @@
                 { "include": "#includeCommand" },
                 { "include": "#addCommand" },
                 { "include": "#nameCommand" },
+                { "include": "#iconCommand" },
                 { "include": "#parameterCommand" },
                 { "include": "#poolCommand" },
                 { "include": "#addpoolCommand" },
@@ -442,6 +443,15 @@
                 { "include": "#messageString" }
             ]
         },
+        "iconCommand": {
+            "begin": "^(!!icon) ",
+            "end": "$|(?=//)",
+            "beginCaptures": { "1": { "name": "keyword" } },
+            "patterns": [
+                { "include": "#pickup" },
+                { "include": "#icon" }
+            ]
+        },
         "parameterCommand": {
             "match": "^(!!parameter) \\w+ ((bool:)(true|false)|(int:)\\d+|(float:)\\d+([,.]\\d+)?|(string:)\\w+)\\b",
             "captures": {