abl-tmlanguage 1.3.1 → 1.3.3

package/index.js

@@ -1,44 +1,310 @@
+// This script create 3 sections: keywords-<A>, handle-attributes-<Z> and abl-functions-<A> . ABL keywords can only be in
+// one of these sections.
 // kwlist.txt file can be generated with `prowin -zgenkwlist > kwlist.txt`
+//
+// methods.txt can be created by copying the 'Related Links' from https://docs.progress.com/bundle/abl-reference/page/Handle-Attributes-and-Methods-Reference.html//
+// It will look something like:
+//    ACCELERATOR attribute
+//    ACCEPT-CHANGES( ) method
+//    ACCEPT-ROW-CHANGES( ) method
+//
+// 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');
 
-let lineReader = require('readline').createInterface({
+let lineReaderMethods = require('readline').createInterface({
+  input: fs.createReadStream('methods.txt')
+});
+
+let lineReaderFunctions = require('readline').createInterface({
+  input: fs.createReadStream('abl-functions.txt')
+});
+
+let lineReaderKeywords = require('readline').createInterface({
   input: fs.createReadStream('kwlist.txt')
 });
 
- 
 let output = 'grammar.json';
 let result = {};
-let grammarBlocks2 = [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []];
+let attributeBlocks = [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []];
+let methodBlocks    = [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []];
+let keywordBlocks   = [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []];
+let functionBlocks  = [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []];
 const re = /(?:\w|-|\()+(?=\s|$)/g
 
-lineReader.on('line', line => {
-    let results;
-    line = line.toLowerCase();
-
-    while ((results = re.exec(line)) !== null) {
-        let kw = results[0];
-        if (kw.indexOf('(') !== -1) {
-            let kwParts = kw.split('(');
-            kw = kwParts[0];
-            grammarBlocks2[kw.charCodeAt(0) - 97].push(kw);
-            let kwComplete = kwParts[1];
-            for (const element of kwComplete) {
-                kw += element;
-                grammarBlocks2[kw.charCodeAt(0) - 97].push(kw);
-            }
-        } else {
-            grammarBlocks2[kw.charCodeAt(0) - 97].push(kw);
-        }
+// The doc is not always accurate ...
+// Add the full keyword to one of these arrays, and
+// it and any abbreviated versions will be added to the
+// appropriate scopes
+let alsoStatements = [];
+alsoStatements.push('centered');
+alsoStatements.push('first');
+alsoStatements.push('format');
+alsoStatements.push('initial');
+alsoStatements.push('label');
+alsoStatements.push('nested');
+alsoStatements.push('row');
+alsoStatements.push('serialize-name');
+alsoStatements.push('single-run');
+alsoStatements.push('transaction');
+
+let functionsNotStatements = [];
+functionsNotStatements.push('set-size');
+
+let alsoFunctions = [];
+alsoFunctions.push('lower');
+alsoFunctions.push('relation-fields');
+alsoFunctions.push('return');
+alsoFunctions.push('substitute');
+alsoFunctions.push('this-object');
+alsoFunctions.push('value');
+
+lineReaderMethods.on('line', line => {
+  let results;
+  line = line.toLowerCase();
+
+  let kw = line.split(' ');
+  let charIdx = kw[0].charCodeAt(0) - 97;
+  let keyWord = kw[0].split('(')[0];
+
+  if (kw.includes('attribute')) {
+    if (!attributeBlocks[charIdx].includes(keyWord)) {
+      attributeBlocks[charIdx].push(keyWord);
+    }
+  } else if (kw.includes('method')) {
+    if (!methodBlocks[charIdx].includes(keyWord)) {
+      methodBlocks[charIdx].push(keyWord);
+    }
+  }
+
+  if (alsoStatements.includes(keyWord)) {
+    if (!keywordBlocks[charIdx].includes(keyWord)) {
+      keywordBlocks[charIdx].push(keyWord);
+    }
+  }
+  if (alsoFunctions.includes(keyWord)) {
+    if (!functionBlocks[charIdx].includes(keyWord)) {
+      functionBlocks[charIdx].push(keyWord);
+    }
+  }
+});
+
+lineReaderFunctions.on('line', line => {
+  let results;
+  line = line.toLowerCase();
+
+  let kw = line.split(' ');
+
+  if (kw.includes('function')) {
+    // CAPS letter alphabet
+    let charIdx = kw[0].charCodeAt(0) - 97;
+
+    if (!functionBlocks[charIdx].includes(kw[0]) && !kw[0].includes('...')) {
+      functionBlocks[charIdx].push(kw[0]);
+    }
+
+    if (alsoStatements.includes(kw[0])) {
+      if (!keywordBlocks[charIdx].includes(kw[0])) {
+        keywordBlocks[charIdx].push(kw[0]);
+      }
+    }
+  } else if (kw.includes('statement')) {
+    for (const keyWord of kw) {
+      let charIdx = keyWord.charCodeAt(0) - 97;
+
+      if (keyWord == "statement") { break; }
+
+      if (keyWord.indexOf('(') !== -1) { continue; }
+
+      if (keyWord.includes('...')) { break; }
+
+      kw2 = keyWord.replace(",", "");
+
+      if (charIdx > 0 && functionsNotStatements.includes(kw2)) {
+        functionBlocks[charIdx].push(kw2);
+      } else if (charIdx > 0 && !keywordBlocks[charIdx].includes(kw2)) {
+        keywordBlocks[charIdx].push(kw2);
+      }
+    }
+  }
+});
+
+lineReaderKeywords.on('line', line => {
+  let results;
+  line = line.toLowerCase();
+
+  while ((results = re.exec(line)) !== null) {
+    let kw = results[0];
+    // CAPS letter alphabet
+    let charIdx = kw.charCodeAt(0) - 97;
+
+    if (kw.indexOf('(') !== -1) {
+      let kwParts = kw.split('(');
+      let fullKw = kwParts[0] + kwParts[1];
+
+      kw = kwParts[0];
+      addToBlock(charIdx, fullKw, kw);
+
+      let kwComplete = kwParts[1];
+      for (const element of kwComplete) {
+        kw += element;
+
+        addToBlock(charIdx, fullKw, kw);
+      }
+    } else {
+      addToBlock(charIdx, kw, kw);
     }
+  }
 });
 
-lineReader.on('close', () => {
-    for (var zz = 0; zz < 26; zz++) {
-        result['keywords-' + String.fromCharCode(97 + zz)] = 
-         {
-            match: "(?i)(?<![\\w-])(" + grammarBlocks2[zz].sort().join('|') + ")(?![\\w-])",
+function addToBlock(charIdx, fullKw, addKw) {
+
+  if (alsoFunctions.includes(fullKw)) {
+    if (!functionBlocks[charIdx].includes(addKw)) {
+      functionBlocks[charIdx].push(addKw);
+    }
+  }
+
+  if (attributeBlocks[charIdx].includes(fullKw)) {
+    if (!attributeBlocks[charIdx].includes(addKw)) {
+      attributeBlocks[charIdx].push(addKw);
+    }
+  } else if (methodBlocks[charIdx].includes(fullKw)) {
+    if (!methodBlocks[charIdx].includes(addKw)) {
+      methodBlocks[charIdx].push(addKw);
+    }
+  } else if (functionBlocks[charIdx].includes(fullKw)) {
+    if (!functionBlocks[charIdx].includes(addKw)) {
+      functionBlocks[charIdx].push(addKw);
+    }
+  } else {
+    if (!keywordBlocks[charIdx].includes(addKw)) {
+      keywordBlocks[charIdx].push(addKw);
+    }
+  }
+}
+
+lineReaderKeywords.on('close', () => {
+
+  result['keywords'] = { patterns: [] }
+
+  for (var zz = 0; zz < 26; zz++) {
+
+    if (keywordBlocks[zz].length > 0) {
+      result.keywords.patterns.push({ include: "#keywords-" + String.fromCharCode(97 + zz).toUpperCase() });
+
+      result['keywords-' + String.fromCharCode(97 + zz).toUpperCase()] =
+      {
+        //match: "(?i)(?<![\\w\\-\\:\\.])(" + keywordBlocks[zz].sort(reverseSort).join('|') + ")(?![\\w\\-])",
+        match: "(?i)\\b(" + keywordBlocks[zz].sort(reverseSort).join('|') + ")\\b",
+        captures: {
+          1: {
             name: "keyword.other.abl"
+          }
         }
+      }
     }
-    fs.writeFileSync(output, JSON.stringify(result, undefined, 4));
+  }
+
+  result['handle-attributes'] = { patterns: [] }
+
+  for (var zz = 0; zz < 26; zz++) {
+    if (attributeBlocks[zz].length > 0) {
+
+      result['handle-attributes'].patterns.push({ include: "#handle-attributes-" + String.fromCharCode(97 + zz).toUpperCase() });
+
+      result['handle-attributes-' + String.fromCharCode(97 + zz).toUpperCase()] =
+      {
+        match: "(?i)(:)(" + attributeBlocks[zz].sort(reverseSort).join('|') + ")\\s*",
+        captures: {
+          1: {
+            name: "punctuation.separator.colon.abl"
+          },
+          2: {
+            name: "entity.name.function.abl"
+          }
+        }
+      }
+    }
+  }
+
+  result['handle-methods'] = { patterns: [] }
+  for (var zz = 0; zz < 26; zz++) {
+
+    if (methodBlocks[zz].length > 0) {
+      result['handle-methods'].patterns.push({ include: "#handle-methods-" + String.fromCharCode(97 + zz).toUpperCase() });
+
+      result['handle-methods-' + String.fromCharCode(97 + zz).toUpperCase()] =
+      {
+        begin: "(?i)(:)(" + methodBlocks[zz].sort(reverseSort).join('|') + ")\\s*(?=\\()",
+        beginCaptures: {
+          1: {
+            name: "punctuation.separator.colon.abl"
+          },
+          2: {
+            name: "support.function.abl"
+          }
+        },
+        end: "(\\))",
+        endCaptures: {
+          1: {
+            name: "meta.brace.round.js"
+          }
+        },
+        patterns: [
+          {
+            include: "#function-arguments"
+          }
+        ]
+      }
+    }
+  }
+
+  result['abl-functions'] = { patterns: [] }
+  for (var zz = 0; zz < 26; zz++) {
+
+    if (functionBlocks[zz].length > 0) {
+      result['abl-functions'].patterns.push({ include: "#abl-functions-" + String.fromCharCode(97 + zz).toUpperCase() });
+
+      result['abl-functions-' + String.fromCharCode(97 + zz).toUpperCase()] =
+      {
+        name: "meta.function-call.abl",
+        begin: "(?i)\\s*(" + functionBlocks[zz].sort(reverseSort).join('|') + ")\\s*(?=\\()",
+        beginCaptures: {
+          1: {
+            name: "support.function.abl"
+          }
+        },
+        end: "(\\))",
+        endCaptures: {
+          1: {
+            name: "meta.brace.round.js"
+          }
+        },
+        patterns: [
+          {
+            include: "#function-arguments"
+          }
+        ]
+      }
+    }
+  }
+  fs.writeFileSync(output, JSON.stringify(result, undefined, 4));
 })
+
+// Sorts in reverse order - so that the longer versions of the keywords appear earlier in the regex
+function reverseSort(a, b) {
+  const nameA = a.toLowerCase(); // ignore upper and lowercase
+  const nameB = b.toLowerCase(); // ignore upper and lowercase
+
+  if (nameA < nameB) {
+    return 1;
+  }
+  if (nameA > nameB) {
+    return -1;
+  }
+
+  // names are equal
+  return 0;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abl-tmlanguage",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "Textmate grammar for Progress OpenEdge ABL Language",
   "main": "",
   "repository": {

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

@@ -0,0 +1,153 @@
+const { assert, expect } = require('chai');
+const shared = require('../shared.js');
+
+describe('', () => {
+  let statement = `for each bCustomer
+    no-lock:
+end.`;
+  let expectedTokens = [
+    [
+      { "startIndex": 0, "endIndex": 3, "scopes": ["source.abl", "keyword.other.abl"] },  // 'for'
+      { "startIndex": 3, "endIndex": 4, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 4, "endIndex": 8, "scopes": ["source.abl", "keyword.other.abl"] },  // 'each'
+      { "startIndex": 8, "endIndex": 9, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 9, "endIndex": 18, "scopes": ["source.abl", "storage.data.table.abl"] }  // 'bCustomer'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl"] },  // '    '
+      { "startIndex": 4, "endIndex": 11, "scopes": ["source.abl", "keyword.other.abl"] },  // 'no-lock'
+      { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl", "punctuation.terminator.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 = `for each bCustomer where true no-lock:
+end.`;
+  let expectedTokens = [
+    [
+      { "startIndex": 0, "endIndex": 3, "scopes": ["source.abl", "keyword.other.abl"] },  // 'for'
+      { "startIndex": 3, "endIndex": 4, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 4, "endIndex": 8, "scopes": ["source.abl", "keyword.other.abl"] },  // 'each'
+      { "startIndex": 8, "endIndex": 9, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 9, "endIndex": 18, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'bCustomer'
+      { "startIndex": 18, "endIndex": 19, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 19, "endIndex": 24, "scopes": ["source.abl", "keyword.other.abl"] },  // 'where'
+      { "startIndex": 24, "endIndex": 25, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 25, "endIndex": 29, "scopes": ["source.abl", "constant.language.abl"] },  // 'true'
+      { "startIndex": 29, "endIndex": 30, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 30, "endIndex": 37, "scopes": ["source.abl", "keyword.other.abl"] },  // 'no-lock'
+      { "startIndex": 37, "endIndex": 38, "scopes": ["source.abl", "punctuation.terminator.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 = `for each bCustomer
+exclusive-l:
+end.`;
+  let expectedTokens = [
+    [
+      { "startIndex": 0, "endIndex": 3, "scopes": ["source.abl", "keyword.other.abl"] },  // 'for'
+      { "startIndex": 3, "endIndex": 4, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 4, "endIndex": 8, "scopes": ["source.abl", "keyword.other.abl"] },  // 'each'
+      { "startIndex": 8, "endIndex": 9, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 9, "endIndex": 18, "scopes": ["source.abl", "storage.data.table.abl"] }  // 'bCustomer'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 11, "scopes": ["source.abl", "keyword.other.abl"] },  // 'exclusive-l'
+      { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl", "punctuation.terminator.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 = `for each bCustomer
+share-lo:
+end.`;
+  let expectedTokens = [
+    [
+      { "startIndex": 0, "endIndex": 3, "scopes": ["source.abl", "keyword.other.abl"] },  // 'for'
+      { "startIndex": 3, "endIndex": 4, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 4, "endIndex": 8, "scopes": ["source.abl", "keyword.other.abl"] },  // 'each'
+      { "startIndex": 8, "endIndex": 9, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 9, "endIndex": 18, "scopes": ["source.abl", "storage.data.table.abl"] }  // 'bCustomer'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 8, "scopes": ["source.abl", "keyword.other.abl"] },  // 'share-lo'
+      { "startIndex": 8, "endIndex": 9, "scopes": ["source.abl", "punctuation.terminator.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 = `block-label: for each bCustomer
+share-lo:
+end.`;
+  let expectedTokens = [
+    [
+      { "startIndex": 0, "endIndex": 11, "scopes": ["source.abl", "meta.block.label.abl"] },  // 'block-label'
+      { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl", "punctuation.terminator.abl"] },  // ':'
+      { "startIndex": 12, "endIndex": 13, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 13, "endIndex": 16, "scopes": ["source.abl", "keyword.other.abl"] },  // 'for'
+      { "startIndex": 16, "endIndex": 17, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 17, "endIndex": 21, "scopes": ["source.abl", "keyword.other.abl"] },  // 'each'
+      { "startIndex": 21, "endIndex": 22, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 22, "endIndex": 31, "scopes": ["source.abl", "storage.data.table.abl"] }  // 'bCustomer'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 8, "scopes": ["source.abl", "keyword.other.abl"] },  // 'share-lo'
+      { "startIndex": 8, "endIndex": 9, "scopes": ["source.abl", "punctuation.terminator.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 = `block-label:
+repeat for bCustomer:
+end.`;
+  let expectedTokens = [
+    [
+      { "startIndex": 0, "endIndex": 11, "scopes": ["source.abl", "meta.block.label.abl"] },  // 'block-label'
+      { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // ':'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "meta.block.abl", "keyword.other.abl"] },  // 'repeat'
+      { "startIndex": 6, "endIndex": 7, "scopes": ["source.abl", "meta.block.abl"] },  // ' '
+      { "startIndex": 7, "endIndex": 10, "scopes": ["source.abl", "meta.block.abl", "keyword.other.abl"] },  // 'for'
+      { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl", "meta.block.abl"] },  // ' '
+      { "startIndex": 11, "endIndex": 20, "scopes": ["source.abl", "meta.block.abl", "storage.data.table.abl"] },  // 'bCustomer'
+      { "startIndex": 20, "endIndex": 21, "scopes": ["source.abl", "punctuation.terminator.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);
+})

package/spec/blocks/on-quit.spec.js

@@ -9,7 +9,7 @@ describe('', () => {
   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": 2, "endIndex": 3, "scopes": ["source.abl", "meta.block.abl", "meta.block.branch.abl"] },  // ' '
       { "startIndex": 3, "endIndex": 5, "scopes": ["source.abl", "meta.block.abl", "meta.block.branch.abl", "keyword.other.abl"] },  // 'on'
       { "startIndex": 5, "endIndex": 6, "scopes": ["source.abl", "meta.block.abl", "meta.block.branch.abl"] },  // ' '
       { "startIndex": 6, "endIndex": 11, "scopes": ["source.abl", "meta.block.abl", "meta.block.branch.abl", "keyword.other.abl"] },  // 'error'

package/spec/comments/comment-in-block-statement.spec.js

@@ -78,7 +78,12 @@ describe('', () => {
       { "startIndex": 69, "endIndex": 70, "scopes": ["source.abl", "meta.block.abl", "meta.block.branch.abl"] },  // ' '
       { "startIndex": 70, "endIndex": 73, "scopes": ["source.abl", "meta.block.abl", "meta.block.branch.abl", "keyword.other.abl"] },  // 'NEW'
       { "startIndex": 73, "endIndex": 74, "scopes": ["source.abl", "meta.block.abl", "meta.block.branch.abl"] },  // ' '
-      { "startIndex": 74, "endIndex": 106, "scopes": ["source.abl", "meta.block.abl", "meta.block.branch.abl", "entity.name.type.abl"] }  // 'StopConditionException() &ENDIF:'
+      { "startIndex": 74, "endIndex": 96, "scopes": ["source.abl", "meta.block.abl", "meta.block.branch.abl", "entity.name.type.abl"] },  // 'StopConditionException'
+      { "startIndex": 96, "endIndex": 97, "scopes": ["source.abl", "meta.block.abl", "meta.block.branch.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 97, "endIndex": 98, "scopes": ["source.abl", "meta.block.abl", "meta.block.branch.abl", "meta.brace.round.js"] },  // ')'
+      { "startIndex": 98, "endIndex": 99, "scopes": ["source.abl", "meta.block.abl", "meta.block.branch.abl"] },  // ' '
+      { "startIndex": 99, "endIndex": 105, "scopes": ["source.abl", "meta.block.abl", "meta.block.branch.abl", "storage.type.function.abl"] },  // '&ENDIF'
+      { "startIndex": 105, "endIndex": 106, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // ':'
     ]
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);

package/spec/comments/comment-in-function-args.spec.js

@@ -6,7 +6,7 @@ describe('', () => {
   let expectedTokens = [
     { "startIndex": 0, "endIndex": 3, "scopes": ["source.abl", "keyword.other.abl"] },  // 'run'
     { "startIndex": 3, "endIndex": 4, "scopes": ["source.abl"] },  // ' '
-    { "startIndex": 4, "endIndex": 10, "scopes": ["source.abl", "meta.other.procedure.abl"] },  // 'getOEM'
+    { "startIndex": 4, "endIndex": 10, "scopes": ["source.abl", "entity.name.procedure.abl"] },  // 'getOEM'
     { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
     { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl", "meta.function.arguments.abl"] },  // ' '
     { "startIndex": 12, "endIndex": 16, "scopes": ["source.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'host'

package/spec/db-table-and-field/foreach.spec.js

@@ -558,8 +558,8 @@ describe('', () => {
     ],
     [
       { "startIndex": 0, "endIndex": 2, "scopes": ["source.abl"] },  // '  '
-      { "startIndex": 2, "endIndex": 13, "scopes": ["source.abl", "meta.block.label.abl"] },  // 'TRANSACTION'
-      { "startIndex": 13, "endIndex": 15, "scopes": ["source.abl"] }  // ':'
+      { "startIndex": 2, "endIndex": 13, "scopes": ["source.abl", "keyword.other.abl"] },  // 'TRANSACTION'
+      { "startIndex": 13, "endIndex": 14, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // ':'
     ]
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);

package/spec/define-parameter/simple-single-line.spec.js

@@ -154,3 +154,75 @@ describe('', () => {
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })
+
+describe('', () => {
+  let statement = `define output parameter table for ttCustomer.`;
+  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": 13, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'output'
+    { "startIndex": 13, "endIndex": 14, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 14, "endIndex": 23, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'parameter'
+    { "startIndex": 23, "endIndex": 24, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 24, "endIndex": 29, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'table'
+    { "startIndex": 29, "endIndex": 30, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 30, "endIndex": 33, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'for'
+    { "startIndex": 33, "endIndex": 34, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 34, "endIndex": 44, "scopes": ["source.abl", "meta.define.abl", "storage.data.table.abl"] },  // 'ttCustomer'
+    { "startIndex": 44, "endIndex": 45, "scopes": ["source.abl", "meta.define.abl", "punctuation.terminator.abl"] }  // '.'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `define output parameter dataset for dsCustomer.`;
+  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": 13, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'output'
+    { "startIndex": 13, "endIndex": 14, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 14, "endIndex": 23, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'parameter'
+    { "startIndex": 23, "endIndex": 24, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 24, "endIndex": 31, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'dataset'
+    { "startIndex": 31, "endIndex": 32, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 32, "endIndex": 35, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'for'
+    { "startIndex": 35, "endIndex": 36, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 36, "endIndex": 46, "scopes": ["source.abl", "meta.define.abl", "storage.data.dataset.abl"] },  // 'dsCustomer'
+    { "startIndex": 46, "endIndex": 47, "scopes": ["source.abl", "meta.define.abl", "punctuation.terminator.abl"] }  // '.'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `define output parameter table-handle vTableHandle.`;
+  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": 13, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'output'
+    { "startIndex": 13, "endIndex": 14, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 14, "endIndex": 23, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'parameter'
+    { "startIndex": 23, "endIndex": 24, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 24, "endIndex": 36, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'table-handle'
+    { "startIndex": 36, "endIndex": 37, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 37, "endIndex": 49, "scopes": ["source.abl", "meta.define.abl", "variable.other.abl"] },  // 'vTableHandle'
+    { "startIndex": 49, "endIndex": 50, "scopes": ["source.abl", "meta.define.abl", "punctuation.terminator.abl"] }  // '.'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `define output parameter dataset-handle vDatasetHandle.`;
+  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": 13, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'output'
+    { "startIndex": 13, "endIndex": 14, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 14, "endIndex": 23, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'parameter'
+    { "startIndex": 23, "endIndex": 24, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 24, "endIndex": 38, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'dataset-handle'
+    { "startIndex": 38, "endIndex": 39, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 39, "endIndex": 53, "scopes": ["source.abl", "meta.define.abl", "variable.other.abl"] },  // 'vDatasetHandle'
+    { "startIndex": 53, "endIndex": 54, "scopes": ["source.abl", "meta.define.abl", "punctuation.terminator.abl"] }  // '.'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})