abl-tmlanguage 1.3.24 → 1.3.26

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+1.3.26
+======
+
+- 🐛 Fix scoping for DELETE PROCEDURE statements (PR #74, issue vscode-abl/vscode-abl#507)
+
+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

@@ -58,7 +58,7 @@
     "procedure-definition": {
       "name": "meta.procedure.abl",
       "comment": "Look ahead to the procedure name, quoted or not. It will be resolved in the patterns. 'Names must begin with a letter.' from https://docs.progress.com/bundle/openedge-abl-manage-applications/page/Name-limits.html",
-      "begin": "(?i)\\s*(proce(?:dure|dur|du|d)?)\\s+(?=[a-zA-Z_])",
+      "begin": "(?i)^\\s*(proce(?:dure|dur|du|d)?)\\s+(?=[a-zA-Z_])",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.abl"
@@ -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.26",
   "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);
+})

package/spec/misc-statements/delete-objects.spec.js

@@ -0,0 +1,65 @@
+const { assert, expect } = require('chai');
+const shared = require('../shared.js');
+
+describe('', () => {
+  let statement = `// vProcedureHandle: entity.name.procedure.abl; meta.procedure.abl; source.abl
+// no-error: entity.name.procedure.abl; meta.procedure.abl; source.abl
+delete procedure vProcedureHandle no-error.`;
+  let expectedTokens = [
+    [
+      { "startIndex": 0, "endIndex": 78, "scopes": ["source.abl", "comment.line.double-slash.abl"] }  // '// vProcedureHandle: entity.name.procedure.abl; meta.procedure.abl; source.abl'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 70, "scopes": ["source.abl", "comment.line.double-slash.abl"] }  // '// no-error: entity.name.procedure.abl; meta.procedure.abl; source.abl'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "keyword.other.abl"] },  // 'delete'
+      { "startIndex": 6, "endIndex": 7, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 7, "endIndex": 16, "scopes": ["source.abl", "keyword.other.abl"] },  // 'procedure'
+      { "startIndex": 16, "endIndex": 17, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 17, "endIndex": 33, "scopes": ["source.abl", "variable.other.abl"] },  // 'vProcedureHandle'
+      { "startIndex": 33, "endIndex": 34, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 34, "endIndex": 42, "scopes": ["source.abl", "keyword.other.abl"] },  // 'no-error'
+      { "startIndex": 42, "endIndex": 43, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+    ]
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `// vProcedureHandle: variable.other.abl; source.abl
+// no-error: keyword.other.abl; source.abl
+delete object vProcedureHandle no-error.`;
+  let expectedTokens = [
+    [
+      { "startIndex": 0, "endIndex": 51, "scopes": ["source.abl", "comment.line.double-slash.abl"] }  // '// vProcedureHandle: variable.other.abl; source.abl'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 42, "scopes": ["source.abl", "comment.line.double-slash.abl"] }  // '// no-error: keyword.other.abl; source.abl'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "keyword.other.abl"] },  // 'delete'
+      { "startIndex": 6, "endIndex": 7, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 7, "endIndex": 13, "scopes": ["source.abl", "keyword.other.abl"] },  // 'object'
+      { "startIndex": 13, "endIndex": 14, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 14, "endIndex": 30, "scopes": ["source.abl", "variable.other.abl"] },  // 'vProcedureHandle'
+      { "startIndex": 30, "endIndex": 31, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 31, "endIndex": 39, "scopes": ["source.abl", "keyword.other.abl"] },  // 'no-error'
+      { "startIndex": 39, "endIndex": 40, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+    ]
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `delete WIDGET SELF.`;
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "keyword.other.abl"] },  // 'delete'
+    { "startIndex": 6, "endIndex": 7, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 7, "endIndex": 13, "scopes": ["source.abl", "keyword.other.abl"] },  // 'WIDGET'
+    { "startIndex": 13, "endIndex": 14, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 14, "endIndex": 18, "scopes": ["source.abl", "variable.language.abl"] },  // 'SELF'
+    { "startIndex": 18, "endIndex": 19, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})