Enhance const expressions resolution (#43)

* Enhance const expressions resolution

* Changelog

* Allow numbers in first capturing group

Author: PhilippeChab

CHANGELOG.md

@@ -44,3 +44,7 @@ All notable changes to the "nwscript-ee-language-server" extension will be docum
 
 - Eslint has been configured along with prettier and the project will be linted from now on.
 - File handling is now done with their uri instead of their path.
+
+## [1.5.2]
+
+- `const` expressions resolution has been enhanced.

package.json

@@ -8,7 +8,7 @@
     "url": "https://github.com/PhilippeChab/nwscript-ee-language-server"
   },
   "license": "MIT",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "author": {
     "name": "Philippe Chabot"
   },

syntaxes/nwscript-ee.tmLanguage

@@ -40,13 +40,7 @@
       </dict>
       <dict>
         <key>match</key>
-        <string>\b(const|static)\b</string>
-        <key>name</key>
-        <string>storage.modifier.nss</string>
-      </dict>
-      <dict>
-        <key>match</key>
-        <string>\b[A-Z]+(_[A-Z]+)*(_[a-zA-Z0-9]+){0,1}(?!\()\b</string>
+        <string>\b_{0,1}[A-Z0-9]+(_[A-Z0-9]+)*(_[a-zA-Z0-9]+){0,1}_{0,1}(?!\()\b</string>
         <key>name</key>
         <string>constant.language.nss</string>
       </dict>
@@ -3736,9 +3730,25 @@ U[a-fA-F0-9]{,8} )</string>
         <array>
           <dict>
             <key>match</key>
-            <string>\b(action|effect|event|float|int|itemproperty|location|object|string|talent|vector|void|json|sqlquery|cassowary)\b</string>
-            <key>name</key>
-            <string>storage.type.built-in.nss</string>
+            <string>(const){0,1} *\b(action|effect|event|float|int|itemproperty|location|object|string|talent|vector|void|json|sqlquery|cassowary)\b (?(1)(\S*)|)</string>
+            <key>captures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>storage.modifier.nss</string>
+              </dict>
+              <key>2</key>
+              <dict>
+                <key>name</key>
+                <string>storage.type.built-in.nss</string>
+              </dict>
+              <key>3</key>
+              <dict>
+                <key>name</key>
+                <string>constant.language.nss</string>
+              </dict>
+            </dict>
           </dict>
           <dict>
             <key>match</key>
@@ -4111,4 +4121,4 @@ U[a-fA-F0-9]{,8} )</string>
       </dict>
     </dict>
   </dict>
-</plist>
+</plist>

syntaxes/nwscript-ee.tmLanguage.json

@@ -25,11 +25,7 @@
       "include": "#storage_types"
     },
     {
-      "match": "\\b(const|static)\\b",
-      "name": "storage.modifier.nss"
-    },
-    {
-      "match": "\\b[A-Z]+(_[A-Z]+)*(_[a-zA-Z0-9]+){0,1}(?!\\()\\b",
+      "match": "\\b_{0,1}[A-Z0-9]+(_[A-Z0-9]+)*(_[a-zA-Z0-9]+){0,1}_{0,1}(?!\\()\\b",
       "name": "constant.language.nss"
     },
     {
@@ -2406,8 +2402,18 @@
     "storage_types": {
       "patterns": [
         {
-          "match": "\\b(action|effect|event|float|int|itemproperty|location|object|string|talent|vector|void|json|sqlquery|cassowary)\\b",
-          "name": "storage.type.built-in.nss"
+          "match": "(const){0,1} *\\b(action|effect|event|float|int|itemproperty|location|object|string|talent|vector|void|json|sqlquery|cassowary)\\b (?(1)(\\S*)|)",
+          "captures": {
+            "1": {
+              "name": "storage.modifier.nss"
+            },
+            "2": {
+              "name": "storage.type.built-in.nss"
+            },
+            "3": {
+              "name": "constant.language.nss"
+            }
+          }
         },
         {
           "match": "\\b(struct)\\b \\b([a-zA-Z_][a-zA-Z0-9_]*\\b(?!\\s*\\())",