abl-tmlanguage 1.3.8 → 1.3.10

package/index.js

@@ -1,5 +1,5 @@
-// This script create 3 sections: keywords-<A>, handle-attributes-<Z> and abl-functions-<A> . ABL keywords can only be in
-// one of these sections.
+// This script create 3 sections: keywords-<A-Z>, handle-attributes-<A-Z> and abl-functions-<A-Z> . ABL keywords can only be in
+// one of these sections. The "keywords" section contains statements that are not in the attributes or function sections
 // kwlist.txt file can be generated with `prowin -zgenkwlist > abl-keywords.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//
@@ -28,9 +28,9 @@ let lineReaderKeywords = require('readline').createInterface({
 let output = 'grammar.json';
 let result = {};
 let attributeBlocks = [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []];
-let methodBlocks    = [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []];
-let keywordBlocks   = [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []];
-let functionBlocks  = [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []];
+let methodBlocks = [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []];
+let keywordBlocks = [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []];
+let functionBlocks = [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []];
 const re = /(?:\w|-|\()+(?=\s|$)/g
 
 // The doc is not always accurate ...
@@ -44,6 +44,7 @@ alsoStatements.push('available');
 alsoStatements.push('bgcolor');
 alsoStatements.push('centered');
 alsoStatements.push('context-help-id');
+alsoStatements.push('column-label');
 alsoStatements.push('dcolor');
 alsoStatements.push('default');
 alsoStatements.push('delete');
@@ -53,14 +54,18 @@ alsoStatements.push('fgcolor');
 alsoStatements.push('first');
 alsoStatements.push('flat-button');
 alsoStatements.push('font');
+alsoStatements.push('foreign-key-hidden');
 alsoStatements.push('format');
+alsoStatements.push('hidden');
 alsoStatements.push('image-down');
-alsoStatements.push('image-up');
 alsoStatements.push('image-insensitive');
+alsoStatements.push('image-up');
 alsoStatements.push('initial');
-alsoStatements.push('foreign-key-hidden');
+alsoStatements.push('keep-frame-z-order');
 alsoStatements.push('label');
 alsoStatements.push('locked');
+alsoStatements.push('max-button');
+alsoStatements.push('message-area');
 alsoStatements.push('mouse-pointer');
 alsoStatements.push('namespace-prefix');
 alsoStatements.push('namespace-uri');
@@ -68,11 +73,18 @@ alsoStatements.push('nested');
 alsoStatements.push('no-focus');
 alsoStatements.push('pfcolor');
 alsoStatements.push('recursive');
+alsoStatements.push('resize');
 alsoStatements.push('return-value');
 alsoStatements.push('row');
+alsoStatements.push('scroll-bars');
+alsoStatements.push('sensitive');
+alsoStatements.push('separators');
 alsoStatements.push('serialize-hidden');
 alsoStatements.push('serialize-name');
 alsoStatements.push('single-run');
+alsoStatements.push('status-area');
+alsoStatements.push('three-d');
+alsoStatements.push('title');
 alsoStatements.push('tooltip');
 alsoStatements.push('transaction');
 alsoStatements.push('view-as');
@@ -86,6 +98,7 @@ functionsNotStatements.push('set-size');
 
 let alsoFunctions = [];
 alsoFunctions.push('lower');
+alsoFunctions.push('os-dir');
 alsoFunctions.push('relation-fields');
 alsoFunctions.push('return');
 alsoFunctions.push('skip');
@@ -93,6 +106,30 @@ alsoFunctions.push('substitute');
 alsoFunctions.push('this-object');
 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
+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)?)');
+
+
 lineReaderMethods.on('line', line => {
   let results;
   line = line.toLowerCase();
@@ -132,21 +169,14 @@ lineReaderFunctions.on('line', line => {
   if (!line.startsWith("#")) {
 
     let kw = line.split(' ');
-    let kwName = '';
 
     // This is to skip the FUNCTION statement
     if (kw.includes('function') && !kw.includes('statement')) {
-
-      if (kw.includes('preprocessor')) {
-        kwName = kw[0];
-      } else {
-        kwName = kw.slice(0, kw.indexOf('function')).join(' ');
-      }
+      let kwName = kw[0];
 
       // CAPS letter alphabet
       let charIdx = kwName.charCodeAt(0) - 97;
-
-      if (!functionBlocks[charIdx].includes(kwName) && !kwName.includes('...')) {
+      if (!functionBlocks[charIdx].includes(kwName)) {
         functionBlocks[charIdx].push(kwName);
       }
 
@@ -163,9 +193,7 @@ lineReaderFunctions.on('line', line => {
 
         if (keyWord.indexOf('(') !== -1) { continue; }
 
-        if (keyWord.includes('...')) { break; }
-
-        kw2 = keyWord.replace(",", "");
+        let kw2 = keyWord.replace(",", "");
 
         if (charIdx > 0 && functionsNotStatements.includes(kw2)) {
           functionBlocks[charIdx].push(kw2);
@@ -190,53 +218,80 @@ lineReaderKeywords.on('line', line => {
         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);
+        // 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] + '(?:';
+        for (let i = kwParts[1].length; i > 0; i--) {
+          kwRegex += kwParts[1].substring(0, i);
+          if (i > 1) {
+            kwRegex += '|';
+          }
         }
+        kwRegex += ')?)';
+        addToBlock(charIdx, fullKw, kwParts[0], kwRegex);
       } else {
-        addToBlock(charIdx, kw, kw);
+        addToBlock(charIdx, kw, kw, kw);
       }
     }
   }
 });
+// Find an appropriate keyword regex
+function getKwRegex(fullKw) {
+  let kwRegex = keywordEntries.get(fullKw);
 
-function addToBlock(charIdx, fullKw, addKw) {
+  if (kwRegex) {
+    return kwRegex;
+  }
 
-  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);
-    }
+  if (minKeywords.has(fullKw)) {
+    return keywordEntries.get(minKeywords.get(fullKw));
   }
 
-  if (alsoFunctions.includes(fullKw)) {
-    if (!functionBlocks[charIdx].includes(addKw)) {
-      functionBlocks[charIdx].push(addKw);
-    }
+  if (alsoKeywords.includes(fullKw)) {
+    return fullKw;
   }
+}
 
+// Adds the kewword 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)) {
+    minKeywords.set(minKw, fullKw);
+  }
+  if  (!keywordEntries.has(fullKw)) {
+    keywordEntries.set(fullKw, kwRegex);
+  }
+
+  if (!attributeBlocks[charIdx].includes(fullKw) &&
+      !methodBlocks[charIdx].includes(fullKw) &&
+      !functionBlocks[charIdx].includes(fullKw) &&
+      !keywordBlocks[charIdx].includes(fullKw)) {
+    keywordBlocks[charIdx].push(fullKw);
+  }
+
+  if (alsoFunctions.includes(fullKw) &&
+    !functionBlocks[charIdx].includes(fullKw)) {
+    functionBlocks[charIdx].push(fullKw);
+  }
 }
 
-lineReaderKeywords.on('close', () => {
+// Replaces full keywords in an array with the regexes, if any
+function replaceKeywordsWithRegex (kwArray) {
+  let regexBlocks = [];
 
-  result['keywords'] = { patterns: [] }
+  for (idx in kwArray) {
+    regexBlocks[idx] = getKwRegex(kwArray[idx]);
+  }
+  return regexBlocks;
+}
+
+lineReaderFunctions.on('close', () => {
+
+  result['keywords'] = {
+    comment: "These scopes contain statements, not all the keywords. Methods, attributes and functions have their own scopes.",
+    patterns: [],
+  }
 
   for (var zz = 0; zz < 26; zz++) {
 
@@ -246,7 +301,7 @@ lineReaderKeywords.on('close', () => {
       result['keywords-' + String.fromCharCode(97 + zz).toUpperCase()] =
       {
         comment: "The keyword must not have a trailing variable character (one of #$-_%&)",
-        match: "(?i)\\b(" + keywordBlocks[zz].sort(reverseSort).join('|') + ")\\b(?![\\#\\$\\-\\_\\%\\&])",
+        match: "(?i)\\b(" + replaceKeywordsWithRegex(keywordBlocks[zz]).sort().join('|') + ")\\b(?![#$\\-_%&])",
         captures: {
           1: {
             name: "keyword.other.abl"
@@ -265,7 +320,7 @@ lineReaderKeywords.on('close', () => {
 
       result['handle-attributes-' + String.fromCharCode(97 + zz).toUpperCase()] =
       {
-        match: "(?i)(:)(" + attributeBlocks[zz].sort(reverseSort).join('|') + ")\\b(?![\\#\\$\\-\\_\\%\\&])",
+        match: "(?i)(:)(" + replaceKeywordsWithRegex(attributeBlocks[zz]).sort().join('|') + ")\\b(?![#$\\-_%&])",
         captures: {
           1: {
             name: "punctuation.separator.colon.abl"
@@ -286,7 +341,7 @@ lineReaderKeywords.on('close', () => {
 
       result['handle-methods-' + String.fromCharCode(97 + zz).toUpperCase()] =
       {
-        begin: "(?i)(:)(" + methodBlocks[zz].sort(reverseSort).join('|') + ")\\s*(?=\\()",
+        begin: "(?i)(:)(" + replaceKeywordsWithRegex(methodBlocks[zz]).sort().join('|') + ")\\s*(?=\\()",
         beginCaptures: {
           1: {
             name: "punctuation.separator.colon.abl"
@@ -319,7 +374,7 @@ lineReaderKeywords.on('close', () => {
       result['abl-functions-' + String.fromCharCode(97 + zz).toUpperCase()] =
       {
         name: "meta.function-call.abl",
-        begin: "(?i)\\s*(" + functionBlocks[zz].sort(reverseSort).join('|') + ")\\s*(?=\\()",
+        begin: "(?i)\\s*(" + replaceKeywordsWithRegex(functionBlocks[zz]).sort().join('|') + ")\\s*(?=\\()",
         beginCaptures: {
           1: {
             name: "support.function.abl"
@@ -341,19 +396,3 @@ lineReaderKeywords.on('close', () => {
   }
   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,21 +1,21 @@
 {
   "name": "abl-tmlanguage",
-  "version": "1.3.8",
-  "description": "Textmate grammar for Progress OpenEdge ABL Language",
+  "version": "1.3.10",
+  "description": "TextMate grammar for Progress OpenEdge ABL Language",
   "main": "",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/chriscamicas/openedge-abl-syntax.git"
+    "url": "git@github.com:chriscamicas/abl-tmlanguage.git"
   },
   "author": "Christophe Camicas",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/chriscamicas/openedge-abl-syntax/issues"
+    "url": "https://github.com/chriscamicas/abl-tmlanguage/issues"
   },
-  "homepage": "https://github.com/chriscamicas/openedge-abl-syntax#readme",
+  "homepage": "https://github.com/chriscamicas/abl-tmlanguage",
   "scripts": {
     "build": "node index.js",
-    "test": "mocha  spec/*/*.spec.js",
+    "test": "mocha spec/*/*.spec.js",
     "test:single": "mocha",
     "test:debug": "mocha 'spec/*/*.spec.js' -- --inspect-brk=5858"
   },

package/spec/annotations/annotation.spec.js

@@ -64,8 +64,14 @@ describe('', () => {
     { "startIndex": 33, "endIndex": 34, "scopes": ["source.abl", "meta.declaration.annotation.abl", "string.double.complex.abl", "punctuation.definition.string.end.abl"] },  // '"'
     { "startIndex": 34, "endIndex": 35, "scopes": ["source.abl", "meta.declaration.annotation.abl", "punctuation.separator.comma.abl"] },  // ','
     { "startIndex": 35, "endIndex": 36, "scopes": ["source.abl", "meta.declaration.annotation.abl"] },  // ' '
-    { "startIndex": 36, "endIndex": 47, "scopes": ["source.abl", "meta.declaration.annotation.abl", "entity.other.attribute-name.abl"] },  // 'three='3').'
-    { "startIndex": 47, "endIndex": 50, "scopes": ["source.abl", "meta.declaration.annotation.abl"] }  // '  '
+    { "startIndex": 36, "endIndex": 41, "scopes": ["source.abl", "meta.declaration.annotation.abl", "entity.other.attribute-name.abl"] },  // 'three'
+    { "startIndex": 41, "endIndex": 42, "scopes": ["source.abl", "meta.declaration.annotation.abl", "keyword.operator.source.abl"] },  // '='
+    { "startIndex": 42, "endIndex": 43, "scopes": ["source.abl", "meta.declaration.annotation.abl", "string.single.complex.abl", "punctuation.definition.string.begin.abl"] },  // '''
+    { "startIndex": 43, "endIndex": 44, "scopes": ["source.abl", "meta.declaration.annotation.abl", "string.single.complex.abl"] },  // '3'
+    { "startIndex": 44, "endIndex": 45, "scopes": ["source.abl", "meta.declaration.annotation.abl", "string.single.complex.abl", "punctuation.definition.string.end.abl"] },  // '''
+    { "startIndex": 45, "endIndex": 46, "scopes": ["source.abl", "meta.declaration.annotation.abl", "meta.brace.round.js"] },  // ')'
+    { "startIndex": 46, "endIndex": 47, "scopes": ["source.abl", "punctuation.terminator.abl"] },  // '.'
+    { "startIndex": 47, "endIndex": 50, "scopes": ["source.abl"] }  // '  '
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })

package/spec/array-extent/issue#5.spec.js

@@ -5,10 +5,10 @@ describe('', () => {
   //label-with-a-dot-inside.spec
   let statement = `mExtVar[mI]`;
   let expectedTokens = [
-    { "startIndex": 0, "endIndex": 7, "scopes": ["source.abl", "variable.other.abl"] },
-    { "startIndex": 7, "endIndex": 8, "scopes": ["source.abl", "meta.array.literal.abl", "meta.brace.square.abl"] },
-    { "startIndex": 8, "endIndex": 10, "scopes": ["source.abl", "meta.array.literal.abl", "variable.other.abl"] },
-    { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl", "meta.array.literal.abl", "meta.brace.square.abl"] }
+    { "startIndex": 0, "endIndex": 7, "scopes": ["source.abl", "variable.other.abl"] },  // 'mExtVar'
+    { "startIndex": 7, "endIndex": 8, "scopes": ["source.abl", "meta.array.literal.abl", "punctuation.definition.bracket.square.begin.abl"] },  // '['
+    { "startIndex": 8, "endIndex": 10, "scopes": ["source.abl", "meta.array.literal.abl", "variable.other.abl"] },  // 'mI'
+    { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl", "meta.array.literal.abl", "punctuation.definition.bracket.square.end.abl"] }  // ']'
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })
@@ -16,11 +16,11 @@ describe('', () => {
 describe('', () => {
   let statement = `mExtVar[ mI]`;
   let expectedTokens = [
-    { "startIndex": 0, "endIndex": 7, "scopes": ["source.abl", "variable.other.abl"] },
-    { "startIndex": 7, "endIndex": 8, "scopes": ["source.abl", "meta.array.literal.abl", "meta.brace.square.abl"] },
-    { "startIndex": 8, "endIndex": 9, "scopes": ["source.abl", "meta.array.literal.abl"] },
-    { "startIndex": 9, "endIndex": 11, "scopes": ["source.abl", "meta.array.literal.abl", "variable.other.abl"] },
-    { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl", "meta.array.literal.abl", "meta.brace.square.abl"] }
+    { "startIndex": 0, "endIndex": 7, "scopes": ["source.abl", "variable.other.abl"] },  // 'mExtVar'
+    { "startIndex": 7, "endIndex": 8, "scopes": ["source.abl", "meta.array.literal.abl", "punctuation.definition.bracket.square.begin.abl"] },  // '['
+    { "startIndex": 8, "endIndex": 9, "scopes": ["source.abl", "meta.array.literal.abl"] },  // ' '
+    { "startIndex": 9, "endIndex": 11, "scopes": ["source.abl", "meta.array.literal.abl", "variable.other.abl"] },  // 'mI'
+    { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl", "meta.array.literal.abl", "punctuation.definition.bracket.square.end.abl"] }  // ']'
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })

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

@@ -106,7 +106,7 @@ share-lo:
 end.`;
   let expectedTokens = [
     [
-      { "startIndex": 0, "endIndex": 11, "scopes": ["source.abl", "meta.block.label.abl"] },  // 'block-label'
+      { "startIndex": 0, "endIndex": 11, "scopes": ["source.abl", "entity.name.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'
@@ -133,7 +133,7 @@ repeat for bCustomer:
 end.`;
   let expectedTokens = [
     [
-      { "startIndex": 0, "endIndex": 11, "scopes": ["source.abl", "meta.block.label.abl"] },  // 'block-label'
+      { "startIndex": 0, "endIndex": 11, "scopes": ["source.abl", "entity.name.label.abl"] },  // 'block-label'
       { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // ':'
     ],
     [
@@ -158,7 +158,7 @@ for bCustomer exclusive-lock:
 end.`;
   let expectedTokens = [
     [
-      { "startIndex": 0, "endIndex": 20, "scopes": ["source.abl", "meta.block.label.abl"] },  // 'EXCLUSIVE-LOCK-BLOCK'
+      { "startIndex": 0, "endIndex": 20, "scopes": ["source.abl", "entity.name.label.abl"] },  // 'EXCLUSIVE-LOCK-BLOCK'
       { "startIndex": 20, "endIndex": 21, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // ':'
     ],
     [

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

@@ -0,0 +1,18 @@
+const { assert, expect } = require('chai');
+const shared = require('../shared.js');
+
+describe('', () => {
+  let statement = `do with frame {&FRAME-NAME}:`;
+  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": 7, "scopes": ["source.abl", "meta.block.abl", "keyword.other.abl"] },  // 'with'
+    { "startIndex": 7, "endIndex": 8, "scopes": ["source.abl", "meta.block.abl"] },  // ' '
+    { "startIndex": 8, "endIndex": 13, "scopes": ["source.abl", "meta.block.abl", "keyword.other.abl"] },  // 'frame'
+    { "startIndex": 13, "endIndex": 14, "scopes": ["source.abl", "meta.block.abl"] },  // ' '
+    { "startIndex": 14, "endIndex": 27, "scopes": ["source.abl", "meta.block.abl", "storage.type.function.abl"] },  // '{&FRAME-NAME}'
+    { "startIndex": 27, "endIndex": 28, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // ':'
+  ]
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+

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

@@ -30,7 +30,7 @@ describe('', () => {
       { "startIndex": 0, "endIndex": 8, "scopes": ["source.abl", "meta.block.abl"] },  // '        '
       { "startIndex": 8, "endIndex": 11, "scopes": ["source.abl", "meta.block.abl", "storage.type.function.abl"] },  // '&IF'
       { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl", "meta.block.abl"] },  // ' '
-      { "startIndex": 12, "endIndex": 22, "scopes": ["source.abl", "meta.block.abl", "variable.other.abl"] },  // 'PROVERSION'
+      { "startIndex": 12, "endIndex": 22, "scopes": ["source.abl", "meta.block.abl", "support.function.abl"] },  // 'PROVERSION'
       { "startIndex": 22, "endIndex": 23, "scopes": ["source.abl", "meta.block.abl"] },  // ' '
       { "startIndex": 23, "endIndex": 25, "scopes": ["source.abl", "meta.block.abl", "keyword.operator.source.abl"] },  // 'NE'
       { "startIndex": 25, "endIndex": 26, "scopes": ["source.abl", "meta.block.abl"] },  // ' '

package/spec/comments/spacious-comment.spec.js

@@ -0,0 +1,73 @@
+const { assert, expect } = require('chai');
+const shared = require('../shared.js');
+
+describe('', () => {
+  let statement = `/*ASSIGN ttPropath.codeEnv        = ttEnv.codeEnv                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          */`;
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 2, "scopes": ["source.abl", "comment.block.source.abl"] },  // '/*'
+    { "startIndex": 2, "endIndex": 1739, "scopes": ["source.abl", "comment.block.source.abl", "comment"] },  // 'ASSIGN ttPropath.codeEnv        = ttEnv.codeEnv                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          '
+    { "startIndex": 1739, "endIndex": 1741, "scopes": ["source.abl", "comment.block.source.abl"] }  // '*/'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `/*       ttPropath.codeOrg        = ttOrganisme.codeOrg asfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasa                                      *//*       ttPropath.codeOrg        = ttOrganisme.codeOrg asfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasa                                      */`;
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 2, "scopes": ["source.abl", "comment.block.source.abl"] },  // '/*'
+    { "startIndex": 2, "endIndex": 1739, "scopes": ["source.abl", "comment.block.source.abl", "comment"] },  // '       ttPropath.codeOrg        = ttOrganisme.codeOrg asfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasa                                      '
+    { "startIndex": 1739, "endIndex": 1741, "scopes": ["source.abl", "comment.block.source.abl"] },  // '*/'
+    { "startIndex": 1741, "endIndex": 1743, "scopes": ["source.abl", "comment.block.source.abl"] },  // '/*'
+    { "startIndex": 1743, "endIndex": 3480, "scopes": ["source.abl", "comment.block.source.abl", "comment"] },  // '       ttPropath.codeOrg        = ttOrganisme.codeOrg asfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasaasfagfagagasgagasgasgasgasgasgasasa                                      '
+    { "startIndex": 3480, "endIndex": 3482, "scopes": ["source.abl", "comment.block.source.abl"] }  // '*/'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `c = /*       ttPropath.codeOrg   /* comment inna comment, tasty */  */     = ttOrganisme.codeOrg`;
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 1, "scopes": ["source.abl", "storage.type.abl"] },  // 'c'
+    { "startIndex": 1, "endIndex": 2, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 2, "endIndex": 3, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '='
+    { "startIndex": 3, "endIndex": 4, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 4, "endIndex": 6, "scopes": ["source.abl", "comment.block.source.abl"] },  // '/*'
+    { "startIndex": 6, "endIndex": 33, "scopes": ["source.abl", "comment.block.source.abl", "comment"] },  // '       ttPropath.codeOrg   '
+    { "startIndex": 33, "endIndex": 35, "scopes": ["source.abl", "comment.block.source.abl", "comment", "comment.block.source.abl"] },  // '/*'
+    { "startIndex": 35, "endIndex": 64, "scopes": ["source.abl", "comment.block.source.abl", "comment", "comment.block.source.abl", "comment"] },  // ' comment inna comment, tasty '
+    { "startIndex": 64, "endIndex": 66, "scopes": ["source.abl", "comment.block.source.abl", "comment", "comment.block.source.abl"] },  // '*/'
+    { "startIndex": 66, "endIndex": 68, "scopes": ["source.abl", "comment.block.source.abl", "comment"] },  // '  '
+    { "startIndex": 68, "endIndex": 70, "scopes": ["source.abl", "comment.block.source.abl"] },  // '*/'
+    { "startIndex": 70, "endIndex": 75, "scopes": ["source.abl"] },  // '     '
+    { "startIndex": 75, "endIndex": 76, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '='
+    { "startIndex": 76, "endIndex": 77, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 77, "endIndex": 96, "scopes": ["source.abl", "storage.data.table.abl"] }  // 'ttOrganisme.codeOrg'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `c = /*       ttPropath.codeOrg   /* comment inna /*and one more*/ comment, tasty */  */     = ttOrganisme.codeOrg`;
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 1, "scopes": ["source.abl", "storage.type.abl"] },  // 'c'
+    { "startIndex": 1, "endIndex": 2, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 2, "endIndex": 3, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '='
+    { "startIndex": 3, "endIndex": 4, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 4, "endIndex": 6, "scopes": ["source.abl", "comment.block.source.abl"] },  // '/*'
+    { "startIndex": 6, "endIndex": 33, "scopes": ["source.abl", "comment.block.source.abl", "comment"] },  // '       ttPropath.codeOrg   '
+    { "startIndex": 33, "endIndex": 35, "scopes": ["source.abl", "comment.block.source.abl", "comment", "comment.block.source.abl"] },  // '/*'
+    { "startIndex": 35, "endIndex": 49, "scopes": ["source.abl", "comment.block.source.abl", "comment", "comment.block.source.abl", "comment"] },  // ' comment inna '
+    { "startIndex": 49, "endIndex": 51, "scopes": ["source.abl", "comment.block.source.abl", "comment", "comment.block.source.abl", "comment", "comment.block.source.abl"] },  // '/*'
+    { "startIndex": 51, "endIndex": 63, "scopes": ["source.abl", "comment.block.source.abl", "comment", "comment.block.source.abl", "comment", "comment.block.source.abl", "comment"] },  // 'and one more'
+    { "startIndex": 63, "endIndex": 65, "scopes": ["source.abl", "comment.block.source.abl", "comment", "comment.block.source.abl", "comment", "comment.block.source.abl"] },  // '*/'
+    { "startIndex": 65, "endIndex": 81, "scopes": ["source.abl", "comment.block.source.abl", "comment", "comment.block.source.abl", "comment"] },  // ' comment, tasty '
+    { "startIndex": 81, "endIndex": 83, "scopes": ["source.abl", "comment.block.source.abl", "comment", "comment.block.source.abl"] },  // '*/'
+    { "startIndex": 83, "endIndex": 85, "scopes": ["source.abl", "comment.block.source.abl", "comment"] },  // '  '
+    { "startIndex": 85, "endIndex": 87, "scopes": ["source.abl", "comment.block.source.abl"] },  // '*/'
+    { "startIndex": 87, "endIndex": 92, "scopes": ["source.abl"] },  // '     '
+    { "startIndex": 92, "endIndex": 93, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '='
+    { "startIndex": 93, "endIndex": 94, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 94, "endIndex": 113, "scopes": ["source.abl", "storage.data.table.abl"] }  // 'ttOrganisme.codeOrg'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})