abl-tmlanguage 1.3.9 → 1.3.11

package/spec/method-definition/method.spec.js

@@ -354,4 +354,188 @@ METHOD STATIC LOGICAL XlsxVersCsv
     ]
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  // This test is to validate that STATIC, PRIVATE and LOGICAL are scoped correctly.
+  let statement = `METHOD
+STATIC
+PRIVATE
+LOGICAL
+XlsxVersCsv
+(p-file AS CHARACTER,p-sheetnum AS INT ):`;
+
+  let expectedTokens = [
+    [
+      { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "meta.define.method.abl", "keyword.other.abl"] }  // 'METHOD'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "meta.define.method.abl", "keyword.other.abl"] }  // 'STATIC'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 7, "scopes": ["source.abl", "meta.define.method.abl", "keyword.other.abl"] }  // 'PRIVATE'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 7, "scopes": ["source.abl", "meta.define.method.abl", "storage.type.abl"] }  // 'LOGICAL'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 11, "scopes": ["source.abl", "meta.define.method.abl", "entity.name.function.abl"] }  // 'XlsxVersCsv'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 1, "scopes": ["source.abl", "meta.define.method.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 1, "endIndex": 7, "scopes": ["source.abl", "meta.define.method.abl", "variable.parameter.abl"] },  // 'p-file'
+      { "startIndex": 7, "endIndex": 8, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
+      { "startIndex": 8, "endIndex": 10, "scopes": ["source.abl", "meta.define.method.abl", "keyword.other.abl"] },  // 'AS'
+      { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
+      { "startIndex": 11, "endIndex": 20, "scopes": ["source.abl", "meta.define.method.abl", "storage.type.abl"] },  // 'CHARACTER'
+      { "startIndex": 20, "endIndex": 21, "scopes": ["source.abl", "meta.define.method.abl", "punctuation.separator.comma.abl"] },  // ','
+      { "startIndex": 21, "endIndex": 31, "scopes": ["source.abl", "meta.define.method.abl", "variable.parameter.abl"] },  // 'p-sheetnum'
+      { "startIndex": 31, "endIndex": 32, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
+      { "startIndex": 32, "endIndex": 34, "scopes": ["source.abl", "meta.define.method.abl", "keyword.other.abl"] },  // 'AS'
+      { "startIndex": 34, "endIndex": 35, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
+      { "startIndex": 35, "endIndex": 38, "scopes": ["source.abl", "meta.define.method.abl", "storage.type.abl"] },  // 'INT'
+      { "startIndex": 38, "endIndex": 39, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
+      { "startIndex": 39, "endIndex": 40, "scopes": ["source.abl", "meta.define.method.abl", "meta.brace.round.js"] },  // ')'
+      { "startIndex": 40, "endIndex": 41, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // ':'
+    ]
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  // This test is to validate that STATIC, PRIVATE and LOGICAL are scoped correctly.
+  let statement = `METHOD
+STATIC
+PRIVATE
+VOID
+XlsxVersCsv
+(p-file AS CHARACTER,p-sheetnum AS INT ):`;
+
+  let expectedTokens = [
+    [
+      { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "meta.define.method.abl", "keyword.other.abl"] },  // 'METHOD'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "meta.define.method.abl", "keyword.other.abl"] },  // 'STATIC'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 7, "scopes": ["source.abl", "meta.define.method.abl", "keyword.other.abl"] },  // 'PRIVATE'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl", "meta.define.method.abl", "keyword.other.abl"] },  // 'VOID'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 11, "scopes": ["source.abl", "meta.define.method.abl", "entity.name.function.abl"] },  // 'XlsxVersCsv'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 1, "scopes": ["source.abl", "meta.define.method.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 1, "endIndex": 7, "scopes": ["source.abl", "meta.define.method.abl", "variable.parameter.abl"] },  // 'p-file'
+      { "startIndex": 7, "endIndex": 8, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
+      { "startIndex": 8, "endIndex": 10, "scopes": ["source.abl", "meta.define.method.abl", "keyword.other.abl"] },  // 'AS'
+      { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
+      { "startIndex": 11, "endIndex": 20, "scopes": ["source.abl", "meta.define.method.abl", "storage.type.abl"] },  // 'CHARACTER'
+      { "startIndex": 20, "endIndex": 21, "scopes": ["source.abl", "meta.define.method.abl", "punctuation.separator.comma.abl"] },  // ','
+      { "startIndex": 21, "endIndex": 31, "scopes": ["source.abl", "meta.define.method.abl", "variable.parameter.abl"] },  // 'p-sheetnum'
+      { "startIndex": 31, "endIndex": 32, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
+      { "startIndex": 32, "endIndex": 34, "scopes": ["source.abl", "meta.define.method.abl", "keyword.other.abl"] },  // 'AS'
+      { "startIndex": 34, "endIndex": 35, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
+      { "startIndex": 35, "endIndex": 38, "scopes": ["source.abl", "meta.define.method.abl", "storage.type.abl"] },  // 'INT'
+      { "startIndex": 38, "endIndex": 39, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
+      { "startIndex": 39, "endIndex": 40, "scopes": ["source.abl", "meta.define.method.abl", "meta.brace.round.js"] },  // ')'
+      { "startIndex": 40, "endIndex": 41, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // ':'
+    ]
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  // This test is to validate that STATIC and PRIVATE are scoped correctly. The return type will be scoped as a function, not a type
+  let statement = `METHOD
+STATIC
+PRIVATE
+SomeClass
+XlsxVersCsv
+(p-file AS CHARACTER,p-sheetnum AS INT ):`;
+
+  let expectedTokens = [
+    [
+      { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "meta.define.method.abl", "keyword.other.abl"] }  // 'METHOD'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "meta.define.method.abl", "keyword.other.abl"] }  // 'STATIC'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 7, "scopes": ["source.abl", "meta.define.method.abl", "keyword.other.abl"] }  // 'PRIVATE'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 9, "scopes": ["source.abl", "meta.define.method.abl", "entity.name.function.abl"] }  // 'SomeClass'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 11, "scopes": ["source.abl", "meta.define.method.abl", "entity.name.function.abl"] }  // 'XlsxVersCsv'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 1, "scopes": ["source.abl", "meta.define.method.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 1, "endIndex": 7, "scopes": ["source.abl", "meta.define.method.abl", "variable.parameter.abl"] },  // 'p-file'
+      { "startIndex": 7, "endIndex": 8, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
+      { "startIndex": 8, "endIndex": 10, "scopes": ["source.abl", "meta.define.method.abl", "keyword.other.abl"] },  // 'AS'
+      { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
+      { "startIndex": 11, "endIndex": 20, "scopes": ["source.abl", "meta.define.method.abl", "storage.type.abl"] },  // 'CHARACTER'
+      { "startIndex": 20, "endIndex": 21, "scopes": ["source.abl", "meta.define.method.abl", "punctuation.separator.comma.abl"] },  // ','
+      { "startIndex": 21, "endIndex": 31, "scopes": ["source.abl", "meta.define.method.abl", "variable.parameter.abl"] },  // 'p-sheetnum'
+      { "startIndex": 31, "endIndex": 32, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
+      { "startIndex": 32, "endIndex": 34, "scopes": ["source.abl", "meta.define.method.abl", "keyword.other.abl"] },  // 'AS'
+      { "startIndex": 34, "endIndex": 35, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
+      { "startIndex": 35, "endIndex": 38, "scopes": ["source.abl", "meta.define.method.abl", "storage.type.abl"] },  // 'INT'
+      { "startIndex": 38, "endIndex": 39, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
+      { "startIndex": 39, "endIndex": 40, "scopes": ["source.abl", "meta.define.method.abl", "meta.brace.round.js"] },  // ')'
+      { "startIndex": 40, "endIndex": 41, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // ':'
+    ]
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  // This test is to validate that STATIC, PRIVATE and return type are scoped correctly.
+  let statement = `METHOD
+STATIC
+PRIVATE
+Package.SomeClass
+XlsxVersCsv
+(p-file AS CHARACTER,p-sheetnum AS INT ):`;
+
+  let expectedTokens = [
+    [
+      { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "meta.define.method.abl", "keyword.other.abl"] }  // 'METHOD'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "meta.define.method.abl", "keyword.other.abl"] }  // 'STATIC'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 7, "scopes": ["source.abl", "meta.define.method.abl", "keyword.other.abl"] }  // 'PRIVATE'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 17, "scopes": ["source.abl", "meta.define.method.abl", "entity.name.type.abl"] }  // 'Package.SomeClass'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 11, "scopes": ["source.abl", "meta.define.method.abl", "entity.name.function.abl"] }  // 'XlsxVersCsv'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 1, "scopes": ["source.abl", "meta.define.method.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 1, "endIndex": 7, "scopes": ["source.abl", "meta.define.method.abl", "variable.parameter.abl"] },  // 'p-file'
+      { "startIndex": 7, "endIndex": 8, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
+      { "startIndex": 8, "endIndex": 10, "scopes": ["source.abl", "meta.define.method.abl", "keyword.other.abl"] },  // 'AS'
+      { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
+      { "startIndex": 11, "endIndex": 20, "scopes": ["source.abl", "meta.define.method.abl", "storage.type.abl"] },  // 'CHARACTER'
+      { "startIndex": 20, "endIndex": 21, "scopes": ["source.abl", "meta.define.method.abl", "punctuation.separator.comma.abl"] },  // ','
+      { "startIndex": 21, "endIndex": 31, "scopes": ["source.abl", "meta.define.method.abl", "variable.parameter.abl"] },  // 'p-sheetnum'
+      { "startIndex": 31, "endIndex": 32, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
+      { "startIndex": 32, "endIndex": 34, "scopes": ["source.abl", "meta.define.method.abl", "keyword.other.abl"] },  // 'AS'
+      { "startIndex": 34, "endIndex": 35, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
+      { "startIndex": 35, "endIndex": 38, "scopes": ["source.abl", "meta.define.method.abl", "storage.type.abl"] },  // 'INT'
+      { "startIndex": 38, "endIndex": 39, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
+      { "startIndex": 39, "endIndex": 40, "scopes": ["source.abl", "meta.define.method.abl", "meta.brace.round.js"] },  // ')'
+      { "startIndex": 40, "endIndex": 41, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // ':'
+    ]
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })

package/spec/misc-statements/array-for.spec.js

@@ -7,13 +7,13 @@ describe('', () => {
     { "startIndex": 0, "endIndex": 7, "scopes": ["source.abl", "keyword.other.abl"] },  // 'DISPLAY'
     { "startIndex": 7, "endIndex": 8, "scopes": ["source.abl"] },  // ' '
     { "startIndex": 8, "endIndex": 15, "scopes": ["source.abl", "variable.other.abl"] },  // 'myArray'
-    { "startIndex": 15, "endIndex": 16, "scopes": ["source.abl", "meta.array.literal.abl", "meta.brace.square.abl"] },  // '['
+    { "startIndex": 15, "endIndex": 16, "scopes": ["source.abl", "meta.array.literal.abl", "punctuation.definition.bracket.square.begin.abl"] },  // '['
     { "startIndex": 16, "endIndex": 17, "scopes": ["source.abl", "meta.array.literal.abl", "constant.numeric.source.abl"] },  // '1'
     { "startIndex": 17, "endIndex": 18, "scopes": ["source.abl", "meta.array.literal.abl"] },  // ' '
     { "startIndex": 18, "endIndex": 21, "scopes": ["source.abl", "meta.array.literal.abl", "keyword.other.abl"] },  // 'FOR'
     { "startIndex": 21, "endIndex": 22, "scopes": ["source.abl", "meta.array.literal.abl"] },  // ' '
     { "startIndex": 22, "endIndex": 23, "scopes": ["source.abl", "meta.array.literal.abl", "constant.numeric.source.abl"] },  // '4'
-    { "startIndex": 23, "endIndex": 24, "scopes": ["source.abl", "meta.array.literal.abl", "meta.brace.square.abl"] },  // ']'
+    { "startIndex": 23, "endIndex": 24, "scopes": ["source.abl", "meta.array.literal.abl", "punctuation.definition.bracket.square.end.abl"] },  // ']'
     { "startIndex": 24, "endIndex": 25, "scopes": ["source.abl", "punctuation.terminator.abl"] },  // '.'
     { "startIndex": 25, "endIndex": 56, "scopes": ["source.abl", "comment.line.double-slash.abl"] }  // '// with and frame are variables'
   ];

package/spec/misc-statements/class-in-var-name.spec.js

@@ -168,7 +168,7 @@ END.`;
     [
       { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl"] },  // '	     '
       { "startIndex": 6, "endIndex": 8, "scopes": ["source.abl", "keyword.other.abl"] },  // 'IF'
-      { "startIndex": 8, "endIndex": 9, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 8, "endIndex": 9, "scopes": ["source.abl", "meta.function-call.abl"] },  // ' '
       { "startIndex": 9, "endIndex": 15, "scopes": ["source.abl", "meta.function-call.abl", "support.function.abl"] },  // 'LOOKUP'
       { "startIndex": 15, "endIndex": 16, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
       { "startIndex": 16, "endIndex": 33, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "storage.data.table.abl"] },  // 'hist-trn.h-status'

package/spec/misc-statements/if-then.spec.js

@@ -149,7 +149,7 @@ describe('', () => {
   let statement = `if string(1) = "1" then .`;
   let expectedTokens = [
     { "startIndex": 0, "endIndex": 2, "scopes": ["source.abl", "keyword.other.abl"] },  // 'if'
-    { "startIndex": 2, "endIndex": 3, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 2, "endIndex": 3, "scopes": ["source.abl", "meta.function-call.abl"] },  // ' '
     { "startIndex": 3, "endIndex": 9, "scopes": ["source.abl", "meta.function-call.abl", "support.function.abl"] },  // 'string'
     { "startIndex": 9, "endIndex": 10, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
     { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "constant.numeric.source.abl"] },  // '1'
@@ -168,7 +168,6 @@ describe('', () => {
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })
 
-
 describe('', () => {
   let statement = `if this-object:MethodName /* ticket-id */ and
   valid-handlE(hDataset) then
@@ -210,3 +209,155 @@ describe('', () => {
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })
 
+describe('', () => {
+  let statement = `    /* Point to a valid window handle. */
+    ASSIGN p_Window = IF VALID-HANDLE( p_Window ) THEN
+                        p_Window
+                      ELSE IF VALID-HANDLE( CURRENT-WINDOW ) THEN
+                        CURRENT-WINDOW
+                      ELSE
+                         DEFAULT-WINDOW.`;
+  let expectedTokens = [
+    [
+      { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl"] },  // '    '
+      { "startIndex": 4, "endIndex": 6, "scopes": ["source.abl", "comment.block.source.abl"] },  // '/*'
+      { "startIndex": 6, "endIndex": 39, "scopes": ["source.abl", "comment.block.source.abl", "comment"] },  // ' Point to a valid window handle. '
+      { "startIndex": 39, "endIndex": 41, "scopes": ["source.abl", "comment.block.source.abl"] }  // '*/'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl"] },  // '    '
+      { "startIndex": 4, "endIndex": 10, "scopes": ["source.abl", "keyword.other.abl"] },  // 'ASSIGN'
+      { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 11, "endIndex": 19, "scopes": ["source.abl", "variable.other.abl"] },  // 'p_Window'
+      { "startIndex": 19, "endIndex": 20, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 20, "endIndex": 21, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '='
+      { "startIndex": 21, "endIndex": 22, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 22, "endIndex": 24, "scopes": ["source.abl", "keyword.other.abl"] },  // 'IF'
+      { "startIndex": 24, "endIndex": 25, "scopes": ["source.abl", "meta.function-call.abl"] },  // ' '
+      { "startIndex": 25, "endIndex": 37, "scopes": ["source.abl", "meta.function-call.abl", "support.function.abl"] },  // 'VALID-HANDLE'
+      { "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"] },  // ' '
+      { "startIndex": 39, "endIndex": 47, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'p_Window'
+      { "startIndex": 47, "endIndex": 48, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl"] },  // ' '
+      { "startIndex": 48, "endIndex": 49, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] },  // ')'
+      { "startIndex": 49, "endIndex": 50, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 50, "endIndex": 54, "scopes": ["source.abl", "keyword.other.abl"] }  // 'THEN'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 24, "scopes": ["source.abl"] },  // '                        '
+      { "startIndex": 24, "endIndex": 32, "scopes": ["source.abl", "variable.other.abl"] }  // 'p_Window'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 22, "scopes": ["source.abl"] },  // '                      '
+      { "startIndex": 22, "endIndex": 26, "scopes": ["source.abl", "keyword.other.abl"] },  // 'ELSE'
+      { "startIndex": 26, "endIndex": 27, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 27, "endIndex": 29, "scopes": ["source.abl", "keyword.other.abl"] },  // 'IF'
+      { "startIndex": 29, "endIndex": 30, "scopes": ["source.abl", "meta.function-call.abl"] },  // ' '
+      { "startIndex": 30, "endIndex": 42, "scopes": ["source.abl", "meta.function-call.abl", "support.function.abl"] },  // 'VALID-HANDLE'
+      { "startIndex": 42, "endIndex": 43, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 43, "endIndex": 44, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl"] },  // ' '
+      { "startIndex": 44, "endIndex": 58, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "variable.language.abl"] },  // 'CURRENT-WINDOW'
+      { "startIndex": 58, "endIndex": 59, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl"] },  // ' '
+      { "startIndex": 59, "endIndex": 60, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] },  // ')'
+      { "startIndex": 60, "endIndex": 61, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 61, "endIndex": 65, "scopes": ["source.abl", "keyword.other.abl"] }  // 'THEN'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 24, "scopes": ["source.abl"] },  // '                        '
+      { "startIndex": 24, "endIndex": 38, "scopes": ["source.abl", "variable.language.abl"] }  // 'CURRENT-WINDOW'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 22, "scopes": ["source.abl"] },  // '                      '
+      { "startIndex": 22, "endIndex": 26, "scopes": ["source.abl", "keyword.other.abl"] }  // 'ELSE'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 25, "scopes": ["source.abl"] },  // '                         '
+      { "startIndex": 25, "endIndex": 39, "scopes": ["source.abl", "variable.language.abl"] },  // 'DEFAULT-WINDOW'
+      { "startIndex": 39, "endIndex": 40, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+    ]
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `IF (NOT PlanWeight AND StockSearchToSearchQtySKU <= StockSearchBrokenUpQtySKU) OR
+( PlanWeight AND StockSearchToSearchWeightNet <= StockSearchBrokenUpWeightNet ) THEN message 123.`;
+  let expectedTokens = [
+    [
+      { "startIndex": 0, "endIndex": 2, "scopes": ["source.abl", "keyword.other.abl"] },  // 'IF'
+      { "startIndex": 2, "endIndex": 3, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 3, "endIndex": 4, "scopes": ["source.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 4, "endIndex": 7, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // 'NOT'
+      { "startIndex": 7, "endIndex": 8, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 8, "endIndex": 18, "scopes": ["source.abl", "variable.other.abl"] },  // 'PlanWeight'
+      { "startIndex": 18, "endIndex": 19, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 19, "endIndex": 22, "scopes": ["source.abl", "keyword.other.abl"] },  // 'AND'
+      { "startIndex": 22, "endIndex": 23, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 23, "endIndex": 48, "scopes": ["source.abl", "variable.other.abl"] },  // 'StockSearchToSearchQtySKU'
+      { "startIndex": 48, "endIndex": 49, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 49, "endIndex": 51, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '<='
+      { "startIndex": 51, "endIndex": 52, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 52, "endIndex": 77, "scopes": ["source.abl", "variable.other.abl"] },  // 'StockSearchBrokenUpQtySKU'
+      { "startIndex": 77, "endIndex": 78, "scopes": ["source.abl", "meta.brace.round.js"] },  // ')'
+      { "startIndex": 78, "endIndex": 79, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 79, "endIndex": 81, "scopes": ["source.abl", "keyword.other.abl"] }  // 'OR'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 1, "scopes": ["source.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 1, "endIndex": 2, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 2, "endIndex": 12, "scopes": ["source.abl", "variable.other.abl"] },  // 'PlanWeight'
+      { "startIndex": 12, "endIndex": 13, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 13, "endIndex": 16, "scopes": ["source.abl", "keyword.other.abl"] },  // 'AND'
+      { "startIndex": 16, "endIndex": 17, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 17, "endIndex": 45, "scopes": ["source.abl", "variable.other.abl"] },  // 'StockSearchToSearchWeightNet'
+      { "startIndex": 45, "endIndex": 46, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 46, "endIndex": 48, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '<='
+      { "startIndex": 48, "endIndex": 49, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 49, "endIndex": 77, "scopes": ["source.abl", "variable.other.abl"] },  // 'StockSearchBrokenUpWeightNet'
+      { "startIndex": 77, "endIndex": 78, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 78, "endIndex": 79, "scopes": ["source.abl", "meta.brace.round.js"] },  // ')'
+      { "startIndex": 79, "endIndex": 80, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 80, "endIndex": 84, "scopes": ["source.abl", "keyword.other.abl"] },  // 'THEN'
+      { "startIndex": 84, "endIndex": 85, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 85, "endIndex": 92, "scopes": ["source.abl", "keyword.other.abl"] },  // 'message'
+      { "startIndex": 92, "endIndex": 93, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 93, "endIndex": 96, "scopes": ["source.abl", "constant.numeric.source.abl"] },  // '123'
+      { "startIndex": 96, "endIndex": 97, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+    ]
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `assign cFormattedString = cFormattedString + cChar
+       iFormattedLength = iFormattedLength + 1.`;
+  let expectedTokens = [
+    [
+      { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "keyword.other.abl"] },  // 'assign'
+      { "startIndex": 6, "endIndex": 7, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 7, "endIndex": 23, "scopes": ["source.abl", "variable.other.abl"] },  // 'cFormattedString'
+      { "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"] },  // ' '
+      { "startIndex": 26, "endIndex": 42, "scopes": ["source.abl", "variable.other.abl"] },  // 'cFormattedString'
+      { "startIndex": 42, "endIndex": 43, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 43, "endIndex": 44, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '+'
+      { "startIndex": 44, "endIndex": 45, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 45, "endIndex": 50, "scopes": ["source.abl", "variable.other.abl"] }  // 'cChar'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 7, "scopes": ["source.abl"] },  // '       '
+      { "startIndex": 7, "endIndex": 23, "scopes": ["source.abl", "variable.other.abl"] },  // 'iFormattedLength'
+      { "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"] },  // ' '
+      { "startIndex": 26, "endIndex": 42, "scopes": ["source.abl", "variable.other.abl"] },  // 'iFormattedLength'
+      { "startIndex": 42, "endIndex": 43, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 43, "endIndex": 44, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '+'
+      { "startIndex": 44, "endIndex": 45, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 45, "endIndex": 46, "scopes": ["source.abl", "constant.numeric.source.abl"] },  // '1'
+      { "startIndex": 46, "endIndex": 47, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+    ]
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})

package/spec/misc-statements/record-buffer-functions.spec.js

@@ -59,11 +59,11 @@ describe('', () => {
       { "startIndex": 3, "endIndex": 7, "scopes": ["source.abl", "keyword.other.abl"] },  // 'else'
       { "startIndex": 7, "endIndex": 8, "scopes": ["source.abl"] },  // ' '
       { "startIndex": 8, "endIndex": 10, "scopes": ["source.abl", "keyword.other.abl"] },  // 'if'
-      { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl"] },  // ' '
-      { "startIndex": 11, "endIndex": 20, "scopes": ["source.abl", "support.function.abl"] },  // 'ambiguous'
-      { "startIndex": 20, "endIndex": 21, "scopes": ["source.abl", "meta.brace.round.js"] },  // '('
-      { "startIndex": 21, "endIndex": 34, "scopes": ["source.abl", "support.data.table.abl"] },  // 's2k.bCustomer'
-      { "startIndex": 34, "endIndex": 35, "scopes": ["source.abl", "meta.brace.round.js"] },  // ')'
+      { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl", "meta.function-call.abl"] },  // ' '
+      { "startIndex": 11, "endIndex": 20, "scopes": ["source.abl", "meta.function-call.abl", "support.function.abl"] },  // 'ambiguous'
+      { "startIndex": 20, "endIndex": 21, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 21, "endIndex": 34, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "storage.data.table.abl"] },  // 's2k.bCustomer'
+      { "startIndex": 34, "endIndex": 35, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] },  // ')'
       { "startIndex": 35, "endIndex": 36, "scopes": ["source.abl"] },  // ' '
       { "startIndex": 36, "endIndex": 40, "scopes": ["source.abl", "keyword.other.abl"] },  // 'then'
       { "startIndex": 40, "endIndex": 41, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'

package/spec/operators/operators.spec.js

@@ -98,11 +98,11 @@ else if Not v_string matches "bar" then .`;
       { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl", "keyword.other.abl"] },  // 'else'
       { "startIndex": 4, "endIndex": 5, "scopes": ["source.abl"] },  // ' '
       { "startIndex": 5, "endIndex": 7, "scopes": ["source.abl", "keyword.other.abl"] },  // 'if'
-      { "startIndex": 7, "endIndex": 8, "scopes": ["source.abl"] },  // ' '
-      { "startIndex": 8, "endIndex": 11, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // 'NOT'
-      { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl", "meta.brace.round.js"] },  // '('
-      { "startIndex": 12, "endIndex": 23, "scopes": ["source.abl", "variable.other.abl"] },  // 'v_condition'
-      { "startIndex": 23, "endIndex": 24, "scopes": ["source.abl", "meta.brace.round.js"] },  // ')'
+      { "startIndex": 7, "endIndex": 8, "scopes": ["source.abl", "meta.function-call.abl"] },  // ' '
+      { "startIndex": 8, "endIndex": 11, "scopes": ["source.abl", "meta.function-call.abl", "support.function.abl"] },  // 'NOT'
+      { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 12, "endIndex": 23, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'v_condition'
+      { "startIndex": 23, "endIndex": 24, "scopes": ["source.abl", "meta.function-call.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/preprocesors/proparse-preprocessor.spec.js

@@ -20,9 +20,9 @@ assign attrValue = BuildAttributeValue(string(attribNames[attribLoop]), annoData
       { "startIndex": 39, "endIndex": 45, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.function-call.abl", "support.function.abl"] },  // 'string'
       { "startIndex": 45, "endIndex": 46, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.function-call.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
       { "startIndex": 46, "endIndex": 57, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.function-call.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'attribNames'
-      { "startIndex": 57, "endIndex": 58, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.function-call.abl", "meta.function.arguments.abl"] },  // '['
-      { "startIndex": 58, "endIndex": 68, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.function-call.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'attribLoop'
-      { "startIndex": 68, "endIndex": 69, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.function-call.abl", "meta.function.arguments.abl"] },  // ']'
+      { "startIndex": 57, "endIndex": 58, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.function-call.abl", "meta.function.arguments.abl", "meta.array.literal.abl", "punctuation.definition.bracket.square.begin.abl"] },  // '['
+      { "startIndex": 58, "endIndex": 68, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.function-call.abl", "meta.function.arguments.abl", "meta.array.literal.abl", "variable.other.abl"] },  // 'attribLoop'
+      { "startIndex": 68, "endIndex": 69, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.function-call.abl", "meta.function.arguments.abl", "meta.array.literal.abl", "punctuation.definition.bracket.square.end.abl"] },  // ']'
       { "startIndex": 69, "endIndex": 70, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.function-call.abl", "meta.brace.round.js"] },  // ')'
       { "startIndex": 70, "endIndex": 71, "scopes": ["source.abl", "meta.function.arguments.abl", "punctuation.separator.comma.abl"] },  // ','
       { "startIndex": 71, "endIndex": 72, "scopes": ["source.abl", "meta.function.arguments.abl"] },  // ' '

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

@@ -9,12 +9,12 @@ end procedure.`;
 
   let expectedTokens = [
     [
-      { "startIndex": 0, "endIndex": 9, "scopes": ["source.abl", "meta.procedure.abl", "keyword.other.abl"] },  // 'procedure'
-      { "startIndex": 9, "endIndex": 10, "scopes": ["source.abl", "meta.procedure.abl"] },  // ' '
-      { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl", "meta.procedure.abl", "string.single.complex.abl", "punctuation.definition.string.begin.abl"] },  // '''
-      { "startIndex": 11, "endIndex": 38, "scopes": ["source.abl", "meta.procedure.abl", "string.single.complex.abl"] },  // 'TpFrame.TaskPanel.ItemClick'
-      { "startIndex": 38, "endIndex": 39, "scopes": ["source.abl", "meta.procedure.abl", "string.single.complex.abl", "punctuation.definition.string.end.abl"] },  // '''
-      { "startIndex": 39, "endIndex": 41, "scopes": ["source.abl", "meta.procedure.abl", "string.single.complex.abl", "support.other.abl"] },  // ':U'
+      { "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": 41, "endIndex": 42, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // ':'
     ],
     [

package/spec/strings/translation-attribute.spec.js

@@ -9,7 +9,7 @@ describe('', () => {
   let expectedTokens = [
     [
       { "startIndex": 0, "endIndex": 2, "scopes": ["source.abl", "keyword.other.abl"] },  // 'if'
-      { "startIndex": 2, "endIndex": 3, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 2, "endIndex": 3, "scopes": ["source.abl", "meta.function-call.abl"] },  // ' '
       { "startIndex": 3, "endIndex": 15, "scopes": ["source.abl", "meta.function-call.abl", "support.function.abl"] },  // 'valid-object'
       { "startIndex": 15, "endIndex": 16, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
       { "startIndex": 16, "endIndex": 26, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'oEventArgs'

package/spec/type-name/parameter-as.spec.js

@@ -57,7 +57,7 @@ describe('', () => {
     { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "meta.define.method.abl", "keyword.other.abl"] },  // 'method'
     { "startIndex": 6, "endIndex": 7, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
     { "startIndex": 7, "endIndex": 13, "scopes": ["source.abl", "meta.define.method.abl", "keyword.other.abl"] },  // 'public'
-    { "startIndex": 13, "endIndex": 14, "scopes": ["source.abl", "meta.define.method.abl", "meta.generic.abl"] },  // ' '
+    { "startIndex": 13, "endIndex": 14, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
     { "startIndex": 14, "endIndex": 39, "scopes": ["source.abl", "meta.define.method.abl", "meta.generic.abl", "entity.name.type.abl"] },  // 'Progress.Collections.List'
     { "startIndex": 39, "endIndex": 40, "scopes": ["source.abl", "meta.define.method.abl", "meta.generic.abl", "punctuation.definition.generic.begin.abl"] },  // '<'
     { "startIndex": 40, "endIndex": 46, "scopes": ["source.abl", "meta.define.method.abl", "meta.generic.abl", "entity.name.type.abl"] },  // 'String'
@@ -84,7 +84,7 @@ describe('', () => {
     { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "meta.define.method.abl", "keyword.other.abl"] },  // 'method'
     { "startIndex": 6, "endIndex": 7, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
     { "startIndex": 7, "endIndex": 13, "scopes": ["source.abl", "meta.define.method.abl", "keyword.other.abl"] },  // 'public'
-    { "startIndex": 13, "endIndex": 14, "scopes": ["source.abl", "meta.define.method.abl", "meta.generic.abl"] },  // ' '
+    { "startIndex": 13, "endIndex": 14, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
     { "startIndex": 14, "endIndex": 39, "scopes": ["source.abl", "meta.define.method.abl", "meta.generic.abl", "entity.name.type.abl"] },  // 'Progress.Collections.List'
     { "startIndex": 39, "endIndex": 40, "scopes": ["source.abl", "meta.define.method.abl", "meta.generic.abl", "punctuation.definition.generic.begin.abl"] },  // '<'
     { "startIndex": 40, "endIndex": 46, "scopes": ["source.abl", "meta.define.method.abl", "meta.generic.abl", "entity.name.type.abl"] },  // 'String'
@@ -536,12 +536,12 @@ describe('', () => {
       { "startIndex": 44, "endIndex": 45, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // ':'
     ],
     [
-      { "startIndex": 0, "endIndex": 24, "scopes": ["source.abl"] },  // '                        '
-      { "startIndex": 24, "endIndex": 27, "scopes": ["source.abl", "keyword.other.abl"] },  // 'var'
-      { "startIndex": 27, "endIndex": 28, "scopes": ["source.abl"] },  // ' '
-      { "startIndex": 28, "endIndex": 31, "scopes": ["source.abl", "storage.type.abl"] },  // 'int'
-      { "startIndex": 31, "endIndex": 32, "scopes": ["source.abl"] },  // ' '
-      { "startIndex": 32, "endIndex": 33, "scopes": ["source.abl", "storage.type.abl"] },  // 'i'
+      { "startIndex": 0, "endIndex": 24, "scopes": ["source.abl", "meta.define.abl"] },  // '                        '
+      { "startIndex": 24, "endIndex": 27, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'var'
+      { "startIndex": 27, "endIndex": 28, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+      { "startIndex": 28, "endIndex": 31, "scopes": ["source.abl", "meta.define.abl", "storage.type.abl"] },  // 'int'
+      { "startIndex": 31, "endIndex": 32, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+      { "startIndex": 32, "endIndex": 33, "scopes": ["source.abl", "meta.define.abl", "variable.other.abl"] },  // 'i'
       { "startIndex": 33, "endIndex": 34, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
     ],
     [
@@ -889,7 +889,7 @@ describe('', () => {
     { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "meta.define.method.abl", "keyword.other.abl"] },  // 'method'
     { "startIndex": 6, "endIndex": 7, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
     { "startIndex": 7, "endIndex": 13, "scopes": ["source.abl", "meta.define.method.abl", "keyword.other.abl"] },  // 'public'
-    { "startIndex": 13, "endIndex": 14, "scopes": ["source.abl", "meta.define.method.abl", "meta.generic.abl"] },  // ' '
+    { "startIndex": 13, "endIndex": 14, "scopes": ["source.abl", "meta.define.method.abl"] },  // ' '
     { "startIndex": 14, "endIndex": 19, "scopes": ["source.abl", "meta.define.method.abl", "meta.generic.abl", "entity.name.type.abl"] },  // 'Tuple'
     { "startIndex": 19, "endIndex": 20, "scopes": ["source.abl", "meta.define.method.abl", "meta.generic.abl", "punctuation.definition.generic.begin.abl"] },  // '<'
     { "startIndex": 20, "endIndex": 23, "scopes": ["source.abl", "meta.define.method.abl", "meta.generic.abl", "entity.name.type.abl"] },  // 'foo'