abl-tmlanguage 1.3.18 → 1.3.19

package/abl.tmLanguage.json

@@ -870,7 +870,7 @@
     },
     "using": {
       "name": "meta.using.abl",
-      "begin": "(?i)\\s*(using)\\s*",
+      "begin": "\\s*([Uu][Ss][Ii][Nn][Gg])\\s*",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.abl"
@@ -893,7 +893,7 @@
           }
         },
         {
-          "match": "(?i)\\s*(from|propath|assembly)\\s*",
+          "match": "\\s*([Ff][Rr][Oo][Mm]|[Pp][Rr][Oo][Pp][Aa][Tt][Hh]|[Aa][Ss][Ss][Ee][Mm][Bb][Ll][Yy])\\s*",
           "captures": {
             "1": {
               "name": "keyword.other.abl"
@@ -902,6 +902,9 @@
         },
         {
           "include": "#type-name"
+        },
+        {
+          "include": "#comment"
         }
       ]
     },
@@ -974,7 +977,7 @@
       },
       "patterns": [
         {
-          "match": "(?i)\\s*(serializable|abstract|final|use-widget-pool|inherits|implements)\\s*",
+          "match": "(?i)\\b(serializable|abstract|final|use-widget-pool|inherits|implements)\\b",
           "captures": {
             "1": {
               "name": "keyword.other.abl"
@@ -2345,7 +2348,7 @@
     },
     "create-buffer": {
       "comment": "https://docs.progress.com/bundle/abl-reference/page/CREATE-BUFFER-statement.html",
-      "begin": "(?i)(create)\\s+(buffer)\\b",
+      "begin": "\\s*([Cc][Rr][Ee][Aa][Tt][Ee])\\s+([Bb][Uu][Ff][Ff][Ee][Rr])\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.abl"
@@ -2354,7 +2357,7 @@
           "name": "keyword.other.abl"
         }
       },
-      "end": "(?i)(\\b((buffer-n(?:ame|am|a)?)|in)\\b)|(?=\\.)",
+      "end": "(?i)(((buffer-n(?:ame|am|a)?)|in)\\b)|(?=\\.)",
       "endCaptures": {
         "1": {
           "name": "keyword.other.abl"
@@ -2362,7 +2365,7 @@
       },
       "patterns": [
         {
-          "match": "(?i)\\s*(for|table)\\s*",
+          "match": "(?i)\\s*(for|table|no-error)\\s*",
           "captures": {
             "1": {
               "name": "keyword.other.abl"
@@ -2381,15 +2384,15 @@
         {
           "include": "#expression"
         },
-        {
-          "include": "#keywords"
-        },
         {
           "include": "#string"
         },
         {
           "include": "#comment"
         },
+        {
+          "include": "#preprocessor-reference"
+        },
         {
           "include": "#handle-attributes"
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abl-tmlanguage",
-  "version": "1.3.18",
+  "version": "1.3.19",
   "description": "TextMate grammar for Progress OpenEdge ABL Language",
   "main": "",
   "type": "commonjs",

package/spec/define-buffer/create-buffer.spec.js

@@ -108,3 +108,48 @@ describe('', () => {
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })
+
+describe('', () => {
+  let statement = `create buffer vBufferHandle for table vTableName no-error.
+
+    create buffer vBufferHandle for table vTableName no-error.`;
+  let expectedTokens = [
+    [
+      { "startIndex": 0, "endIndex": 6, "scopes": ["source.abl", "keyword.other.abl"] },  // 'create'
+      { "startIndex": 6, "endIndex": 7, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 7, "endIndex": 13, "scopes": ["source.abl", "keyword.other.abl"] },  // 'buffer'
+      { "startIndex": 13, "endIndex": 14, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 14, "endIndex": 27, "scopes": ["source.abl", "variable.other.abl"] },  // 'vBufferHandle'
+      { "startIndex": 27, "endIndex": 28, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 28, "endIndex": 31, "scopes": ["source.abl", "keyword.other.abl"] },  // 'for'
+      { "startIndex": 31, "endIndex": 32, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 32, "endIndex": 37, "scopes": ["source.abl", "keyword.other.abl"] },  // 'table'
+      { "startIndex": 37, "endIndex": 38, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 38, "endIndex": 48, "scopes": ["source.abl", "variable.other.abl"] },  // 'vTableName'
+      { "startIndex": 48, "endIndex": 49, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 49, "endIndex": 57, "scopes": ["source.abl", "keyword.other.abl"] },  // 'no-error'
+      { "startIndex": 57, "endIndex": 58, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 1, "scopes": ["source.abl"] }  // ''
+    ],
+    [
+      { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl"] },  // '    '
+      { "startIndex": 4, "endIndex": 10, "scopes": ["source.abl", "keyword.other.abl"] },  // 'create'
+      { "startIndex": 10, "endIndex": 11, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 11, "endIndex": 17, "scopes": ["source.abl", "keyword.other.abl"] },  // 'buffer'
+      { "startIndex": 17, "endIndex": 18, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 18, "endIndex": 31, "scopes": ["source.abl", "variable.other.abl"] },  // 'vBufferHandle'
+      { "startIndex": 31, "endIndex": 32, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 32, "endIndex": 35, "scopes": ["source.abl", "keyword.other.abl"] },  // 'for'
+      { "startIndex": 35, "endIndex": 36, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 36, "endIndex": 41, "scopes": ["source.abl", "keyword.other.abl"] },  // 'table'
+      { "startIndex": 41, "endIndex": 42, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 42, "endIndex": 52, "scopes": ["source.abl", "variable.other.abl"] },  // 'vTableName'
+      { "startIndex": 52, "endIndex": 53, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 53, "endIndex": 61, "scopes": ["source.abl", "keyword.other.abl"] },  // 'no-error'
+      { "startIndex": 61, "endIndex": 62, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+    ]
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})

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

@@ -141,7 +141,7 @@ describe('', () => {
 })
 
 describe('', () => {
-  let statement = `CLASS foo.bar.baz serializable inherits parent.class implements one.interface,anotehr.iface abstract use-widget-pool:`;
+  let statement = `CLASS foo.bar.baz serializable inherits parent.class implements one.interface,another.iface abstract use-widget-pool:`;
 
   let expectedTokens = [
     { "startIndex": 0, "endIndex": 5, "scopes": ["source.abl", "meta.define.class.abl", "keyword.other.abl"] },  // 'CLASS'
@@ -158,7 +158,7 @@ describe('', () => {
     { "startIndex": 63, "endIndex": 64, "scopes": ["source.abl", "meta.define.class.abl"] },  // ' '
     { "startIndex": 64, "endIndex": 77, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] },  // 'one.interface'
     { "startIndex": 77, "endIndex": 78, "scopes": ["source.abl", "meta.define.class.abl", "punctuation.separator.comma.abl"] },  // ','
-    { "startIndex": 78, "endIndex": 91, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] },  // 'anotehr.iface'
+    { "startIndex": 78, "endIndex": 91, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] },  // 'another.iface'
     { "startIndex": 91, "endIndex": 92, "scopes": ["source.abl", "meta.define.class.abl"] },  // ' '
     { "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"] },  // ' '
@@ -466,3 +466,90 @@ describe('', () => {
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })
+
+describe('', () => {
+  let statement = `class Company.Plugins.ServerPlugin
+    inherits AbstractPlugin
+    implements IServerPlugin :`;
+
+  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": 34, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] }  // 'Company.Plugins.ServerPlugin'
+    ],
+    [
+      { "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": 27, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] }  // 'AbstractPlugin'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl", "meta.define.class.abl"] },  // '    '
+      { "startIndex": 4, "endIndex": 14, "scopes": ["source.abl", "meta.define.class.abl", "keyword.other.abl"] },  // 'implements'
+      { "startIndex": 14, "endIndex": 15, "scopes": ["source.abl", "meta.define.class.abl"] },  // ' '
+      { "startIndex": 15, "endIndex": 28, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] },  // 'IServerPlugin'
+      { "startIndex": 28, "endIndex": 29, "scopes": ["source.abl", "meta.define.class.abl"] },  // ' '
+      { "startIndex": 29, "endIndex": 30, "scopes": ["source.abl", "meta.define.class.abl", "punctuation.terminator.abl"] }  // ':'
+    ]
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `class Company.Plugins.ServerPlugin
+    inherits FinalAbstractPlugin
+    implements IServerPlugin :`;
+
+  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": 34, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] }  // 'Company.Plugins.ServerPlugin'
+    ],
+    [
+      { "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": 32, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] }  // 'FinalAbstractPlugin'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl", "meta.define.class.abl"] },  // '    '
+      { "startIndex": 4, "endIndex": 14, "scopes": ["source.abl", "meta.define.class.abl", "keyword.other.abl"] },  // 'implements'
+      { "startIndex": 14, "endIndex": 15, "scopes": ["source.abl", "meta.define.class.abl"] },  // ' '
+      { "startIndex": 15, "endIndex": 28, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] },  // 'IServerPlugin'
+      { "startIndex": 28, "endIndex": 29, "scopes": ["source.abl", "meta.define.class.abl"] },  // ' '
+      { "startIndex": 29, "endIndex": 30, "scopes": ["source.abl", "meta.define.class.abl", "punctuation.terminator.abl"] }  // ':'
+    ]
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `class Company.Plugins.ServerPlugin
+    inherits FinalAbstractPlugin
+    implements AbstractServerPlugin :`;
+
+  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": 34, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] }  // 'Company.Plugins.ServerPlugin'
+    ],
+    [
+      { "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": 32, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] }  // 'FinalAbstractPlugin'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 4, "scopes": ["source.abl", "meta.define.class.abl"] },  // '    '
+      { "startIndex": 4, "endIndex": 14, "scopes": ["source.abl", "meta.define.class.abl", "keyword.other.abl"] },  // 'implements'
+      { "startIndex": 14, "endIndex": 15, "scopes": ["source.abl", "meta.define.class.abl"] },  // ' '
+      { "startIndex": 15, "endIndex": 35, "scopes": ["source.abl", "meta.define.class.abl", "entity.name.type.abl"] },  // 'AbstractServerPlugin'
+      { "startIndex": 35, "endIndex": 36, "scopes": ["source.abl", "meta.define.class.abl"] },  // ' '
+      { "startIndex": 36, "endIndex": 37, "scopes": ["source.abl", "meta.define.class.abl", "punctuation.terminator.abl"] }  // ':'
+    ]
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})

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

@@ -126,3 +126,35 @@ describe('', () => {
   ];
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })
+
+describe('', () => {
+  let statement = `using foo.bar.*  /*from propath*/.`;
+
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 5, "scopes": ["source.abl", "meta.using.abl", "keyword.other.abl"] },  // 'using'
+    { "startIndex": 5, "endIndex": 6, "scopes": ["source.abl", "meta.using.abl"] },  // ' '
+    { "startIndex": 6, "endIndex": 13, "scopes": ["source.abl", "meta.using.abl", "entity.name.package.abl"] },  // 'foo.bar'
+    { "startIndex": 13, "endIndex": 17, "scopes": ["source.abl", "meta.using.abl"] },  // '.*  '
+    { "startIndex": 17, "endIndex": 19, "scopes": ["source.abl", "meta.using.abl", "comment.block.source.abl"] },  // '/*'
+    { "startIndex": 19, "endIndex": 31, "scopes": ["source.abl", "meta.using.abl", "comment.block.source.abl", "comment"] },  // 'from propath'
+    { "startIndex": 31, "endIndex": 33, "scopes": ["source.abl", "meta.using.abl", "comment.block.source.abl"] },  // '*/'
+    { "startIndex": 33, "endIndex": 34, "scopes": ["source.abl", "meta.using.abl", "punctuation.terminator.abl"] }  // '.'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `using foo.bar.baz  /*from propath*/.`;
+
+  let expectedTokens = [
+    { "startIndex": 0, "endIndex": 5, "scopes": ["source.abl", "meta.using.abl", "keyword.other.abl"] },  // 'using'
+    { "startIndex": 5, "endIndex": 6, "scopes": ["source.abl", "meta.using.abl"] },  // ' '
+    { "startIndex": 6, "endIndex": 17, "scopes": ["source.abl", "meta.using.abl", "entity.name.type.abl"] },  // 'foo.bar.baz'
+    { "startIndex": 17, "endIndex": 19, "scopes": ["source.abl", "meta.using.abl"] },  // '  '
+    { "startIndex": 19, "endIndex": 21, "scopes": ["source.abl", "meta.using.abl", "comment.block.source.abl"] },  // '/*'
+    { "startIndex": 21, "endIndex": 33, "scopes": ["source.abl", "meta.using.abl", "comment.block.source.abl", "comment"] },  // 'from propath'
+    { "startIndex": 33, "endIndex": 35, "scopes": ["source.abl", "meta.using.abl", "comment.block.source.abl"] },  // '*/'
+    { "startIndex": 35, "endIndex": 36, "scopes": ["source.abl", "meta.using.abl", "punctuation.terminator.abl"] }  // '.'
+  ];
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})