abl-tmlanguage 1.2.0 → 1.3.0

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

@@ -0,0 +1,52 @@
+const { assert, expect } = require('chai');
+const shared = require('../shared.js');
+
+describe('', () => {
+  // the :R in the method name should not be marked as a string colon-R
+  let statement = `if valid-object(oEventArgs:ResponseBody) then
+    assign oResponse:ContentType = "application/json":u
+            oResponse:Entity      = oEventArgs:ResponseBody.`;
+  let expectedTokens = [
+    [
+      { "startIndex": 0, "endIndex": 2, "scopes": ["source.abl", "keyword.other.abl"] },  // 'if'
+      { "startIndex": 2, "endIndex": 3, "scopes": ["source.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'
+      { "startIndex": 26, "endIndex": 27, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "punctuation.separator.colon.abl"] },  // ':'
+      { "startIndex": 27, "endIndex": 39, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "entity.name.function.abl"] },  // 'ResponseBody'
+      { "startIndex": 39, "endIndex": 40, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] },  // ')'
+      { "startIndex": 40, "endIndex": 41, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 41, "endIndex": 45, "scopes": ["source.abl", "keyword.other.abl"] }  // 'then'
+    ],
+    [
+      { "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": 20, "scopes": ["source.abl", "variable.other.abl"] },  // 'oResponse'
+      { "startIndex": 20, "endIndex": 21, "scopes": ["source.abl", "punctuation.separator.colon.abl"] },  // ':'
+      { "startIndex": 21, "endIndex": 32, "scopes": ["source.abl", "entity.name.function.abl"] },  // 'ContentType'
+      { "startIndex": 32, "endIndex": 33, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 33, "endIndex": 34, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '='
+      { "startIndex": 34, "endIndex": 35, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 35, "endIndex": 36, "scopes": ["source.abl", "string.double.complex.abl", "punctuation.definition.string.begin.abl"] },  // '"'
+      { "startIndex": 36, "endIndex": 52, "scopes": ["source.abl", "string.double.complex.abl"] },  // 'application/json'
+      { "startIndex": 52, "endIndex": 53, "scopes": ["source.abl", "string.double.complex.abl", "punctuation.definition.string.end.abl"] },  // '"'
+      { "startIndex": 53, "endIndex": 55, "scopes": ["source.abl", "support.other.abl"] }  // ':u'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 12, "scopes": ["source.abl"] },  // '            '
+      { "startIndex": 12, "endIndex": 21, "scopes": ["source.abl", "variable.other.abl"] },  // 'oResponse'
+      { "startIndex": 21, "endIndex": 22, "scopes": ["source.abl", "punctuation.separator.colon.abl"] },  // ':'
+      { "startIndex": 22, "endIndex": 28, "scopes": ["source.abl", "entity.name.function.abl"] },  // 'Entity'
+      { "startIndex": 28, "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": 46, "scopes": ["source.abl", "variable.other.abl"] },  // 'oEventArgs'
+      { "startIndex": 46, "endIndex": 47, "scopes": ["source.abl", "punctuation.separator.colon.abl"] },  // ':'
+      { "startIndex": 47, "endIndex": 59, "scopes": ["source.abl", "entity.name.function.abl"] },  // 'ResponseBody'
+      { "startIndex": 59, "endIndex": 60, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+    ]
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})

package/spec/strings/vscode-abl-issue#28.spec.js

@@ -19,7 +19,7 @@ describe('', () => {
     { "startIndex": 20, "endIndex": 21, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "string.double.complex.abl", "punctuation.definition.string.begin.abl"] },  // '"'
     { "startIndex": 21, "endIndex": 22, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "string.double.complex.abl"] },  // ')'
     { "startIndex": 22, "endIndex": 23, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "string.double.complex.abl", "punctuation.definition.string.end.abl"] },  // '"'
-    { "startIndex": 23, "endIndex": 24, "scopes": ["source.abl", "meta.brace.round.js"] },  // ')'
+    { "startIndex": 23, "endIndex": 24, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] },  // ')'
     { "startIndex": 24, "endIndex": 25, "scopes": ["source.abl", "punctuation.terminator.abl"] },  // '.'
     { "startIndex": 25, "endIndex": 26, "scopes": ["source.abl"] },  // ' '
     { "startIndex": 26, "endIndex": 33, "scopes": ["source.abl", "keyword.other.abl"] },  // 'message'

package/spec/type-name/argument.spec.js

