abl-tmlanguage 1.1.3 → 1.3.0

package/spec/define-variable/issue#9.spec.js

@@ -2,38 +2,44 @@ const { assert, expect } = require('chai');
 const shared = require('../shared.js');
 
 describe('', () => {
-    //label-with-a-dot-inside.spec
-    let statement =
-`define frame f_sum
+  //label-with-a-dot-inside.spec
+  let statement =
+    `define frame f_sum
     xsuplan label 'Test.label' colon 58
     with row 4 centered.`;
-    let expectedTokens = [
-        [
-            {"startIndex":0,"endIndex":6,"scopes":["source.abl","meta.define.abl","keyword.other.abl"]},
-            {"startIndex":6,"endIndex":7,"scopes":["source.abl","meta.define.abl"]},
-            {"startIndex":7,"endIndex":12,"scopes":["source.abl","meta.define.abl","keyword.other.abl"]},
-            {"startIndex":12,"endIndex":19,"scopes":["source.abl","meta.define.abl"]}
-        ],[
-            {"startIndex":0,"endIndex":12,"scopes":["source.abl","meta.define.abl"]},
-            {"startIndex":12,"endIndex":17,"scopes":["source.abl","meta.define.abl","keyword.other.abl"]},
-            {"startIndex":17,"endIndex":18,"scopes":["source.abl","meta.define.abl"]},
-            {"startIndex":18,"endIndex":19,"scopes":["source.abl","meta.define.abl","string.single.complex.abl","punctuation.definition.string.begin.abl"]},
-            {"startIndex":19,"endIndex":29,"scopes":["source.abl","meta.define.abl","string.single.complex.abl"]},
-            {"startIndex":29,"endIndex":30,"scopes":["source.abl","meta.define.abl","string.single.complex.abl","punctuation.definition.string.end.abl"]},
-            {"startIndex":30,"endIndex":31,"scopes":["source.abl","meta.define.abl"]},
-            {"startIndex":31,"endIndex":36,"scopes":["source.abl","meta.define.abl","keyword.other.abl"]},
-            {"startIndex":36,"endIndex":37,"scopes":["source.abl","meta.define.abl"]},
-            {"startIndex":37,"endIndex":39,"scopes":["source.abl","meta.define.abl","constant.numeric.source.abl"]}
-        ],[
-            {"startIndex":0,"endIndex":4,"scopes":["source.abl","meta.define.abl"]},
-            {"startIndex":4,"endIndex":8,"scopes":["source.abl","meta.define.abl","keyword.other.abl"]},
-            {"startIndex":8,"endIndex":9,"scopes":["source.abl","meta.define.abl"]},
-            {"startIndex":9,"endIndex":12,"scopes":["source.abl","meta.define.abl","keyword.other.abl"]},
-            {"startIndex":12,"endIndex":13,"scopes":["source.abl","meta.define.abl"]},
-            {"startIndex":13,"endIndex":14,"scopes":["source.abl","meta.define.abl","constant.numeric.source.abl"]},
-            {"startIndex":14,"endIndex":15,"scopes":["source.abl","meta.define.abl"]},
-            {"startIndex":15,"endIndex":23,"scopes":["source.abl","meta.define.abl","keyword.other.abl"]},
-            {"startIndex":23,"endIndex":24,"scopes":["source.abl","punctuation.terminator.abl"]}
-        ]];
-    shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+  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": 12, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'frame'
+      { "startIndex": 12, "endIndex": 13, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+      { "startIndex": 13, "endIndex": 18, "scopes": ["source.abl", "meta.define.abl", "variable.other.abl"] }  // 'f_sum'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl", "meta.define.abl"] },  // '    '
+      { "startIndex": 4, "endIndex": 11, "scopes": ["source.abl", "meta.define.abl", "variable.other.abl"] },  // 'xsuplan'
+      { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+      { "startIndex": 12, "endIndex": 17, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'label'
+      { "startIndex": 17, "endIndex": 18, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+      { "startIndex": 18, "endIndex": 19, "scopes": ["source.abl", "meta.define.abl", "string.single.complex.abl", "punctuation.definition.string.begin.abl"] },  // '''
+      { "startIndex": 19, "endIndex": 29, "scopes": ["source.abl", "meta.define.abl", "string.single.complex.abl"] },  // 'Test.label'
+      { "startIndex": 29, "endIndex": 30, "scopes": ["source.abl", "meta.define.abl", "string.single.complex.abl", "punctuation.definition.string.end.abl"] },  // '''
+      { "startIndex": 30, "endIndex": 31, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+      { "startIndex": 31, "endIndex": 36, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'colon'
+      { "startIndex": 36, "endIndex": 37, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+      { "startIndex": 37, "endIndex": 39, "scopes": ["source.abl", "meta.define.abl", "constant.numeric.source.abl"] }  // '58'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl", "meta.define.abl"] },  // '    '
+      { "startIndex": 4, "endIndex": 8, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'with'
+      { "startIndex": 8, "endIndex": 9, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+      { "startIndex": 9, "endIndex": 12, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'row'
+      { "startIndex": 12, "endIndex": 13, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+      { "startIndex": 13, "endIndex": 14, "scopes": ["source.abl", "meta.define.abl", "constant.numeric.source.abl"] },  // '4'
+      { "startIndex": 14, "endIndex": 15, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+      { "startIndex": 15, "endIndex": 23, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'centered'
+      { "startIndex": 23, "endIndex": 24, "scopes": ["source.abl", "meta.define.abl", "punctuation.terminator.abl"] }  // '.'
+    ]
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })

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

@@ -2,99 +2,180 @@ const { assert, expect } = require('chai');
 const shared = require('../shared.js');
 
 describe('', () => {
-    let statement = `define variable variable-name as int no-undo.`;
-    let expectedTokens = [
-        { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },
-        { "startIndex": 6, "endIndex": 7, "scopes": ["source.abl", "meta.define.abl"] },
-        { "startIndex": 7, "endIndex": 15, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "keyword.other.abl"] },
-        { "startIndex": 15, "endIndex": 16, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 16, "endIndex": 29, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "variable.other.abl"] },
-        { "startIndex": 29, "endIndex": 30, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 30, "endIndex": 32, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "keyword.other.abl"] },
-        { "startIndex": 32, "endIndex": 33, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 33, "endIndex": 36, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "storage.type.abl"] },
-        { "startIndex": 36, "endIndex": 37, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 37, "endIndex": 44, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "keyword.other.abl"] },
-        { "startIndex": 44, "endIndex": 45, "scopes": ["source.abl", "punctuation.terminator.abl"] }
-    ];
-    shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+  let statement = `define variable variable-name as int no-undo.`;
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },
+    { "startIndex": 6, "endIndex": 7, "scopes": ["source.abl", "meta.define.abl"] },
+    { "startIndex": 7, "endIndex": 15, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },
+    { "startIndex": 15, "endIndex": 16, "scopes": ["source.abl", "meta.define.abl"] },
+    { "startIndex": 16, "endIndex": 29, "scopes": ["source.abl", "meta.define.abl", "variable.other.abl"] },
+    { "startIndex": 29, "endIndex": 30, "scopes": ["source.abl", "meta.define.abl"] },
+    { "startIndex": 30, "endIndex": 32, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },
+    { "startIndex": 32, "endIndex": 33, "scopes": ["source.abl", "meta.define.abl"] },
+    { "startIndex": 33, "endIndex": 36, "scopes": ["source.abl", "meta.define.abl", "storage.type.abl"] },
+    { "startIndex": 36, "endIndex": 37, "scopes": ["source.abl", "meta.define.abl"] },
+    { "startIndex": 37, "endIndex": 44, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },
+    { "startIndex": 44, "endIndex": 45, "scopes": ["source.abl", "meta.define.abl", "punctuation.terminator.abl"] }
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })
 describe('', () => {
-    let statement = `def var variable-name as int no-undo.`;
-    let expectedTokens = [
-        { "startIndex": 0, "endIndex": 3, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },
-        { "startIndex": 3, "endIndex": 4, "scopes": ["source.abl", "meta.define.abl"] },
-        { "startIndex": 4, "endIndex": 7, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "keyword.other.abl"] },
-        { "startIndex": 7, "endIndex": 8, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 8, "endIndex": 21, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "variable.other.abl"] },
-        { "startIndex": 21, "endIndex": 22, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 22, "endIndex": 24, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "keyword.other.abl"] },
-        { "startIndex": 24, "endIndex": 25, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 25, "endIndex": 28, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "storage.type.abl"] },
-        { "startIndex": 28, "endIndex": 29, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 29, "endIndex": 36, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "keyword.other.abl"] },
-        { "startIndex": 36, "endIndex": 37, "scopes": ["source.abl", "punctuation.terminator.abl"] }
-    ];
-    shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+  let statement = `def var variable-name as int no-undo.`;
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 3, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },
+    { "startIndex": 3, "endIndex": 4, "scopes": ["source.abl", "meta.define.abl"] },
+    { "startIndex": 4, "endIndex": 7, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },
+    { "startIndex": 7, "endIndex": 8, "scopes": ["source.abl", "meta.define.abl"] },
+    { "startIndex": 8, "endIndex": 21, "scopes": ["source.abl", "meta.define.abl", "variable.other.abl"] },
+    { "startIndex": 21, "endIndex": 22, "scopes": ["source.abl", "meta.define.abl"] },
+    { "startIndex": 22, "endIndex": 24, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },
+    { "startIndex": 24, "endIndex": 25, "scopes": ["source.abl", "meta.define.abl"] },
+    { "startIndex": 25, "endIndex": 28, "scopes": ["source.abl", "meta.define.abl", "storage.type.abl"] },
+    { "startIndex": 28, "endIndex": 29, "scopes": ["source.abl", "meta.define.abl"] },
+    { "startIndex": 29, "endIndex": 36, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },
+    { "startIndex": 36, "endIndex": 37, "scopes": ["source.abl", "meta.define.abl", "punctuation.terminator.abl"] }
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })
 describe('', () => {
-    let statement = `def new shared var variable-name as int no-undo.`;
-    let expectedTokens = [
-        { "startIndex": 0, "endIndex": 3, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },
-        { "startIndex": 3, "endIndex": 4, "scopes": ["source.abl", "meta.define.abl"] },
-        { "startIndex": 4, "endIndex": 7, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "keyword.other.abl"] },
-        { "startIndex": 7, "endIndex": 8, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 8, "endIndex": 14, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "keyword.other.abl"] },
-        { "startIndex": 14, "endIndex": 15, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 15, "endIndex": 18, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "keyword.other.abl"] },
-        { "startIndex": 18, "endIndex": 19, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 19, "endIndex": 32, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "variable.other.abl"] },
-        { "startIndex": 32, "endIndex": 33, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 33, "endIndex": 35, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "keyword.other.abl"] },
-        { "startIndex": 35, "endIndex": 36, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 36, "endIndex": 39, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "storage.type.abl"] },
-        { "startIndex": 39, "endIndex": 40, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 40, "endIndex": 47, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "keyword.other.abl"] },
-        { "startIndex": 47, "endIndex": 48, "scopes": ["source.abl", "punctuation.terminator.abl"] }
-    ];
-    shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+  let statement = `def new shared var variable-name as int no-undo.`;
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 3, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'def'
+    { "startIndex": 3, "endIndex": 4, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 4, "endIndex": 7, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'new'
+    { "startIndex": 7, "endIndex": 8, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 8, "endIndex": 14, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'shared'
+    { "startIndex": 14, "endIndex": 15, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 15, "endIndex": 18, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'var'
+    { "startIndex": 18, "endIndex": 19, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 19, "endIndex": 32, "scopes": ["source.abl", "meta.define.abl", "variable.other.abl"] },  // 'variable-name'
+    { "startIndex": 32, "endIndex": 33, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 33, "endIndex": 35, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'as'
+    { "startIndex": 35, "endIndex": 36, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 36, "endIndex": 39, "scopes": ["source.abl", "meta.define.abl", "storage.type.abl"] },  // 'int'
+    { "startIndex": 39, "endIndex": 40, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 40, "endIndex": 47, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'no-undo'
+    { "startIndex": 47, "endIndex": 48, "scopes": ["source.abl", "meta.define.abl", "punctuation.terminator.abl"] }  // '.'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })
 describe('', () => {
-    let statement = `def shared var variable-name as int no-undo.`;
-    let expectedTokens = [
-        { "startIndex": 0, "endIndex": 3, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },
-        { "startIndex": 3, "endIndex": 4, "scopes": ["source.abl", "meta.define.abl"] },
-        { "startIndex": 4, "endIndex": 10, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "keyword.other.abl"] },
-        { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 11, "endIndex": 14, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "keyword.other.abl"] },
-        { "startIndex": 14, "endIndex": 15, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 15, "endIndex": 28, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "variable.other.abl"] },
-        { "startIndex": 28, "endIndex": 29, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 29, "endIndex": 31, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "keyword.other.abl"] },
-        { "startIndex": 31, "endIndex": 32, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 32, "endIndex": 35, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "storage.type.abl"] },
-        { "startIndex": 35, "endIndex": 36, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 36, "endIndex": 43, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "keyword.other.abl"] },
-        { "startIndex": 43, "endIndex": 44, "scopes": ["source.abl", "punctuation.terminator.abl"] }
-    ];
-    shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+  let statement = `def shared var variable-name as int no-undo.`;
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 3, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'def'
+    { "startIndex": 3, "endIndex": 4, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 4, "endIndex": 10, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'shared'
+    { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 11, "endIndex": 14, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'var'
+    { "startIndex": 14, "endIndex": 15, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 15, "endIndex": 28, "scopes": ["source.abl", "meta.define.abl", "variable.other.abl"] },  // 'variable-name'
+    { "startIndex": 28, "endIndex": 29, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 29, "endIndex": 31, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'as'
+    { "startIndex": 31, "endIndex": 32, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 32, "endIndex": 35, "scopes": ["source.abl", "meta.define.abl", "storage.type.abl"] },  // 'int'
+    { "startIndex": 35, "endIndex": 36, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 36, "endIndex": 43, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'no-undo'
+    { "startIndex": 43, "endIndex": 44, "scopes": ["source.abl", "meta.define.abl", "punctuation.terminator.abl"] }  // '.'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })
+
+describe('', () => {
+  let statement = `def var variable-name as int no-undo .`;
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 3, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },
+    { "startIndex": 3, "endIndex": 4, "scopes": ["source.abl", "meta.define.abl"] },
+    { "startIndex": 4, "endIndex": 7, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },
+    { "startIndex": 7, "endIndex": 8, "scopes": ["source.abl", "meta.define.abl"] },
+    { "startIndex": 8, "endIndex": 21, "scopes": ["source.abl", "meta.define.abl", "variable.other.abl"] },
+    { "startIndex": 21, "endIndex": 22, "scopes": ["source.abl", "meta.define.abl"] },
+    { "startIndex": 22, "endIndex": 24, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },
+    { "startIndex": 24, "endIndex": 25, "scopes": ["source.abl", "meta.define.abl"] },
+    { "startIndex": 25, "endIndex": 28, "scopes": ["source.abl", "meta.define.abl", "storage.type.abl"] },
+    { "startIndex": 28, "endIndex": 29, "scopes": ["source.abl", "meta.define.abl"] },
+    { "startIndex": 29, "endIndex": 36, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },
+    { "startIndex": 36, "endIndex": 37, "scopes": ["source.abl", "meta.define.abl"] },
+    { "startIndex": 37, "endIndex": 38, "scopes": ["source.abl", "meta.define.abl", "punctuation.terminator.abl"] }
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `def var bob as i.`;
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 3, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'def'
+    { "startIndex": 3, "endIndex": 4, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 4, "endIndex": 7, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'var'
+    { "startIndex": 7, "endIndex": 8, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 8, "endIndex": 11, "scopes": ["source.abl", "meta.define.abl", "variable.other.abl"] },  // 'bob'
+    { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 12, "endIndex": 14, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'as'
+    { "startIndex": 14, "endIndex": 15, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 15, "endIndex": 16, "scopes": ["source.abl", "meta.define.abl", "storage.type.abl"] },  // 'i'
+    { "startIndex": 16, "endIndex": 17, "scopes": ["source.abl", "meta.define.abl", "punctuation.terminator.abl"] }  // '.'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `def var bob as c.`;
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 3, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'def'
+    { "startIndex": 3, "endIndex": 4, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 4, "endIndex": 7, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'var'
+    { "startIndex": 7, "endIndex": 8, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 8, "endIndex": 11, "scopes": ["source.abl", "meta.define.abl", "variable.other.abl"] },  // 'bob'
+    { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 12, "endIndex": 14, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'as'
+    { "startIndex": 14, "endIndex": 15, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 15, "endIndex": 16, "scopes": ["source.abl", "meta.define.abl", "storage.type.abl"] },  // 'c'
+    { "startIndex": 16, "endIndex": 17, "scopes": ["source.abl", "meta.define.abl", "punctuation.terminator.abl"] }  // '.'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `def var bob as l initial false.`;
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 3, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'def'
+    { "startIndex": 3, "endIndex": 4, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 4, "endIndex": 7, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'var'
+    { "startIndex": 7, "endIndex": 8, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 8, "endIndex": 11, "scopes": ["source.abl", "meta.define.abl", "variable.other.abl"] },  // 'bob'
+    { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 12, "endIndex": 14, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'as'
+    { "startIndex": 14, "endIndex": 15, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 15, "endIndex": 16, "scopes": ["source.abl", "meta.define.abl", "storage.type.abl"] },  // 'l'
+    { "startIndex": 16, "endIndex": 17, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 17, "endIndex": 24, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'initial'
+    { "startIndex": 24, "endIndex": 25, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 25, "endIndex": 30, "scopes": ["source.abl", "meta.define.abl", "constant.language.abl"] },  // 'false'
+    { "startIndex": 30, "endIndex": 31, "scopes": ["source.abl", "meta.define.abl", "punctuation.terminator.abl"] }  // '.'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
 describe('', () => {
-    let statement = `def var variable-name as int no-undo .`;
-    let expectedTokens = [
-        { "startIndex": 0, "endIndex": 3, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },
-        { "startIndex": 3, "endIndex": 4, "scopes": ["source.abl", "meta.define.abl"] },
-        { "startIndex": 4, "endIndex": 7, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "keyword.other.abl"] },
-        { "startIndex": 7, "endIndex": 8, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 8, "endIndex": 21, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "variable.other.abl"] },
-        { "startIndex": 21, "endIndex": 22, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 22, "endIndex": 24, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "keyword.other.abl"] },
-        { "startIndex": 24, "endIndex": 25, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 25, "endIndex": 28, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "storage.type.abl"] },
-        { "startIndex": 28, "endIndex": 29, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 29, "endIndex": 36, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "keyword.other.abl"] },
-        { "startIndex": 36, "endIndex": 37, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 37, "endIndex": 38, "scopes": ["source.abl", "punctuation.terminator.abl"] }
-    ];
-    shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+  let statement = `def var bob as da initial today format 99/99/99.`;
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 3, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'def'
+    { "startIndex": 3, "endIndex": 4, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 4, "endIndex": 7, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'var'
+    { "startIndex": 7, "endIndex": 8, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 8, "endIndex": 11, "scopes": ["source.abl", "meta.define.abl", "variable.other.abl"] },  // 'bob'
+    { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 12, "endIndex": 14, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'as'
+    { "startIndex": 14, "endIndex": 15, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 15, "endIndex": 17, "scopes": ["source.abl", "meta.define.abl", "storage.type.abl"] },  // 'da'
+    { "startIndex": 17, "endIndex": 18, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 18, "endIndex": 25, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'initial'
+    { "startIndex": 25, "endIndex": 26, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 26, "endIndex": 31, "scopes": ["source.abl", "meta.define.abl", "constant.language.abl"] },  // 'today'
+    { "startIndex": 31, "endIndex": 32, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 32, "endIndex": 38, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'format'
+    { "startIndex": 38, "endIndex": 39, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 39, "endIndex": 47, "scopes": ["source.abl", "meta.define.abl", "constant.language.source.abl"] },  // '99/99/99'
+    { "startIndex": 47, "endIndex": 48, "scopes": ["source.abl", "meta.define.abl", "punctuation.terminator.abl"] }  // '.'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })

package/spec/define-variable/single-line-with-a-comment-at-the-end.spec.js

@@ -1,62 +1,62 @@
-const { assert } = require('chai');
-const shared = require('../shared.js');
-
-describe('', () => {
-    let statement = `define variable variable-name as int no-undo./* comment */`;
-    let expectedTokens = [
-        { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },
-        { "startIndex": 6, "endIndex": 7, "scopes": ["source.abl", "meta.define.abl"] },
-        { "startIndex": 7, "endIndex": 15, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "keyword.other.abl"] },
-        { "startIndex": 15, "endIndex": 16, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 16, "endIndex": 29, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "variable.other.abl"] },
-        { "startIndex": 29, "endIndex": 30, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 30, "endIndex": 32, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "keyword.other.abl"] },
-        { "startIndex": 32, "endIndex": 33, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 33, "endIndex": 36, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "storage.type.abl"] },
-        { "startIndex": 36, "endIndex": 37, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 37, "endIndex": 44, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "keyword.other.abl"] },
-        { "startIndex": 44, "endIndex": 45, "scopes": ["source.abl", "punctuation.terminator.abl"] },
-        { "startIndex": 45, "endIndex": 47, "scopes": ["source.abl", "comment.block.source.abl"] },
-        { "startIndex": 47, "endIndex": 56, "scopes": ["source.abl", "comment.block.source.abl", "comment"] },
-        { "startIndex": 56, "endIndex": 58, "scopes": ["source.abl", "comment.block.source.abl"] }
-    ];
-    shared.itShouldMatchExpectedScopes(statement, expectedTokens);
-})
-describe('', () => {
-    let statement = `define variable variable-name as int no-undo.// comment`;
-    let expectedTokens = [
-        { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },
-        { "startIndex": 6, "endIndex": 7, "scopes": ["source.abl", "meta.define.abl"] },
-        { "startIndex": 7, "endIndex": 15, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "keyword.other.abl"] },
-        { "startIndex": 15, "endIndex": 16, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 16, "endIndex": 29, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "variable.other.abl"] },
-        { "startIndex": 29, "endIndex": 30, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 30, "endIndex": 32, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "keyword.other.abl"] },
-        { "startIndex": 32, "endIndex": 33, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 33, "endIndex": 36, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "storage.type.abl"] },
-        { "startIndex": 36, "endIndex": 37, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 37, "endIndex": 44, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "keyword.other.abl"] },
-        { "startIndex": 44, "endIndex": 45, "scopes": ["source.abl", "punctuation.terminator.abl"] },
-        { "startIndex": 45, "endIndex": 55, "scopes": ["source.abl", "comment.source.abl"] }
-    ];
-    shared.itShouldMatchExpectedScopes(statement, expectedTokens);
-})
-describe('', () => {
-    let statement = `define variable variable-name as int no-undo.//comment`;
-    let expectedTokens = [
-        { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },
-        { "startIndex": 6, "endIndex": 7, "scopes": ["source.abl", "meta.define.abl"] },
-        { "startIndex": 7, "endIndex": 15, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "keyword.other.abl"] },
-        { "startIndex": 15, "endIndex": 16, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 16, "endIndex": 29, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "variable.other.abl"] },
-        { "startIndex": 29, "endIndex": 30, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 30, "endIndex": 32, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "keyword.other.abl"] },
-        { "startIndex": 32, "endIndex": 33, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 33, "endIndex": 36, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "storage.type.abl"] },
-        { "startIndex": 36, "endIndex": 37, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl"] },
-        { "startIndex": 37, "endIndex": 44, "scopes": ["source.abl", "meta.define.abl", "meta.define.variable.abl", "keyword.other.abl"] },
-        { "startIndex": 44, "endIndex": 45, "scopes": ["source.abl", "punctuation.terminator.abl"] },
-        { "startIndex": 45, "endIndex": 54, "scopes": ["source.abl", "comment.source.abl"] }
-    ];
-    shared.itShouldMatchExpectedScopes(statement, expectedTokens);
-})
+const { assert } = require('chai');
+const shared = require('../shared.js');
+
+describe('', () => {
+  let statement = `define variable variable-name as int no-undo./* comment */`;
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },
+    { "startIndex": 6, "endIndex": 7, "scopes": ["source.abl", "meta.define.abl"] },
+    { "startIndex": 7, "endIndex": 15, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },
+    { "startIndex": 15, "endIndex": 16, "scopes": ["source.abl", "meta.define.abl"] },
+    { "startIndex": 16, "endIndex": 29, "scopes": ["source.abl", "meta.define.abl", "variable.other.abl"] },
+    { "startIndex": 29, "endIndex": 30, "scopes": ["source.abl", "meta.define.abl"] },
+    { "startIndex": 30, "endIndex": 32, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },
+    { "startIndex": 32, "endIndex": 33, "scopes": ["source.abl", "meta.define.abl"] },
+    { "startIndex": 33, "endIndex": 36, "scopes": ["source.abl", "meta.define.abl", "storage.type.abl"] },
+    { "startIndex": 36, "endIndex": 37, "scopes": ["source.abl", "meta.define.abl"] },
+    { "startIndex": 37, "endIndex": 44, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },
+    { "startIndex": 44, "endIndex": 45, "scopes": ["source.abl", "meta.define.abl", "punctuation.terminator.abl"] },
+    { "startIndex": 45, "endIndex": 47, "scopes": ["source.abl", "comment.block.source.abl"] },
+    { "startIndex": 47, "endIndex": 56, "scopes": ["source.abl", "comment.block.source.abl", "comment"] },
+    { "startIndex": 56, "endIndex": 58, "scopes": ["source.abl", "comment.block.source.abl"] }
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+describe('', () => {
+  let statement = `define variable variable-name as int no-undo.// comment`;
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },
+    { "startIndex": 6, "endIndex": 7, "scopes": ["source.abl", "meta.define.abl"] },
+    { "startIndex": 7, "endIndex": 15, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },
+    { "startIndex": 15, "endIndex": 16, "scopes": ["source.abl", "meta.define.abl"] },
+    { "startIndex": 16, "endIndex": 29, "scopes": ["source.abl", "meta.define.abl", "variable.other.abl"] },
+    { "startIndex": 29, "endIndex": 30, "scopes": ["source.abl", "meta.define.abl"] },
+    { "startIndex": 30, "endIndex": 32, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },
+    { "startIndex": 32, "endIndex": 33, "scopes": ["source.abl", "meta.define.abl"] },
+    { "startIndex": 33, "endIndex": 36, "scopes": ["source.abl", "meta.define.abl", "storage.type.abl"] },
+    { "startIndex": 36, "endIndex": 37, "scopes": ["source.abl", "meta.define.abl"] },
+    { "startIndex": 37, "endIndex": 44, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },
+    { "startIndex": 44, "endIndex": 45, "scopes": ["source.abl", "meta.define.abl", "punctuation.terminator.abl"] },
+    { "startIndex": 45, "endIndex": 55, "scopes": ["source.abl", "comment.line.double-slash.abl"] }
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+describe('', () => {
+  let statement = `define variable variable-name as int no-undo.//comment`;
+  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": 29, "scopes": ["source.abl", "meta.define.abl", "variable.other.abl"] },  // 'variable-name'
+    { "startIndex": 29, "endIndex": 30, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 30, "endIndex": 32, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'as'
+    { "startIndex": 32, "endIndex": 33, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 33, "endIndex": 36, "scopes": ["source.abl", "meta.define.abl", "storage.type.abl"] },  // 'int'
+    { "startIndex": 36, "endIndex": 37, "scopes": ["source.abl", "meta.define.abl"] },  // ' '
+    { "startIndex": 37, "endIndex": 44, "scopes": ["source.abl", "meta.define.abl", "keyword.other.abl"] },  // 'no-undo'
+    { "startIndex": 44, "endIndex": 45, "scopes": ["source.abl", "meta.define.abl", "punctuation.terminator.abl"] },  // '.'
+    { "startIndex": 45, "endIndex": 54, "scopes": ["source.abl", "comment.line.double-slash.abl"] }  // '// comment'      
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})