abl-tmlanguage 1.3.10 → 1.3.12

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+1.3.12
+======
+
+- Ensure GET and SET in property definitions are case-insensitive. Fix for Syntax highlighting (vscode-abl/vscode-abl#307)
+- Support comments in a FOR EACH statement
+- Scope functions named GET-VALUE and SET-VALUE correctly
+- Support WHILE in FOR EACH
+- Allow keywords in parameter arguments
+- Limit scope of SET-SIZE function arguments appropriately
+
+1.3.11
+======
+
+- Fix CREATE ALIAS highlight (#53)
+- Fix IF in variable name (#52)
+- Fix scope of ROWID function args
+- Allow word breaks (eg commas) before constants
+
 1.3.10
 ======
 - Too many changes to be listed here...

package/abl.tmLanguage.json

@@ -433,6 +433,15 @@
         {
           "include": "#comment"
         },
+        {
+          "include": "#abl-function-variable-arg"
+        },
+        {
+          "include": "#while-expression"
+        },
+        {
+          "include": "#rowid-function"
+        },
         {
           "include": "#var-statement"
         },
@@ -987,6 +996,32 @@
         }
       ]
     },
+    "abl-function-variable-arg": {
+      "name": "meta.function-call.abl",
+      "begin": "(?i)\\s*(set-size)\\s*(?=\\()",
+      "beginCaptures": {
+        "1": {
+          "name": "support.function.abl"
+        }
+      },
+      "end": "(\\))",
+      "endCaptures": {
+        "1": {
+          "name": "meta.brace.round.js"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#parens"
+        },
+        {
+          "include": "#type-member-call"
+        },
+        {
+          "include": "#variable-name"
+        }
+      ]
+    },
     "get-class": {
       "name": "meta.function-call.abl",
       "begin": "(?i)\\s*(get-class)\\s*(\\()",
@@ -1195,6 +1230,12 @@
         },
         {
           "include": "#db-dot-table-dot-field"
+        },
+        {
+          "include": "#while-expression"
+        },
+        {
+          "include": "#comment"
         }
       ]
     },
@@ -1416,7 +1457,7 @@
       ]
     },
     "property-get-set-super": {
-      "match": "\\b(get|set)\\s+(super)\\s*(?=\\.)",
+      "match": "(?i)\\b(get|set)\\s+(super)\\s*(?=\\.)",
       "comment": "This is a call to the parent class' property getter or setter",
       "captures": {
         "1": {
@@ -1429,7 +1470,7 @@
     },
     "property-get-set-empty": {
       "comment": "This rule is needed since for 'plain' gets and sets, there's no END",
-      "match": "\\b(get|set)\\s*(?=\\.)",
+      "match": "\\b([Gg][Ee][Tt]|[Ss][Ee][Tt])\\s*(?=\\.)",
       "captures": {
         "1": {
           "name": "keyword.other.abl"
@@ -1437,13 +1478,13 @@
       }
     },
     "property-get-set-block": {
-      "begin": "(?i)\\s*(?<!:)\\s*(get|set)\\b",
+      "begin": "\\s*(?<!:)\\s*([Gg][Ee][Tt]|[Ss][Ee][Tt])\\b(?![#$\\-_%&])",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.abl"
         }
       },
-      "end": "(?i)\\s*(end)\\s*(get|set)?\\s*(?=\\.)\\s*",
+      "end": "\\s*([Ee][Nn][Dd])\\s*([Gg][Ee][Tt]|[Ss][Ee][Tt])?\\s*(?=\\.)\\s*",
       "comment": "The end capture does a lookahead on . so that the 'define' capture can end ",
       "endCaptures": {
         "1": {
@@ -2006,7 +2047,7 @@
         }
       },
       "comment": "This match just gets the definition of the property; the getter and setter are handled separately",
-      "end": "(?i)\\s*(?=get|set)",
+      "end": "\\s*(?=[Gg][Ee][Tt]|[Ss][Ee][Tt])",
       "patterns": [
         {
           "include": "#property-as"
@@ -2125,7 +2166,7 @@
           "name": "keyword.other.abl"
         }
       },
-      "end": "(=\\.)",
+      "end": "(?=\\.)",
       "patterns": [
         {
           "include": "#keywords"
@@ -3203,7 +3244,7 @@
       ]
     },
     "if-then": {
-      "begin": "(?i)\\s*(if)\\s*",
+      "begin": "(?i)\\b(if)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.abl"
@@ -3347,6 +3388,9 @@
         {
           "include": "#handle-methods"
         },
+        {
+          "include": "#keywords"
+        },
         {
           "include": "#expression"
         },
@@ -3769,7 +3813,7 @@
       "name": "constant.language.abl"
     },
     "constant": {
-      "match": "(?i)(?<=^|\\s|\\()(true|false|yes|no|\\?)(?![a-zA-Z0-9_\\-#$%])",
+      "match": "(?i)(?<=^|\\b|\\s|\\()(true|false|yes|no|\\?)(?![a-zA-Z0-9_\\-#$%])",
       "name": "constant.language.abl"
     },
     "punctuation-colon": {
@@ -3863,6 +3907,23 @@
         }
       }
     },