@@ -14,7 +14,7 @@ describe('', () => {
     { "startIndex": 13, "endIndex": 14, "scopes": ["source.abl", "meta.function.arguments.abl", "punctuation.separator.comma.abl"] },  // ','
     { "startIndex": 14, "endIndex": 15, "scopes": ["source.abl", "meta.function.arguments.abl"] },  // ' '
     { "startIndex": 15, "endIndex": 26, "scopes": ["source.abl", "meta.function.arguments.abl", "entity.name.type.abl"] },  // 'foo.bar.baz'
-    { "startIndex": 26, "endIndex": 27, "scopes": ["source.abl", "meta.function.arguments.abl"] },  // ':'
+    { "startIndex": 26, "endIndex": 27, "scopes": ["source.abl", "meta.function.arguments.abl", "punctuation.separator.colon.abl"] },  // ':'
     { "startIndex": 27, "endIndex": 35, "scopes": ["source.abl", "meta.function.arguments.abl", "entity.name.function.abl"] },  // 'Property'
     { "startIndex": 35, "endIndex": 36, "scopes": ["source.abl", "meta.brace.round.js"] },  // ')'
     { "startIndex": 36, "endIndex": 38, "scopes": ["source.abl"] }  // ' '

package/spec/type-name/define-class.spec.js

@@ -10,7 +10,7 @@ describe('', () => {
     { "startIndex": 5, "endIndex": 6, "scopes": ["source.abl", "meta.define.class.abl"] },  // ' '
     { "startIndex": 6, "endIndex": 17, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] },  // 'foo.bar.baz'
     { "startIndex": 17, "endIndex": 18, "scopes": ["source.abl", "meta.define.class.abl"] },  // ' '
-    { "startIndex": 18, "endIndex": 19, "scopes": ["source.abl", "meta.define.class.abl", "punctuation.terminator.abl"] } // ':'    
+    { "startIndex": 18, "endIndex": 19, "scopes": ["source.abl", "meta.define.class.abl", "punctuation.terminator.abl"] } // ':'
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })
@@ -42,10 +42,10 @@ describe('', () => {
 })
 
 describe('', () => {
-  let statement = `CLASS foo.bar.baz ABSTRACT    
-    inherits parent.class 
+  let statement = `CLASS foo.bar.baz ABSTRACT
+    inherits parent.class
     implements one.interface,
-    anotehr.iface    
+    another.iface
     :`;
 
   let expectedTokens = [
@@ -54,15 +54,13 @@ describe('', () => {
       { "startIndex": 5, "endIndex": 6, "scopes": ["source.abl", "meta.define.class.abl"] },  // ' '
       { "startIndex": 6, "endIndex": 17, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] },  // 'foo.bar.baz'
       { "startIndex": 17, "endIndex": 18, "scopes": ["source.abl", "meta.define.class.abl"] },  // ' '
-      { "startIndex": 18, "endIndex": 26, "scopes": ["source.abl", "meta.define.class.abl", "keyword.other.abl"] },  // 'ABSTRACT'
-      { "startIndex": 26, "endIndex": 31, "scopes": ["source.abl", "meta.define.class.abl"] }  // '    '
+      { "startIndex": 18, "endIndex": 26, "scopes": ["source.abl", "meta.define.class.abl", "keyword.other.abl"] }  // 'ABSTRACT'
     ],
     [
       { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl", "meta.define.class.abl"] },  // '    '
       { "startIndex": 4, "endIndex": 12, "scopes": ["source.abl", "meta.define.class.abl", "keyword.other.abl"] },  // 'inherits'
       { "startIndex": 12, "endIndex": 13, "scopes": ["source.abl", "meta.define.class.abl"] },  // ' '
-      { "startIndex": 13, "endIndex": 25, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] },  // 'parent.class'
-      { "startIndex": 25, "endIndex": 27, "scopes": ["source.abl", "meta.define.class.abl"] }  // ' '
+      { "startIndex": 13, "endIndex": 25, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] }  // 'parent.class'
     ],
     [
       { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl", "meta.define.class.abl"] },  // '    '
@@ -73,8 +71,7 @@ describe('', () => {
     ],
     [
       { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl", "meta.define.class.abl"] },  // '    '
-      { "startIndex": 4, "endIndex": 17, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] },  // 'anotehr.iface'
-      { "startIndex": 17, "endIndex": 22, "scopes": ["source.abl", "meta.define.class.abl"] }  // '    '
+      { "startIndex": 4, "endIndex": 17, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] }  // 'another.iface'
     ],
     [
       { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl", "meta.define.class.abl"] },  // '    '
@@ -85,10 +82,10 @@ describe('', () => {
 })
 
 describe('', () => {
-  let statement = `CLASS foo.bar.baz inherits parent.class 
+  let statement = `CLASS foo.bar.baz inherits parent.class
     implements one.interface,
-    anotehr.iface
-    abstract 
+    another.iface
+    abstract
     use-widget-pool:
       def var x as int.
       `;
@@ -101,8 +98,7 @@ describe('', () => {
       { "startIndex": 17, "endIndex": 18, "scopes": ["source.abl", "meta.define.class.abl"] },  // ' '
       { "startIndex": 18, "endIndex": 26, "scopes": ["source.abl", "meta.define.class.abl", "keyword.other.abl"] },  // 'inherits'
       { "startIndex": 26, "endIndex": 27, "scopes": ["source.abl", "meta.define.class.abl"] },  // ' '
-      { "startIndex": 27, "endIndex": 39, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] },  // 'parent.class'
-      { "startIndex": 39, "endIndex": 41, "scopes": ["source.abl", "meta.define.class.abl"] }  // ' '
+      { "startIndex": 27, "endIndex": 39, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] }  // 'parent.class'
     ],
     [
       { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl", "meta.define.class.abl"] },  // '    '
@@ -113,12 +109,11 @@ describe('', () => {
     ],
     [
       { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl", "meta.define.class.abl"] },  // '    '
-      { "startIndex": 4, "endIndex": 17, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] }  // 'anotehr.iface'
+      { "startIndex": 4, "endIndex": 17, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] }  // 'another.iface'
     ],
     [
       { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl", "meta.define.class.abl"] },  // '    '
-      { "startIndex": 4, "endIndex": 12, "scopes": ["source.abl", "meta.define.class.abl", "keyword.other.abl"] },  // 'abstract'
-      { "startIndex": 12, "endIndex": 14, "scopes": ["source.abl", "meta.define.class.abl"] }  // ' '
+      { "startIndex": 4, "endIndex": 12, "scopes": ["source.abl", "meta.define.class.abl", "keyword.other.abl"] }  // 'abstract'
     ],
     [
       { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl", "meta.define.class.abl"] },  // '    '
@@ -168,16 +163,16 @@ describe('', () => {
     { "startIndex": 92, "endIndex": 100, "scopes": ["source.abl", "meta.define.class.abl", "keyword.other.abl"] },  // 'abstract'
     { "startIndex": 100, "endIndex": 101, "scopes": ["source.abl", "meta.define.class.abl"] },  // ' '
     { "startIndex": 101, "endIndex": 116, "scopes": ["source.abl", "meta.define.class.abl", "keyword.other.abl"] },  // 'use-widget-pool'
-    { "startIndex": 116, "endIndex": 117, "scopes": ["source.abl", "meta.define.class.abl", "punctuation.terminator.abl"] }  // ':'   
+    { "startIndex": 116, "endIndex": 117, "scopes": ["source.abl", "meta.define.class.abl", "punctuation.terminator.abl"] }  // ':'
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })
 
 describe('', () => {
-  let statement = `CLASS foo.bar.baz inherits parent.class 
+  let statement = `CLASS foo.bar.baz inherits parent.class
     implements one.interface,
-    anotehr.iface
-    abstract 
+    another.iface
+    abstract
     use-widget-pool serializable
     :`;
 
@@ -189,8 +184,7 @@ describe('', () => {
       { "startIndex": 17, "endIndex": 18, "scopes": ["source.abl", "meta.define.class.abl"] },  // ' '
       { "startIndex": 18, "endIndex": 26, "scopes": ["source.abl", "meta.define.class.abl", "keyword.other.abl"] },  // 'inherits'
       { "startIndex": 26, "endIndex": 27, "scopes": ["source.abl", "meta.define.class.abl"] },  // ' '
-      { "startIndex": 27, "endIndex": 39, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] },  // 'parent.class'
-      { "startIndex": 39, "endIndex": 41, "scopes": ["source.abl", "meta.define.class.abl"] }  // ' '
+      { "startIndex": 27, "endIndex": 39, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] }  // 'parent.class'
     ],
     [
       { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl", "meta.define.class.abl"] },  // '    '
@@ -201,12 +195,11 @@ describe('', () => {
     ],
     [
       { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl", "meta.define.class.abl"] },  // '    '
-      { "startIndex": 4, "endIndex": 17, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] }  // 'anotehr.iface'
+      { "startIndex": 4, "endIndex": 17, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] }  // 'another.iface'
     ],
     [
       { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl", "meta.define.class.abl"] },  // '    '
-      { "startIndex": 4, "endIndex": 12, "scopes": ["source.abl", "meta.define.class.abl", "keyword.other.abl"] },  // 'abstract'
-      { "startIndex": 12, "endIndex": 14, "scopes": ["source.abl", "meta.define.class.abl"] }  // ' '
+      { "startIndex": 4, "endIndex": 12, "scopes": ["source.abl", "meta.define.class.abl", "keyword.other.abl"] }  // 'abstract'
     ],
     [
       { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl", "meta.define.class.abl"] },  // '    '
@@ -223,11 +216,11 @@ describe('', () => {
 })
 
 describe('', () => {
-  let statement = `CLASS foo.bar.baz 
+  let statement = `CLASS foo.bar.baz
   implements one.interface,
-  anotehr.iface
-  inherits parent.class 
-    abstract 
+  another.iface
+  inherits parent.class
+    abstract
     use-widget-pool serializable
     :`;
 
@@ -235,8 +228,7 @@ describe('', () => {
     [
       { "startIndex": 0, "endIndex": 5, "scopes": ["source.abl", "meta.define.class.abl", "keyword.other.abl"] },  // 'CLASS'
       { "startIndex": 5, "endIndex": 6, "scopes": ["source.abl", "meta.define.class.abl"] },  // ' '
-      { "startIndex": 6, "endIndex": 17, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] },  // 'foo.bar.baz'
-      { "startIndex": 17, "endIndex": 19, "scopes": ["source.abl", "meta.define.class.abl"] }  // ' '
+      { "startIndex": 6, "endIndex": 17, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] }  // 'foo.bar.baz'
     ],
     [
       { "startIndex": 0, "endIndex": 2, "scopes": ["source.abl", "meta.define.class.abl"] },  // '  '
@@ -247,19 +239,17 @@ describe('', () => {
     ],
     [
       { "startIndex": 0, "endIndex": 2, "scopes": ["source.abl", "meta.define.class.abl"] },  // '  '
-      { "startIndex": 2, "endIndex": 15, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] }  // 'anotehr.iface'
+      { "startIndex": 2, "endIndex": 15, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] }  // 'another.iface'
     ],
     [
       { "startIndex": 0, "endIndex": 2, "scopes": ["source.abl", "meta.define.class.abl"] },  // '  '
       { "startIndex": 2, "endIndex": 10, "scopes": ["source.abl", "meta.define.class.abl", "keyword.other.abl"] },  // 'inherits'
       { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl", "meta.define.class.abl"] },  // ' '
-      { "startIndex": 11, "endIndex": 23, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] },  // 'parent.class'
-      { "startIndex": 23, "endIndex": 25, "scopes": ["source.abl", "meta.define.class.abl"] }  // ' '
+      { "startIndex": 11, "endIndex": 23, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] }  // 'parent.class'
     ],
     [
       { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl", "meta.define.class.abl"] },  // '    '
-      { "startIndex": 4, "endIndex": 12, "scopes": ["source.abl", "meta.define.class.abl", "keyword.other.abl"] },  // 'abstract'
-      { "startIndex": 12, "endIndex": 14, "scopes": ["source.abl", "meta.define.class.abl"] }  // ' '
+      { "startIndex": 4, "endIndex": 12, "scopes": ["source.abl", "meta.define.class.abl", "keyword.other.abl"] }  // 'abstract'
     ],
     [
       { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl", "meta.define.class.abl"] },  // '    '
@@ -285,21 +275,20 @@ describe('', () => {
     { "startIndex": 6, "endIndex": 17, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] },  // 'foo.bar.baz'
     { "startIndex": 17, "endIndex": 19, "scopes": ["source.abl", "meta.define.class.abl"] },  // '  '
     { "startIndex": 19, "endIndex": 34, "scopes": ["source.abl", "meta.define.class.abl", "keyword.other.abl"] },  // 'use-widget-pool'
-    { "startIndex": 34, "endIndex": 35, "scopes": ["source.abl", "meta.define.class.abl", "punctuation.terminator.abl"] }  // ':'      
+    { "startIndex": 34, "endIndex": 35, "scopes": ["source.abl", "meta.define.class.abl", "punctuation.terminator.abl"] }  // ':'
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })
 
 describe('', () => {
-  let statement = `CLASS foo.bar.baz 
+  let statement = `CLASS foo.bar.baz
      use-widget-pool:`;
 
   let expectedTokens = [
     [
       { "startIndex": 0, "endIndex": 5, "scopes": ["source.abl", "meta.define.class.abl", "keyword.other.abl"] },  // 'CLASS'
       { "startIndex": 5, "endIndex": 6, "scopes": ["source.abl", "meta.define.class.abl"] },  // ' '
-      { "startIndex": 6, "endIndex": 17, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] },  // 'foo.bar.baz'
-      { "startIndex": 17, "endIndex": 19, "scopes": ["source.abl", "meta.define.class.abl"] }  // ' '
+      { "startIndex": 6, "endIndex": 17, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] }  // 'foo.bar.baz'
     ],
     [
       { "startIndex": 0, "endIndex": 5, "scopes": ["source.abl", "meta.define.class.abl"] },  // '     '
@@ -334,17 +323,16 @@ describe('', () => {
 })
 
 describe('', () => {
-  let statement = `CLASS foo.bar.baz 
+  let statement = `CLASS foo.bar.baz
             INheriTS boo.scoo
-     use-widget-POOL 
+     use-widget-POOL
      :`;
 
   let expectedTokens = [
     [
       { "startIndex": 0, "endIndex": 5, "scopes": ["source.abl", "meta.define.class.abl", "keyword.other.abl"] },  // 'CLASS'
       { "startIndex": 5, "endIndex": 6, "scopes": ["source.abl", "meta.define.class.abl"] },  // ' '
-      { "startIndex": 6, "endIndex": 17, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] },  // 'foo.bar.baz'
-      { "startIndex": 17, "endIndex": 19, "scopes": ["source.abl", "meta.define.class.abl"] }  // ' '
+      { "startIndex": 6, "endIndex": 17, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] }  // 'foo.bar.baz'
     ],
     [
       { "startIndex": 0, "endIndex": 12, "scopes": ["source.abl", "meta.define.class.abl"] },  // '            '
@@ -354,8 +342,7 @@ describe('', () => {
     ],
     [
       { "startIndex": 0, "endIndex": 5, "scopes": ["source.abl", "meta.define.class.abl"] },  // '     '
-      { "startIndex": 5, "endIndex": 20, "scopes": ["source.abl", "meta.define.class.abl", "keyword.other.abl"] },  // 'use-widget-POOL'
-      { "startIndex": 20, "endIndex": 22, "scopes": ["source.abl", "meta.define.class.abl"] }  // ' '
+      { "startIndex": 5, "endIndex": 20, "scopes": ["source.abl", "meta.define.class.abl", "keyword.other.abl"] }  // 'use-widget-POOL'
     ],
     [
       { "startIndex": 0, "endIndex": 5, "scopes": ["source.abl", "meta.define.class.abl"] },  // '     '
@@ -366,8 +353,8 @@ describe('', () => {
 })
 
 describe('', () => {
-  let statement = `CLASS foo.bar.baz 
-        INheriTS 
+  let statement = `CLASS foo.bar.baz
+        INheriTS
             boo.scoo
 
      :`;
@@ -376,13 +363,11 @@ describe('', () => {
     [
       { "startIndex": 0, "endIndex": 5, "scopes": ["source.abl", "meta.define.class.abl", "keyword.other.abl"] },  // 'CLASS'
       { "startIndex": 5, "endIndex": 6, "scopes": ["source.abl", "meta.define.class.abl"] },  // ' '
-      { "startIndex": 6, "endIndex": 17, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] },  // 'foo.bar.baz'
-      { "startIndex": 17, "endIndex": 19, "scopes": ["source.abl", "meta.define.class.abl"] }  // ' '
+      { "startIndex": 6, "endIndex": 17, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] }  // 'foo.bar.baz'
     ],
     [
       { "startIndex": 0, "endIndex": 8, "scopes": ["source.abl", "meta.define.class.abl"] },  // '        '
-      { "startIndex": 8, "endIndex": 16, "scopes": ["source.abl", "meta.define.class.abl", "keyword.other.abl"] },  // 'INheriTS'
-      { "startIndex": 16, "endIndex": 18, "scopes": ["source.abl", "meta.define.class.abl"] }  // ' '
+      { "startIndex": 8, "endIndex": 16, "scopes": ["source.abl", "meta.define.class.abl", "keyword.other.abl"] }  // 'INheriTS'
     ],
     [
       { "startIndex": 0, "endIndex": 12, "scopes": ["source.abl", "meta.define.class.abl"] },  // '            '
@@ -400,26 +385,23 @@ describe('', () => {
 })
 
 describe('', () => {
-  let statement = `CLASS 
-        foo.bar.baz 
-        INheriTS 
+  let statement = `CLASS
+        foo.bar.baz
+        INheriTS
         boo.scoo
 :`;
 
   let expectedTokens = [
     [
-      { "startIndex": 0, "endIndex": 5, "scopes": ["source.abl", "meta.define.class.abl", "keyword.other.abl"] },  // 'CLASS'
-      { "startIndex": 5, "endIndex": 7, "scopes": ["source.abl", "meta.define.class.abl"] }  // ' '
+      { "startIndex": 0, "endIndex": 5, "scopes": ["source.abl", "meta.define.class.abl", "keyword.other.abl"] }  // 'CLASS'
     ],
     [
       { "startIndex": 0, "endIndex": 8, "scopes": ["source.abl", "meta.define.class.abl"] },  // '        '
-      { "startIndex": 8, "endIndex": 19, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] },  // 'foo.bar.baz'
-      { "startIndex": 19, "endIndex": 21, "scopes": ["source.abl", "meta.define.class.abl"] } // ' '
+      { "startIndex": 8, "endIndex": 19, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] }  // 'foo.bar.baz'
     ],
     [
       { "startIndex": 0, "endIndex": 8, "scopes": ["source.abl", "meta.define.class.abl"] },  // '        '
-      { "startIndex": 8, "endIndex": 16, "scopes": ["source.abl", "meta.define.class.abl", "keyword.other.abl"] },  // 'INheriTS'
-      { "startIndex": 16, "endIndex": 18, "scopes": ["source.abl", "meta.define.class.abl"] }  // ' '
+      { "startIndex": 8, "endIndex": 16, "scopes": ["source.abl", "meta.define.class.abl", "keyword.other.abl"] }, // 'INheriTS'
     ],
     [
       { "startIndex": 0, "endIndex": 8, "scopes": ["source.abl", "meta.define.class.abl"] },  // '        '
@@ -457,15 +439,30 @@ describe('', () => {
     { "startIndex": 61, "endIndex": 64, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] },  // 'ijk'
     { "startIndex": 64, "endIndex": 65, "scopes": ["source.abl", "meta.define.class.abl"] },  // ' '
     { "startIndex": 65, "endIndex": 66, "scopes": ["source.abl", "meta.define.class.abl", "punctuation.terminator.abl"] }  // ':'
-
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })
 
+describe('', () => {
+  let statement = `class Package.SubModule.ClassName
+  //inherits JSONSerializer
+  serializable:`;
 
-
-
-
-
-
-
+  let expectedTokens = [
+    [
+      { "startIndex": 0, "endIndex": 5, "scopes": ["source.abl", "meta.define.class.abl", "keyword.other.abl"] },  // 'class'
+      { "startIndex": 5, "endIndex": 6, "scopes": ["source.abl", "meta.define.class.abl"] },  // ' '
+      { "startIndex": 6, "endIndex": 33, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] }  // 'Package.SubModule.ClassName'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 2, "scopes": ["source.abl", "meta.define.class.abl"] },  // '  '
+      { "startIndex": 2, "endIndex": 27, "scopes": ["source.abl", "meta.define.class.abl", "comment.line.double-slash.abl"] }  // '//inherits JSONSerializer'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 2, "scopes": ["source.abl", "meta.define.class.abl"] },  // '  '
+      { "startIndex": 2, "endIndex": 14, "scopes": ["source.abl", "meta.define.class.abl", "keyword.other.abl"] },  // 'serializable'
+      { "startIndex": 14, "endIndex": 15, "scopes": ["source.abl", "meta.define.class.abl", "punctuation.terminator.abl"] }  // ':'
+    ]
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})

package/spec/type-name/define-property.spec.js

@@ -41,7 +41,7 @@ describe('', () => {
       { "startIndex": 5, "endIndex": 11, "scopes": ["source.abl", "meta.define.abl", "meta.define.getter.abl", "keyword.other.abl"] },  // 'return'
       { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl", "meta.define.abl", "meta.define.getter.abl"] },  // ' '
       { "startIndex": 12, "endIndex": 23, "scopes": ["source.abl", "meta.define.abl", "meta.define.getter.abl", "variable.language.abl"] },  // 'this-object'
-      { "startIndex": 23, "endIndex": 24, "scopes": ["source.abl", "meta.define.abl", "meta.define.getter.abl", "punctuation.terminator.abl"] },  // ':'
+      { "startIndex": 23, "endIndex": 24, "scopes": ["source.abl", "meta.define.abl", "meta.define.getter.abl", "punctuation.separator.colon.abl"] },  // ':'
       { "startIndex": 24, "endIndex": 30, "scopes": ["source.abl", "meta.define.abl", "meta.define.getter.abl", "entity.name.function.abl"] },  // 'AThing'
       { "startIndex": 30, "endIndex": 31, "scopes": ["source.abl", "meta.define.abl", "meta.define.getter.abl", "punctuation.terminator.abl"] }  // '.'
     ],

package/spec/type-name/define-variable-property.spec.js

@@ -182,7 +182,7 @@ describe('', () => {
       { "startIndex": 5, "endIndex": 11, "scopes": ["source.abl", "meta.define.abl", "meta.define.getter.abl", "keyword.other.abl"] },  // 'return'
       { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl", "meta.define.abl", "meta.define.getter.abl"] },  // ' '
       { "startIndex": 12, "endIndex": 23, "scopes": ["source.abl", "meta.define.abl", "meta.define.getter.abl", "variable.language.abl"] },  // 'this-object'
-      { "startIndex": 23, "endIndex": 24, "scopes": ["source.abl", "meta.define.abl", "meta.define.getter.abl", "punctuation.terminator.abl"] },  // ':'
+      { "startIndex": 23, "endIndex": 24, "scopes": ["source.abl", "meta.define.abl", "meta.define.getter.abl", "punctuation.separator.colon.abl"] },  // ':'
       { "startIndex": 24, "endIndex": 30, "scopes": ["source.abl", "meta.define.abl", "meta.define.getter.abl", "entity.name.function.abl"] },  // 'AThing'
       { "startIndex": 30, "endIndex": 31, "scopes": ["source.abl", "meta.define.abl", "meta.define.getter.abl", "punctuation.terminator.abl"] }  // '.'
     ],

package/spec/type-name/get-class.spec.js

@@ -5,11 +5,11 @@ describe('', () => {
   let statement = `GET-CLASS(foo.bar.baz) `;
 
   let expectedTokens = [
-    { "startIndex": 0, "endIndex": 9, "scopes": ["source.abl", "meta.function-call.abl", "entity.name.function.abl"] },
-    { "startIndex": 9, "endIndex": 10, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] },
-    { "startIndex": 10, "endIndex": 21, "scopes": ["source.abl", "meta.function-call.abl", "entity.name.type.abl"] },
-    { "startIndex": 21, "endIndex": 22, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] },
-    { "startIndex": 22, "endIndex": 24, "scopes": ["source.abl"] }
+    { "startIndex": 0, "endIndex": 9, "scopes": ["source.abl", "meta.function-call.abl", "support.function.abl"] },  // 'GET-CLASS'
+    { "startIndex": 9, "endIndex": 10, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] },  // '('
+    { "startIndex": 10, "endIndex": 21, "scopes": ["source.abl", "meta.function-call.abl", "entity.name.type.abl"] },  // 'foo.bar.baz'
+    { "startIndex": 21, "endIndex": 22, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] },  // ')'
+    { "startIndex": 22, "endIndex": 24, "scopes": ["source.abl"] }  // ' '
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })
@@ -18,14 +18,14 @@ describe('', () => {
   let statement = `GET-CLASS ( foo.bar.baz ) `;
 
   let expectedTokens = [
-    { "startIndex": 0, "endIndex": 9, "scopes": ["source.abl", "meta.function-call.abl", "entity.name.function.abl"] },
-    { "startIndex": 9, "endIndex": 10, "scopes": ["source.abl", "meta.function-call.abl"] },
-    { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] },
-    { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl", "meta.function-call.abl"] },
-    { "startIndex": 12, "endIndex": 23, "scopes": ["source.abl", "meta.function-call.abl", "entity.name.type.abl"] },
-    { "startIndex": 23, "endIndex": 24, "scopes": ["source.abl", "meta.function-call.abl"] },
-    { "startIndex": 24, "endIndex": 25, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] },
-    { "startIndex": 25, "endIndex": 27, "scopes": ["source.abl"] }
+    { "startIndex": 0, "endIndex": 9, "scopes": ["source.abl", "meta.function-call.abl", "support.function.abl"] },  // 'GET-CLASS'
+    { "startIndex": 9, "endIndex": 10, "scopes": ["source.abl", "meta.function-call.abl"] },  // ' '
+    { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] },  // '('
+    { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl", "meta.function-call.abl"] },  // ' '
+    { "startIndex": 12, "endIndex": 23, "scopes": ["source.abl", "meta.function-call.abl", "entity.name.type.abl"] },  // 'foo.bar.baz'
+    { "startIndex": 23, "endIndex": 24, "scopes": ["source.abl", "meta.function-call.abl"] },  // ' '
+    { "startIndex": 24, "endIndex": 25, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] },  // ')'
+    { "startIndex": 25, "endIndex": 27, "scopes": ["source.abl"] }  // ' '
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })
@@ -34,7 +34,7 @@ describe('', () => {
   let statement = `GET-CLASS ( List<foo.bar.baz> ) `;
 
   let expectedTokens = [
-    { "startIndex": 0, "endIndex": 9, "scopes": ["source.abl", "meta.function-call.abl", "entity.name.function.abl"] },  // 'GET-CLASS'
+    { "startIndex": 0, "endIndex": 9, "scopes": ["source.abl", "meta.function-call.abl", "support.function.abl"] },  // 'GET-CLASS'
     { "startIndex": 9, "endIndex": 10, "scopes": ["source.abl", "meta.function-call.abl"] },  // ' '
     { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] },  // '('
     { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl", "meta.function-call.abl", "entity.name.type.generic.abl"] },  // ' '
@@ -44,7 +44,7 @@ describe('', () => {
     { "startIndex": 28, "endIndex": 29, "scopes": ["source.abl", "meta.function-call.abl", "entity.name.type.generic.abl"] },  // '>'
     { "startIndex": 29, "endIndex": 30, "scopes": ["source.abl", "meta.function-call.abl"] },  // ' '
     { "startIndex": 30, "endIndex": 31, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] },  // ')'
-    { "startIndex": 31, "endIndex": 33, "scopes": ["source.abl"] }  // ' '    
+    { "startIndex": 31, "endIndex": 33, "scopes": ["source.abl"] }  // ' '
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })
@@ -53,7 +53,7 @@ describe('', () => {
   let statement = `GET-CLASS ( Progress.Collections.List<foo.bar.baz> ) `;
 
   let expectedTokens = [
-    { "startIndex": 0, "endIndex": 9, "scopes": ["source.abl", "meta.function-call.abl", "entity.name.function.abl"] },  // 'GET-CLASS'
+    { "startIndex": 0, "endIndex": 9, "scopes": ["source.abl", "meta.function-call.abl", "support.function.abl"] },  // 'GET-CLASS'
     { "startIndex": 9, "endIndex": 10, "scopes": ["source.abl", "meta.function-call.abl"] },  // ' '
     { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] },  // '('
     { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl", "meta.function-call.abl", "entity.name.type.generic.abl"] },  // ' '
@@ -63,7 +63,7 @@ describe('', () => {
     { "startIndex": 49, "endIndex": 50, "scopes": ["source.abl", "meta.function-call.abl", "entity.name.type.generic.abl"] },  // '>'
     { "startIndex": 50, "endIndex": 51, "scopes": ["source.abl", "meta.function-call.abl"] },  // ' '
     { "startIndex": 51, "endIndex": 52, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] },  // ')'
-    { "startIndex": 52, "endIndex": 54, "scopes": ["source.abl"] }  // ' '  
+    { "startIndex": 52, "endIndex": 54, "scopes": ["source.abl"] }  // ' '
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })
@@ -72,7 +72,7 @@ describe('', () => {
   let statement = `GET-CLASS ( Dictionary<foo.bar, boo.baz> ) `;
 
   let expectedTokens = [
-    { "startIndex": 0, "endIndex": 9, "scopes": ["source.abl", "meta.function-call.abl", "entity.name.function.abl"] },  // 'GET-CLASS'
+    { "startIndex": 0, "endIndex": 9, "scopes": ["source.abl", "meta.function-call.abl", "support.function.abl"] },  // 'GET-CLASS'
     { "startIndex": 9, "endIndex": 10, "scopes": ["source.abl", "meta.function-call.abl"] },  // ' '
     { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] },  // '('
     { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl", "meta.function-call.abl", "entity.name.type.generic.abl"] },  // ' '