abl-tmlanguage 1.3.26 → 1.3.28

package/index.mjs

@@ -13,7 +13,7 @@
 
 import * as fs from 'node:fs';
 import * as readline from 'node:readline';
-import {optimize} from 'oniguruma-parser/optimizer';
+import { optimize } from 'oniguruma-parser/optimizer';
 
 let lineReaderMethods = readline.createInterface({
   input: fs.createReadStream('abl-methods.txt')
@@ -125,6 +125,67 @@ alsoFunctions.push('substitute');
 alsoFunctions.push('this-object');
 alsoFunctions.push('value');
 
+let noParameterFunctions = [];
+noParameterFunctions.push('accum');
+noParameterFunctions.push('ambiguous');
+noParameterFunctions.push('available');
+noParameterFunctions.push('current-changed');
+noParameterFunctions.push('current-language');
+noParameterFunctions.push('dataservers');
+noParameterFunctions.push('dbname');
+noParameterFunctions.push('entered');
+noParameterFunctions.push('etime');
+noParameterFunctions.push('frame-col');
+noParameterFunctions.push('frame-db');
+noParameterFunctions.push('frame-down');
+noParameterFunctions.push('frame-field');
+noParameterFunctions.push('frame-file');
+noParameterFunctions.push('frame-index');
+noParameterFunctions.push('frame-line');
+noParameterFunctions.push('frame-name');
+noParameterFunctions.push('frame-row');
+noParameterFunctions.push('frame-value');
+noParameterFunctions.push('gateways');
+noParameterFunctions.push('generate-pbe-salt');
+noParameterFunctions.push('generate-random-key');
+noParameterFunctions.push('generate-uuid');
+noParameterFunctions.push('get-codepages');
+noParameterFunctions.push('go-pending');
+noParameterFunctions.push('guid');
+noParameterFunctions.push('input');
+noParameterFunctions.push('is-attr-space');
+noParameterFunctions.push('lastkey');
+noParameterFunctions.push('line-counter');
+noParameterFunctions.push('locked');
+noParameterFunctions.push('message-lines');
+noParameterFunctions.push('not entered');
+noParameterFunctions.push('now');
+noParameterFunctions.push('num-aliases');
+noParameterFunctions.push('num-dbs');
+noParameterFunctions.push('opsys');
+noParameterFunctions.push('os-drives');
+noParameterFunctions.push('os-error');
+noParameterFunctions.push('page-number');
+noParameterFunctions.push('page-size');
+noParameterFunctions.push('proc-handle');
+noParameterFunctions.push('proc-status');
+noParameterFunctions.push('process-architecture');
+noParameterFunctions.push('progress');
+noParameterFunctions.push('promsgs');
+noParameterFunctions.push('propath');
+noParameterFunctions.push('proversion');
+noParameterFunctions.push('retry');
+noParameterFunctions.push('return');
+noParameterFunctions.push('return-value');
+noParameterFunctions.push('screen-lines');
+noParameterFunctions.push('skip');
+noParameterFunctions.push('super');
+noParameterFunctions.push('terminal');
+noParameterFunctions.push('time');
+noParameterFunctions.push('today');
+noParameterFunctions.push('transaction');
+noParameterFunctions.push('userid');
+
 let alsoKeywords = [];
 alsoKeywords.push('get-collation'); //plural version as key
 
@@ -136,7 +197,7 @@ minKeywords.set('&scop', '&scoped-define');
 minKeywords.set('glob', 'global');
 minKeywords.set('var', 'variable');
 
-// This may holds the keyword names and their regex entries
+// This 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)');
@@ -180,6 +241,13 @@ lineReaderFunctions.on('line', line => {
   let results;
   line = line.toLowerCase();
 
+  // NOT ENTERED function is captured
+  // as NOT , which is an operator and not
+  // a function
+  if (line.startsWith("not entered")) {
+    return;
+  }
+
   if (!line.startsWith("#")) {
 
     let kw = line.split(' ');
@@ -188,8 +256,10 @@ lineReaderFunctions.on('line', line => {
     if (kw.includes('function') && !kw.includes('statement')) {
       let kwName = kw[0];
 
+
       // CAPS letter alphabet
       let charIdx = kwName.charCodeAt(0) - 97;
+
       if (!functionBlocks[charIdx].includes(kwName)) {
         functionBlocks[charIdx].push(kwName);
       }
@@ -266,14 +336,14 @@ function addToBlock(charIdx, fullKw, minKw, kwRegex) {
   if (!minKeywords.has(minKw)) {
     minKeywords.set(minKw, fullKw);
   }
-  if  (!keywordEntries.has(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)) {
+    !methodBlocks[charIdx].includes(fullKw) &&
+    !functionBlocks[charIdx].includes(fullKw) &&
+    !keywordBlocks[charIdx].includes(fullKw)) {
     keywordBlocks[charIdx].push(fullKw);
   }
 
@@ -284,7 +354,7 @@ function addToBlock(charIdx, fullKw, minKw, kwRegex) {
 }
 
 // Replaces full keywords in an array with the regexes, if any
-function replaceKeywordsWithRegex (kwArray) {
+function replaceKeywordsWithRegex(kwArray) {
   let regexBlocks = [];
 
   for (var idx in kwArray) {
@@ -378,6 +448,14 @@ lineReaderFunctions.on('close', () => {
   }
 
   result['abl-functions'] = { patterns: [] }
+
+  // turn noParameterFunctions into an alphabetically-sorted array
+  let noParameterFunctionBlocks = [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []];
+  for (var zz = 0; zz < noParameterFunctions.length; zz++) {
+    let charIdx = noParameterFunctions[zz].charCodeAt(0) - 97;
+    noParameterFunctionBlocks[charIdx].push(noParameterFunctions[zz]);
+  }
+
   for (var zz = 0; zz < 26; zz++) {
 
     if (functionBlocks[zz].length > 0) {
@@ -385,12 +463,11 @@ lineReaderFunctions.on('close', () => {
 
       result['abl-functions-' + String.fromCharCode(97 + zz).toUpperCase()] =
       {
-        name: "meta.function-call.abl",
         begin: "(?i)\\s*(" + replaceKeywordsWithRegex(functionBlocks[zz]) + ")\\s*(?=\\()",
         beginCaptures: {
-          1: {
-            name: "support.function.abl"
-          }
+              1: {
+                name: "support.function.abl"
+              }
         },
         end: "(\\))",
         endCaptures: {
@@ -406,5 +483,26 @@ lineReaderFunctions.on('close', () => {
       }
     }
   }
+
+  //Add functions without parens
+  let npfb = [];
+  for (var zz = 0; zz < 26; zz++) {
+    if (noParameterFunctionBlocks[zz].length > 0) {
+      npfb.push({
+        match: "(?i)\\b(" + replaceKeywordsWithRegex(noParameterFunctionBlocks[zz]) + ")(?!(\\.\\w+))(?=\\)|\\s|,|]|:|\\.)",
+        captures: {
+          1: {
+            name: "support.function.abl"
+          }
+        }
+      });
+
+    }
+  }
+
+  result['abl-functions'].patterns.push({
+    comment: "ABL functions that can be called without parentheses. Some functions have optional arguments, some are never called with parens",
+    patterns: npfb});
+
   fs.writeFileSync(output, JSON.stringify(result, undefined, 4));
 })

package/package.json

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

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

@@ -133,28 +133,28 @@ describe('', () => {
       { "startIndex": 9, "endIndex": 10, "scopes": ["source.abl"] },  // ' '
       { "startIndex": 10, "endIndex": 15, "scopes": ["source.abl", "keyword.other.abl"] },  // 'throw'
       { "startIndex": 15, "endIndex": 16, "scopes": ["source.abl"] },  // ' '
-      { "startIndex": 16, "endIndex": 19, "scopes": ["source.abl", "keyword.other.abl"] },  // 'new'
+      { "startIndex": 16, "endIndex": 19, "scopes": ["source.abl", "support.function.abl"] },  // 'new'
       { "startIndex": 19, "endIndex": 20, "scopes": ["source.abl"] },  // ' '
       { "startIndex": 20, "endIndex": 45, "scopes": ["source.abl", "entity.name.type.abl"] },  // 'ImportValidationException'
-      { "startIndex": 45, "endIndex": 46, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
-      { "startIndex": 46, "endIndex": 47, "scopes": ["source.abl", "meta.function.arguments.abl", "string.quoted.double.abl", "punctuation.definition.string.begin.abl"] },  // '"'
-      { "startIndex": 47, "endIndex": 55, "scopes": ["source.abl", "meta.function.arguments.abl", "string.quoted.double.abl"] },  // 'custname'
-      { "startIndex": 55, "endIndex": 56, "scopes": ["source.abl", "meta.function.arguments.abl", "string.quoted.double.abl", "punctuation.definition.string.end.abl"] },  // '"'
-      { "startIndex": 56, "endIndex": 57, "scopes": ["source.abl", "meta.function.arguments.abl", "punctuation.separator.comma.abl"] }  // ','
+      { "startIndex": 45, "endIndex": 46, "scopes": ["source.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 46, "endIndex": 47, "scopes": ["source.abl", "string.quoted.double.abl", "punctuation.definition.string.begin.abl"] },  // '"'
+      { "startIndex": 47, "endIndex": 55, "scopes": ["source.abl", "string.quoted.double.abl"] },  // 'custname'
+      { "startIndex": 55, "endIndex": 56, "scopes": ["source.abl", "string.quoted.double.abl", "punctuation.definition.string.end.abl"] },  // '"'
+      { "startIndex": 56, "endIndex": 57, "scopes": ["source.abl", "punctuation.separator.comma.abl"] }  // ','
     ],
     [
-      { "startIndex": 0, "endIndex": 48, "scopes": ["source.abl", "meta.function.arguments.abl"] },  // '                                                '
-      { "startIndex": 48, "endIndex": 65, "scopes": ["source.abl", "meta.function.arguments.abl", "storage.data.table.abl"] },  // 'pbAccount.CustKey'
-      { "startIndex": 65, "endIndex": 66, "scopes": ["source.abl", "meta.function.arguments.abl", "punctuation.separator.comma.abl"] }  // ','
+      { "startIndex": 0, "endIndex": 48, "scopes": ["source.abl"] },  // '                                                '
+      { "startIndex": 48, "endIndex": 65, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'pbAccount.CustKey'
+      { "startIndex": 65, "endIndex": 66, "scopes": ["source.abl", "punctuation.separator.comma.abl"] }  // ','
     ],
     [
-      { "startIndex": 0, "endIndex": 48, "scopes": ["source.abl", "meta.function.arguments.abl"] },  // '                                                '
-      { "startIndex": 48, "endIndex": 72, "scopes": ["source.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'SalesforceObjectTypeEnum'
-      { "startIndex": 72, "endIndex": 73, "scopes": ["source.abl", "meta.function.arguments.abl", "punctuation.separator.colon.abl"] },  // ':'
-      { "startIndex": 73, "endIndex": 80, "scopes": ["source.abl", "meta.function.arguments.abl", "entity.name.function.abl"] },  // 'Account'
-      { "startIndex": 80, "endIndex": 81, "scopes": ["source.abl", "meta.function.arguments.abl", "punctuation.separator.colon.abl"] },  // ':'
-      { "startIndex": 81, "endIndex": 89, "scopes": ["source.abl", "meta.function.arguments.abl", "entity.name.function.abl"] },  // 'ToString'
-      { "startIndex": 89, "endIndex": 90, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 0, "endIndex": 48, "scopes": ["source.abl"] },  // '                                                '
+      { "startIndex": 48, "endIndex": 72, "scopes": ["source.abl", "variable.other.abl"] },  // 'SalesforceObjectTypeEnum'
+      { "startIndex": 72, "endIndex": 73, "scopes": ["source.abl", "punctuation.separator.colon.abl"] },  // ':'
+      { "startIndex": 73, "endIndex": 80, "scopes": ["source.abl", "entity.name.function.abl"] },  // 'Account'
+      { "startIndex": 80, "endIndex": 81, "scopes": ["source.abl", "punctuation.separator.colon.abl"] },  // ':'
+      { "startIndex": 81, "endIndex": 89, "scopes": ["source.abl", "entity.name.function.abl"] },  // 'ToString'
+      { "startIndex": 89, "endIndex": 90, "scopes": ["source.abl", "meta.brace.round.js"] },  // '('
       { "startIndex": 90, "endIndex": 91, "scopes": ["source.abl", "meta.brace.round.js"] },  // ')'
       { "startIndex": 91, "endIndex": 92, "scopes": ["source.abl", "punctuation.separator.comma.abl"] }  // ','
     ],

package/spec/blocks/finally-blocks.spec.js

@@ -62,11 +62,11 @@ end finally.`;
     [
       { "startIndex": 0, "endIndex": 2, "scopes": ["source.abl"] },  // '  '
       { "startIndex": 2, "endIndex": 4, "scopes": ["source.abl", "keyword.other.abl"] },  // 'if'
-      { "startIndex": 4, "endIndex": 5, "scopes": ["source.abl", "meta.function-call.abl"] },  // ' '
-      { "startIndex": 5, "endIndex": 17, "scopes": ["source.abl", "meta.function-call.abl", "support.function.abl"] },  // 'valid-object'
-      { "startIndex": 17, "endIndex": 18, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
-      { "startIndex": 18, "endIndex": 23, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'oMenu'
-      { "startIndex": 23, "endIndex": 24, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] },  // ')'
+      { "startIndex": 4, "endIndex": 5, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 5, "endIndex": 17, "scopes": ["source.abl", "support.function.abl"] },  // 'valid-object'
+      { "startIndex": 17, "endIndex": 18, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 18, "endIndex": 23, "scopes": ["source.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'oMenu'
+      { "startIndex": 23, "endIndex": 24, "scopes": ["source.abl", "meta.brace.round.js"] },  // ')'
       { "startIndex": 24, "endIndex": 25, "scopes": ["source.abl"] },  // ' '
       { "startIndex": 25, "endIndex": 29, "scopes": ["source.abl", "keyword.other.abl"] },  // 'then'
       { "startIndex": 29, "endIndex": 30, "scopes": ["source.abl"] },  // ' '

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

@@ -81,7 +81,7 @@ describe('', () => {
       { "startIndex": 63, "endIndex": 64, "scopes": ["source.abl", "meta.block.abl"] },  // ' '
       { "startIndex": 64, "endIndex": 69, "scopes": ["source.abl", "meta.block.abl", "keyword.other.abl"] },  // 'ERROR'
       { "startIndex": 69, "endIndex": 70, "scopes": ["source.abl", "meta.block.abl"] },  // ' '
-      { "startIndex": 70, "endIndex": 73, "scopes": ["source.abl", "meta.block.abl", "keyword.other.abl"] },  // 'NEW'
+      { "startIndex": 70, "endIndex": 73, "scopes": ["source.abl", "meta.block.abl", "support.function.abl"] },  // 'NEW'
       { "startIndex": 73, "endIndex": 74, "scopes": ["source.abl", "meta.block.abl"] },  // ' '
       { "startIndex": 74, "endIndex": 96, "scopes": ["source.abl", "meta.block.abl", "entity.name.type.abl"] },  // 'StopConditionException'
       { "startIndex": 96, "endIndex": 97, "scopes": ["source.abl", "meta.block.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('

package/spec/comments/comment-in-for-each.spec.js

@@ -46,11 +46,11 @@ describe('', () => {
       { "startIndex": 4, "endIndex": 20, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'web-cart.web-key'
       { "startIndex": 20, "endIndex": 21, "scopes": ["source.abl"] },  // ' '
       { "startIndex": 21, "endIndex": 22, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '='
-      { "startIndex": 22, "endIndex": 23, "scopes": ["source.abl", "meta.function-call.abl"] },  // ' '
-      { "startIndex": 23, "endIndex": 26, "scopes": ["source.abl", "meta.function-call.abl", "support.function.abl"] },  // 'dec'
-      { "startIndex": 26, "endIndex": 27, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
-      { "startIndex": 27, "endIndex": 37, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'ip-web-key'
-      { "startIndex": 37, "endIndex": 38, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] },  // ')'
+      { "startIndex": 22, "endIndex": 23, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 23, "endIndex": 26, "scopes": ["source.abl", "support.function.abl"] },  // 'dec'
+      { "startIndex": 26, "endIndex": 27, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 27, "endIndex": 37, "scopes": ["source.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'ip-web-key'
+      { "startIndex": 37, "endIndex": 38, "scopes": ["source.abl", "meta.brace.round.js"] },  // ')'
       { "startIndex": 38, "endIndex": 39, "scopes": ["source.abl"] },  // ' '
       { "startIndex": 39, "endIndex": 42, "scopes": ["source.abl", "keyword.other.abl"] }  // 'AND'
     ],

package/spec/comments/vscode-abl-issue#127.spec.js

@@ -61,7 +61,7 @@ describe('', () => {
     ],
     [
       { "startIndex": 0, "endIndex": 10, "scopes": ["source.abl", "meta.define.abl"] },  // '          '
-      { "startIndex": 10, "endIndex": 16, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'return'
+      { "startIndex": 10, "endIndex": 16, "scopes": ["source.abl", "meta.define.abl", "support.function.abl"] },  // 'return'
       { "startIndex": 16, "endIndex": 17, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
       { "startIndex": 17, "endIndex": 27, "scopes": ["source.abl", "meta.define.abl", "variable.other.abl"] },  // 'mUTF8Value'
       { "startIndex": 27, "endIndex": 28, "scopes": ["source.abl", "meta.define.abl", "punctuation.terminator.abl"] }  // '.'
@@ -72,17 +72,17 @@ describe('', () => {
     ],
     [
       { "startIndex": 0, "endIndex": 10, "scopes": ["source.abl", "meta.define.abl"] },  // '          '
-      { "startIndex": 10, "endIndex": 16, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'return'
-      { "startIndex": 16, "endIndex": 17, "scopes": ["source.abl", "meta.define.abl", "meta.function-call.abl"] },  // ' '
-      { "startIndex": 17, "endIndex": 33, "scopes": ["source.abl", "meta.define.abl", "meta.function-call.abl", "support.function.abl"] },  // 'codepage-convert'
-      { "startIndex": 33, "endIndex": 34, "scopes": ["source.abl", "meta.define.abl", "meta.function-call.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
-      { "startIndex": 34, "endIndex": 44, "scopes": ["source.abl", "meta.define.abl", "meta.function-call.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'mUTF8Value'
-      { "startIndex": 44, "endIndex": 45, "scopes": ["source.abl", "meta.define.abl", "meta.function-call.abl", "meta.function.arguments.abl", "punctuation.separator.comma.abl"] },  // ','
-      { "startIndex": 45, "endIndex": 46, "scopes": ["source.abl", "meta.define.abl", "meta.function-call.abl", "meta.function.arguments.abl"] },  // ' '
-      { "startIndex": 46, "endIndex": 57, "scopes": ["source.abl", "meta.define.abl", "meta.function-call.abl", "meta.function.arguments.abl", "variable.language.abl"] },  // 'this-object'
-      { "startIndex": 57, "endIndex": 58, "scopes": ["source.abl", "meta.define.abl", "meta.function-call.abl", "meta.function.arguments.abl", "punctuation.separator.colon.abl"] },  // ':'
-      { "startIndex": 58, "endIndex": 66, "scopes": ["source.abl", "meta.define.abl", "meta.function-call.abl", "meta.function.arguments.abl", "entity.name.function.abl"] },  // 'Encoding'
-      { "startIndex": 66, "endIndex": 67, "scopes": ["source.abl", "meta.define.abl", "meta.function-call.abl", "meta.brace.round.js"] },  // ')'
+      { "startIndex": 10, "endIndex": 16, "scopes": ["source.abl", "meta.define.abl", "support.function.abl"] },  // 'return'
+      { "startIndex": 16, "endIndex": 17, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+      { "startIndex": 17, "endIndex": 33, "scopes": ["source.abl", "meta.define.abl", "support.function.abl"] },  // 'codepage-convert'
+      { "startIndex": 33, "endIndex": 34, "scopes": ["source.abl", "meta.define.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 34, "endIndex": 44, "scopes": ["source.abl", "meta.define.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'mUTF8Value'
+      { "startIndex": 44, "endIndex": 45, "scopes": ["source.abl", "meta.define.abl", "meta.function.arguments.abl", "punctuation.separator.comma.abl"] },  // ','
+      { "startIndex": 45, "endIndex": 46, "scopes": ["source.abl", "meta.define.abl", "meta.function.arguments.abl"] },  // ' '
+      { "startIndex": 46, "endIndex": 57, "scopes": ["source.abl", "meta.define.abl", "meta.function.arguments.abl", "variable.language.abl"] },  // 'this-object'
+      { "startIndex": 57, "endIndex": 58, "scopes": ["source.abl", "meta.define.abl", "meta.function.arguments.abl", "punctuation.separator.colon.abl"] },  // ':'
+      { "startIndex": 58, "endIndex": 66, "scopes": ["source.abl", "meta.define.abl", "meta.function.arguments.abl", "entity.name.function.abl"] },  // 'Encoding'
+      { "startIndex": 66, "endIndex": 67, "scopes": ["source.abl", "meta.define.abl", "meta.brace.round.js"] },  // ')'
       { "startIndex": 67, "endIndex": 68, "scopes": ["source.abl", "meta.define.abl", "punctuation.terminator.abl"] }  // '.'
     ],
     [
@@ -140,14 +140,14 @@ describe('', () => {
       { "startIndex": 13, "endIndex": 23, "scopes": ["source.abl", "variable.other.abl"] },  // 'mUTF8Value'
       { "startIndex": 23, "endIndex": 24, "scopes": ["source.abl"] },  // ' '
       { "startIndex": 24, "endIndex": 25, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '='
-      { "startIndex": 25, "endIndex": 26, "scopes": ["source.abl", "meta.function-call.abl"] },  // ' '
-      { "startIndex": 26, "endIndex": 36, "scopes": ["source.abl", "meta.function-call.abl", "support.function.abl"] },  // 'right-trim'
-      { "startIndex": 36, "endIndex": 37, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
-      { "startIndex": 37, "endIndex": 46, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "meta.function-call.abl", "support.function.abl"] },  // 'left-trim'
-      { "startIndex": 46, "endIndex": 47, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "meta.function-call.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
-      { "startIndex": 47, "endIndex": 57, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "meta.function-call.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'mUTF8Value'
-      { "startIndex": 57, "endIndex": 58, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "meta.function-call.abl", "meta.brace.round.js"] },  // ')'
-      { "startIndex": 58, "endIndex": 59, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] },  // ')'
+      { "startIndex": 25, "endIndex": 26, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 26, "endIndex": 36, "scopes": ["source.abl", "support.function.abl"] },  // 'right-trim'
+      { "startIndex": 36, "endIndex": 37, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 37, "endIndex": 46, "scopes": ["source.abl", "meta.function.arguments.abl", "support.function.abl"] },  // 'left-trim'
+      { "startIndex": 46, "endIndex": 47, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 47, "endIndex": 57, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'mUTF8Value'
+      { "startIndex": 57, "endIndex": 58, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // ')'
+      { "startIndex": 58, "endIndex": 59, "scopes": ["source.abl", "meta.brace.round.js"] },  // ')'
       { "startIndex": 59, "endIndex": 60, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
     ],
     [

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

@@ -51,11 +51,11 @@ describe('', () => {
       { "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": 54, "endIndex": 55, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 55, "endIndex": 59, "scopes": ["source.abl", "support.function.abl"] },  // 'CAPS'
+      { "startIndex": 59, "endIndex": 60, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 60, "endIndex": 74, "scopes": ["source.abl", "meta.function.arguments.abl", "storage.data.table.abl"] },  // 'custname.state'
+      { "startIndex": 74, "endIndex": 75, "scopes": ["source.abl", "meta.brace.round.js"] },  // ')'
       { "startIndex": 75, "endIndex": 76, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
     ]
   ];
@@ -100,13 +100,13 @@ EXCEPT f1 f4 af
       { "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.quoted.double.abl", "punctuation.definition.string.begin.abl"] },  // '"'
-      { "startIndex": 39, "endIndex": 42, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "string.quoted.double.abl"] },  // 'abf'
-      { "startIndex": 42, "endIndex": 43, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "string.quoted.double.abl", "punctuation.definition.string.end.abl"] },  // '"'
-      { "startIndex": 43, "endIndex": 44, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] }  // ')'
+      { "startIndex": 32, "endIndex": 33, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 33, "endIndex": 37, "scopes": ["source.abl", "support.function.abl"] },  // 'caps'
+      { "startIndex": 37, "endIndex": 38, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 38, "endIndex": 39, "scopes": ["source.abl", "meta.function.arguments.abl", "string.quoted.double.abl", "punctuation.definition.string.begin.abl"] },  // '"'
+      { "startIndex": 39, "endIndex": 42, "scopes": ["source.abl", "meta.function.arguments.abl", "string.quoted.double.abl"] },  // 'abf'
+      { "startIndex": 42, "endIndex": 43, "scopes": ["source.abl", "meta.function.arguments.abl", "string.quoted.double.abl", "punctuation.definition.string.end.abl"] },  // '"'
+      { "startIndex": 43, "endIndex": 44, "scopes": ["source.abl", "meta.brace.round.js"] }  // ')'
     ],
     [
       { "startIndex": 0, "endIndex": 3, "scopes": ["source.abl"] },  // '   '
@@ -223,22 +223,22 @@ describe('', () => {
       { "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": 30, "endIndex": 31, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 31, "endIndex": 36, "scopes": ["source.abl", "support.function.abl"] },  // 'RECID'
+      { "startIndex": 36, "endIndex": 37, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 37, "endIndex": 39, "scopes": ["source.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // '_P'
+      { "startIndex": 39, "endIndex": 40, "scopes": ["source.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": 30, "endIndex": 31, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 31, "endIndex": 36, "scopes": ["source.abl", "support.function.abl"] },  // 'RECID'
+      { "startIndex": 36, "endIndex": 37, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 37, "endIndex": 39, "scopes": ["source.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // '_U'
+      { "startIndex": 39, "endIndex": 40, "scopes": ["source.abl", "meta.brace.round.js"] },  // ')'
       { "startIndex": 40, "endIndex": 41, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
     ]
   ];

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

@@ -27,51 +27,52 @@ describe('', () => {
     { "startIndex": 6, "endIndex": 7, "scopes": ["source.abl"] },  // ' '
     { "startIndex": 7, "endIndex": 12, "scopes": ["source.abl", "keyword.other.abl"] },  // 'ALIAS'
     { "startIndex": 12, "endIndex": 13, "scopes": ["source.abl"] },  // ' '
-    { "startIndex": 13, "endIndex": 18, "scopes": ["source.abl", "meta.function-call.abl", "support.function.abl"] },  // 'value'
-    { "startIndex": 18, "endIndex": 19, "scopes": ["source.abl", "meta.function-call.abl"] },  // ' '
-    { "startIndex": 19, "endIndex": 20, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
-    { "startIndex": 20, "endIndex": 21, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl"] },  // ' '
-    { "startIndex": 21, "endIndex": 31, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'expression'
-    { "startIndex": 31, "endIndex": 32, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl"] },  // ' '
-    { "startIndex": 32, "endIndex": 33, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] },  // ')'
+    { "startIndex": 13, "endIndex": 18, "scopes": ["source.abl", "support.function.abl"] },  // 'value'
+    { "startIndex": 18, "endIndex": 19, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 19, "endIndex": 20, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+    { "startIndex": 20, "endIndex": 21, "scopes": ["source.abl", "meta.function.arguments.abl"] },  // ' '
+    { "startIndex": 21, "endIndex": 31, "scopes": ["source.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'expression'
+    { "startIndex": 31, "endIndex": 32, "scopes": ["source.abl", "meta.function.arguments.abl"] },  // ' '
+    { "startIndex": 32, "endIndex": 33, "scopes": ["source.abl", "meta.brace.round.js"] },  // ')'
     { "startIndex": 33, "endIndex": 34, "scopes": ["source.abl"] },  // ' '
     { "startIndex": 34, "endIndex": 37, "scopes": ["source.abl", "keyword.other.abl"] },  // 'FOR'
     { "startIndex": 37, "endIndex": 38, "scopes": ["source.abl"] },  // ' '
     { "startIndex": 38, "endIndex": 46, "scopes": ["source.abl", "keyword.other.abl"] },  // 'DATABASE'
-    { "startIndex": 46, "endIndex": 47, "scopes": ["source.abl", "meta.function-call.abl"] },  // ' '
-    { "startIndex": 47, "endIndex": 52, "scopes": ["source.abl", "meta.function-call.abl", "support.function.abl"] },  // 'value'
-    { "startIndex": 52, "endIndex": 53, "scopes": ["source.abl", "meta.function-call.abl"] },  // ' '
-    { "startIndex": 53, "endIndex": 54, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
-    { "startIndex": 54, "endIndex": 55, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl"] },  // ' '
-    { "startIndex": 55, "endIndex": 65, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'expression'
-    { "startIndex": 65, "endIndex": 66, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl"] },  // ' '
-    { "startIndex": 66, "endIndex": 67, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] },  // ')'
+    { "startIndex": 46, "endIndex": 47, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 47, "endIndex": 52, "scopes": ["source.abl", "support.function.abl"] },  // 'value'
+    { "startIndex": 52, "endIndex": 53, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 53, "endIndex": 54, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+    { "startIndex": 54, "endIndex": 55, "scopes": ["source.abl", "meta.function.arguments.abl"] },  // ' '
+    { "startIndex": 55, "endIndex": 65, "scopes": ["source.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'expression'
+    { "startIndex": 65, "endIndex": 66, "scopes": ["source.abl", "meta.function.arguments.abl"] },  // ' '
+    { "startIndex": 66, "endIndex": 67, "scopes": ["source.abl", "meta.brace.round.js"] },  // ')'
     { "startIndex": 67, "endIndex": 68, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })
 
 describe('', () => {
-  let statement = `CREATE ALIAS ALIAS_STRING FOR DATABASE value ( tt.fld1 ).`;
+  let statement = `    CREATE ALIAS ALIAS_STRING FOR DATABASE value ( tt.fld1 ).`
   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", "keyword.other.abl"] },  // 'ALIAS'
-    { "startIndex": 12, "endIndex": 13, "scopes": ["source.abl"] },  // ' '
-    { "startIndex": 13, "endIndex": 25, "scopes": ["source.abl", "storage.data.database.abl"] },  // 'ALIAS_STRING'
-    { "startIndex": 25, "endIndex": 26, "scopes": ["source.abl"] },  // ' '
-    { "startIndex": 26, "endIndex": 29, "scopes": ["source.abl", "keyword.other.abl"] },  // 'FOR'
+    { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl"] },  // '    '
+    { "startIndex": 4, "endIndex": 10, "scopes": ["source.abl", "keyword.other.abl"] },  // 'CREATE'
+    { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 11, "endIndex": 16, "scopes": ["source.abl", "keyword.other.abl"] },  // 'ALIAS'
+    { "startIndex": 16, "endIndex": 17, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 17, "endIndex": 29, "scopes": ["source.abl", "storage.data.database.abl"] },  // 'ALIAS_STRING'
     { "startIndex": 29, "endIndex": 30, "scopes": ["source.abl"] },  // ' '
-    { "startIndex": 30, "endIndex": 38, "scopes": ["source.abl", "keyword.other.abl"] },  // 'DATABASE'
-    { "startIndex": 38, "endIndex": 39, "scopes": ["source.abl", "meta.function-call.abl"] },  // ' '
-    { "startIndex": 39, "endIndex": 44, "scopes": ["source.abl", "meta.function-call.abl", "support.function.abl"] },  // 'value'
-    { "startIndex": 44, "endIndex": 45, "scopes": ["source.abl", "meta.function-call.abl"] },  // ' '
-    { "startIndex": 45, "endIndex": 46, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
-    { "startIndex": 46, "endIndex": 47, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl"] },  // ' '
-    { "startIndex": 47, "endIndex": 54, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "storage.data.table.abl"] },  // 'tt.fld1'
-    { "startIndex": 54, "endIndex": 55, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl"] },  // ' '
-    { "startIndex": 55, "endIndex": 56, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] },  // ')'
-    { "startIndex": 56, "endIndex": 57, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+    { "startIndex": 30, "endIndex": 33, "scopes": ["source.abl", "keyword.other.abl"] },  // 'FOR'
+    { "startIndex": 33, "endIndex": 34, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 34, "endIndex": 42, "scopes": ["source.abl", "keyword.other.abl"] },  // 'DATABASE'
+    { "startIndex": 42, "endIndex": 43, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 43, "endIndex": 48, "scopes": ["source.abl", "support.function.abl"] },  // 'value'
+    { "startIndex": 48, "endIndex": 49, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 49, "endIndex": 50, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+    { "startIndex": 50, "endIndex": 51, "scopes": ["source.abl", "meta.function.arguments.abl"] },  // ' '
+    { "startIndex": 51, "endIndex": 58, "scopes": ["source.abl", "meta.function.arguments.abl", "storage.data.table.abl"] },  // 'tt.fld1'
+    { "startIndex": 58, "endIndex": 59, "scopes": ["source.abl", "meta.function.arguments.abl"] },  // ' '
+    { "startIndex": 59, "endIndex": 60, "scopes": ["source.abl", "meta.brace.round.js"] },  // ')'
+    { "startIndex": 60, "endIndex": 61, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })
@@ -90,11 +91,11 @@ describe('', () => {
     { "startIndex": 23, "endIndex": 26, "scopes": ["source.abl", "keyword.other.abl"] },  // 'FOR'
     { "startIndex": 26, "endIndex": 27, "scopes": ["source.abl"] },  // ' '
     { "startIndex": 27, "endIndex": 35, "scopes": ["source.abl", "keyword.other.abl"] },  // 'DATABASE'
-    { "startIndex": 35, "endIndex": 36, "scopes": ["source.abl", "meta.function-call.abl"] },  // ' '
-    { "startIndex": 36, "endIndex": 41, "scopes": ["source.abl", "meta.function-call.abl", "support.function.abl"] },  // 'VALUE'
-    { "startIndex": 41, "endIndex": 42, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
-    { "startIndex": 42, "endIndex": 53, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'user_dbname'
-    { "startIndex": 53, "endIndex": 54, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] },  // ')'
+    { "startIndex": 35, "endIndex": 36, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 36, "endIndex": 41, "scopes": ["source.abl", "support.function.abl"] },  // 'VALUE'
+    { "startIndex": 41, "endIndex": 42, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+    { "startIndex": 42, "endIndex": 53, "scopes": ["source.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'user_dbname'
+    { "startIndex": 53, "endIndex": 54, "scopes": ["source.abl", "meta.brace.round.js"] },  // ')'
     { "startIndex": 54, "endIndex": 55, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);