@salesforce/apex-tmlanguage 1.5.0 → 1.7.0

package/README.md

@@ -1,6 +1,5 @@
 # Salesforce Apex Language Grammar
 
-[![CircleCI](https://circleci.com/gh/forcedotcom/apex-tmLanguage.svg?style=svg)](https://circleci.com/gh/forcedotcom/apex-tmLanguage)
 [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
 
 ## Introduction
@@ -15,9 +14,9 @@ Development and setup of this project has not been tested for Windows OS. You ma
 
 To **build and test** install Node.js do the following:
 
-- Run `npm install` to install any dependencies.
-- Run `gulp` to build.
-- Run `npm run test` to run tests.
+- Run `yarn install` to install any dependencies.
+- Run `yarn run build` to build using gulp.
+- Run `yarn run test` to run tests.
 
 Output grammars are output in the `grammars/` directory.
 
@@ -54,7 +53,7 @@ The example-\* queries were taken from [Example SELECT clauses](https://develope
 
 ## Releasing
 
-Tags on this repo get automatically published as a GitHub release and an NPM package through Travis CI.
+Merges to main on this repo with commits of type 'feat' or 'fix' get automatically published as a GitHub release and an NPM package through Github Actions.
 
 ## Attribution
 

package/grammars/apex.tmLanguage

@@ -1675,7 +1675,7 @@
       <key>soql-functions</key>
       <dict>
         <key>begin</key>
-        <string>\b(AVG|CALENDAR_MONTH|CALENDAR_QUARTER|CALENDAR_YEAR|convertCurrency|convertTimezone|COUNT|DAY_IN_MONTH|DAY_IN_WEEK|DAY_IN_YEAR|DAY_ONLY|toLabel|INCLUDES|EXCLUDES|FISCAL_MONTH|FISCAL_QUARTER|FISCAL_YEAR|FORMAT|GROUPING|GROUP BY CUBE|GROUP BY ROLLUP|HOUR_IN_DAY|MAX|MIN|SUM|WEEK_IN_MONTH|WEEK_IN_YEAR)\s*(\()</string>
+        <string>\b(AVG|CALENDAR_MONTH|CALENDAR_QUARTER|CALENDAR_YEAR|convertCurrency|convertTimezone|COUNT|COUNT_DISTINCT|DAY_IN_MONTH|DAY_IN_WEEK|DAY_IN_YEAR|DAY_ONLY|toLabel|INCLUDES|EXCLUDES|FISCAL_MONTH|FISCAL_QUARTER|FISCAL_YEAR|FORMAT|GROUPING|GROUP BY CUBE|GROUP BY ROLLUP|HOUR_IN_DAY|MAX|MIN|SUM|WEEK_IN_MONTH|WEEK_IN_YEAR)\s*(\()</string>
         <key>beginCaptures</key>
         <dict>
           <key>1</key>
@@ -1724,7 +1724,7 @@
       <key>from-clause</key>
       <dict>
         <key>match</key>
-        <string>(FROM)\b\s*([_\.[:alnum:]]+)\b\s*</string>
+        <string>(FROM)\b\s*([_\.[:alnum:]]+\b)?</string>
         <key>captures</key>
         <dict>
           <key>1</key>
@@ -1797,7 +1797,7 @@
       <key>ordering-nulls</key>
       <dict>
         <key>match</key>
-        <string>\b(?:(NULLS first)|(NULLS last))\b</string>
+        <string>\b(?:(NULLS FIRST)|(NULLS LAST))\b</string>
         <key>captures</key>
         <dict>
           <key>1</key>

package/grammars/apex.tmLanguage.cson

@@ -998,7 +998,7 @@ repository:
       }
     ]
   "soql-functions":
-    begin: "\\b(AVG|CALENDAR_MONTH|CALENDAR_QUARTER|CALENDAR_YEAR|convertCurrency|convertTimezone|COUNT|DAY_IN_MONTH|DAY_IN_WEEK|DAY_IN_YEAR|DAY_ONLY|toLabel|INCLUDES|EXCLUDES|FISCAL_MONTH|FISCAL_QUARTER|FISCAL_YEAR|FORMAT|GROUPING|GROUP BY CUBE|GROUP BY ROLLUP|HOUR_IN_DAY|MAX|MIN|SUM|WEEK_IN_MONTH|WEEK_IN_YEAR)\\s*(\\()"
+    begin: "\\b(AVG|CALENDAR_MONTH|CALENDAR_QUARTER|CALENDAR_YEAR|convertCurrency|convertTimezone|COUNT|COUNT_DISTINCT|DAY_IN_MONTH|DAY_IN_WEEK|DAY_IN_YEAR|DAY_ONLY|toLabel|INCLUDES|EXCLUDES|FISCAL_MONTH|FISCAL_QUARTER|FISCAL_YEAR|FORMAT|GROUPING|GROUP BY CUBE|GROUP BY ROLLUP|HOUR_IN_DAY|MAX|MIN|SUM|WEEK_IN_MONTH|WEEK_IN_YEAR)\\s*(\\()"
     beginCaptures:
       "1":
         name: "support.function.query.apex"
@@ -1024,7 +1024,7 @@ repository:
       }
     ]
   "from-clause":
-    match: "(FROM)\\b\\s*([_\\.[:alnum:]]+)\\b\\s*"
+    match: "(FROM)\\b\\s*([_\\.[:alnum:]]+\\b)?"
     captures:
       "1":
         name: "keyword.operator.query.from.apex"
@@ -1056,7 +1056,7 @@ repository:
       "2":
         name: "keyword.operator.query.descending.apex"
   "ordering-nulls":
-    match: "\\b(?:(NULLS first)|(NULLS last))\\b"
+    match: "\\b(?:(NULLS FIRST)|(NULLS LAST))\\b"
     captures:
       "1":
         name: "keyword.operator.query.nullsfirst.apex"

package/grammars/soql.tmLanguage

@@ -14,6 +14,10 @@
     <string>1CDD8B23-7C84-46AA-9302-476968A79A83</string>
     <key>patterns</key>
     <array>
+      <dict>
+        <key>include</key>
+        <string>#soqlHeaderComment</string>
+      </dict>
       <dict>
         <key>include</key>
         <string>#soql-query-expression</string>
@@ -1367,10 +1371,6 @@
             <key>include</key>
             <string>#soql-query-body</string>
           </dict>
-          <dict>
-            <key>include</key>
-            <string>#comment</string>
-          </dict>
           <dict>
             <key>include</key>
             <string>#punctuation-comma</string>
@@ -1657,7 +1657,7 @@
       <key>soql-functions</key>
       <dict>
         <key>begin</key>
-        <string>\b(AVG|CALENDAR_MONTH|CALENDAR_QUARTER|CALENDAR_YEAR|convertCurrency|convertTimezone|COUNT|DAY_IN_MONTH|DAY_IN_WEEK|DAY_IN_YEAR|DAY_ONLY|toLabel|INCLUDES|EXCLUDES|FISCAL_MONTH|FISCAL_QUARTER|FISCAL_YEAR|FORMAT|GROUPING|GROUP BY CUBE|GROUP BY ROLLUP|HOUR_IN_DAY|MAX|MIN|SUM|WEEK_IN_MONTH|WEEK_IN_YEAR)\s*(\()</string>
+        <string>\b(AVG|CALENDAR_MONTH|CALENDAR_QUARTER|CALENDAR_YEAR|convertCurrency|convertTimezone|COUNT|COUNT_DISTINCT|DAY_IN_MONTH|DAY_IN_WEEK|DAY_IN_YEAR|DAY_ONLY|toLabel|INCLUDES|EXCLUDES|FISCAL_MONTH|FISCAL_QUARTER|FISCAL_YEAR|FORMAT|GROUPING|GROUP BY CUBE|GROUP BY ROLLUP|HOUR_IN_DAY|MAX|MIN|SUM|WEEK_IN_MONTH|WEEK_IN_YEAR)\s*(\()</string>
         <key>beginCaptures</key>
         <dict>
           <key>1</key>
@@ -1706,7 +1706,7 @@
       <key>from-clause</key>
       <dict>
         <key>match</key>
-        <string>(FROM)\b\s*([_\.[:alnum:]]+)\b\s*</string>
+        <string>(FROM)\b\s*([_\.[:alnum:]]+\b)?</string>
         <key>captures</key>
         <dict>
           <key>1</key>
@@ -1779,7 +1779,7 @@
       <key>ordering-nulls</key>
       <dict>
         <key>match</key>
-        <string>\b(?:(NULLS first)|(NULLS last))\b</string>
+        <string>\b(?:(NULLS FIRST)|(NULLS LAST))\b</string>
         <key>captures</key>
         <dict>
           <key>1</key>
@@ -5070,6 +5070,15 @@
           </dict>
         </dict>
       </dict>
+      <key>soqlHeaderComment</key>
+      <dict>
+        <key>name</key>
+        <string>comment.line</string>
+        <key>begin</key>
+        <string>^\s*//.*$</string>
+        <key>while</key>
+        <string>^\s*//.*$</string>
+      </dict>
     </dict>
   </dict>
 </plist>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/apex-tmlanguage",
-  "version": "1.5.0",
+  "version": "1.7.0",
   "description": "Textmate grammar for Apex with outputs for VSCode, Atom and TextMate.",
   "displayName": "apex-tmLanguage",
   "keywords": [
@@ -31,13 +31,14 @@
     }
   ],
   "scripts": {
+    "build": "gulp",
     "compile": "node ./node_modules/typescript/bin/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; npm run test:soql-tmgrammar; npm run test:soql-tmgrammar-snapshots",
+    "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",
     "format": "prettier --config .prettierrc.json --write './**/*.{ts,js,json,md}'"
@@ -72,9 +73,6 @@
     "vscode-textmate": "4.4.0",
     "vscode-tmgrammar-test": "^0.0.10"
   },
-  "volta": {
-    "node": "12.18.4"
-  },
   "husky": {
     "hooks": {
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
@@ -85,4 +83,4 @@
       "path": "./node_modules/cz-conventional-changelog"
     }
   }
-}
+}