abl-tmlanguage 1.3.12 → 1.3.14

package/{index.js → index.mjs}

@@ -11,17 +11,19 @@
 // abl-functions.txt can be created by copying the 'Related Links' from https://docs.progress.com/bundle/abl-reference/page/ABL-Syntax-Reference.html
 //
 
-const fs = require('fs');
+import * as fs from 'node:fs';
+import * as readline from 'node:readline';
+import {optimize} from 'oniguruma-parser/optimizer';
 
-let lineReaderMethods = require('readline').createInterface({
+let lineReaderMethods = readline.createInterface({
   input: fs.createReadStream('abl-methods.txt')
 });
 
-let lineReaderFunctions = require('readline').createInterface({
+let lineReaderFunctions = readline.createInterface({
   input: fs.createReadStream('abl-functions.txt')
 });
 
-let lineReaderKeywords = require('readline').createInterface({
+let lineReaderKeywords = readline.createInterface({
   input: fs.createReadStream('abl-keywords.txt')
 });
 
@@ -43,19 +45,23 @@ alsoStatements.push('auto-go');
 alsoStatements.push('available');
 alsoStatements.push('bgcolor');
 alsoStatements.push('centered');
-alsoStatements.push('context-help-id');
 alsoStatements.push('column-label');
+alsoStatements.push('context-help-id');
 alsoStatements.push('dcolor');
+alsoStatements.push('default-button');
 alsoStatements.push('default');
 alsoStatements.push('delete');
 alsoStatements.push('delimiter');
 alsoStatements.push('drop-target');
+alsoStatements.push('edge-pixels');
 alsoStatements.push('fgcolor');
 alsoStatements.push('first');
 alsoStatements.push('flat-button');
 alsoStatements.push('font');
 alsoStatements.push('foreign-key-hidden');
 alsoStatements.push('format');
+alsoStatements.push('graphic-edge');
+alsoStatements.push('help');
 alsoStatements.push('hidden');
 alsoStatements.push('image-down');
 alsoStatements.push('image-insensitive');
@@ -71,24 +77,31 @@ alsoStatements.push('namespace-prefix');
 alsoStatements.push('namespace-uri');
 alsoStatements.push('nested');
 alsoStatements.push('no-focus');
+alsoStatements.push('page-bottom');
 alsoStatements.push('pfcolor');
 alsoStatements.push('recursive');
 alsoStatements.push('resize');
 alsoStatements.push('return-value');
 alsoStatements.push('row');
 alsoStatements.push('scroll-bars');
+alsoStatements.push('scrollable');
 alsoStatements.push('sensitive');
 alsoStatements.push('separators');
 alsoStatements.push('serialize-hidden');
 alsoStatements.push('serialize-name');
+alsoStatements.push('show-in-taskbar');
+alsoStatements.push('side-labels');
 alsoStatements.push('single-run');
 alsoStatements.push('status-area');
 alsoStatements.push('three-d');
 alsoStatements.push('title');
 alsoStatements.push('tooltip');
 alsoStatements.push('transaction');
+alsoStatements.push('value');
 alsoStatements.push('view-as');
 alsoStatements.push('warning');
+alsoStatements.push('widget-id');
+alsoStatements.push('write');
 alsoStatements.push('xml-data-type');
 alsoStatements.push('xml-node-name');
 alsoStatements.push('xml-node-type');
@@ -102,6 +115,7 @@ alsoFunctions.push('os-dir');
 alsoFunctions.push('relation-fields');
 alsoFunctions.push('return');
 alsoFunctions.push('skip');
+alsoFunctions.push('space');
 alsoFunctions.push('substitute');
 alsoFunctions.push('this-object');
 alsoFunctions.push('value');
@@ -109,26 +123,21 @@ alsoFunctions.push('value');
 let alsoKeywords = [];
 alsoKeywords.push('get-collation'); //plural version as key
 
-// This may holds the keyword names and their regex entries
-let keywordEntries = new Map();
-let minKeywords = new Map();
-
 // The documentation does not reflect all abbreviations
+let minKeywords = new Map();
 minKeywords.set('log', 'logical');
-keywordEntries.set('logical', '(log(?:ical|ica|ic|i)?)|lo|l|(longch(?:ar|a)?)');
-
 minKeywords.set('&glob', '&global-define');
-keywordEntries.set('&global-define', '(?:&glob(?:al-define|al-defin|al-defi|al-def|al-de|al-d|al-|al|a)?)');
-
 minKeywords.set('&scop', '&scoped-define');
-keywordEntries.set('&scoped-define', '(?:&scop(?:ed-define|ed-defin|ed-defi|ed-def|ed-de|ed-d|ed-|ed|e)?)');
-
 minKeywords.set('glob', 'global');
-keywordEntries.set('global', '(?:glob(?:al|a)?)');
-
 minKeywords.set('var', 'variable');
-keywordEntries.set('variable', '(var(?:iable|iabl|iab|ia|i)?)');
 
+// This may holds the keyword names and their regex entries
+let keywordEntries = new Map();
+keywordEntries.set('logical', 'logical|logica|logic|logi|log|lo');
+keywordEntries.set('&global-define', '&global-define|&global-defin|&global-defi|&global-def|&global-de|&global-d|&global-|&global|&globa|&glob)');
+keywordEntries.set('&scoped-define', '&scoped-define|&scoped-defin|&scoped-defi|&scoped-def|&scoped-de|&scoped-d|&scoped-|&scoped|&scope|&scop');
+keywordEntries.set('global', 'global|globa|glob');
+keywordEntries.set('variable', 'variable|variabl|variab|varia|vari|var');
 
 lineReaderMethods.on('line', line => {
   let results;
@@ -217,18 +226,11 @@ lineReaderKeywords.on('line', line => {
       if (kw.indexOf('(') !== -1) {
         let kwParts = kw.split('(');
         let fullKw = kwParts[0] + kwParts[1];
-
-        // Add shortest version first, then the remainder in length order, eg
-        // (char(?:haracter|haracte|haract|harac|hara)?)?
-        // CHARACTER differs in the keywords from the actual behaviour
-        let kwRegex = '(' + kwParts[0] + '(?:';
+        let kwRegex = '';
         for (let i = kwParts[1].length; i > 0; i--) {
-          kwRegex += kwParts[1].substring(0, i);
-          if (i > 1) {
-            kwRegex += '|';
-          }
+          kwRegex += kwParts[0] + kwParts[1].substring(0, i) + '|';
         }
-        kwRegex += ')?)';
+        kwRegex += kwParts[0];
         addToBlock(charIdx, fullKw, kwParts[0], kwRegex);
       } else {
         addToBlock(charIdx, kw, kw, kw);
@@ -253,7 +255,7 @@ function getKwRegex(fullKw) {
   }
 }
 
-// Adds the kewword regex to the relevant block
+// Adds the keyword regex to the relevant block
 function addToBlock(charIdx, fullKw, minKw, kwRegex) {
   // We will use these to resolve the full keywords later
   if (!minKeywords.has(minKw)) {
@@ -280,10 +282,15 @@ function addToBlock(charIdx, fullKw, minKw, kwRegex) {
 function replaceKeywordsWithRegex (kwArray) {
   let regexBlocks = [];
 
-  for (idx in kwArray) {
+  for (var idx in kwArray) {
     regexBlocks[idx] = getKwRegex(kwArray[idx]);
   }
-  return regexBlocks;
+
+  let cleanBlocks = regexBlocks.sort().filter(val => val).join('|');
+
+  // remove any empty entries before joining
+  // approach from https://stackoverflow.com/a/19903533/18177
+  return optimize(cleanBlocks).pattern;
 }
 
 lineReaderFunctions.on('close', () => {
@@ -301,7 +308,7 @@ lineReaderFunctions.on('close', () => {
       result['keywords-' + String.fromCharCode(97 + zz).toUpperCase()] =
       {
         comment: "The keyword must not have a trailing variable character (one of #$-_%&)",
-        match: "(?i)\\b(" + replaceKeywordsWithRegex(keywordBlocks[zz]).sort().join('|') + ")\\b(?![#$\\-_%&])",
+        match: "(?i)\\b(" + replaceKeywordsWithRegex(keywordBlocks[zz]) + ")\\b(?![#$\\-_%&])",
         captures: {
           1: {
             name: "keyword.other.abl"
@@ -320,7 +327,7 @@ lineReaderFunctions.on('close', () => {
 
       result['handle-attributes-' + String.fromCharCode(97 + zz).toUpperCase()] =
       {
-        match: "(?i)(:)(" + replaceKeywordsWithRegex(attributeBlocks[zz]).sort().join('|') + ")\\b(?![#$\\-_%&])",
+        match: "(?i)(:)(" + replaceKeywordsWithRegex(attributeBlocks[zz]) + ")\\b(?![#$\\-_%&])",
         captures: {
           1: {
             name: "punctuation.separator.colon.abl"
@@ -341,7 +348,7 @@ lineReaderFunctions.on('close', () => {
 
       result['handle-methods-' + String.fromCharCode(97 + zz).toUpperCase()] =
       {
-        begin: "(?i)(:)(" + replaceKeywordsWithRegex(methodBlocks[zz]).sort().join('|') + ")\\s*(?=\\()",
+        begin: "(?i)(:)(" + replaceKeywordsWithRegex(methodBlocks[zz]) + ")\\s*(?=\\()",
         beginCaptures: {
           1: {
             name: "punctuation.separator.colon.abl"
@@ -374,7 +381,7 @@ lineReaderFunctions.on('close', () => {
       result['abl-functions-' + String.fromCharCode(97 + zz).toUpperCase()] =
       {
         name: "meta.function-call.abl",
-        begin: "(?i)\\s*(" + replaceKeywordsWithRegex(functionBlocks[zz]).sort().join('|') + ")\\s*(?=\\()",
+        begin: "(?i)\\s*(" + replaceKeywordsWithRegex(functionBlocks[zz]) + ")\\s*(?=\\()",
         beginCaptures: {
           1: {
             name: "support.function.abl"

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "abl-tmlanguage",
-  "version": "1.3.12",
+  "version": "1.3.14",
   "description": "TextMate grammar for Progress OpenEdge ABL Language",
   "main": "",
+  "type": "commonjs",
   "repository": {
     "type": "git",
     "url": "git@github.com:chriscamicas/abl-tmlanguage.git"
@@ -14,7 +15,7 @@
   },
   "homepage": "https://github.com/chriscamicas/abl-tmlanguage",
   "scripts": {
-    "build": "node index.js",
+    "build": "node index.mjs",
     "test": "mocha spec/*/*.spec.js",
     "test:single": "mocha",
     "test:debug": "mocha 'spec/*/*.spec.js' -- --inspect-brk=5858"
@@ -25,5 +26,8 @@
     "mocha": "^10.2.0",
     "vscode-oniguruma": "^1.6.2",
     "vscode-textmate": "^7.0.4"
+  },
+  "dependencies": {
+    "oniguruma-parser": "^0.12.0"
   }
-}
+}

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

@@ -175,4 +175,27 @@ end.`;
     ]
   ]
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  // The Next in NextOrderprocessError should not be a flow statement
+  let statement = `ASSIGN NextOrderprocessError = UIMessage:canFindFirstUIMessage("SH0057A").`;
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "keyword.other.abl"] },  // 'ASSIGN'
+    { "startIndex": 6, "endIndex": 7, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 7, "endIndex": 28, "scopes": ["source.abl", "variable.other.abl"] },  // 'NextOrderprocessError'
+    { "startIndex": 28, "endIndex": 29, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 29, "endIndex": 30, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '='
+    { "startIndex": 30, "endIndex": 31, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 31, "endIndex": 40, "scopes": ["source.abl", "variable.other.abl"] },  // 'UIMessage'
+    { "startIndex": 40, "endIndex": 41, "scopes": ["source.abl", "punctuation.separator.colon.abl"] },  // ':'
+    { "startIndex": 41, "endIndex": 62, "scopes": ["source.abl", "entity.name.function.abl"] },  // 'canFindFirstUIMessage'
+    { "startIndex": 62, "endIndex": 63, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+    { "startIndex": 63, "endIndex": 64, "scopes": ["source.abl", "meta.function.arguments.abl", "string.double.complex.abl", "punctuation.definition.string.begin.abl"] },  // '"'
+    { "startIndex": 64, "endIndex": 71, "scopes": ["source.abl", "meta.function.arguments.abl", "string.double.complex.abl"] },  // 'SH0057A'
+    { "startIndex": 71, "endIndex": 72, "scopes": ["source.abl", "meta.function.arguments.abl", "string.double.complex.abl", "punctuation.definition.string.end.abl"] },  // '"'
+    { "startIndex": 72, "endIndex": 73, "scopes": ["source.abl", "meta.brace.round.js"] },  // ')'
+    { "startIndex": 73, "endIndex": 74, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+  ]
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })

package/spec/db-table-and-field/buffer-copy.spec.js

@@ -0,0 +1,239 @@
+const { assert, expect } = require('chai');
+const shared = require('../shared.js');
+
+describe('', () => {
+  let statement = `buffer-copy custname using address-1 address-2 city state zip country phone fax
+         to ar-remit-from
+                assign ar-remit-from.remit-from-name = custname.cust-name
+                       ar-remit-from.state           = CAPS(custname.state).`;
+  let expectedTokens = [
+    [
+      { "startIndex": 0, "endIndex": 11, "scopes": ["source.abl", "keyword.other.abl"] },  // 'buffer-copy'
+      { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 12, "endIndex": 20, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'custname'
+      { "startIndex": 20, "endIndex": 21, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 21, "endIndex": 26, "scopes": ["source.abl", "keyword.other.abl"] },  // 'using'
+      { "startIndex": 26, "endIndex": 27, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 27, "endIndex": 36, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'address-1'
+      { "startIndex": 36, "endIndex": 37, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 37, "endIndex": 46, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'address-2'
+      { "startIndex": 46, "endIndex": 47, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 47, "endIndex": 51, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'city'
+      { "startIndex": 51, "endIndex": 52, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 52, "endIndex": 57, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'state'
+      { "startIndex": 57, "endIndex": 58, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 58, "endIndex": 61, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'zip'
+      { "startIndex": 61, "endIndex": 62, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 62, "endIndex": 69, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'country'
+      { "startIndex": 69, "endIndex": 70, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 70, "endIndex": 75, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'phone'
+      { "startIndex": 75, "endIndex": 76, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 76, "endIndex": 79, "scopes": ["source.abl", "storage.data.table.abl"] }  // 'fax'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 9, "scopes": ["source.abl"] },  // '         '
+      { "startIndex": 9, "endIndex": 11, "scopes": ["source.abl", "keyword.other.abl"] },  // 'to'
+      { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 12, "endIndex": 25, "scopes": ["source.abl", "storage.data.table.abl"] }  // 'ar-remit-from'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 16, "scopes": ["source.abl"] },  // '                '
+      { "startIndex": 16, "endIndex": 22, "scopes": ["source.abl", "keyword.other.abl"] },  // 'assign'
+      { "startIndex": 22, "endIndex": 23, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 23, "endIndex": 52, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'ar-remit-from.remit-from-name'
+      { "startIndex": 52, "endIndex": 53, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 53, "endIndex": 54, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '='
+      { "startIndex": 54, "endIndex": 55, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 55, "endIndex": 73, "scopes": ["source.abl", "storage.data.table.abl"] }  // 'custname.cust-name'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 23, "scopes": ["source.abl"] },  // '                       '
+      { "startIndex": 23, "endIndex": 42, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'ar-remit-from.state'
+      { "startIndex": 42, "endIndex": 53, "scopes": ["source.abl"] },  // '           '
+      { "startIndex": 53, "endIndex": 54, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '='
+      { "startIndex": 54, "endIndex": 55, "scopes": ["source.abl", "meta.function-call.abl"] },  // ' '
+      { "startIndex": 55, "endIndex": 59, "scopes": ["source.abl", "meta.function-call.abl", "support.function.abl"] },  // 'CAPS'
+      { "startIndex": 59, "endIndex": 60, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 60, "endIndex": 74, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "storage.data.table.abl"] },  // 'custname.state'
+      { "startIndex": 74, "endIndex": 75, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] },  // ')'
+      { "startIndex": 75, "endIndex": 76, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+    ]
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `BUFFER-COPY source
+EXCEPT f1 f4 af
+  uSING field
+  TO target  ASSIGN target.f23 = caps("abf")
+   NO-LOBS  NO-ERROR`;
+  let expectedTokens = [
+    [
+      { "startIndex": 0, "endIndex": 11, "scopes": ["source.abl", "keyword.other.abl"] },  // 'BUFFER-COPY'
+      { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 12, "endIndex": 18, "scopes": ["source.abl", "storage.data.table.abl"] }  // 'source'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "keyword.other.abl"] },  // 'EXCEPT'
+      { "startIndex": 6, "endIndex": 7, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 7, "endIndex": 9, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'f1'
+      { "startIndex": 9, "endIndex": 10, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 10, "endIndex": 12, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'f4'
+      { "startIndex": 12, "endIndex": 13, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 13, "endIndex": 15, "scopes": ["source.abl", "storage.data.table.abl"] }  // 'af'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 2, "scopes": ["source.abl"] },  // '  '
+      { "startIndex": 2, "endIndex": 7, "scopes": ["source.abl", "keyword.other.abl"] },  // 'uSING'
+      { "startIndex": 7, "endIndex": 8, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 8, "endIndex": 13, "scopes": ["source.abl", "storage.data.table.abl"] }  // 'field'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 2, "scopes": ["source.abl"] },  // '  '
+      { "startIndex": 2, "endIndex": 4, "scopes": ["source.abl", "keyword.other.abl"] },  // 'TO'
+      { "startIndex": 4, "endIndex": 5, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 5, "endIndex": 11, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'target'
+      { "startIndex": 11, "endIndex": 13, "scopes": ["source.abl"] },  // '  '
+      { "startIndex": 13, "endIndex": 19, "scopes": ["source.abl", "keyword.other.abl"] },  // 'ASSIGN'
+      { "startIndex": 19, "endIndex": 20, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 20, "endIndex": 30, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'target.f23'
+      { "startIndex": 30, "endIndex": 31, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 31, "endIndex": 32, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '='
+      { "startIndex": 32, "endIndex": 33, "scopes": ["source.abl", "meta.function-call.abl"] },  // ' '
+      { "startIndex": 33, "endIndex": 37, "scopes": ["source.abl", "meta.function-call.abl", "support.function.abl"] },  // 'caps'
+      { "startIndex": 37, "endIndex": 38, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 38, "endIndex": 39, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "string.double.complex.abl", "punctuation.definition.string.begin.abl"] },  // '"'
+      { "startIndex": 39, "endIndex": 42, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "string.double.complex.abl"] },  // 'abf'
+      { "startIndex": 42, "endIndex": 43, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "string.double.complex.abl", "punctuation.definition.string.end.abl"] },  // '"'
+      { "startIndex": 43, "endIndex": 44, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] }  // ')'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 3, "scopes": ["source.abl"] },  // '   '
+      { "startIndex": 3, "endIndex": 10, "scopes": ["source.abl", "keyword.other.abl"] },  // 'NO-LOBS'
+      { "startIndex": 10, "endIndex": 12, "scopes": ["source.abl"] },  // '  '
+      { "startIndex": 12, "endIndex": 20, "scopes": ["source.abl", "keyword.other.abl"] }  // 'NO-ERROR'
+    ]
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `buffer-COPY s2k.customer     to customer-archive   .`;
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 11, "scopes": ["source.abl", "keyword.other.abl"] },  // 'buffer-COPY'
+    { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 12, "endIndex": 24, "scopes": ["source.abl", "storage.data.table.abl"] },  // 's2k.customer'
+    { "startIndex": 24, "endIndex": 29, "scopes": ["source.abl"] },  // '     '
+    { "startIndex": 29, "endIndex": 31, "scopes": ["source.abl", "keyword.other.abl"] },  // 'to'
+    { "startIndex": 31, "endIndex": 32, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 32, "endIndex": 48, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'customer-archive'
+    { "startIndex": 48, "endIndex": 51, "scopes": ["source.abl"] },  // '   '
+    { "startIndex": 51, "endIndex": 52, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `buffer-COPY {&file}     to {&file}-archive   .`;
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 11, "scopes": ["source.abl", "keyword.other.abl"] },  // 'buffer-COPY'
+    { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 12, "endIndex": 19, "scopes": ["source.abl", "storage.type.function.abl"] },  // '{&file}'
+    { "startIndex": 19, "endIndex": 24, "scopes": ["source.abl"] },  // '     '
+    { "startIndex": 24, "endIndex": 26, "scopes": ["source.abl", "keyword.other.abl"] },  // 'to'
+    { "startIndex": 26, "endIndex": 27, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 27, "endIndex": 34, "scopes": ["source.abl", "storage.type.function.abl"] },  // '{&file}'
+    { "startIndex": 34, "endIndex": 35, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '-'
+    { "startIndex": 35, "endIndex": 45, "scopes": ["source.abl"] },  // 'archive   '
+    { "startIndex": 45, "endIndex": 46, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `BUFFER-COPY ttPerms EXCEPT Can-SubSeq Can-SubExpr TO ttPerms0
+                            ASSIGN ttPerms0.Can-SubSeq = 0
+                                   ttPerms0.Can-SubExpr = ?.`;
+  let expectedTokens = [
+[
+{ "startIndex": 0, "endIndex": 11, "scopes": ["source.abl", "keyword.other.abl"] },  // 'BUFFER-COPY'
+{ "startIndex": 11, "endIndex": 12, "scopes": ["source.abl"] },  // ' '
+{ "startIndex": 12, "endIndex": 19, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'ttPerms'
+{ "startIndex": 19, "endIndex": 20, "scopes": ["source.abl"] },  // ' '
+{ "startIndex": 20, "endIndex": 26, "scopes": ["source.abl", "keyword.other.abl"] },  // 'EXCEPT'
+{ "startIndex": 26, "endIndex": 27, "scopes": ["source.abl"] },  // ' '
+{ "startIndex": 27, "endIndex": 37, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'Can-SubSeq'
+{ "startIndex": 37, "endIndex": 38, "scopes": ["source.abl"] },  // ' '
+{ "startIndex": 38, "endIndex": 49, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'Can-SubExpr'
+{ "startIndex": 49, "endIndex": 50, "scopes": ["source.abl"] },  // ' '
+{ "startIndex": 50, "endIndex": 52, "scopes": ["source.abl", "keyword.other.abl"] },  // 'TO'
+{ "startIndex": 52, "endIndex": 53, "scopes": ["source.abl"] },  // ' '
+{ "startIndex": 53, "endIndex": 61, "scopes": ["source.abl", "storage.data.table.abl"] }  // 'ttPerms0'
+],
+[
+{ "startIndex": 0, "endIndex": 28, "scopes": ["source.abl"] },  // '                            '
+{ "startIndex": 28, "endIndex": 34, "scopes": ["source.abl", "keyword.other.abl"] },  // 'ASSIGN'
+{ "startIndex": 34, "endIndex": 35, "scopes": ["source.abl"] },  // ' '
+{ "startIndex": 35, "endIndex": 54, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'ttPerms0.Can-SubSeq'
+{ "startIndex": 54, "endIndex": 55, "scopes": ["source.abl"] },  // ' '
+{ "startIndex": 55, "endIndex": 56, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '='
+{ "startIndex": 56, "endIndex": 57, "scopes": ["source.abl"] },  // ' '
+{ "startIndex": 57, "endIndex": 58, "scopes": ["source.abl", "constant.numeric.source.abl"] }  // '0'
+],
+[
+{ "startIndex": 0, "endIndex": 35, "scopes": ["source.abl"] },  // '                                   '
+{ "startIndex": 35, "endIndex": 55, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'ttPerms0.Can-SubExpr'
+{ "startIndex": 55, "endIndex": 56, "scopes": ["source.abl"] },  // ' '
+{ "startIndex": 56, "endIndex": 57, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '='
+{ "startIndex": 57, "endIndex": 58, "scopes": ["source.abl"] },  // ' '
+{ "startIndex": 58, "endIndex": 59, "scopes": ["source.abl", "constant.language.abl"] },  // '?'
+{ "startIndex": 59, "endIndex": 60, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+]
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `       BUFFER-COPY template_TRG TO _TRG
+         ASSIGN _TRG._pRECID = RECID(_P)
+                _TRG._wRECID = RECID(_U).`;
+  let expectedTokens = [
+    [
+      { "startIndex": 0, "endIndex": 7, "scopes": ["source.abl"] },  // '       '
+      { "startIndex": 7, "endIndex": 18, "scopes": ["source.abl", "keyword.other.abl"] },  // 'BUFFER-COPY'
+      { "startIndex": 18, "endIndex": 19, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 19, "endIndex": 31, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'template_TRG'
+      { "startIndex": 31, "endIndex": 32, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 32, "endIndex": 34, "scopes": ["source.abl", "keyword.other.abl"] },  // 'TO'
+      { "startIndex": 34, "endIndex": 35, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 35, "endIndex": 39, "scopes": ["source.abl", "storage.data.table.abl"] }  // '_TRG'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 9, "scopes": ["source.abl"] },  // '         '
+      { "startIndex": 9, "endIndex": 15, "scopes": ["source.abl", "keyword.other.abl"] },  // 'ASSIGN'
+      { "startIndex": 15, "endIndex": 16, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 16, "endIndex": 28, "scopes": ["source.abl", "storage.data.table.abl"] },  // '_TRG._pRECID'
+      { "startIndex": 28, "endIndex": 29, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 29, "endIndex": 30, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '='
+      { "startIndex": 30, "endIndex": 31, "scopes": ["source.abl", "meta.function-call.abl"] },  // ' '
+      { "startIndex": 31, "endIndex": 36, "scopes": ["source.abl", "meta.function-call.abl", "support.function.abl"] },  // 'RECID'
+      { "startIndex": 36, "endIndex": 37, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 37, "endIndex": 39, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // '_P'
+      { "startIndex": 39, "endIndex": 40, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] }  // ')'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 16, "scopes": ["source.abl"] },  // '                '
+      { "startIndex": 16, "endIndex": 28, "scopes": ["source.abl", "storage.data.table.abl"] },  // '_TRG._wRECID'
+      { "startIndex": 28, "endIndex": 29, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 29, "endIndex": 30, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '='
+      { "startIndex": 30, "endIndex": 31, "scopes": ["source.abl", "meta.function-call.abl"] },  // ' '
+      { "startIndex": 31, "endIndex": 36, "scopes": ["source.abl", "meta.function-call.abl", "support.function.abl"] },  // 'RECID'
+      { "startIndex": 36, "endIndex": 37, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 37, "endIndex": 39, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // '_U'
+      { "startIndex": 39, "endIndex": 40, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] },  // ')'
+      { "startIndex": 40, "endIndex": 41, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+    ]
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})

package/spec/db-table-and-field/create-record.spec.js

@@ -41,3 +41,35 @@ describe('', () => {
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })
 
+describe('', () => {
+  let statement = `create customer-buf1.`;
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "keyword.other.abl"] },  // 'create'
+    { "startIndex": 6, "endIndex": 7, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 7, "endIndex": 20, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'customer-buf1'
+    { "startIndex": 20, "endIndex": 21, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `create buf1.`;
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "keyword.other.abl"] },  // 'create'
+    { "startIndex": 6, "endIndex": 7, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 7, "endIndex": 11, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'buf1'
+    { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `create buf-1.`;
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "keyword.other.abl"] },  // 'create'
+    { "startIndex": 6, "endIndex": 7, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 7, "endIndex": 12, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'buf-1'
+    { "startIndex": 12, "endIndex": 13, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})

package/spec/db-table-and-field/find-record.spec.js

@@ -32,7 +32,7 @@ describe('', () => {
       { "startIndex": 4, "endIndex": 5, "scopes": ["source.abl"] },  // ' '
       { "startIndex": 5, "endIndex": 14, "scopes": ["source.abl", "support.function.abl"] },  // 'AVAILABLE'
       { "startIndex": 14, "endIndex": 15, "scopes": ["source.abl"] },  // ' '
-      { "startIndex": 15, "endIndex": 31, "scopes": ["source.abl", "support.data.table.abl"] },  // 'z_anchor.z_print'
+      { "startIndex": 15, "endIndex": 31, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'z_anchor.z_print'
       { "startIndex": 31, "endIndex": 32, "scopes": ["source.abl"] },  // ' '
       { "startIndex": 32, "endIndex": 36, "scopes": ["source.abl", "keyword.other.abl"] },  // 'THEN'
       { "startIndex": 36, "endIndex": 37, "scopes": ["source.abl", "meta.block.abl"] },  // ' '
@@ -75,7 +75,7 @@ describe('', () => {
       { "startIndex": 4, "endIndex": 5, "scopes": ["source.abl"] },  // ' '
       { "startIndex": 5, "endIndex": 14, "scopes": ["source.abl", "support.function.abl"] },  // 'AVAILABLE'
       { "startIndex": 14, "endIndex": 15, "scopes": ["source.abl"] },  // ' '
-      { "startIndex": 15, "endIndex": 22, "scopes": ["source.abl", "support.data.table.abl"] },  // 'z_print'
+      { "startIndex": 15, "endIndex": 22, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'z_print'
       { "startIndex": 22, "endIndex": 23, "scopes": ["source.abl"] },  // ' '
       { "startIndex": 23, "endIndex": 27, "scopes": ["source.abl", "keyword.other.abl"] },  // 'THEN'
       { "startIndex": 27, "endIndex": 28, "scopes": ["source.abl", "meta.block.abl"] },  // ' '