@salesforce/apex-tmlanguage 1.7.0 → 1.8.1

package/grammars/soql.tmLanguage

@@ -382,7 +382,7 @@
           </dict>
         </dict>
         <key>end</key>
-        <string>(?&lt;=\)|$)</string>
+        <string>(?=\s(?!\())|(?=\s*$)|(?&lt;=\s*\))</string>
         <key>patterns</key>
         <array>
           <dict>
@@ -1896,15 +1896,15 @@
       <dict>
         <key>begin</key>
         <string>(?x)
-(?&lt;type-name&gt;
+(?&lt;type_name&gt;
   (?:
     (?:
       (?:(?&lt;identifier&gt;@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
-      (?&lt;name-and-type-args&gt; # identifier + type arguments (if any)
+      (?&lt;name_and_type_args&gt; # identifier + type arguments (if any)
         \g&lt;identifier&gt;\s*
-        (?&lt;type-args&gt;\s*&lt;(?:[^&lt;&gt;]|\g&lt;type-args&gt;)+&gt;\s*)?
+        (?&lt;type_args&gt;\s*&lt;(?:[^&lt;&gt;]|\g&lt;type_args&gt;)+&gt;\s*)?
       )
-      (?:\s*\.\s*\g&lt;name-and-type-args&gt;)*
+      (?:\s*\.\s*\g&lt;name_and_type_args&gt;)*
     )
     (?:\s*\?\s*)? # nullable suffix?
     (?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
@@ -1967,25 +1967,25 @@
         <key>begin</key>
         <string>(?x)
 (?!.*\b(?:class|interface|enum)\b)\s*
-(?&lt;return-type&gt;
-  (?&lt;type-name&gt;
+(?&lt;return_type&gt;
+  (?&lt;type_name&gt;
     (?:
       (?:ref\s+)?   # ref return
       (?:
         (?:(?&lt;identifier&gt;@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
-        (?&lt;name-and-type-args&gt; # identifier + type arguments (if any)
+        (?&lt;name_and_type_args&gt; # identifier + type arguments (if any)
           \g&lt;identifier&gt;\s*
-          (?&lt;type-args&gt;\s*&lt;(?:[^&lt;&gt;]|\g&lt;type-args&gt;)+&gt;\s*)?
+          (?&lt;type_args&gt;\s*&lt;(?:[^&lt;&gt;]|\g&lt;type_args&gt;)+&gt;\s*)?
         )
-        (?:\s*\.\s*\g&lt;name-and-type-args&gt;)*
+        (?:\s*\.\s*\g&lt;name_and_type_args&gt;)*
       )
       (?:\s*\?\s*)? # nullable suffix?
       (?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
     )
   )\s+
 )
-(?&lt;interface-name&gt;\g&lt;type-name&gt;\s*\.\s*)?
-(?&lt;property-name&gt;\g&lt;identifier&gt;)\s*
+(?&lt;interface_name&gt;\g&lt;type_name&gt;\s*\.\s*)?
+(?&lt;property_name&gt;\g&lt;identifier&gt;)\s*
 (?=\{|=&gt;|$)</string>
         <key>beginCaptures</key>
         <dict>
@@ -2049,25 +2049,25 @@
       <dict>
         <key>begin</key>
         <string>(?x)
-(?&lt;return-type&gt;
-  (?&lt;type-name&gt;
+(?&lt;return_type&gt;
+  (?&lt;type_name&gt;
     (?:
       (?:ref\s+)?   # ref return
       (?:
         (?:(?&lt;identifier&gt;@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
-        (?&lt;name-and-type-args&gt; # identifier + type arguments (if any)
+        (?&lt;name_and_type_args&gt; # identifier + type arguments (if any)
           \g&lt;identifier&gt;\s*
-          (?&lt;type-args&gt;\s*&lt;(?:[^&lt;&gt;]|\g&lt;type-args&gt;)+&gt;\s*)?
+          (?&lt;type_args&gt;\s*&lt;(?:[^&lt;&gt;]|\g&lt;type_args&gt;)+&gt;\s*)?
         )
-        (?:\s*\.\s*\g&lt;name-and-type-args&gt;)*
+        (?:\s*\.\s*\g&lt;name_and_type_args&gt;)*
       )
       (?:\s*\?\s*)? # nullable suffix?
       (?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
     )
   )\s+
 )
-(?&lt;interface-name&gt;\g&lt;type-name&gt;\s*\.\s*)?
-(?&lt;indexer-name&gt;this)\s*
+(?&lt;interface_name&gt;\g&lt;type_name&gt;\s*\.\s*)?
+(?&lt;indexer_name&gt;this)\s*
 (?=\[)</string>
         <key>beginCaptures</key>
         <dict>
@@ -2187,24 +2187,24 @@
       <dict>
         <key>begin</key>
         <string>(?x)
-(?&lt;return-type&gt;
-  (?&lt;type-name&gt;
+(?&lt;return_type&gt;
+  (?&lt;type_name&gt;
     (?:
       (?:ref\s+)?   # ref return
       (?:
         (?:(?&lt;identifier&gt;@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
-        (?&lt;name-and-type-args&gt; # identifier + type arguments (if any)
+        (?&lt;name_and_type_args&gt; # identifier + type arguments (if any)
           \g&lt;identifier&gt;\s*
-          (?&lt;type-args&gt;\s*&lt;(?:[^&lt;&gt;]|\g&lt;type-args&gt;)+&gt;\s*)?
+          (?&lt;type_args&gt;\s*&lt;(?:[^&lt;&gt;]|\g&lt;type_args&gt;)+&gt;\s*)?
         )
-        (?:\s*\.\s*\g&lt;name-and-type-args&gt;)*
+        (?:\s*\.\s*\g&lt;name_and_type_args&gt;)*
       )
       (?:\s*\?\s*)? # nullable suffix?
       (?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
     )
   )\s+
 )
-(?&lt;interface-name&gt;\g&lt;type-name&gt;\s*\.\s*)?
+(?&lt;interface_name&gt;\g&lt;type_name&gt;\s*\.\s*)?
 (\g&lt;identifier&gt;)\s*
 (&lt;([^&lt;&gt;]+)&gt;)?\s*
 (?=\()</string>
@@ -3217,15 +3217,15 @@
               <dict>
                 <key>match</key>
                 <string>(?x)
-(?&lt;type-name&gt;
+(?&lt;type_name&gt;
   (?:
     (?:
       (?:(?&lt;identifier&gt;@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
-      (?&lt;name-and-type-args&gt; # identifier + type arguments (if any)
+      (?&lt;name_and_type_args&gt; # identifier + type arguments (if any)
         \g&lt;identifier&gt;\s*
-        (?&lt;type-args&gt;\s*&lt;(?:[^&lt;&gt;]|\g&lt;type-args&gt;)+&gt;\s*)?
+        (?&lt;type_args&gt;\s*&lt;(?:[^&lt;&gt;]|\g&lt;type_args&gt;)+&gt;\s*)?
       )
-      (?:\s*\.\s*\g&lt;name-and-type-args&gt;)*
+      (?:\s*\.\s*\g&lt;name_and_type_args&gt;)*
     )
     (?:\s*\?\s*)? # nullable suffix?
     (?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
@@ -3287,16 +3287,16 @@
         <string>(?x)
 (?:
   (?:(\bref)\s+)?(\bvar\b)| # ref local
-  (?&lt;type-name&gt;
+  (?&lt;type_name&gt;
     (?:
       (?:ref\s+)?   # ref local
       (?:
         (?:(?&lt;identifier&gt;@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
-        (?&lt;name-and-type-args&gt; # identifier + type arguments (if any)
+        (?&lt;name_and_type_args&gt; # identifier + type arguments (if any)
           \g&lt;identifier&gt;\s*
-          (?&lt;type-args&gt;\s*&lt;(?:[^&lt;&gt;]|\g&lt;type-args&gt;)+&gt;\s*)?
+          (?&lt;type_args&gt;\s*&lt;(?:[^&lt;&gt;]|\g&lt;type_args&gt;)+&gt;\s*)?
         )
-        (?:\s*\.\s*\g&lt;name-and-type-args&gt;)*
+        (?:\s*\.\s*\g&lt;name_and_type_args&gt;)*
       )
       (?:\s*\?\s*)? # nullable suffix?
       (?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
@@ -3365,16 +3365,16 @@
       <dict>
         <key>begin</key>
         <string>(?x)
-(?&lt;const-keyword&gt;\b(?:const)\b)\s*
-(?&lt;type-name&gt;
+(?&lt;const_keyword&gt;\b(?:const)\b)\s*
+(?&lt;type_name&gt;
   (?:
     (?:
       (?:(?&lt;identifier&gt;@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
-      (?&lt;name-and-type-args&gt; # identifier + type arguments (if any)
+      (?&lt;name_and_type_args&gt; # identifier + type arguments (if any)
         \g&lt;identifier&gt;\s*
-        (?&lt;type-args&gt;\s*&lt;(?:[^&lt;&gt;]|\g&lt;type-args&gt;)+&gt;\s*)?
+        (?&lt;type_args&gt;\s*&lt;(?:[^&lt;&gt;]|\g&lt;type_args&gt;)+&gt;\s*)?
       )
-      (?:\s*\.\s*\g&lt;name-and-type-args&gt;)*
+      (?:\s*\.\s*\g&lt;name_and_type_args&gt;)*
     )
     (?:\s*\?\s*)? # nullable suffix?
     (?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
@@ -3778,15 +3778,15 @@
         <key>match</key>
         <string>(?x)
 (\()\s*
-(?&lt;type-name&gt;
+(?&lt;type_name&gt;
   (?:
     (?:
       (?:(?&lt;identifier&gt;@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
-      (?&lt;name-and-type-args&gt; # identifier + type arguments (if any)
+      (?&lt;name_and_type_args&gt; # identifier + type arguments (if any)
         \g&lt;identifier&gt;\s*
-        (?&lt;type-args&gt;\s*&lt;(?:[^&lt;&gt;]|\g&lt;type-args&gt;)+&gt;\s*)?
+        (?&lt;type_args&gt;\s*&lt;(?:[^&lt;&gt;]|\g&lt;type_args&gt;)+&gt;\s*)?
       )
-      (?:\s*\.\s*\g&lt;name-and-type-args&gt;)*
+      (?:\s*\.\s*\g&lt;name_and_type_args&gt;)*
     )
     (?:\s*\?\s*)? # nullable suffix?
     (?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
@@ -3840,7 +3840,7 @@
         <string>(?x)
 (?:(\??\.)\s*)?                                  # safe navigator or accessor
 (@?[_[:alpha:]][_[:alnum:]]*)\s*                 # method name
-(?&lt;type-args&gt;\s*&lt;([^&lt;&gt;]|\g&lt;type-args&gt;)+&gt;\s*)?\s* # type arguments
+(?&lt;type_args&gt;\s*&lt;([^&lt;&gt;]|\g&lt;type_args&gt;)+&gt;\s*)?\s* # type arguments
 (?=\()                                           # open paren of argument list</string>
         <key>beginCaptures</key>
         <dict>
@@ -3967,7 +3967,7 @@
             <string>(?x)
 (\??\.)?\s*
 (@?[_[:alpha:]][_[:alnum:]]*)
-(?&lt;type-params&gt;\s*&lt;([^&lt;&gt;]|\g&lt;type-params&gt;)+&gt;\s*)
+(?&lt;type_params&gt;\s*&lt;([^&lt;&gt;]|\g&lt;type_params&gt;)+&gt;\s*)
 (?=
   (\s*\?)?
   \s*\.\s*@?[_[:alpha:]][_[:alnum:]]*
@@ -4048,15 +4048,15 @@
         <string>(?x)
 (delete|insert|undelete|update|upsert)?
 \s*(new)\s+
-(?&lt;type-name&gt;
+(?&lt;type_name&gt;
   (?:
     (?:
       (?:(?&lt;identifier&gt;@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
-      (?&lt;name-and-type-args&gt; # identifier + type arguments (if any)
+      (?&lt;name_and_type_args&gt; # identifier + type arguments (if any)
         \g&lt;identifier&gt;\s*
-        (?&lt;type-args&gt;\s*&lt;(?:[^&lt;&gt;]|\g&lt;type-args&gt;)+&gt;\s*)?
+        (?&lt;type_args&gt;\s*&lt;(?:[^&lt;&gt;]|\g&lt;type_args&gt;)+&gt;\s*)?
       )
-      (?:\s*\.\s*\g&lt;name-and-type-args&gt;)*
+      (?:\s*\.\s*\g&lt;name_and_type_args&gt;)*
     )
     (?:\s*\?\s*)? # nullable suffix?
     (?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
@@ -4106,15 +4106,15 @@
         <string>(?x)
 (delete|insert|undelete|update|upsert)?
 \s*(new)\s+
-(?&lt;type-name&gt;
+(?&lt;type_name&gt;
   (?:
     (?:
       (?:(?&lt;identifier&gt;@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
-      (?&lt;name-and-type-args&gt; # identifier + type arguments (if any)
+      (?&lt;name_and_type_args&gt; # identifier + type arguments (if any)
         \g&lt;identifier&gt;\s*
-        (?&lt;type-args&gt;\s*&lt;(?:[^&lt;&gt;]|\g&lt;type-args&gt;)+&gt;\s*)?
+        (?&lt;type_args&gt;\s*&lt;(?:[^&lt;&gt;]|\g&lt;type_args&gt;)+&gt;\s*)?
       )
-      (?:\s*\.\s*\g&lt;name-and-type-args&gt;)*
+      (?:\s*\.\s*\g&lt;name_and_type_args&gt;)*
     )
     (?:\s*\?\s*)? # nullable suffix?
     (?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
@@ -4154,15 +4154,15 @@
         <key>begin</key>
         <string>(?x)
 \b(new)\b\s*
-(?&lt;type-name&gt;
+(?&lt;type_name&gt;
   (?:
     (?:
       (?:(?&lt;identifier&gt;@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
-      (?&lt;name-and-type-args&gt; # identifier + type arguments (if any)
+      (?&lt;name_and_type_args&gt; # identifier + type arguments (if any)
         \g&lt;identifier&gt;\s*
-        (?&lt;type-args&gt;\s*&lt;(?:[^&lt;&gt;]|\g&lt;type-args&gt;)+&gt;\s*)?
+        (?&lt;type_args&gt;\s*&lt;(?:[^&lt;&gt;]|\g&lt;type_args&gt;)+&gt;\s*)?
       )
-      (?:\s*\.\s*\g&lt;name-and-type-args&gt;)*
+      (?:\s*\.\s*\g&lt;name_and_type_args&gt;)*
     )
     (?:\s*\?\s*)? # nullable suffix?
     (?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
@@ -4248,16 +4248,16 @@
         <key>match</key>
         <string>(?x)
 (?:(?:\b(this)\b)\s+)?
-(?&lt;type-name&gt;
+(?&lt;type_name&gt;
   (?:
     (?:ref\s+)?   # ref return
     (?:
       (?:(?&lt;identifier&gt;@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
-      (?&lt;name-and-type-args&gt; # identifier + type arguments (if any)
+      (?&lt;name_and_type_args&gt; # identifier + type arguments (if any)
         \g&lt;identifier&gt;\s*
-        (?&lt;type-args&gt;\s*&lt;(?:[^&lt;&gt;]|\g&lt;type-args&gt;)+&gt;\s*)?
+        (?&lt;type_args&gt;\s*&lt;(?:[^&lt;&gt;]|\g&lt;type_args&gt;)+&gt;\s*)?
       )
-      (?:\s*\.\s*\g&lt;name-and-type-args&gt;)*
+      (?:\s*\.\s*\g&lt;name_and_type_args&gt;)*
     )
     (?:\s*\?\s*)? # nullable suffix?
     (?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/apex-tmlanguage",
-  "version": "1.7.0",
+  "version": "1.8.1",
   "description": "Textmate grammar for Apex with outputs for VSCode, Atom and TextMate.",
   "displayName": "apex-tmLanguage",
   "keywords": [
@@ -31,16 +31,18 @@
     }
   ],
   "scripts": {
-    "build": "gulp",
-    "compile": "node ./node_modules/typescript/bin/tsc -p .",
+    "build:grammars": "node scripts/build-grammars.js",
+    "build:atom": "node scripts/build-atom.js",
+    "build:soql": "node scripts/build-soql.js",
+    "build": "npm run build:grammars && npm run build:atom && npm run build:soql",
+    "compile": "tsc -p .",
     "commit-init": "commitizen init cz-conventional-changelog --save-dev --save-exact --force",
     "commit": "git-cz",
-    "watch": "node ./node_modules/typescript/bin/tsc -w -p .",
-    "test:soql-tmgrammar": "vscode-tmgrammar-test -s source.soql -g \"./grammars/soql.tmLanguage\" -t \"./test/soql/*.soql\" ",
-    "test:soql-tmgrammar-snapshots": "vscode-tmgrammar-snap -s source.soql -g \"./grammars/soql.tmLanguage\" -t \"./test/soql/snapshots/*.soql\" ",
-    "test": "gulp test && yarn run test:soql-tmgrammar && yarn run test:soql-tmgrammar-snapshots",
-    "prepare": "gulp",
-    "build:default": "gulp default",
+    "watch": "tsc -w -p .",
+    "test:soql-tmgrammar": "vscode-tmgrammar-test -g \"./grammars/soql.tmLanguage\" \"./test/soql/*.soql\" ",
+    "test:soql-tmgrammar-snapshots": "vscode-tmgrammar-snap -s source.soql -g \"./grammars/soql.tmLanguage\" \"./test/soql/snapshots/*.soql\" ",
+    "test": "npm run compile && mocha out/test/**/*.tests.js && npm run test:soql-tmgrammar && npm run test:soql-tmgrammar-snapshots",
+    "prepare": "npm run build",
     "format": "prettier --config .prettierrc.json --write './**/*.{ts,js,json,md}'"
   },
   "files": [
@@ -49,29 +51,24 @@
     "README.md"
   ],
   "engines": {
-    "node": ">=12.4.0"
+    "node": ">=16"
   },
   "devDependencies": {
-    "@commitlint/cli": "^7",
-    "@commitlint/config-conventional": "^7",
-    "@types/chai": "4.2.8",
-    "@types/gulp": "^4.0.5",
-    "@types/mocha": "^5.2.1",
-    "chai": "^4.1.2",
-    "commitizen": "^3.0.5",
-    "cz-conventional-changelog": "^2.1.0",
-    "gulp": "4.0.2",
-    "gulp-json2cson": "^2.0.0",
-    "gulp-mocha": "^6.0.0",
-    "gulp-typescript": "^4.0.2",
-    "gulp-yaml": "^2.0.1",
-    "js-yaml": "^3.12.0",
-    "mocha": "^5.2.0",
-    "plist": "^3.0.1",
-    "prettier": "^1.13.5",
-    "typescript": "3.7.5",
-    "vscode-textmate": "4.4.0",
-    "vscode-tmgrammar-test": "^0.0.10"
+    "@commitlint/cli": "^17",
+    "@commitlint/config-conventional": "^17",
+    "@types/chai": "4.3.4",
+    "@types/mocha": "^10.0.10",
+    "chai": "^4.3.7",
+    "commitizen": "^4.3.1",
+    "cson-parser": "^4.0.9",
+    "cz-conventional-changelog": "^3.3.0",
+    "js-yaml": "^4.1.0",
+    "mocha": "^10.1.0",
+    "plist": "^3.1.0",
+    "prettier": "^2.8.0",
+    "typescript": "4.9.3",
+    "vscode-textmate": "^9.2.0",
+    "vscode-tmgrammar-test": "^0.1.3"
   },
   "husky": {
     "hooks": {