+    "rowid-function": {
+      "match": "(?i)\\s*(rowid)\\s*(\\()\\s*([a-zA-Z_][a-zA-Z0-9_\\-#$%]*(\\.[a-zA-Z][a-zA-Z0-9_\\-#$%]*)?)\\s*(\\))",
+      "captures": {
+        "1": {
+          "name": "support.function.abl"
+        },
+        "2": {
+          "name": "meta.brace.round.js"
+        },
+        "3": {
+          "name": "storage.data.table.abl"
+        },
+        "5": {
+          "name": "meta.brace.round.js"
+        }
+      }
+    },
     "new-record": {
       "comment": "This scope MUST be called after before type-reference (especially new-class) to avoid types being captured as tables",
       "patterns": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abl-tmlanguage",
-  "version": "1.3.10",
+  "version": "1.3.12",
   "description": "TextMate grammar for Progress OpenEdge ABL Language",
   "main": "",
   "repository": {

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

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

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

@@ -0,0 +1,102 @@
+const { assert, expect } = require('chai');
+const shared = require('../shared.js');
+
+describe('', () => {
+  let statement = `FOR EACH  web-cart /*FIELDS (SYSTEM-ID web-key bom-key kit-seq-num req-date line-num entry-key order-num)*/ WHERE
+    web-cart.system-id = user-ctl.system-id[{&web-cart-sys-id}] AND
+    web-cart.web-key = dec(ip-web-key) AND
+    web-cart.order-num = "" AND
+    web-cart.web-type = "GrDirect"
+    NO-LOCK
+     BREAK BY web-cart.req-date
+          BY web-cart.offer-key
+          BY web-cart.location-key:`;
+  let expectedTokens = [
+    [
+      { "startIndex": 0, "endIndex": 3, "scopes": ["source.abl", "keyword.other.abl"] },  // 'FOR'
+      { "startIndex": 3, "endIndex": 4, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 4, "endIndex": 8, "scopes": ["source.abl", "keyword.other.abl"] },  // 'EACH'
+      { "startIndex": 8, "endIndex": 10, "scopes": ["source.abl"] },  // '  '
+      { "startIndex": 10, "endIndex": 18, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'web-cart'
+      { "startIndex": 18, "endIndex": 19, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 19, "endIndex": 21, "scopes": ["source.abl", "comment.block.source.abl"] },  // '/*'
+      { "startIndex": 21, "endIndex": 105, "scopes": ["source.abl", "comment.block.source.abl", "comment"] },  // 'FIELDS (SYSTEM-ID web-key bom-key kit-seq-num req-date line-num entry-key order-num)'
+      { "startIndex": 105, "endIndex": 107, "scopes": ["source.abl", "comment.block.source.abl"] },  // '*/'
+      { "startIndex": 107, "endIndex": 108, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 108, "endIndex": 113, "scopes": ["source.abl", "keyword.other.abl"] }  // 'WHERE'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl"] },  // '    '
+      { "startIndex": 4, "endIndex": 22, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'web-cart.system-id'
+      { "startIndex": 22, "endIndex": 23, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 23, "endIndex": 24, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '='
+      { "startIndex": 24, "endIndex": 25, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 25, "endIndex": 43, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'user-ctl.system-id'
+      { "startIndex": 43, "endIndex": 44, "scopes": ["source.abl", "meta.array.literal.abl", "punctuation.definition.bracket.square.begin.abl"] },  // '['
+      { "startIndex": 44, "endIndex": 62, "scopes": ["source.abl", "meta.array.literal.abl", "storage.type.function.abl"] },  // '{&web-cart-sys-id}'
+      { "startIndex": 62, "endIndex": 63, "scopes": ["source.abl", "meta.array.literal.abl", "punctuation.definition.bracket.square.end.abl"] },  // ']'
+      { "startIndex": 63, "endIndex": 64, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 64, "endIndex": 67, "scopes": ["source.abl", "keyword.other.abl"] }  // 'AND'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl"] },  // '    '
+      { "startIndex": 4, "endIndex": 20, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'web-cart.web-key'
+      { "startIndex": 20, "endIndex": 21, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 21, "endIndex": 22, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '='
+      { "startIndex": 22, "endIndex": 23, "scopes": ["source.abl", "meta.function-call.abl"] },  // ' '
+      { "startIndex": 23, "endIndex": 26, "scopes": ["source.abl", "meta.function-call.abl", "support.function.abl"] },  // 'dec'
+      { "startIndex": 26, "endIndex": 27, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+      { "startIndex": 27, "endIndex": 37, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'ip-web-key'
+      { "startIndex": 37, "endIndex": 38, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] },  // ')'
+      { "startIndex": 38, "endIndex": 39, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 39, "endIndex": 42, "scopes": ["source.abl", "keyword.other.abl"] }  // 'AND'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl"] },  // '    '
+      { "startIndex": 4, "endIndex": 22, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'web-cart.order-num'
+      { "startIndex": 22, "endIndex": 23, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 23, "endIndex": 24, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '='
+      { "startIndex": 24, "endIndex": 25, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 25, "endIndex": 26, "scopes": ["source.abl", "string.double.complex.abl", "punctuation.definition.string.begin.abl"] },  // '"'
+      { "startIndex": 26, "endIndex": 27, "scopes": ["source.abl", "string.double.complex.abl", "punctuation.definition.string.end.abl"] },  // '"'
+      { "startIndex": 27, "endIndex": 28, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 28, "endIndex": 31, "scopes": ["source.abl", "keyword.other.abl"] }  // 'AND'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl"] },  // '    '
+      { "startIndex": 4, "endIndex": 21, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'web-cart.web-type'
+      { "startIndex": 21, "endIndex": 22, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 22, "endIndex": 23, "scopes": ["source.abl", "keyword.operator.source.abl"] },  // '='
+      { "startIndex": 23, "endIndex": 24, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 24, "endIndex": 25, "scopes": ["source.abl", "string.double.complex.abl", "punctuation.definition.string.begin.abl"] },  // '"'
+      { "startIndex": 25, "endIndex": 33, "scopes": ["source.abl", "string.double.complex.abl"] },  // 'GrDirect'
+      { "startIndex": 33, "endIndex": 34, "scopes": ["source.abl", "string.double.complex.abl", "punctuation.definition.string.end.abl"] }  // '"'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl"] },  // '    '
+      { "startIndex": 4, "endIndex": 11, "scopes": ["source.abl", "keyword.other.abl"] }  // 'NO-LOCK'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 5, "scopes": ["source.abl"] },  // '     '
+      { "startIndex": 5, "endIndex": 10, "scopes": ["source.abl", "keyword.other.abl"] },  // 'BREAK'
+      { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 11, "endIndex": 13, "scopes": ["source.abl", "keyword.other.abl"] },  // 'BY'
+      { "startIndex": 13, "endIndex": 14, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 14, "endIndex": 31, "scopes": ["source.abl", "storage.data.table.abl"] }  // 'web-cart.req-date'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 10, "scopes": ["source.abl"] },  // '          '
+      { "startIndex": 10, "endIndex": 12, "scopes": ["source.abl", "keyword.other.abl"] },  // 'BY'
+      { "startIndex": 12, "endIndex": 13, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 13, "endIndex": 31, "scopes": ["source.abl", "storage.data.table.abl"] }  // 'web-cart.offer-key'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 10, "scopes": ["source.abl"] },  // '          '
+      { "startIndex": 10, "endIndex": 12, "scopes": ["source.abl", "keyword.other.abl"] },  // 'BY'
+      { "startIndex": 12, "endIndex": 13, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 13, "endIndex": 34, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'web-cart.location-key'
+      { "startIndex": 34, "endIndex": 35, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // ':'
+    ]
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})

package/spec/comments/comment-in-function-args.spec.js

@@ -36,10 +36,54 @@ describe('', () => {
     { "startIndex": 72, "endIndex": 73, "scopes": ["source.abl", "meta.function.arguments.abl"] },  // ' '
     { "startIndex": 73, "endIndex": 79, "scopes": ["source.abl", "meta.function.arguments.abl", "keyword.other.abl"] },  // 'output'
     { "startIndex": 79, "endIndex": 80, "scopes": ["source.abl", "meta.function.arguments.abl"] },  // ' '
-    { "startIndex": 80, "endIndex": 86, "scopes": ["source.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'result'
+    { "startIndex": 80, "endIndex": 86, "scopes": ["source.abl", "meta.function.arguments.abl", "keyword.other.abl"] },  // 'result'
     { "startIndex": 86, "endIndex": 87, "scopes": ["source.abl", "meta.function.arguments.abl"] },  // ' '
     { "startIndex": 87, "endIndex": 88, "scopes": ["source.abl", "meta.brace.round.js"] },  // ')'
     { "startIndex": 88, "endIndex": 89, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })
+
+describe('', () => {
+  let statement = `run getOEM( host, port, metricPath, "" /* cred */, opts, output xStatus, output vlResult ).`;
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 3, "scopes": ["source.abl", "keyword.other.abl"] },  // 'run'
+    { "startIndex": 3, "endIndex": 4, "scopes": ["source.abl"] },  // ' '
+    { "startIndex": 4, "endIndex": 10, "scopes": ["source.abl", "entity.name.procedure.abl"] },  // 'getOEM'
+    { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
+    { "startIndex": 11, "endIndex": 12, "scopes": ["source.abl", "meta.function.arguments.abl"] },  // ' '
+    { "startIndex": 12, "endIndex": 16, "scopes": ["source.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'host'
+    { "startIndex": 16, "endIndex": 17, "scopes": ["source.abl", "meta.function.arguments.abl", "punctuation.separator.comma.abl"] },  // ','
+    { "startIndex": 17, "endIndex": 18, "scopes": ["source.abl", "meta.function.arguments.abl"] },  // ' '
+    { "startIndex": 18, "endIndex": 22, "scopes": ["source.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'port'
+    { "startIndex": 22, "endIndex": 23, "scopes": ["source.abl", "meta.function.arguments.abl", "punctuation.separator.comma.abl"] },  // ','
+    { "startIndex": 23, "endIndex": 24, "scopes": ["source.abl", "meta.function.arguments.abl"] },  // ' '
+    { "startIndex": 24, "endIndex": 34, "scopes": ["source.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'metricPath'
+    { "startIndex": 34, "endIndex": 35, "scopes": ["source.abl", "meta.function.arguments.abl", "punctuation.separator.comma.abl"] },  // ','
+    { "startIndex": 35, "endIndex": 36, "scopes": ["source.abl", "meta.function.arguments.abl"] },  // ' '
+    { "startIndex": 36, "endIndex": 37, "scopes": ["source.abl", "meta.function.arguments.abl", "string.double.complex.abl", "punctuation.definition.string.begin.abl"] },  // '"'
+    { "startIndex": 37, "endIndex": 38, "scopes": ["source.abl", "meta.function.arguments.abl", "string.double.complex.abl", "punctuation.definition.string.end.abl"] },  // '"'
+    { "startIndex": 38, "endIndex": 39, "scopes": ["source.abl", "meta.function.arguments.abl"] },  // ' '
+    { "startIndex": 39, "endIndex": 41, "scopes": ["source.abl", "meta.function.arguments.abl", "comment.block.source.abl"] },  // '/*'
+    { "startIndex": 41, "endIndex": 47, "scopes": ["source.abl", "meta.function.arguments.abl", "comment.block.source.abl", "comment"] },  // ' cred '
+    { "startIndex": 47, "endIndex": 49, "scopes": ["source.abl", "meta.function.arguments.abl", "comment.block.source.abl"] },  // '*/'
+    { "startIndex": 49, "endIndex": 50, "scopes": ["source.abl", "meta.function.arguments.abl", "punctuation.separator.comma.abl"] },  // ','
+    { "startIndex": 50, "endIndex": 51, "scopes": ["source.abl", "meta.function.arguments.abl"] },  // ' '
+    { "startIndex": 51, "endIndex": 55, "scopes": ["source.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'opts'
+    { "startIndex": 55, "endIndex": 56, "scopes": ["source.abl", "meta.function.arguments.abl", "punctuation.separator.comma.abl"] },  // ','
+    { "startIndex": 56, "endIndex": 57, "scopes": ["source.abl", "meta.function.arguments.abl"] },  // ' '
+    { "startIndex": 57, "endIndex": 63, "scopes": ["source.abl", "meta.function.arguments.abl", "keyword.other.abl"] },  // 'output'
+    { "startIndex": 63, "endIndex": 64, "scopes": ["source.abl", "meta.function.arguments.abl"] },  // ' '
+    { "startIndex": 64, "endIndex": 71, "scopes": ["source.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'xStatus'
+    { "startIndex": 71, "endIndex": 72, "scopes": ["source.abl", "meta.function.arguments.abl", "punctuation.separator.comma.abl"] },  // ','
+    { "startIndex": 72, "endIndex": 73, "scopes": ["source.abl", "meta.function.arguments.abl"] },  // ' '
+    { "startIndex": 73, "endIndex": 79, "scopes": ["source.abl", "meta.function.arguments.abl", "keyword.other.abl"] },  // 'output'
+    { "startIndex": 79, "endIndex": 80, "scopes": ["source.abl", "meta.function.arguments.abl"] },  // ' '
+    { "startIndex": 80, "endIndex": 88, "scopes": ["source.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'vlResult'
+    { "startIndex": 88, "endIndex": 89, "scopes": ["source.abl", "meta.function.arguments.abl"] },  // ' '
+    { "startIndex": 89, "endIndex": 90, "scopes": ["source.abl", "meta.brace.round.js"] },  // ')'
+    { "startIndex": 90, "endIndex": 91, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+

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

@@ -15,7 +15,7 @@ describe('', () => {
     { "startIndex": 32, "endIndex": 40, "scopes": ["source.abl", "keyword.other.abl"] },  // 'DATABASE'
     { "startIndex": 40, "endIndex": 41, "scopes": ["source.abl"] },  // ' '
     { "startIndex": 41, "endIndex": 60, "scopes": ["source.abl", "storage.data.database.abl"] },  // 'logical-name-string'
-    { "startIndex": 60, "endIndex": 62, "scopes": ["source.abl"] }  // '.'
+    { "startIndex": 60, "endIndex": 61, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })
@@ -46,7 +46,7 @@ describe('', () => {
     { "startIndex": 55, "endIndex": 65, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'expression'
     { "startIndex": 65, "endIndex": 66, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl"] },  // ' '
     { "startIndex": 66, "endIndex": 67, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] },  // ')'
-    { "startIndex": 67, "endIndex": 69, "scopes": ["source.abl"] }  // '.'
+    { "startIndex": 67, "endIndex": 68, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })
@@ -71,7 +71,7 @@ describe('', () => {
     { "startIndex": 47, "endIndex": 54, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "storage.data.table.abl"] },  // 'tt.fld1'
     { "startIndex": 54, "endIndex": 55, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl"] },  // ' '
     { "startIndex": 55, "endIndex": 56, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] },  // ')'
-    { "startIndex": 56, "endIndex": 58, "scopes": ["source.abl"] }  // '.'
+    { "startIndex": 56, "endIndex": 57, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })
@@ -95,7 +95,36 @@ describe('', () => {
     { "startIndex": 41, "endIndex": 42, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "meta.brace.round.js"] },  // '('
     { "startIndex": 42, "endIndex": 53, "scopes": ["source.abl", "meta.function-call.abl", "meta.function.arguments.abl", "variable.other.abl"] },  // 'user_dbname'
     { "startIndex": 53, "endIndex": 54, "scopes": ["source.abl", "meta.function-call.abl", "meta.brace.round.js"] },  // ')'
-    { "startIndex": 54, "endIndex": 56, "scopes": ["source.abl"] }  // '.'
+    { "startIndex": 54, "endIndex": 55, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `// Valid comment
+CREATE ALIAS xx1 FOR DATABASE xx2.
+// Not correctly highlighted`;
+  let expectedTokens = [
+    [
+      { "startIndex": 0, "endIndex": 16, "scopes": ["source.abl", "comment.line.double-slash.abl"] }  // '// Valid comment'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "keyword.other.abl"] },  // 'CREATE'
+      { "startIndex": 6, "endIndex": 7, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 7, "endIndex": 12, "scopes": ["source.abl", "keyword.other.abl"] },  // 'ALIAS'
+      { "startIndex": 12, "endIndex": 13, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 13, "endIndex": 16, "scopes": ["source.abl", "storage.data.database.abl"] },  // 'xx1'
+      { "startIndex": 16, "endIndex": 17, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 17, "endIndex": 20, "scopes": ["source.abl", "keyword.other.abl"] },  // 'FOR'
+      { "startIndex": 20, "endIndex": 21, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 21, "endIndex": 29, "scopes": ["source.abl", "keyword.other.abl"] },  // 'DATABASE'
+      { "startIndex": 29, "endIndex": 30, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 30, "endIndex": 33, "scopes": ["source.abl", "storage.data.database.abl"] },  // 'xx2'
+      { "startIndex": 33, "endIndex": 34, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 28, "scopes": ["source.abl", "comment.line.double-slash.abl"] }  // '// Not correctly highlighted'
+    ]
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })