abl-tmlanguage 1.3.16 → 1.3.18

package/spec/numbers/scientific-notation.spec.js

@@ -0,0 +1,212 @@
+const { assert, expect } = require('chai');
+const shared = require('../shared.js');
+
+describe('', () => {
+  let statement = `define variable Avogadro as decimal init 6.02214076e+23.`;
+  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": 15, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'variable'
+    { "startIndex": 15, "endIndex": 16, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 16, "endIndex": 24, "scopes": ["source.abl", "meta.define.abl", "variable.other.abl"] },  // 'Avogadro'
+    { "startIndex": 24, "endIndex": 25, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 25, "endIndex": 27, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'as'
+    { "startIndex": 27, "endIndex": 28, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 28, "endIndex": 35, "scopes": ["source.abl", "meta.define.abl", "storage.type.abl"] },  // 'decimal'
+    { "startIndex": 35, "endIndex": 36, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 36, "endIndex": 40, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'init'
+    { "startIndex": 40, "endIndex": 41, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 41, "endIndex": 55, "scopes": ["source.abl", "meta.define.abl", "constant.numeric.source.abl"] },  // '6.02214076e+23'
+    { "startIndex": 55, "endIndex": 56, "scopes": ["source.abl", "meta.define.abl", "punctuation.terminator.abl"] }  // '.'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `var decimal Avogadro = 6.02214076e+23.`;
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 3, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'var'
+    { "startIndex": 3, "endIndex": 4, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 4, "endIndex": 11, "scopes": ["source.abl", "meta.define.abl", "storage.type.abl"] },  // 'decimal'
+    { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 12, "endIndex": 20, "scopes": ["source.abl", "meta.define.abl", "variable.other.abl"] },  // 'Avogadro'
+    { "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"] },  // ' '
+    { "startIndex": 23, "endIndex": 37, "scopes": ["source.abl", "constant.numeric.source.abl"] },  // '6.02214076e+23'
+    { "startIndex": 37, "endIndex": 38, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `var integer someintval = 1.456e-3 + 4.246e+4.`;
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 3, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'var'
+    { "startIndex": 3, "endIndex": 4, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 4, "endIndex": 11, "scopes": ["source.abl", "meta.define.abl", "storage.type.abl"] },  // 'integer'
+    { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 12, "endIndex": 22, "scopes": ["source.abl", "meta.define.abl", "variable.other.abl"] },  // 'someintval'
+    { "startIndex": 22, "endIndex": 23, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 23, "endIndex": 24, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '='
+    { "startIndex": 24, "endIndex": 25, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 25, "endIndex": 33, "scopes": ["source.abl", "constant.numeric.source.abl"] },  // '1.456e-3'
+    { "startIndex": 33, "endIndex": 34, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 34, "endIndex": 35, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '+'
+    { "startIndex": 35, "endIndex": 36, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 36, "endIndex": 44, "scopes": ["source.abl", "constant.numeric.source.abl"] },  // '4.246e+4'
+    { "startIndex": 44, "endIndex": 45, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `var decimal[] planetsDiameterkm = [12.742e+3, 4.8794e+3, 6779.0, 12.104e+3, 23766e-1].`;
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 3, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'var'
+    { "startIndex": 3, "endIndex": 4, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 4, "endIndex": 11, "scopes": ["source.abl", "meta.define.abl", "storage.type.abl"] },  // 'decimal'
+    { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl", "meta.define.abl", "meta.array.literal.abl", "punctuation.definition.bracket.square.begin.abl"] },  // '['
+    { "startIndex": 12, "endIndex": 13, "scopes": ["source.abl", "meta.define.abl", "meta.array.literal.abl", "punctuation.definition.bracket.square.end.abl"] },  // ']'
+    { "startIndex": 13, "endIndex": 14, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 14, "endIndex": 31, "scopes": ["source.abl", "meta.define.abl", "variable.other.abl"] },  // 'planetsDiameterkm'
+    { "startIndex": 31, "endIndex": 32, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 32, "endIndex": 33, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '='
+    { "startIndex": 33, "endIndex": 34, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 34, "endIndex": 35, "scopes": ["source.abl", "meta.array.literal.abl", "punctuation.definition.bracket.square.begin.abl"] },  // '['
+    { "startIndex": 35, "endIndex": 44, "scopes": ["source.abl", "meta.array.literal.abl", "constant.numeric.source.abl"] },  // '12.742e+3'
+    { "startIndex": 44, "endIndex": 45, "scopes": ["source.abl", "meta.array.literal.abl", "punctuation.separator.comma.abl"] },  // ','
+    { "startIndex": 45, "endIndex": 46, "scopes": ["source.abl", "meta.array.literal.abl"] },  // ' '
+    { "startIndex": 46, "endIndex": 55, "scopes": ["source.abl", "meta.array.literal.abl", "constant.numeric.source.abl"] },  // '4.8794e+3'
+    { "startIndex": 55, "endIndex": 56, "scopes": ["source.abl", "meta.array.literal.abl", "punctuation.separator.comma.abl"] },  // ','
+    { "startIndex": 56, "endIndex": 57, "scopes": ["source.abl", "meta.array.literal.abl"] },  // ' '
+    { "startIndex": 57, "endIndex": 63, "scopes": ["source.abl", "meta.array.literal.abl", "constant.numeric.source.abl"] },  // '6779.0'
+    { "startIndex": 63, "endIndex": 64, "scopes": ["source.abl", "meta.array.literal.abl", "punctuation.separator.comma.abl"] },  // ','
+    { "startIndex": 64, "endIndex": 65, "scopes": ["source.abl", "meta.array.literal.abl"] },  // ' '
+    { "startIndex": 65, "endIndex": 74, "scopes": ["source.abl", "meta.array.literal.abl", "constant.numeric.source.abl"] },  // '12.104e+3'
+    { "startIndex": 74, "endIndex": 75, "scopes": ["source.abl", "meta.array.literal.abl", "punctuation.separator.comma.abl"] },  // ','
+    { "startIndex": 75, "endIndex": 76, "scopes": ["source.abl", "meta.array.literal.abl"] },  // ' '
+    { "startIndex": 76, "endIndex": 84, "scopes": ["source.abl", "meta.array.literal.abl", "constant.numeric.source.abl"] },  // '23766e-1'
+    { "startIndex": 84, "endIndex": 85, "scopes": ["source.abl", "meta.array.literal.abl", "punctuation.definition.bracket.square.end.abl"] },  // ']'
+    { "startIndex": 85, "endIndex": 86, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `define variable Avogadro as decimal init 0.
+Avogadro = decimal("6.02214076e+23").`;
+  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": 15, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'variable'
+      { "startIndex": 15, "endIndex": 16, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+      { "startIndex": 16, "endIndex": 24, "scopes": ["source.abl", "meta.define.abl", "variable.other.abl"] },  // 'Avogadro'
+      { "startIndex": 24, "endIndex": 25, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+      { "startIndex": 25, "endIndex": 27, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'as'
+      { "startIndex": 27, "endIndex": 28, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+      { "startIndex": 28, "endIndex": 35, "scopes": ["source.abl", "meta.define.abl", "storage.type.abl"] },  // 'decimal'
+      { "startIndex": 35, "endIndex": 36, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+      { "startIndex": 36, "endIndex": 40, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'init'
+      { "startIndex": 40, "endIndex": 41, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+      { "startIndex": 41, "endIndex": 42, "scopes": ["source.abl", "meta.define.abl", "constant.numeric.source.abl"] },  // '0'
+      { "startIndex": 42, "endIndex": 43, "scopes": ["source.abl", "meta.define.abl", "punctuation.terminator.abl"] }  // '.'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 8, "scopes": ["source.abl", "variable.other.abl"] },  // 'Avogadro'
+      { "startIndex": 8, "endIndex": 9, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 9, "endIndex": 10, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '='
+      { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl", "meta.function-call.abl"] },  // ' '
+      { "startIndex": 11, "endIndex": 18, "scopes": ["source.abl", "meta.function-call.abl", "support.function.abl"] },  // 'decimal'
+      { "startIndex": 18, "endIndex": 19, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 19, "endIndex": 20, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "string.quoted.double.abl", "punctuation.definition.string.begin.abl"] },  // '"'
+      { "startIndex": 20, "endIndex": 34, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "string.quoted.double.abl"] },  // '6.02214076e+23'
+      { "startIndex": 34, "endIndex": 35, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "string.quoted.double.abl", "punctuation.definition.string.end.abl"] },  // '"'
+      { "startIndex": 35, "endIndex": 36, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] },  // ')'
+      { "startIndex": 36, "endIndex": 37, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+    ]
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `define variable Avogadro as decimal init 6.02214076e+23 format "9.9999<<e+99".`;
+  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": 15, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'variable'
+    { "startIndex": 15, "endIndex": 16, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 16, "endIndex": 24, "scopes": ["source.abl", "meta.define.abl", "variable.other.abl"] },  // 'Avogadro'
+    { "startIndex": 24, "endIndex": 25, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 25, "endIndex": 27, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'as'
+    { "startIndex": 27, "endIndex": 28, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 28, "endIndex": 35, "scopes": ["source.abl", "meta.define.abl", "storage.type.abl"] },  // 'decimal'
+    { "startIndex": 35, "endIndex": 36, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 36, "endIndex": 40, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'init'
+    { "startIndex": 40, "endIndex": 41, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 41, "endIndex": 55, "scopes": ["source.abl", "meta.define.abl", "constant.numeric.source.abl"] },  // '6.02214076e+23'
+    { "startIndex": 55, "endIndex": 56, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 56, "endIndex": 62, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'format'
+    { "startIndex": 62, "endIndex": 63, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 63, "endIndex": 64, "scopes": ["source.abl", "meta.define.abl", "string.quoted.double.abl", "punctuation.definition.string.begin.abl"] },  // '"'
+    { "startIndex": 64, "endIndex": 76, "scopes": ["source.abl", "meta.define.abl", "string.quoted.double.abl"] },  // '9.9999<<e+99'
+    { "startIndex": 76, "endIndex": 77, "scopes": ["source.abl", "meta.define.abl", "string.quoted.double.abl", "punctuation.definition.string.end.abl"] },  // '"'
+    { "startIndex": 77, "endIndex": 78, "scopes": ["source.abl", "meta.define.abl", "punctuation.terminator.abl"] }  // '.'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `    fix-codepage(jsondata) = "utf-8".
+jsondata = '~{ "somevalue": 123e+5 ~}'.`;
+  let expectedTokens = [
+    [
+      { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl"] },  // '    '
+      { "startIndex": 4, "endIndex": 16, "scopes": ["source.abl", "entity.name.function.abl"] },  // 'fix-codepage'
+      { "startIndex": 16, "endIndex": 17, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 17, "endIndex": 25, "scopes": ["source.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'jsondata'
+      { "startIndex": 25, "endIndex": 26, "scopes": ["source.abl", "meta.brace.round.js"] },  // ')'
+      { "startIndex": 26, "endIndex": 27, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 27, "endIndex": 28, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '='
+      { "startIndex": 28, "endIndex": 29, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 29, "endIndex": 30, "scopes": ["source.abl", "string.quoted.double.abl", "punctuation.definition.string.begin.abl"] },  // '"'
+      { "startIndex": 30, "endIndex": 35, "scopes": ["source.abl", "string.quoted.double.abl"] },  // 'utf-8'
+      { "startIndex": 35, "endIndex": 36, "scopes": ["source.abl", "string.quoted.double.abl", "punctuation.definition.string.end.abl"] },  // '"'
+      { "startIndex": 36, "endIndex": 37, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 8, "scopes": ["source.abl", "variable.other.abl"] },  // 'jsondata'
+      { "startIndex": 8, "endIndex": 9, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 9, "endIndex": 10, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '='
+      { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl", "string.quoted.single.abl", "punctuation.definition.string.begin.abl"] },  // '''
+      { "startIndex": 12, "endIndex": 14, "scopes": ["source.abl", "string.quoted.single.abl", "constant.character.escape.abl"] },  // '~{'
+      { "startIndex": 14, "endIndex": 35, "scopes": ["source.abl", "string.quoted.single.abl"] },  // ' "somevalue": 123e+5 '
+      { "startIndex": 35, "endIndex": 37, "scopes": ["source.abl", "string.quoted.single.abl", "constant.character.escape.abl"] },  // '~}'
+      { "startIndex": 37, "endIndex": 38, "scopes": ["source.abl", "string.quoted.single.abl", "punctuation.definition.string.end.abl"] },  // '''
+      { "startIndex": 38, "endIndex": 39, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+    ]
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `jsondata:Add("somevalue", 123e+5 ).`;
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 8, "scopes": ["source.abl", "variable.other.abl"] },  // 'jsondata'
+    { "startIndex": 8, "endIndex": 9, "scopes": ["source.abl", "punctuation.separator.colon.abl"] },  // ':'
+    { "startIndex": 9, "endIndex": 12, "scopes": ["source.abl", "entity.name.function.abl"] },  // 'Add'
+    { "startIndex": 12, "endIndex": 13, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+    { "startIndex": 13, "endIndex": 14, "scopes": ["source.abl", "meta.function.arguments.abl", "string.quoted.double.abl", "punctuation.definition.string.begin.abl"] },  // '"'
+    { "startIndex": 14, "endIndex": 23, "scopes": ["source.abl", "meta.function.arguments.abl", "string.quoted.double.abl"] },  // 'somevalue'
+    { "startIndex": 23, "endIndex": 24, "scopes": ["source.abl", "meta.function.arguments.abl", "string.quoted.double.abl", "punctuation.definition.string.end.abl"] },  // '"'
+    { "startIndex": 24, "endIndex": 25, "scopes": ["source.abl", "meta.function.arguments.abl", "punctuation.separator.comma.abl"] },  // ','
+    { "startIndex": 25, "endIndex": 26, "scopes": ["source.abl", "meta.function.arguments.abl"] },  // ' '
+    { "startIndex": 26, "endIndex": 32, "scopes": ["source.abl", "meta.function.arguments.abl", "constant.numeric.source.abl"] },  // '123e+5'
+    { "startIndex": 32, "endIndex": 33, "scopes": ["source.abl", "meta.function.arguments.abl"] },  // ' '
+    { "startIndex": 33, "endIndex": 34, "scopes": ["source.abl", "meta.brace.round.js"] },  // ')'
+    { "startIndex": 34, "endIndex": 35, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})

package/spec/operators/operators.spec.js

@@ -68,10 +68,10 @@ describe('', () => {
     { "startIndex": 6, "endIndex": 7, "scopes": ["source.abl"] },  // ' '
     { "startIndex": 7, "endIndex": 9, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '+='
     { "startIndex": 9, "endIndex": 10, "scopes": ["source.abl"] },  // ' '
-    { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl", "string.double.complex.abl", "punctuation.definition.string.begin.abl"] },  // '"'
-    { "startIndex": 11, "endIndex": 16, "scopes": ["source.abl", "string.double.complex.abl"] },  // 'thing'
-    { "startIndex": 16, "endIndex": 17, "scopes": ["source.abl", "string.double.complex.abl", "punctuation.definition.string.end.abl"] },  // '"'
-    { "startIndex": 17, "endIndex": 19, "scopes": ["source.abl", "string.double.complex.abl", "support.other.abl"] },  // ':u'
+    { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl", "string.quoted.double.abl", "punctuation.definition.string.begin.abl"] },  // '"'
+    { "startIndex": 11, "endIndex": 16, "scopes": ["source.abl", "string.quoted.double.abl"] },  // 'thing'
+    { "startIndex": 16, "endIndex": 17, "scopes": ["source.abl", "string.quoted.double.abl", "punctuation.definition.string.end.abl"] },  // '"'
+    { "startIndex": 17, "endIndex": 19, "scopes": ["source.abl", "string.quoted.double.abl", "support.other.abl"] },  // ':u'
     { "startIndex": 19, "endIndex": 20, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
@@ -117,9 +117,9 @@ else if Not v_string matches "bar" then .`;
       { "startIndex": 16, "endIndex": 17, "scopes": ["source.abl"] },  // ' '
       { "startIndex": 17, "endIndex": 24, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // 'matches'
       { "startIndex": 24, "endIndex": 25, "scopes": ["source.abl"] },  // ' '
-      { "startIndex": 25, "endIndex": 26, "scopes": ["source.abl", "string.double.complex.abl", "punctuation.definition.string.begin.abl"] },  // '"'
-      { "startIndex": 26, "endIndex": 29, "scopes": ["source.abl", "string.double.complex.abl"] },  // 'foo'
-      { "startIndex": 29, "endIndex": 30, "scopes": ["source.abl", "string.double.complex.abl", "punctuation.definition.string.end.abl"] },  // '"'
+      { "startIndex": 25, "endIndex": 26, "scopes": ["source.abl", "string.quoted.double.abl", "punctuation.definition.string.begin.abl"] },  // '"'
+      { "startIndex": 26, "endIndex": 29, "scopes": ["source.abl", "string.quoted.double.abl"] },  // 'foo'
+      { "startIndex": 29, "endIndex": 30, "scopes": ["source.abl", "string.quoted.double.abl", "punctuation.definition.string.end.abl"] },  // '"'
       { "startIndex": 30, "endIndex": 31, "scopes": ["source.abl"] },  // ' '
       { "startIndex": 31, "endIndex": 35, "scopes": ["source.abl", "keyword.other.abl"] },  // 'then'
       { "startIndex": 35, "endIndex": 36, "scopes": ["source.abl"] },  // ' '
@@ -136,9 +136,9 @@ else if Not v_string matches "bar" then .`;
       { "startIndex": 20, "endIndex": 21, "scopes": ["source.abl"] },  // ' '
       { "startIndex": 21, "endIndex": 28, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // 'matches'
       { "startIndex": 28, "endIndex": 29, "scopes": ["source.abl"] },  // ' '
-      { "startIndex": 29, "endIndex": 30, "scopes": ["source.abl", "string.double.complex.abl", "punctuation.definition.string.begin.abl"] },  // '"'
-      { "startIndex": 30, "endIndex": 33, "scopes": ["source.abl", "string.double.complex.abl"] },  // 'bar'
-      { "startIndex": 33, "endIndex": 34, "scopes": ["source.abl", "string.double.complex.abl", "punctuation.definition.string.end.abl"] },  // '"'
+      { "startIndex": 29, "endIndex": 30, "scopes": ["source.abl", "string.quoted.double.abl", "punctuation.definition.string.begin.abl"] },  // '"'
+      { "startIndex": 30, "endIndex": 33, "scopes": ["source.abl", "string.quoted.double.abl"] },  // 'bar'
+      { "startIndex": 33, "endIndex": 34, "scopes": ["source.abl", "string.quoted.double.abl", "punctuation.definition.string.end.abl"] },  // '"'
       { "startIndex": 34, "endIndex": 35, "scopes": ["source.abl"] },  // ' '
       { "startIndex": 35, "endIndex": 39, "scopes": ["source.abl", "keyword.other.abl"] },  // 'then'
       { "startIndex": 39, "endIndex": 40, "scopes": ["source.abl"] },  // ' '

package/spec/preprocesors/issue166.spec.js

@@ -4,13 +4,14 @@ const shared = require('../shared.js');
 describe('', () => {
   let statement = `&global-define MY-TABLE-NEW "table"`;
   let expectedTokens = [
-    { "startIndex": 0, "endIndex": 14, "scopes": ["source.abl", "meta.preprocessor.define.abl", "keyword.other.abl"] },  // '&global-define'
-    { "startIndex": 14, "endIndex": 15, "scopes": ["source.abl", "meta.preprocessor.define.abl"] },  // ' '
-    { "startIndex": 15, "endIndex": 27, "scopes": ["source.abl", "meta.preprocessor.define.abl", "entity.name.function.preprocessor.abl"] },  // 'MY-TABLE-NEW'
-    { "startIndex": 27, "endIndex": 28, "scopes": ["source.abl", "meta.preprocessor.define.abl"] },  // ' '
-    { "startIndex": 28, "endIndex": 29, "scopes": ["source.abl", "meta.preprocessor.define.abl", "string.double.complex.abl", "punctuation.definition.string.begin.abl"] },  // '"'
-    { "startIndex": 29, "endIndex": 34, "scopes": ["source.abl", "meta.preprocessor.define.abl", "string.double.complex.abl"] },  // 'table'
-    { "startIndex": 34, "endIndex": 35, "scopes": ["source.abl", "meta.preprocessor.define.abl", "string.double.complex.abl", "punctuation.definition.string.end.abl"] }  // '"'
+    { "startIndex": 0, "endIndex": 1, "scopes": ["source.abl", "meta.preprocessor.abl", "punctuation.definition.preprocessor.abl"] },  // '&'
+    { "startIndex": 1, "endIndex": 14, "scopes": ["source.abl", "meta.preprocessor.abl", "keyword.control.directive.define.abl"] },  // 'global-define'
+    { "startIndex": 14, "endIndex": 15, "scopes": ["source.abl", "meta.preprocessor.abl"] },  // ' '
+    { "startIndex": 15, "endIndex": 27, "scopes": ["source.abl", "meta.preprocessor.abl", "entity.name.function.preprocessor.abl"] },  // 'MY-TABLE-NEW'
+    { "startIndex": 27, "endIndex": 28, "scopes": ["source.abl", "meta.preprocessor.abl"] },  // ' '
+    { "startIndex": 28, "endIndex": 29, "scopes": ["source.abl", "string.quoted.double.abl", "punctuation.definition.string.begin.abl"] },  // '"'
+    { "startIndex": 29, "endIndex": 34, "scopes": ["source.abl", "string.quoted.double.abl"] },  // 'table'
+    { "startIndex": 34, "endIndex": 35, "scopes": ["source.abl", "string.quoted.double.abl", "punctuation.definition.string.end.abl"] }  // '"'
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })
@@ -18,13 +19,14 @@ describe('', () => {
 describe('', () => {
   let statement = `&global-define TEST-NEW-2 "b"`;
   let expectedTokens = [
-    { "startIndex": 0, "endIndex": 14, "scopes": ["source.abl", "meta.preprocessor.define.abl", "keyword.other.abl"] },  // '&global-define'
-    { "startIndex": 14, "endIndex": 15, "scopes": ["source.abl", "meta.preprocessor.define.abl"] },  // ' '
-    { "startIndex": 15, "endIndex": 25, "scopes": ["source.abl", "meta.preprocessor.define.abl", "entity.name.function.preprocessor.abl"] },  // 'TEST-NEW-2'
-    { "startIndex": 25, "endIndex": 26, "scopes": ["source.abl", "meta.preprocessor.define.abl"] },  // ' '
-    { "startIndex": 26, "endIndex": 27, "scopes": ["source.abl", "meta.preprocessor.define.abl", "string.double.complex.abl", "punctuation.definition.string.begin.abl"] },  // '"'
-    { "startIndex": 27, "endIndex": 28, "scopes": ["source.abl", "meta.preprocessor.define.abl", "string.double.complex.abl"] },  // 'b'
-    { "startIndex": 28, "endIndex": 29, "scopes": ["source.abl", "meta.preprocessor.define.abl", "string.double.complex.abl", "punctuation.definition.string.end.abl"] }  // '"'
+    { "startIndex": 0, "endIndex": 1, "scopes": ["source.abl", "meta.preprocessor.abl", "punctuation.definition.preprocessor.abl"] },  // '&'
+    { "startIndex": 1, "endIndex": 14, "scopes": ["source.abl", "meta.preprocessor.abl", "keyword.control.directive.define.abl"] },  // 'global-define'
+    { "startIndex": 14, "endIndex": 15, "scopes": ["source.abl", "meta.preprocessor.abl"] },  // ' '
+    { "startIndex": 15, "endIndex": 25, "scopes": ["source.abl", "meta.preprocessor.abl", "entity.name.function.preprocessor.abl"] },  // 'TEST-NEW-2'
+    { "startIndex": 25, "endIndex": 26, "scopes": ["source.abl", "meta.preprocessor.abl"] },  // ' '
+    { "startIndex": 26, "endIndex": 27, "scopes": ["source.abl", "string.quoted.double.abl", "punctuation.definition.string.begin.abl"] },  // '"'
+    { "startIndex": 27, "endIndex": 28, "scopes": ["source.abl", "string.quoted.double.abl"] },  // 'b'
+    { "startIndex": 28, "endIndex": 29, "scopes": ["source.abl", "string.quoted.double.abl", "punctuation.definition.string.end.abl"] }  // '"'
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })
@@ -44,7 +46,10 @@ describe('', () => {
     { "startIndex": 30, "endIndex": 31, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
     { "startIndex": 31, "endIndex": 38, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'initial'
     { "startIndex": 38, "endIndex": 39, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
-    { "startIndex": 39, "endIndex": 54, "scopes": ["source.abl", "meta.define.abl", "storage.type.function.abl"] },  // '{&MY-TABLE-NEW}'
+    { "startIndex": 39, "endIndex": 40, "scopes": ["source.abl", "meta.define.abl", "meta.preprocessor.abl", "punctuation.section.abl"] },  // '{'
+    { "startIndex": 40, "endIndex": 41, "scopes": ["source.abl", "meta.define.abl", "meta.preprocessor.abl", "punctuation.definition.preprocessor.abl"] },  // '&'
+    { "startIndex": 41, "endIndex": 53, "scopes": ["source.abl", "meta.define.abl", "meta.preprocessor.abl", "entity.name.function.preprocessor.abl"] },  // 'MY-TABLE-NEW'
+    { "startIndex": 53, "endIndex": 54, "scopes": ["source.abl", "meta.define.abl", "meta.preprocessor.abl", "punctuation.section.abl"] },  // '}'
     { "startIndex": 54, "endIndex": 55, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
     { "startIndex": 55, "endIndex": 62, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'no-undo'
     { "startIndex": 62, "endIndex": 63, "scopes": ["source.abl", "meta.define.abl", "punctuation.terminator.abl"] }  // '.'
@@ -60,13 +65,16 @@ end.`;
     [
       { "startIndex": 0, "endIndex": 2, "scopes": ["source.abl", "keyword.other.abl"] },  // 'if'
       { "startIndex": 2, "endIndex": 3, "scopes": ["source.abl"] },  // ' '
-      { "startIndex": 3, "endIndex": 18, "scopes": ["source.abl", "storage.type.function.abl"] },  // '{&MY-TABLE-NEW}'
+      { "startIndex": 3, "endIndex": 4, "scopes": ["source.abl", "meta.preprocessor.abl", "punctuation.section.abl"] },  // '{'
+      { "startIndex": 4, "endIndex": 5, "scopes": ["source.abl", "meta.preprocessor.abl", "punctuation.definition.preprocessor.abl"] },  // '&'
+      { "startIndex": 5, "endIndex": 17, "scopes": ["source.abl", "meta.preprocessor.abl", "entity.name.function.preprocessor.abl"] },  // 'MY-TABLE-NEW'
+      { "startIndex": 17, "endIndex": 18, "scopes": ["source.abl", "meta.preprocessor.abl", "punctuation.section.abl"] },  // '}'
       { "startIndex": 18, "endIndex": 19, "scopes": ["source.abl"] },  // ' '
       { "startIndex": 19, "endIndex": 21, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // 'eq'
       { "startIndex": 21, "endIndex": 22, "scopes": ["source.abl"] },  // ' '
-      { "startIndex": 22, "endIndex": 23, "scopes": ["source.abl", "string.double.complex.abl", "punctuation.definition.string.begin.abl"] },  // '"'
-      { "startIndex": 23, "endIndex": 28, "scopes": ["source.abl", "string.double.complex.abl"] },  // 'table'
-      { "startIndex": 28, "endIndex": 29, "scopes": ["source.abl", "string.double.complex.abl", "punctuation.definition.string.end.abl"] },  // '"'
+      { "startIndex": 22, "endIndex": 23, "scopes": ["source.abl", "string.quoted.double.abl", "punctuation.definition.string.begin.abl"] },  // '"'
+      { "startIndex": 23, "endIndex": 28, "scopes": ["source.abl", "string.quoted.double.abl"] },  // 'table'
+      { "startIndex": 28, "endIndex": 29, "scopes": ["source.abl", "string.quoted.double.abl", "punctuation.definition.string.end.abl"] },  // '"'
       { "startIndex": 29, "endIndex": 30, "scopes": ["source.abl"] },  // ' '
       { "startIndex": 30, "endIndex": 34, "scopes": ["source.abl", "keyword.other.abl"] }  // 'then'
     ],

package/spec/preprocesors/preprocessor-functions.spec.js

@@ -0,0 +1,77 @@
+const { assert, expect } = require('chai');
+const shared = require('../shared.js');
+
+describe('', () => {
+  let statement = `&if defined(OpenEdge_12_8) gt 0 &then
+                                                                    TokenResolver:Resolve("integrate-$~{t.YMD}-$~{t.HMS}.csv"))
+&else
+                                                                    TokenResolver:Resolve("integrate-$~{T.YYYY}$~{T.MM}$~{T.DD}-$~{T.HH}$~{T.MMM}$~{T.SS}.csv"))
+&endif`;
+  let expectedTokens = [
+    [
+      { "startIndex": 0, "endIndex": 1, "scopes": ["source.abl", "punctuation.definition.preprocessor.abl"] },  // '&'
+      { "startIndex": 1, "endIndex": 3, "scopes": ["source.abl", "keyword.control.directive.conditional.abl"] },  // 'if'
+      { "startIndex": 3, "endIndex": 4, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 4, "endIndex": 11, "scopes": ["source.abl", "storage.type.function.abl"] },  // 'defined'
+      { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 12, "endIndex": 25, "scopes": ["source.abl", "entity.name.function.preprocessor.abl"] },  // 'OpenEdge_12_8'
+      { "startIndex": 25, "endIndex": 26, "scopes": ["source.abl", "meta.brace.round.js"] },  // ')'
+      { "startIndex": 26, "endIndex": 27, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 27, "endIndex": 29, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // 'gt'
+      { "startIndex": 29, "endIndex": 30, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 30, "endIndex": 31, "scopes": ["source.abl", "constant.numeric.source.abl"] },  // '0'
+      { "startIndex": 31, "endIndex": 32, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 32, "endIndex": 33, "scopes": ["source.abl", "punctuation.definition.preprocessor.abl"] },  // '&'
+      { "startIndex": 33, "endIndex": 37, "scopes": ["source.abl", "keyword.control.directive.conditional.abl"] }  // 'then'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 68, "scopes": ["source.abl"] },  // '                                                                    '
+      { "startIndex": 68, "endIndex": 81, "scopes": ["source.abl", "variable.other.abl"] },  // 'TokenResolver'
+      { "startIndex": 81, "endIndex": 82, "scopes": ["source.abl", "punctuation.separator.colon.abl"] },  // ':'
+      { "startIndex": 82, "endIndex": 89, "scopes": ["source.abl", "entity.name.function.abl"] },  // 'Resolve'
+      { "startIndex": 89, "endIndex": 90, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 90, "endIndex": 91, "scopes": ["source.abl", "meta.function.arguments.abl", "string.quoted.double.abl", "punctuation.definition.string.begin.abl"] },  // '"'
+      { "startIndex": 91, "endIndex": 102, "scopes": ["source.abl", "meta.function.arguments.abl", "string.quoted.double.abl"] },  // 'integrate-$'
+      { "startIndex": 102, "endIndex": 104, "scopes": ["source.abl", "meta.function.arguments.abl", "string.quoted.double.abl", "constant.character.escape.abl"] },  // '~{'
+      { "startIndex": 104, "endIndex": 112, "scopes": ["source.abl", "meta.function.arguments.abl", "string.quoted.double.abl"] },  // 't.YMD}-$'
+      { "startIndex": 112, "endIndex": 114, "scopes": ["source.abl", "meta.function.arguments.abl", "string.quoted.double.abl", "constant.character.escape.abl"] },  // '~{'
+      { "startIndex": 114, "endIndex": 124, "scopes": ["source.abl", "meta.function.arguments.abl", "string.quoted.double.abl"] },  // 't.HMS}.csv'
+      { "startIndex": 124, "endIndex": 125, "scopes": ["source.abl", "meta.function.arguments.abl", "string.quoted.double.abl", "punctuation.definition.string.end.abl"] },  // '"'
+      { "startIndex": 125, "endIndex": 126, "scopes": ["source.abl", "meta.brace.round.js"] },  // ')'
+      { "startIndex": 126, "endIndex": 127, "scopes": ["source.abl", "meta.brace.round.js"] }  // ')'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 1, "scopes": ["source.abl", "punctuation.definition.preprocessor.abl"] },  // '&'
+      { "startIndex": 1, "endIndex": 5, "scopes": ["source.abl", "keyword.control.directive.conditional.abl"] }  // 'else'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 68, "scopes": ["source.abl"] },  // '                                                                    '
+      { "startIndex": 68, "endIndex": 81, "scopes": ["source.abl", "variable.other.abl"] },  // 'TokenResolver'
+      { "startIndex": 81, "endIndex": 82, "scopes": ["source.abl", "punctuation.separator.colon.abl"] },  // ':'
+      { "startIndex": 82, "endIndex": 89, "scopes": ["source.abl", "entity.name.function.abl"] },  // 'Resolve'
+      { "startIndex": 89, "endIndex": 90, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 90, "endIndex": 91, "scopes": ["source.abl", "meta.function.arguments.abl", "string.quoted.double.abl", "punctuation.definition.string.begin.abl"] },  // '"'
+      { "startIndex": 91, "endIndex": 102, "scopes": ["source.abl", "meta.function.arguments.abl", "string.quoted.double.abl"] },  // 'integrate-$'
+      { "startIndex": 102, "endIndex": 104, "scopes": ["source.abl", "meta.function.arguments.abl", "string.quoted.double.abl", "constant.character.escape.abl"] },  // '~{'
+      { "startIndex": 104, "endIndex": 112, "scopes": ["source.abl", "meta.function.arguments.abl", "string.quoted.double.abl"] },  // 'T.YYYY}$'
+      { "startIndex": 112, "endIndex": 114, "scopes": ["source.abl", "meta.function.arguments.abl", "string.quoted.double.abl", "constant.character.escape.abl"] },  // '~{'
+      { "startIndex": 114, "endIndex": 120, "scopes": ["source.abl", "meta.function.arguments.abl", "string.quoted.double.abl"] },  // 'T.MM}$'
+      { "startIndex": 120, "endIndex": 122, "scopes": ["source.abl", "meta.function.arguments.abl", "string.quoted.double.abl", "constant.character.escape.abl"] },  // '~{'
+      { "startIndex": 122, "endIndex": 129, "scopes": ["source.abl", "meta.function.arguments.abl", "string.quoted.double.abl"] },  // 'T.DD}-$'
+      { "startIndex": 129, "endIndex": 131, "scopes": ["source.abl", "meta.function.arguments.abl", "string.quoted.double.abl", "constant.character.escape.abl"] },  // '~{'
+      { "startIndex": 131, "endIndex": 137, "scopes": ["source.abl", "meta.function.arguments.abl", "string.quoted.double.abl"] },  // 'T.HH}$'
+      { "startIndex": 137, "endIndex": 139, "scopes": ["source.abl", "meta.function.arguments.abl", "string.quoted.double.abl", "constant.character.escape.abl"] },  // '~{'
+      { "startIndex": 139, "endIndex": 146, "scopes": ["source.abl", "meta.function.arguments.abl", "string.quoted.double.abl"] },  // 'T.MMM}$'
+      { "startIndex": 146, "endIndex": 148, "scopes": ["source.abl", "meta.function.arguments.abl", "string.quoted.double.abl", "constant.character.escape.abl"] },  // '~{'
+      { "startIndex": 148, "endIndex": 157, "scopes": ["source.abl", "meta.function.arguments.abl", "string.quoted.double.abl"] },  // 'T.SS}.csv'
+      { "startIndex": 157, "endIndex": 158, "scopes": ["source.abl", "meta.function.arguments.abl", "string.quoted.double.abl", "punctuation.definition.string.end.abl"] },  // '"'
+      { "startIndex": 158, "endIndex": 159, "scopes": ["source.abl", "meta.brace.round.js"] },  // ')'
+      { "startIndex": 159, "endIndex": 160, "scopes": ["source.abl", "meta.brace.round.js"] }  // ')'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 1, "scopes": ["source.abl", "punctuation.definition.preprocessor.abl"] },  // '&'
+      { "startIndex": 1, "endIndex": 6, "scopes": ["source.abl", "keyword.control.directive.conditional.abl"] }  // 'endif'
+    ]
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})

package/spec/preprocesors/proparse-preprocessor.spec.js

@@ -6,7 +6,10 @@ describe('', () => {
 assign attrValue = BuildAttributeValue(string(attribNames[attribLoop]), annoData).`;
   let expectedTokens = [
     [
-      { "startIndex": 0, "endIndex": 38, "scopes": ["source.abl", "storage.type.function.abl"] }  // '{&_proparse_ prolint-nowarn(overflow)}'
+      { "startIndex": 0, "endIndex": 1, "scopes": ["source.abl", "meta.preprocessor.abl", "punctuation.section.abl"] },  // '{'
+      { "startIndex": 1, "endIndex": 2, "scopes": ["source.abl", "meta.preprocessor.abl", "punctuation.definition.preprocessor.abl"] },  // '&'
+      { "startIndex": 2, "endIndex": 37, "scopes": ["source.abl", "meta.preprocessor.abl", "entity.name.function.preprocessor.abl"] },  // '_proparse_ prolint-nowarn(overflow)'
+      { "startIndex": 37, "endIndex": 38, "scopes": ["source.abl", "meta.preprocessor.abl", "punctuation.section.abl"] }  // '}'
     ],
     [
       { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "keyword.other.abl"] },  // 'assign'
@@ -51,7 +54,10 @@ describe('', () => {
     { "startIndex": 36, "endIndex": 37, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
     { "startIndex": 37, "endIndex": 41, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'init'
     { "startIndex": 41, "endIndex": 42, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
-    { "startIndex": 42, "endIndex": 55, "scopes": ["source.abl", "meta.define.abl", "storage.type.function.abl"] },  // '{&DEBUG-WAIT}'
+    { "startIndex": 42, "endIndex": 43, "scopes": ["source.abl", "meta.define.abl", "meta.preprocessor.abl", "punctuation.section.abl"] },  // '{'
+    { "startIndex": 43, "endIndex": 44, "scopes": ["source.abl", "meta.define.abl", "meta.preprocessor.abl", "punctuation.definition.preprocessor.abl"] },  // '&'
+    { "startIndex": 44, "endIndex": 54, "scopes": ["source.abl", "meta.define.abl", "meta.preprocessor.abl", "entity.name.function.preprocessor.abl"] },  // 'DEBUG-WAIT'
+    { "startIndex": 54, "endIndex": 55, "scopes": ["source.abl", "meta.define.abl", "meta.preprocessor.abl", "punctuation.section.abl"] },  // '}'
     { "startIndex": 55, "endIndex": 56, "scopes": ["source.abl", "meta.define.abl", "punctuation.terminator.abl"] }  // '.'
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
@@ -60,7 +66,25 @@ describe('', () => {
 describe('', () => {
   let statement = `{&WINDOW-SYSTEM}`;
   let expectedTokens = [
-    { "startIndex": 0, "endIndex": 16, "scopes": ["source.abl", "storage.type.function.abl"] }  // '{&WINDOW-SYSTEM}'
+    { "startIndex": 0, "endIndex": 1, "scopes": ["source.abl", "meta.preprocessor.abl", "punctuation.section.abl"] },  // '{'
+    { "startIndex": 1, "endIndex": 2, "scopes": ["source.abl", "meta.preprocessor.abl", "punctuation.definition.preprocessor.abl"] },  // '&'
+    { "startIndex": 2, "endIndex": 15, "scopes": ["source.abl", "meta.preprocessor.abl", "entity.name.function.preprocessor.abl"] },  // 'WINDOW-SYSTEM'
+    { "startIndex": 15, "endIndex": 16, "scopes": ["source.abl", "meta.preprocessor.abl", "punctuation.section.abl"] }  // '}'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('Spaces before closing curly brace', () => {
+  let statement = `message {&WINDOW-SYSTEM  }.`;
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 7, "scopes": ["source.abl", "keyword.other.abl"] },  // 'message'
+    { "startIndex": 7, "endIndex": 8, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 8, "endIndex": 9, "scopes": ["source.abl", "meta.preprocessor.abl", "punctuation.section.abl"] },  // '{'
+    { "startIndex": 9, "endIndex": 10, "scopes": ["source.abl", "meta.preprocessor.abl", "punctuation.definition.preprocessor.abl"] },  // '&'
+    { "startIndex": 10, "endIndex": 23, "scopes": ["source.abl", "meta.preprocessor.abl", "entity.name.function.preprocessor.abl"] },  // 'WINDOW-SYSTEM'
+    { "startIndex": 23, "endIndex": 25, "scopes": ["source.abl", "meta.preprocessor.abl"] },  // '  '
+    { "startIndex": 25, "endIndex": 26, "scopes": ["source.abl", "meta.preprocessor.abl", "punctuation.section.abl"] },  // '}'
+    { "startIndex": 26, "endIndex": 27, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })

package/spec/procedure-definition/trigger-procedure.spec.js

@@ -16,14 +16,20 @@ describe('', () => {
     { "startIndex": 27, "endIndex": 28, "scopes": ["source.abl"] },  // ' '
     { "startIndex": 28, "endIndex": 30, "scopes": ["source.abl", "keyword.other.abl"] },  // 'of'
     { "startIndex": 30, "endIndex": 31, "scopes": ["source.abl"] },  // ' '
-    { "startIndex": 31, "endIndex": 38, "scopes": ["source.abl", "storage.type.function.abl"] },  // '{&file}'
+    { "startIndex": 31, "endIndex": 32, "scopes": ["source.abl", "meta.preprocessor.abl", "punctuation.section.abl"] },  // '{'
+    { "startIndex": 32, "endIndex": 33, "scopes": ["source.abl", "meta.preprocessor.abl", "punctuation.definition.preprocessor.abl"] },  // '&'
+    { "startIndex": 33, "endIndex": 37, "scopes": ["source.abl", "meta.preprocessor.abl", "entity.name.function.preprocessor.abl"] },  // 'file'
+    { "startIndex": 37, "endIndex": 38, "scopes": ["source.abl", "meta.preprocessor.abl", "punctuation.section.abl"] },  // '}'
     { "startIndex": 38, "endIndex": 39, "scopes": ["source.abl"] },  // ' '
     { "startIndex": 39, "endIndex": 42, "scopes": ["source.abl", "keyword.other.abl"] },  // 'old'
     { "startIndex": 42, "endIndex": 43, "scopes": ["source.abl"] },  // ' '
     { "startIndex": 43, "endIndex": 49, "scopes": ["source.abl", "keyword.other.abl"] },  // 'buffer'
     { "startIndex": 49, "endIndex": 50, "scopes": ["source.abl"] },  // ' '
     { "startIndex": 50, "endIndex": 54, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'old-'
-    { "startIndex": 54, "endIndex": 61, "scopes": ["source.abl", "storage.type.function.abl"] },  // '{&file}'
+    { "startIndex": 54, "endIndex": 55, "scopes": ["source.abl", "meta.preprocessor.abl", "punctuation.section.abl"] },  // '{'
+    { "startIndex": 55, "endIndex": 56, "scopes": ["source.abl", "meta.preprocessor.abl", "punctuation.definition.preprocessor.abl"] },  // '&'
+    { "startIndex": 56, "endIndex": 60, "scopes": ["source.abl", "meta.preprocessor.abl", "entity.name.function.preprocessor.abl"] },  // 'file'
+    { "startIndex": 60, "endIndex": 61, "scopes": ["source.abl", "meta.preprocessor.abl", "punctuation.section.abl"] },  // '}'
     { "startIndex": 61, "endIndex": 62, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);

package/spec/procedure-definition/vscode-abl-issue#22.spec.js

@@ -15,9 +15,9 @@ END PROCEDURE.`;
       { "startIndex": 29, "endIndex": 30, "scopes": ["source.abl", "meta.procedure.abl"] },  // ' '
       { "startIndex": 30, "endIndex": 38, "scopes": ["source.abl", "meta.procedure.abl", "keyword.other.abl"] },  // 'EXTERNAL'
       { "startIndex": 38, "endIndex": 39, "scopes": ["source.abl", "meta.procedure.abl"] },  // ' '
-      { "startIndex": 39, "endIndex": 40, "scopes": ["source.abl", "meta.procedure.abl", "string.double.complex.abl", "punctuation.definition.string.begin.abl"] },  // '"'
-      { "startIndex": 40, "endIndex": 52, "scopes": ["source.abl", "meta.procedure.abl", "string.double.complex.abl"] },  // 'KERNEL32.DLL'
-      { "startIndex": 52, "endIndex": 53, "scopes": ["source.abl", "meta.procedure.abl", "string.double.complex.abl", "punctuation.definition.string.end.abl"] },  // '"'
+      { "startIndex": 39, "endIndex": 40, "scopes": ["source.abl", "meta.procedure.abl", "string.quoted.double.abl", "punctuation.definition.string.begin.abl"] },  // '"'
+      { "startIndex": 40, "endIndex": 52, "scopes": ["source.abl", "meta.procedure.abl", "string.quoted.double.abl"] },  // 'KERNEL32.DLL'
+      { "startIndex": 52, "endIndex": 53, "scopes": ["source.abl", "meta.procedure.abl", "string.quoted.double.abl", "punctuation.definition.string.end.abl"] },  // '"'
       { "startIndex": 53, "endIndex": 54, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // ':'
     ],
     [

package/spec/procedure-definition/vscode-abl-issue#26.spec.js

@@ -11,10 +11,10 @@ end procedure.`;
     [
       { "startIndex": 0, "endIndex": 9, "scopes": ["source.abl", "keyword.other.abl"] },  // 'procedure'
       { "startIndex": 9, "endIndex": 10, "scopes": ["source.abl"] },  // ' '
-      { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl", "string.single.complex.abl", "punctuation.definition.string.begin.abl"] },  // '''
-      { "startIndex": 11, "endIndex": 38, "scopes": ["source.abl", "string.single.complex.abl"] },  // 'TpFrame.TaskPanel.ItemClick'
-      { "startIndex": 38, "endIndex": 39, "scopes": ["source.abl", "string.single.complex.abl", "punctuation.definition.string.end.abl"] },  // '''
-      { "startIndex": 39, "endIndex": 41, "scopes": ["source.abl", "string.single.complex.abl", "support.other.abl"] },  // ':U'
+      { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl", "string.quoted.single.abl", "punctuation.definition.string.begin.abl"] },  // '''
+      { "startIndex": 11, "endIndex": 38, "scopes": ["source.abl", "string.quoted.single.abl"] },  // 'TpFrame.TaskPanel.ItemClick'
+      { "startIndex": 38, "endIndex": 39, "scopes": ["source.abl", "string.quoted.single.abl", "punctuation.definition.string.end.abl"] },  // '''
+      { "startIndex": 39, "endIndex": 41, "scopes": ["source.abl", "string.quoted.single.abl", "support.other.abl"] },  // ':U'
       { "startIndex": 41, "endIndex": 42, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // ':'
     ],
     [