abl-tmlanguage 1.3.15 → 1.3.16

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+1.3.16
+======
+
+- 🐛 Addresses syntax highlighting - DO..WHILE loops with long conditions (vscode-abl/vscode-abl#401)
+- ✨ Improve closing scope on DEFINE QUERY statement
+- ✨ Improve termination of UNDO statement
+- ✨ Dataset scoping improvements
+
 1.3.15
 ======
 

package/abl.tmLanguage.json

@@ -518,6 +518,9 @@
         {
           "include": "#event-un-subscribe"
         },
+        {
+          "include": "#dataset-name"
+        },
         {
           "include": "#buffer-name"
         },
@@ -1952,7 +1955,7 @@
           "name": "variable.other.abl"
         }
       },
-      "end": "(?i)\\b(?=\\.)\\b",
+      "end": "(?i)(?=\\.\\s*)",
       "patterns": [
         {
           "match": "(?i)\\b(for|scrolling|(rcode-info(?:rmation|rmatio|rmati|rmat|rma|rm|r)?))\\b",
@@ -2132,6 +2135,17 @@
         }
       ]
     },
+    "dataset-name": {
+      "match": "(?i)\\s*(dataset)\\s+([a-zA-Z][a-zA-Z0-9_\\-]*)",
+      "captures": {
+        "1": {
+          "name": "keyword.other.abl"
+        },
+        "2": {
+          "name": "storage.data.dataset.abl"
+        }
+      }
+    },
     "buffer-name": {
       "match": "(?i)\\b(buffer)\\s+([a-zA-Z][a-zA-Z0-9_\\-#$%]*(\\.[a-zA-Z][a-zA-Z0-9_\\-#$%]*)?)",
       "captures": {
@@ -2826,53 +2840,20 @@
       "name": "meta.block.abl",
       "patterns": [
         {
-          "include": "#comment"
-        },
-        {
-          "include": "#for-record"
-        },
-        {
-          "include": "#operator"
-        },
-        {
-          "include": "#from-to-by"
-        },
-        {
-          "include": "#while-expression"
-        },
-        {
-          "match": "(?i)\\b((transact(?:ion|io|i)?)|stop-after)\\b",
+          "match": "(?i)\\b((transact(?:ion|io|i)?)|stop-after|and|or)\\b",
           "name": "keyword.other.abl"
         },
         {
-          "include": "#numeric"
-        },
-        {
-          "include": "#type-member-call"
-        },
-        {
-          "include": "#language-functions"
-        },
-        {
-          "include": "#abl-functions"
+          "include": "#logical-expression"
         },
         {
-          "include": "#punctuation-comma"
+          "include": "#while-expression"
         },
         {
-          "include": "#punctuation-colon"
+          "include": "#for-record"
         },
         {
           "include": "#branch-options"
-        },
-        {
-          "include": "#keywords"
-        },
-        {
-          "include": "#expression"
-        },
-        {
-          "include": "#preprocessors"
         }
       ]
     },
@@ -3206,7 +3187,7 @@
           "name": "punctuation.separator.comma.abl"
         }
       },
-      "end": "(?=\\.|:)",
+      "end": "(?=[\\.:](?![a-zA-Z0-9_\\-#$%]))",
       "patterns": [
         {
           "include": "#string"
@@ -3237,6 +3218,12 @@
         {
           "include": "#function-arguments"
         },
+        {
+          "include": "#function-arguments-no-parens"
+        },
+        {
+          "include": "#parens"
+        },
         {
           "include": "#expression"
         },
@@ -3280,20 +3267,10 @@
       "end": "(?i)(?=(transact(?:ion|io|i)?)|on|:|with)",
       "patterns": [
         {
-          "comment": "The comment scopes are included in the statements pattern, but the operator trumps these",
-          "include": "#comment"
-        },
-        {
-          "include": "#operator"
-        },
-        {
-          "include": "#property-call"
+          "include": "#logical-expression"
         },
         {
           "include": "#branch-options"
-        },
-        {
-          "include": "#expression"
         }
       ]
     },
@@ -3320,7 +3297,7 @@
         }
       ]
     },
