abl-tmlanguage 1.3.25 → 1.3.27

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+1.3.27
+======
+
+- 🐛 Fix scoping of parameter definition with 'class' in the type name (PR #75)
+
+1.3.26
+======
+
+- 🐛 Fix scoping for DELETE PROCEDURE statements (PR #74, issue vscode-abl/vscode-abl#507)
+
 1.3.25
 ======
 

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"
@@ -1659,7 +1659,7 @@
       "end": "(?=\\s|\\)|\\.|,)",
       "patterns": [
         {
-          "match": "\\s*([Cc][Ll][Aa][Ss]{2})\\s*",
+          "match": "\\b([Cc][Ll][Aa][Ss]{2})\\b",
           "captures": {
             "1": {
               "name": "keyword.other.abl"

package/package.json

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

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);
+})

package/spec/type-name/parameter-as.spec.js

@@ -926,4 +926,53 @@ describe('', () => {
     { "startIndex": 81, "endIndex": 82, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // ':'
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
-})
+})
+
+describe('', () => {
+  let statement = `method public character GetStaticQueryNames (pcTempTableName as character,
+     pcIndexName as character,
+     output poParameterType as ClassName ):`;
+
+  let expectedTokens = [
+    [
+      { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "meta.define.method.abl", "keyword.other.abl"] },  // 'method'
+      { "startIndex": 6, "endIndex": 7, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
+      { "startIndex": 7, "endIndex": 13, "scopes": ["source.abl", "meta.define.method.abl", "keyword.other.abl"] },  // 'public'
+      { "startIndex": 13, "endIndex": 14, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
+      { "startIndex": 14, "endIndex": 23, "scopes": ["source.abl", "meta.define.method.abl", "storage.type.abl"] },  // 'character'
+      { "startIndex": 23, "endIndex": 24, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
+      { "startIndex": 24, "endIndex": 43, "scopes": ["source.abl", "meta.define.method.abl", "entity.name.function.abl"] },  // 'GetStaticQueryNames'
+      { "startIndex": 43, "endIndex": 44, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
+      { "startIndex": 44, "endIndex": 45, "scopes": ["source.abl", "meta.define.method.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 45, "endIndex": 60, "scopes": ["source.abl", "meta.define.method.abl", "variable.parameter.abl"] },  // 'pcTempTableName'
+      { "startIndex": 60, "endIndex": 61, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
+      { "startIndex": 61, "endIndex": 63, "scopes": ["source.abl", "meta.define.method.abl", "keyword.other.abl"] },  // 'as'
+      { "startIndex": 63, "endIndex": 64, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
+      { "startIndex": 64, "endIndex": 73, "scopes": ["source.abl", "meta.define.method.abl", "storage.type.abl"] },  // 'character'
+      { "startIndex": 73, "endIndex": 74, "scopes": ["source.abl", "meta.define.method.abl", "punctuation.separator.comma.abl"] }  // ','
+    ],
+    [
+      { "startIndex": 0, "endIndex": 5, "scopes": ["source.abl", "meta.define.method.abl"] },  // '     '
+      { "startIndex": 5, "endIndex": 16, "scopes": ["source.abl", "meta.define.method.abl", "variable.parameter.abl"] },  // 'pcIndexName'
+      { "startIndex": 16, "endIndex": 17, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
+      { "startIndex": 17, "endIndex": 19, "scopes": ["source.abl", "meta.define.method.abl", "keyword.other.abl"] },  // 'as'
+      { "startIndex": 19, "endIndex": 20, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
+      { "startIndex": 20, "endIndex": 29, "scopes": ["source.abl", "meta.define.method.abl", "storage.type.abl"] },  // 'character'
+      { "startIndex": 29, "endIndex": 30, "scopes": ["source.abl", "meta.define.method.abl", "punctuation.separator.comma.abl"] }  // ','
+    ],
+    [
+      { "startIndex": 0, "endIndex": 5, "scopes": ["source.abl", "meta.define.method.abl"] },  // '     '
+      { "startIndex": 5, "endIndex": 11, "scopes": ["source.abl", "meta.define.method.abl", "keyword.other.abl"] },  // 'output'
+      { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
+      { "startIndex": 12, "endIndex": 27, "scopes": ["source.abl", "meta.define.method.abl", "variable.parameter.abl"] },  // 'poParameterType'
+      { "startIndex": 27, "endIndex": 28, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
+      { "startIndex": 28, "endIndex": 30, "scopes": ["source.abl", "meta.define.method.abl", "keyword.other.abl"] },  // 'as'
+      { "startIndex": 30, "endIndex": 31, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
+      { "startIndex": 31, "endIndex": 40, "scopes": ["source.abl", "meta.define.method.abl", "entity.name.type.abl"] },  // 'ClassName'
+      { "startIndex": 40, "endIndex": 41, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
+      { "startIndex": 41, "endIndex": 42, "scopes": ["source.abl", "meta.define.method.abl", "meta.brace.round.js"] },  // ')'
+      { "startIndex": 42, "endIndex": 43, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // ':'
+    ]
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})