abl-tmlanguage 1.3.24 → 1.3.25

package/CHANGELOG.md

@@ -1,3 +1,8 @@
+1.3.25
+======
+
+- 🐛 Fix scope for VAR CLASS <primitive> to not capture VAR ClassSomething (PR #73, issue vscode-abl/vscode-abl#488)
+
 1.3.24
 ======
 

package/abl.tmLanguage.json

@@ -2834,7 +2834,7 @@
         },
         {
           "comment": "This capture must use spaces and not word boundaries because the 'end' is on a space. This also captures class names that are ABL primitive type names, for example OpenEdge.Core.Memptr in its short form",
-          "match": "(?i)\\s*(class)\\s*(blob|character|char|clob|com-handle|date|datetime|datetime-tz|decimal|handle|int64|integer|int|logical|longchar|memptr|raw|recid|rowid|widget-handle)?",
+          "match": "(?i)\\s*(class)\\s+(blob|character|char|clob|com-handle|date|datetime|datetime-tz|decimal|handle|int64|integer|int|logical|longchar|memptr|raw|recid|rowid|widget-handle)?",
           "captures": {
             "1": {
               "name": "keyword.other.abl"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abl-tmlanguage",
-  "version": "1.3.24",
+  "version": "1.3.25",
   "description": "TextMate grammar for Progress OpenEdge ABL Language",
   "main": "",
   "type": "commonjs",

package/spec/define-variable/var-statement.spec.js

@@ -437,3 +437,31 @@ describe('', () => {
   ]
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })
+
+describe('', () => {
+  let statement = `var      ClassMyClass cmc.`
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 3, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'var'
+    { "startIndex": 3, "endIndex": 9, "scopes": ["source.abl", "meta.define.abl"] },  // '      '
+    { "startIndex": 9, "endIndex": 21, "scopes": ["source.abl", "meta.define.abl", "entity.name.type.abl"] },  // 'ClassMyClass'
+    { "startIndex": 21, "endIndex": 22, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 22, "endIndex": 25, "scopes": ["source.abl", "meta.define.abl", "variable.other.abl"] },  // 'cmc'
+    { "startIndex": 25, "endIndex": 26, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+  ]
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `var     class   ClassMyClass cmc.`
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 3, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'var'
+    { "startIndex": 3, "endIndex": 8, "scopes": ["source.abl", "meta.define.abl"] },  // '     '
+    { "startIndex": 8, "endIndex": 13, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'class'
+    { "startIndex": 13, "endIndex": 16, "scopes": ["source.abl", "meta.define.abl"] },  // '   '
+    { "startIndex": 16, "endIndex": 28, "scopes": ["source.abl", "meta.define.abl", "entity.name.type.abl"] },  // 'ClassMyClass'
+    { "startIndex": 28, "endIndex": 29, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 29, "endIndex": 32, "scopes": ["source.abl", "meta.define.abl", "variable.other.abl"] },  // 'cmc'
+    { "startIndex": 32, "endIndex": 33, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+  ]
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})