-    "if-then": {
+    "X-if-then": {
       "begin": "(?i)\\b(if)\\b",
       "beginCaptures": {
         "1": {
@@ -3343,10 +3320,7 @@
           "include": "#function-arguments"
         },
         {
-          "include": "#property-call"
-        },
-        {
-          "include": "#static-object-property-call"
+          "include": "#type-member-call"
         },
         {
           "include": "#db-dot-table-dot-field"
@@ -3375,6 +3349,71 @@
       ],
       "end": "(?i)\\b(?=then)\\b"
     },
+    "if-then": {
+      "begin": "(?i)\\b(if)\\b",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.other.abl"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#logical-expression"
+        }
+      ],
+      "end": "(?i)\\b(?=then)\\b"
+    },
+    "logical-expression": {
+      "patterns": [
+        {
+          "match": "\\b([Aa][Nn][Dd]|[Oo][Rr])\\b",
+          "captures": {
+            "1": {
+              "name": "keyword.other.abl"
+            }
+          }
+        },
+        {
+          "include": "#parens"
+        },
+        {
+          "include": "#function-arguments"
+        },
+        {
+          "include": "#type-member-call"
+        },
+        {
+          "include": "#db-dot-table-dot-field"
+        },
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#operator"
+        },
+        {
+          "include": "#code-block"
+        },
+        {
+          "include": "#handle-attributes"
+        },
+        {
+          "include": "#preprocessors"
+        },
+        {
+          "include": "#language-functions"
+        },
+        {
+          "include": "#abl-functions"
+        },
+        {
+          "include": "#abl-system-handles"
+        },
+        {
+          "include": "#keywords"
+        }
+      ]
+    },
     "function-arguments": {
       "name": "meta.function.arguments.abl",
       "comment": "Captures what's between ( and ) when calling a function, excluding the braces ",

package/package.json

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

package/spec/blocks/block-options.spec.js

@@ -16,3 +16,157 @@ describe('', () => {
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })
 
+describe('', () => {
+  let statement = `do while
+    vFooId eq ?
+    or vFooId eq ""
+    or can-find(
+        first ttFoo
+            where ttFoo.FooId eq vFooId):
+
+    vFooId = guid.
+
+end.`;
+  let expectedTokens = [
+    [
+      { "startIndex": 0, "endIndex": 2, "scopes": ["source.abl", "meta.block.abl", "keyword.other.abl"] },  // 'do'
+      { "startIndex": 2, "endIndex": 3, "scopes": ["source.abl", "meta.block.abl"] },  // ' '
+      { "startIndex": 3, "endIndex": 8, "scopes": ["source.abl", "meta.block.abl", "keyword.other.abl"] }  // 'while'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl", "meta.block.abl"] },  // '    '
+      { "startIndex": 4, "endIndex": 10, "scopes": ["source.abl", "meta.block.abl", "variable.other.abl"] },  // 'vFooId'
+      { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl", "meta.block.abl"] },  // ' '
+      { "startIndex": 11, "endIndex": 13, "scopes": ["source.abl", "meta.block.abl", "keyword.operator.source.abl"] },  // 'eq'
+      { "startIndex": 13, "endIndex": 14, "scopes": ["source.abl", "meta.block.abl"] },  // ' '
+      { "startIndex": 14, "endIndex": 15, "scopes": ["source.abl", "meta.block.abl", "constant.language.abl"] }  // '?'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl", "meta.block.abl"] },  // '    '
+      { "startIndex": 4, "endIndex": 6, "scopes": ["source.abl", "meta.block.abl", "keyword.other.abl"] },  // 'or'
+      { "startIndex": 6, "endIndex": 7, "scopes": ["source.abl", "meta.block.abl"] },  // ' '
+      { "startIndex": 7, "endIndex": 13, "scopes": ["source.abl", "meta.block.abl", "variable.other.abl"] },  // 'vFooId'
+      { "startIndex": 13, "endIndex": 14, "scopes": ["source.abl", "meta.block.abl"] },  // ' '
+      { "startIndex": 14, "endIndex": 16, "scopes": ["source.abl", "meta.block.abl", "keyword.operator.source.abl"] },  // 'eq'
+      { "startIndex": 16, "endIndex": 17, "scopes": ["source.abl", "meta.block.abl"] },  // ' '
+      { "startIndex": 17, "endIndex": 18, "scopes": ["source.abl", "meta.block.abl", "string.double.complex.abl", "punctuation.definition.string.begin.abl"] },  // '"'
+      { "startIndex": 18, "endIndex": 19, "scopes": ["source.abl", "meta.block.abl", "string.double.complex.abl", "punctuation.definition.string.end.abl"] }  // '"'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl", "meta.block.abl"] },  // '    '
+      { "startIndex": 4, "endIndex": 6, "scopes": ["source.abl", "meta.block.abl", "keyword.other.abl"] },  // 'or'
+      { "startIndex": 6, "endIndex": 7, "scopes": ["source.abl", "meta.block.abl"] },  // ' '
+      { "startIndex": 7, "endIndex": 15, "scopes": ["source.abl", "meta.block.abl", "support.function.abl"] },  // 'can-find'
+      { "startIndex": 15, "endIndex": 16, "scopes": ["source.abl", "meta.block.abl", "meta.brace.round.js"] }  // '('
+    ],
+    [
+      { "startIndex": 0, "endIndex": 8, "scopes": ["source.abl", "meta.block.abl"] },  // '        '
+      { "startIndex": 8, "endIndex": 13, "scopes": ["source.abl", "meta.block.abl", "keyword.other.abl"] },  // 'first'
+      { "startIndex": 13, "endIndex": 14, "scopes": ["source.abl", "meta.block.abl"] },  // ' '
+      { "startIndex": 14, "endIndex": 19, "scopes": ["source.abl", "meta.block.abl", "storage.data.table.abl"] }  // 'ttFoo'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 12, "scopes": ["source.abl", "meta.block.abl"] },  // '            '
+      { "startIndex": 12, "endIndex": 17, "scopes": ["source.abl", "meta.block.abl", "keyword.other.abl"] },  // 'where'
+      { "startIndex": 17, "endIndex": 18, "scopes": ["source.abl", "meta.block.abl"] },  // ' '
+      { "startIndex": 18, "endIndex": 29, "scopes": ["source.abl", "meta.block.abl", "storage.data.table.abl"] },  // 'ttFoo.FooId'
+      { "startIndex": 29, "endIndex": 30, "scopes": ["source.abl", "meta.block.abl"] },  // ' '
+      { "startIndex": 30, "endIndex": 32, "scopes": ["source.abl", "meta.block.abl", "keyword.operator.source.abl"] },  // 'eq'
+      { "startIndex": 32, "endIndex": 33, "scopes": ["source.abl", "meta.block.abl"] },  // ' '
+      { "startIndex": 33, "endIndex": 39, "scopes": ["source.abl", "meta.block.abl", "variable.other.abl"] },  // 'vFooId'
+      { "startIndex": 39, "endIndex": 40, "scopes": ["source.abl", "meta.block.abl", "meta.brace.round.js"] },  // ')'
+      { "startIndex": 40, "endIndex": 41, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // ':'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 1, "scopes": ["source.abl"] }  // ''
+    ],
+    [
+      { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl"] },  // '    '
+      { "startIndex": 4, "endIndex": 10, "scopes": ["source.abl", "variable.other.abl"] },  // 'vFooId'
+      { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '='
+      { "startIndex": 12, "endIndex": 13, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 13, "endIndex": 17, "scopes": ["source.abl", "support.function.abl"] },  // 'guid'
+      { "startIndex": 17, "endIndex": 18, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 1, "scopes": ["source.abl"] }  // ''
+    ],
+    [
+      { "startIndex": 0, "endIndex": 3, "scopes": ["source.abl", "keyword.other.abl"] },  // 'end'
+      { "startIndex": 3, "endIndex": 4, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+    ]
+  ]
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `if oValidationMessages:IsEmpty() = false then
+    undo, throw new ImportValidationException("custname",
+                                                pbAccount.CustKey,
+                                                SalesforceObjectTypeEnum:Account:ToString(),
+                                                pbAccount.ObjectId,
+                                                oValidationMessages).`;
+  let expectedTokens = [
+    [
+      { "startIndex": 0, "endIndex": 2, "scopes": ["source.abl", "keyword.other.abl"] },  // 'if'
+      { "startIndex": 2, "endIndex": 3, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 3, "endIndex": 22, "scopes": ["source.abl", "variable.other.abl"] },  // 'oValidationMessages'
+      { "startIndex": 22, "endIndex": 23, "scopes": ["source.abl", "punctuation.separator.colon.abl"] },  // ':'
+      { "startIndex": 23, "endIndex": 30, "scopes": ["source.abl", "entity.name.function.abl"] },  // 'IsEmpty'
+      { "startIndex": 30, "endIndex": 31, "scopes": ["source.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 31, "endIndex": 32, "scopes": ["source.abl", "meta.brace.round.js"] },  // ')'
+      { "startIndex": 32, "endIndex": 33, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 33, "endIndex": 34, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '='
+      { "startIndex": 34, "endIndex": 35, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 35, "endIndex": 40, "scopes": ["source.abl", "constant.language.abl"] },  // 'false'
+      { "startIndex": 40, "endIndex": 41, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 41, "endIndex": 45, "scopes": ["source.abl", "keyword.other.abl"] }  // 'then'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl"] },  // '    '
+      { "startIndex": 4, "endIndex": 8, "scopes": ["source.abl", "keyword.other.abl"] },  // 'undo'
+      { "startIndex": 8, "endIndex": 9, "scopes": ["source.abl", "punctuation.separator.comma.abl"] },  // ','
+      { "startIndex": 9, "endIndex": 10, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 10, "endIndex": 15, "scopes": ["source.abl", "keyword.other.abl"] },  // 'throw'
+      { "startIndex": 15, "endIndex": 16, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 16, "endIndex": 19, "scopes": ["source.abl", "keyword.other.abl"] },  // 'new'
+      { "startIndex": 19, "endIndex": 20, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 20, "endIndex": 45, "scopes": ["source.abl", "entity.name.type.abl"] },  // 'ImportValidationException'
+      { "startIndex": 45, "endIndex": 46, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 46, "endIndex": 47, "scopes": ["source.abl", "meta.function.arguments.abl", "string.double.complex.abl", "punctuation.definition.string.begin.abl"] },  // '"'
+      { "startIndex": 47, "endIndex": 55, "scopes": ["source.abl", "meta.function.arguments.abl", "string.double.complex.abl"] },  // 'custname'
+      { "startIndex": 55, "endIndex": 56, "scopes": ["source.abl", "meta.function.arguments.abl", "string.double.complex.abl", "punctuation.definition.string.end.abl"] },  // '"'
+      { "startIndex": 56, "endIndex": 57, "scopes": ["source.abl", "meta.function.arguments.abl", "punctuation.separator.comma.abl"] }  // ','
+    ],
+    [
+      { "startIndex": 0, "endIndex": 48, "scopes": ["source.abl", "meta.function.arguments.abl"] },  // '                                                '
+      { "startIndex": 48, "endIndex": 65, "scopes": ["source.abl", "meta.function.arguments.abl", "storage.data.table.abl"] },  // 'pbAccount.CustKey'
+      { "startIndex": 65, "endIndex": 66, "scopes": ["source.abl", "meta.function.arguments.abl", "punctuation.separator.comma.abl"] }  // ','
+    ],
+    [
+      { "startIndex": 0, "endIndex": 48, "scopes": ["source.abl", "meta.function.arguments.abl"] },  // '                                                '
+      { "startIndex": 48, "endIndex": 72, "scopes": ["source.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'SalesforceObjectTypeEnum'
+      { "startIndex": 72, "endIndex": 73, "scopes": ["source.abl", "meta.function.arguments.abl", "punctuation.separator.colon.abl"] },  // ':'
+      { "startIndex": 73, "endIndex": 80, "scopes": ["source.abl", "meta.function.arguments.abl", "entity.name.function.abl"] },  // 'Account'
+      { "startIndex": 80, "endIndex": 81, "scopes": ["source.abl", "meta.function.arguments.abl", "punctuation.separator.colon.abl"] },  // ':'
+      { "startIndex": 81, "endIndex": 89, "scopes": ["source.abl", "meta.function.arguments.abl", "entity.name.function.abl"] },  // 'ToString'
+      { "startIndex": 89, "endIndex": 90, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 90, "endIndex": 91, "scopes": ["source.abl", "meta.brace.round.js"] },  // ')'
+      { "startIndex": 91, "endIndex": 92, "scopes": ["source.abl", "punctuation.separator.comma.abl"] }  // ','
+    ],
+    [
+      { "startIndex": 0, "endIndex": 48, "scopes": ["source.abl"] },  // '                                                '
+      { "startIndex": 48, "endIndex": 66, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'pbAccount.ObjectId'
+      { "startIndex": 66, "endIndex": 67, "scopes": ["source.abl", "punctuation.separator.comma.abl"] }  // ','
+    ],
+    [
+      { "startIndex": 0, "endIndex": 48, "scopes": ["source.abl"] },  // '                                                '
+      { "startIndex": 48, "endIndex": 67, "scopes": ["source.abl", "variable.other.abl"] },  // 'oValidationMessages'
+      { "startIndex": 67, "endIndex": 68, "scopes": ["source.abl", "meta.brace.round.js"] },  // ')'
+      { "startIndex": 68, "endIndex": 69, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+    ]
+  ]
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+

package/spec/define/define-query.spec.js

@@ -99,3 +99,46 @@ describe('', () => {
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })
+
+describe('', () => {
+  // Note space before .
+  let statement = `DEFINE QUERY qQuery FOR SmartAttributeValue, SmartAttribute .`;
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'DEFINE'
+    { "startIndex": 6, "endIndex": 7, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 7, "endIndex": 12, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'QUERY'
+    { "startIndex": 12, "endIndex": 13, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 13, "endIndex": 19, "scopes": ["source.abl", "meta.define.abl", "variable.other.abl"] },  // 'qQuery'
+    { "startIndex": 19, "endIndex": 20, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 20, "endIndex": 23, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'FOR'
+    { "startIndex": 23, "endIndex": 24, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 24, "endIndex": 43, "scopes": ["source.abl", "meta.define.abl", "storage.data.table.abl"] },  // 'SmartAttributeValue'
+    { "startIndex": 43, "endIndex": 44, "scopes": ["source.abl", "meta.define.abl", "punctuation.separator.comma.abl"] },  // ','
+    { "startIndex": 44, "endIndex": 45, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 45, "endIndex": 59, "scopes": ["source.abl", "meta.define.abl", "storage.data.table.abl"] },  // 'SmartAttribute'
+    { "startIndex": 59, "endIndex": 60, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 60, "endIndex": 61, "scopes": ["source.abl", "meta.define.abl", "punctuation.terminator.abl"] }  // '.'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  // Note NO space before .
+  let statement = `DEFINE QUERY qQuery FOR SmartAttributeValue, SmartAttribute.`;
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'DEFINE'
+    { "startIndex": 6, "endIndex": 7, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 7, "endIndex": 12, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'QUERY'
+    { "startIndex": 12, "endIndex": 13, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 13, "endIndex": 19, "scopes": ["source.abl", "meta.define.abl", "variable.other.abl"] },  // 'qQuery'
+    { "startIndex": 19, "endIndex": 20, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 20, "endIndex": 23, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'FOR'
+    { "startIndex": 23, "endIndex": 24, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 24, "endIndex": 43, "scopes": ["source.abl", "meta.define.abl", "storage.data.table.abl"] },  // 'SmartAttributeValue'
+    { "startIndex": 43, "endIndex": 44, "scopes": ["source.abl", "meta.define.abl", "punctuation.separator.comma.abl"] },  // ','
+    { "startIndex": 44, "endIndex": 45, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 45, "endIndex": 59, "scopes": ["source.abl", "meta.define.abl", "storage.data.table.abl"] },  // 'SmartAttribute'
+    { "startIndex": 59, "endIndex": 60, "scopes": ["source.abl", "meta.define.abl", "punctuation.terminator.abl"] }  // '.'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})

package/spec/do/do-blocks.spec.js

@@ -197,7 +197,7 @@ end.`;
       { "startIndex": 8, "endIndex": 9, "scopes": ["source.abl", "meta.block.abl", "constant.numeric.source.abl"] },  // '1'
       { "startIndex": 9, "endIndex": 10, "scopes": ["source.abl", "meta.block.abl"] },  // ' '
       { "startIndex": 10, "endIndex": 12, "scopes": ["source.abl", "meta.block.abl", "keyword.other.abl"] },  // 'to'
-      { "startIndex": 12, "endIndex": 13, "scopes": ["source.abl", "meta.block.abl"] },  // ' '
+      { "startIndex": 12, "endIndex": 13, "scopes": ["source.abl", "meta.block.abl", "meta.function-call.abl"] },  // ' '
       { "startIndex": 13, "endIndex": 24, "scopes": ["source.abl", "meta.block.abl", "meta.function-call.abl", "support.function.abl"] },  // 'num-entries'
       { "startIndex": 24, "endIndex": 25, "scopes": ["source.abl", "meta.block.abl", "meta.function-call.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
       { "startIndex": 25, "endIndex": 30, "scopes": ["source.abl", "meta.block.abl", "meta.function-call.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'vList'

package/spec/method-attribute-property-call/datset-table-attribute-method-call.spec.js

@@ -0,0 +1,53 @@
+const { assert, expect } = require('chai');
+const shared = require('../shared.js');
+
+describe('', () => {
+  let statement = `dataset dsEmployee:apply-callback("BEFORE-FILL":U).
+buffer eEmployee:apply-callback("BEFORE-FILL":U).
+buffer eEmployee:apply-callback("BEFORE-ROW-FILL":U).`;
+  let expectedTokens = [
+    [
+      { "startIndex": 0, "endIndex": 7, "scopes": ["source.abl", "keyword.other.abl"] },  // 'dataset'
+      { "startIndex": 7, "endIndex": 8, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 8, "endIndex": 18, "scopes": ["source.abl", "storage.data.dataset.abl"] },  // 'dsEmployee'
+      { "startIndex": 18, "endIndex": 19, "scopes": ["source.abl", "punctuation.separator.colon.abl"] },  // ':'
+      { "startIndex": 19, "endIndex": 33, "scopes": ["source.abl", "entity.name.function.abl"] },  // 'apply-callback'
+      { "startIndex": 33, "endIndex": 34, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 34, "endIndex": 35, "scopes": ["source.abl", "meta.function.arguments.abl", "string.double.complex.abl", "punctuation.definition.string.begin.abl"] },  // '"'
+      { "startIndex": 35, "endIndex": 46, "scopes": ["source.abl", "meta.function.arguments.abl", "string.double.complex.abl"] },  // 'BEFORE-FILL'
+      { "startIndex": 46, "endIndex": 47, "scopes": ["source.abl", "meta.function.arguments.abl", "string.double.complex.abl", "punctuation.definition.string.end.abl"] },  // '"'
+      { "startIndex": 47, "endIndex": 49, "scopes": ["source.abl", "meta.function.arguments.abl", "string.double.complex.abl", "support.other.abl"] },  // ':U'
+      { "startIndex": 49, "endIndex": 50, "scopes": ["source.abl", "meta.brace.round.js"] },  // ')'
+      { "startIndex": 50, "endIndex": 51, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "keyword.other.abl"] },  // 'buffer'
+      { "startIndex": 6, "endIndex": 7, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 7, "endIndex": 16, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'eEmployee'
+      { "startIndex": 16, "endIndex": 17, "scopes": ["source.abl", "punctuation.separator.colon.abl"] },  // ':'
+      { "startIndex": 17, "endIndex": 31, "scopes": ["source.abl", "entity.name.function.abl"] },  // 'apply-callback'
+      { "startIndex": 31, "endIndex": 32, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 32, "endIndex": 33, "scopes": ["source.abl", "meta.function.arguments.abl", "string.double.complex.abl", "punctuation.definition.string.begin.abl"] },  // '"'
+      { "startIndex": 33, "endIndex": 44, "scopes": ["source.abl", "meta.function.arguments.abl", "string.double.complex.abl"] },  // 'BEFORE-FILL'
+      { "startIndex": 44, "endIndex": 45, "scopes": ["source.abl", "meta.function.arguments.abl", "string.double.complex.abl", "punctuation.definition.string.end.abl"] },  // '"'
+      { "startIndex": 45, "endIndex": 47, "scopes": ["source.abl", "meta.function.arguments.abl", "string.double.complex.abl", "support.other.abl"] },  // ':U'
+      { "startIndex": 47, "endIndex": 48, "scopes": ["source.abl", "meta.brace.round.js"] },  // ')'
+      { "startIndex": 48, "endIndex": 49, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "keyword.other.abl"] },  // 'buffer'
+      { "startIndex": 6, "endIndex": 7, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 7, "endIndex": 16, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'eEmployee'
+      { "startIndex": 16, "endIndex": 17, "scopes": ["source.abl", "punctuation.separator.colon.abl"] },  // ':'
+      { "startIndex": 17, "endIndex": 31, "scopes": ["source.abl", "entity.name.function.abl"] },  // 'apply-callback'
+      { "startIndex": 31, "endIndex": 32, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 32, "endIndex": 33, "scopes": ["source.abl", "meta.function.arguments.abl", "string.double.complex.abl", "punctuation.definition.string.begin.abl"] },  // '"'
+      { "startIndex": 33, "endIndex": 48, "scopes": ["source.abl", "meta.function.arguments.abl", "string.double.complex.abl"] },  // 'BEFORE-ROW-FILL'
+      { "startIndex": 48, "endIndex": 49, "scopes": ["source.abl", "meta.function.arguments.abl", "string.double.complex.abl", "punctuation.definition.string.end.abl"] },  // '"'
+      { "startIndex": 49, "endIndex": 51, "scopes": ["source.abl", "meta.function.arguments.abl", "string.double.complex.abl", "support.other.abl"] },  // ':U'
+      { "startIndex": 51, "endIndex": 52, "scopes": ["source.abl", "meta.brace.round.js"] },  // ')'
+      { "startIndex": 52, "endIndex": 53, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+    ]
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})

package/spec/misc-statements/class-in-var-name.spec.js

@@ -31,7 +31,7 @@ END.`;
       { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl", "meta.block.abl", "constant.numeric.source.abl"] },  // '1'
       { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl", "meta.block.abl"] },  // ' '
       { "startIndex": 12, "endIndex": 14, "scopes": ["source.abl", "meta.block.abl", "keyword.other.abl"] },  // 'to'
-      { "startIndex": 14, "endIndex": 15, "scopes": ["source.abl", "meta.block.abl"] },  // ' '
+      { "startIndex": 14, "endIndex": 15, "scopes": ["source.abl", "meta.block.abl", "meta.function-call.abl"] },  // ' '
       { "startIndex": 15, "endIndex": 26, "scopes": ["source.abl", "meta.block.abl", "meta.function-call.abl", "support.function.abl"] },  // 'NUM-ENTRIES'
       { "startIndex": 26, "endIndex": 27, "scopes": ["source.abl", "meta.block.abl", "meta.function-call.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
       { "startIndex": 27, "endIndex": 42, "scopes": ["source.abl", "meta.block.abl", "meta.function-call.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'mc-g-list-class'

package/spec/shared.js

@@ -43,7 +43,7 @@ module.exports = {
           let lines = statement.split(/\n/g);
           let nbLines = lines.length;
           if (nbLines === 1) {
-            //singleline                        
+            //singleline
             tokenResult = grammar.tokenizeLine(statement);
 
             // More human-readable output
@@ -52,15 +52,13 @@ module.exports = {
               const token = tokenResult.tokens[j];
 
               // More human-readable output
-              // console.log(` - token from ${token.startIndex} to ${token.endIndex} ` +
-              //     `(${statement.substring(token.startIndex, token.endIndex)}) ` +
-              //     `with scopes ${token.scopes.join(', ')}`
-              // );
-
               // Formatted as input-values
               var O = token.scopes.map((e) => ('"' + e + '",')).join(' ').replace(/,\s*$/, "");
-              console.log(`{ "startIndex": ${token.startIndex}, "endIndex": ${token.endIndex}, "scopes": [${O}] },  // '${statement.substring(token.startIndex, token.endIndex)}'`,);
-
+              if (j < tokenResult.tokens.length - 1 ) {
+                console.log(`{ "startIndex": ${token.startIndex}, "endIndex": ${token.endIndex}, "scopes": [${O}] },  // '${statement.substring(token.startIndex, token.endIndex)}'`,);
+              } else {
+                console.log(`{ "startIndex": ${token.startIndex}, "endIndex": ${token.endIndex}, "scopes": [${O}] }  // '${statement.substring(token.startIndex, token.endIndex)}'`,);
+              }
             }
           } else {
             //multiline, we stack the tokens in an array
@@ -70,6 +68,7 @@ module.exports = {
             };
             lines.forEach(line => {
               let r = grammar.tokenizeLine(line, ruleStack);
+
               ruleStack = r.ruleStack;
               tokenResult.tokens.push(r.tokens);
 
@@ -87,12 +86,14 @@ module.exports = {
 
                 // Formatted as input-values
                 var O = token.scopes.map((e) => ('"' + e + '",')).join(' ').replace(/,\s*$/, "");
-                console.log(`{ "startIndex": ${token.startIndex}, "endIndex": ${token.endIndex}, "scopes": [${O}] },  // '${line.substring(token.startIndex, token.endIndex)}'`,);
-
+                if (j < r.tokens.length - 1 ) {
+                  console.log(`{ "startIndex": ${token.startIndex}, "endIndex": ${token.endIndex}, "scopes": [${O}] },  // '${line.substring(token.startIndex, token.endIndex)}'`,);
+                } else {
+                  console.log(`{ "startIndex": ${token.startIndex}, "endIndex": ${token.endIndex}, "scopes": [${O}] }  // '${line.substring(token.startIndex, token.endIndex)}'`,);
+                }
               }
               // Formatted as input-values
               console.log(`],`);
-
             });
           }
           assert.deepEqual(tokenResult.tokens, expectedTokens, JSON.stringify(tokenResult.tokens));

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

@@ -869,7 +869,7 @@ describe('', () => {
       { "startIndex": 71, "endIndex": 95, "scopes": ["source.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'ClassNameNotEntertedEnum'
       { "startIndex": 95, "endIndex": 96, "scopes": ["source.abl", "meta.function.arguments.abl", "punctuation.separator.colon.abl"] },  // ':'
       { "startIndex": 96, "endIndex": 110, "scopes": ["source.abl", "meta.function.arguments.abl", "entity.name.function.abl"] },  // 'BusinessEntity'
-      { "startIndex": 110, "endIndex": 111, "scopes": ["source.abl"] },  // ')'
+      { "startIndex": 110, "endIndex": 111, "scopes": ["source.abl", "meta.brace.round.js"] },  // ')'
       { "startIndex": 111, "endIndex": 112, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
     ]
   ];