abl-tmlanguage 1.3.3 → 1.3.5

package/abl.tmLanguage.json

@@ -76,9 +76,95 @@
         }
       }
     },
+    "function-definition": {
+      "name": "meta.define.function.abl",
+      "begin": "(?i)\\b(function)\\s+([a-z0-9][a-z0-9#$\\-_%&]+)\\b",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.other.abl"
+        },
+        "2": {
+          "name": "entity.name.function.abl"
+        }
+      },
+      "end": "(\\.|\\:)",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.terminator.abl"
+        }
+      },
+      "patterns": [
+        {
+          "match": "(?i)\\b(map|to)\\s+(?!to\\s+)([a-z0-9][a-z0-9#$\\-_%&]+)\\b",
+          "captures": {
+            "1": {
+              "name": "keyword.other.abl"
+            },
+            "2": {
+              "name": "entity.name.function.abl"
+            }
+          }
+        },
+        {
+          "match": "(?i)\\b(returns|private|class|extent|in|super|forward|map)\\b",
+          "comment": "Captures the allowed keywords before the parenthesis. Some keywords are after the 'parens' when there are no parens used",
+          "captures": {
+            "1": {
+              "name": "keyword.other.abl"
+            }
+          }
+        },
+        {
+          "include": "#function-parameter-definition"
+        },
+        {
+          "include": "#parens"
+        },
+        {
+          "comment": "This captures everything after the parens, which may contain variables and methods",
+          "begin": "(?i)(?<=\\)|in)",
+          "end": "(?=(\\.|\\:)\\s)",
+          "patterns": [
+            {
+              "include": "#keywords"
+            },
+            {
+              "include": "#type-member-call"
+            },
+            {
+              "include": "#variable-name"
+            },
+            {
+              "include": "#comment"
+            },
+            {
+              "include": "#string"
+            },
+            {
+              "include": "#preprocessors"
+            }
+          ]
+        },
+        {
+          "include": "#primitive-type"
+        },
+        {
+          "include": "#type-name"
+        },
+        {
+          "include": "#keywords"
+        },
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#preprocessors"
+        }
+      ]
+    },
     "method-definition": {
       "name": "meta.define.method.abl",
-      "begin": "(?i)^\\s*(method|constructor)\\s*",
+      "begin": "(?i)^\\s*(method|constructor|destructor)\\s*",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.abl"
@@ -316,6 +402,9 @@
         },
         {
           "include": "#comment"
+        },
+        {
+          "include": "#preprocessors"
         }
       ]
     },
@@ -343,6 +432,12 @@
     "statements": {
       "name": "meta.statements.abl",
       "patterns": [
+        {
+          "include": "#function-definition"
+        },
+        {
+          "include": "#record-buffer-functions"
+        },
         {
           "include": "#release"
         },
@@ -459,6 +554,9 @@
         {
           "include": "#timestamp-constant"
         },
+        {
+          "include": "#break-by"
+        },
         {
           "include": "#for-join"
         },
@@ -565,6 +663,21 @@
         }
       ]
     },
+    "break-by": {
+      "match": "(?i)\\s*((break)\\s+)?(by)\\s+(([\\w\\-#$%]+\\.)?([\\w\\-#$%]+\\.)([\\w\\-#$%]+)(\\[\\d+\\])?)\\b",
+      "comments": "The match needs a space capture before the BREAK, not a word break",
+      "captures": {
+        "2": {
+          "name": "keyword.other.abl"
+        },
+        "3": {
+          "name": "keyword.other.abl"
+        },
+        "4": {
+          "name": "storage.data.table.abl"
+        }
+      }
+    },
     "preprocessors": {
       "match": "(?i)(\\&[\\w-]*)|({\\&[\\w-]*})|(&window-system|&text-height|&line-number|&batch-mode|&file-name|&undefine|&sequence|&message|defined|&elseif|&scoped|&global|&opsys|&endif|&else|&scop|&then|&glob|&if)",
       "captures": {
@@ -1185,6 +1298,24 @@
         }
       ]
     },
+    "record-buffer-functions": {
+      "comment": "this capture does not include the NOT function since it is impossible to determine whether this is a new class or a new record.",
+      "match": "(?i)\\b(available|locked|ambiguous)\\s*(\\()?\\s*([\\w\\-#$%]+(\\.[\\w\\-#$%]+)?)\\s*(\\))?",
+      "captures": {
+        "1": {
+          "name": "support.function.abl"
+        },
+        "2": {
+          "name": "meta.brace.round.js"
+        },
+        "3": {
+          "name": "support.data.table.abl"
+        },
+        "5": {
+          "name": "meta.brace.round.js"
+        }
+      }
+    },
     "copy-lob": {
       "comment": "Has its own rule because of the 'FOR length' option, which is parsed as a 'FOR EACH' type statement",
       "begin": "(?i)\\b(copy-lob)\\b",
@@ -1301,6 +1432,9 @@
     },
     "code-block": {
       "patterns": [
+        {
+          "include": "#record-buffer-functions"
+        },
         {
           "include": "#comment"
         },
@@ -2243,7 +2377,7 @@
       }
     },
     "block-label": {
-      "match": "(?i)^\\s*((?!transaction|no-lock|exclusive-lock|exclusive-loc|exclusive-lo|exclusive-l|share-lock|share-loc|share-lo|share-|share)([a-z][a-z0-9\\-\\$\\#]*)+(:))\\s",
+      "match": "(?i)^\\s*(?!(transaction|no-lock|exclusive-lock|exclusive-loc|exclusive-lo|exclusive-l|share-lock|share-loc|share-lo|share-|share):)([a-z][a-z0-9\\-\\$\\#]*)(:)\\s",
       "comment": "A colon followed by a space is only legal is for block labels. Block labels must also be at the beginning of a line",
       "captures": {
         "2": {
@@ -3359,7 +3493,8 @@
       }
     },
     "operator-with-space": {
-      "match": "(?i)\\s+(contains|begins|matches|eq|le|lt|ge|gt|ne)\\s+",
+      "match": "(?i)(?<=\\s)(not|contains|begins|matches|eq|le|lt|ge|gt|ne)(?=\\s|\\()",
+      "comment": "Lookahead and -behind for the spaces, so that in particular the NOT is captured properly",
       "captures": {
         "1": {
           "name": "keyword.operator.source.abl"
@@ -3446,7 +3581,7 @@
       ]
     },
     "keywords-A": {
-      "match": "(?i)\\b(avg|average|averag|avera|aver|ave|automatic|auto-endkey|authorization|audit-policy|audit-control|attribute-type|attachment|attach|at|assign|assembly|ask-overwrite|ascending|ascendin|ascendi|ascend|ascen|asce|asc|as-cursor|as|array-message|array-messag|array-messa|array-mess|array-mes|array-me|array-m|apply|application|append-line|append|anywhere|any-printable|any-key|any|ansi-only|and|alternate-key|alter|allow-replication|all|alert-box|aggregate|advise|add|active-window|active-form|across|accumulate|accumulat|accumula|accumul|accumu|accum|abstract|abort)\\b",
+        "match": "(?i)\\b(avg|average|averag|avera|aver|ave|available|automatic|auto-endkey|authorization|audit-policy|audit-control|attribute-type|attachment|attach|at|assign|assembly|ask-overwrite|ascending|ascendin|ascendi|ascend|ascen|asce|asc|as-cursor|as|array-message|array-messag|array-messa|array-mess|array-mes|array-me|array-m|apply|application|append-line|append|anywhere|any-printable|any-key|any|ansi-only|and|ambiguous|alternate-key|alter|allow-replication|all|alert-box|aggregate|advise|add|active-window|active-form|across|accumulate|accumulat|accumula|accumul|accumu|accum|abstract|abort)\\b",
       "captures": {
         "1": {
           "name": "keyword.other.abl"
@@ -3486,7 +3621,7 @@
       }
     },
     "keywords-F": {
-      "match": "(?i)\\b(function-call-type|full-height|fromnoreorder|from-pixels|from-pixel|from-pixe|from-pix|from-pi|from-p|from-current|from-curren|from-curre|from-curr|from-cur|from-chars|from-char|from-cha|from-ch|from-c|from|frame-value|frame|forwards|forward|format|form|force-file|for|font-table|font|focus-in|focus|float|flags|fixed-only|fix-codepage|first|firehose-cursor|finder|find-wrap-around|find-select|find-previous|find-prev-occurrence|find-next-occurrence|find-next|find-global|find-case-sensitive|find|finally|final|filters|fill-in|filename|file-information|file-informatio|file-informati|file-informat|file-informa|file-inform|file-infor|file-info|file-access-time|file-access-tim|file-access-ti|file-access-t|file-access-date|file-access-dat|file-access-da|file-access-d|file|fields|field|fetch|false-leaks|false)\\b",
+        "match": "(?i)\\b(function-call-type|function|full-height|fromnoreorder|from-pixels|from-pixel|from-pixe|from-pix|from-pi|from-p|from-current|from-curren|from-curre|from-curr|from-cur|from-chars|from-char|from-cha|from-ch|from-c|from|frame-value|frame|forwards|forward|format|form|force-file|for|font-table|font|focus-in|focus|float|flags|fixed-only|fix-codepage|first|firehose-cursor|finder|find-wrap-around|find-select|find-previous|find-prev-occurrence|find-next-occurrence|find-next|find-global|find-case-sensitive|find|finally|final|filters|fill-in|filename|file-information|file-informatio|file-informati|file-informat|file-informa|file-inform|file-infor|file-info|file-access-time|file-access-tim|file-access-ti|file-access-t|file-access-date|file-access-dat|file-access-da|file-access-d|file|fields|field|fetch|false-leaks|false)\\b",
       "captures": {
         "1": {
           "name": "keyword.other.abl"
@@ -3534,7 +3669,7 @@
       }
     },
     "keywords-L": {
-      "match": "(?i)\\b(lt|lookahead|longchar|longcha|longch|long|log-manager|log-id|lob-dir|load-result-into|load-picture|load-from|load|little-endian|listing|listin|listi|line-up|line-right|line-left|line-down|like-sequential|like|length|left-end|left-aligned|left-aligne|left-align|left|leave|leak-detection|leading|le|last-key|last-event|last-even|landscape|label-pfcolor|label-pfcolo|label-pfcol|label-pfco|label-pfc|label)\\b",
+      "match": "(?i)\\b(lt|lookahead|longchar|longcha|longch|long|log-manager|log-id|locked|lob-dir|load-result-into|load-picture|load-from|load|little-endian|listing|listin|listi|line-up|line-right|line-left|line-down|like-sequential|like|length|left-end|left-aligned|left-aligne|left-align|left|leave|leak-detection|leading|le|last-key|last-event|last-even|landscape|label-pfcolor|label-pfcolo|label-pfcol|label-pfco|label-pfc|label)\\b",
       "captures": {
         "1": {
           "name": "keyword.other.abl"
@@ -3550,7 +3685,7 @@
       }
     },
     "keywords-N": {
-      "match": "(?i)\\b(numeric|num-selected|num-copies|null|not-active|none|non-serializable|node-type|no-word-wrap|no-wait|no-undo|no-underline|no-underlin|no-underli|no-underl|no-under|no-unde|no-und|no-tab-stop|no-tab-sto|no-tab-st|no-tab-s|no-tab-|no-tab|no-separators|no-separate-connection|no-scrolling|no-scrollbar-vertical|no-scrollbar-vertica|no-scrollbar-vertic|no-scrollbar-verti|no-scrollbar-vert|no-scrollbar-ver|no-scrollbar-ve|no-scrollbar-v|no-schema-marshall|no-schema-marshal|no-row-markers|no-return-value|no-return-valu|no-return-val|no-query-unique-added|no-query-unique-adde|no-query-unique-add|no-query-unique-ad|no-query-unique-a|no-query-unique-|no-query-unique|no-query-uniqu|no-query-uniq|no-query-uni|no-query-un|no-query-u|no-query-order-added|no-query-order-adde|no-query-order-add|no-query-order-ad|no-query-order-a|no-query-order-|no-query-order|no-query-orde|no-query-ord|no-query-or|no-query-o|no-prefetch|no-prefetc|no-prefet|no-prefe|no-pause|no-message|no-messag|no-messa|no-mess|no-mes|no-map|no-lookahead|no-lock|no-lobs|no-labels|no-label|no-keycache-join|no-join-by-sqldb|no-inherit-fgcolor|no-inherit-fgcolo|no-inherit-fgcol|no-inherit-fgco|no-inherit-fgc|no-inherit-bgcolor|no-inherit-bgcolo|no-inherit-bgcol|no-inherit-bgco|no-inherit-bgc|no-index-hint|no-hide|no-help|no-firehose-cursor|no-fill|no-fil|no-fi|no-f|no-error|no-echo|no-drag|no-debug|no-convert-3d-colors|no-convert-3d-color|no-convert-3d-colo|no-convert-3d-col|no-convert-3d-co|no-convert-3d-c|no-convert-3d-|no-convert-3d|no-convert|no-console|no-column-scrolling|no-column-scrollin|no-column-scrolli|no-column-scroll|no-column-scrol|no-column-scro|no-column-scr|no-column-sc|no-box|no-bind-where|no-auto-validate|no-auto-trim|no-auto-tri|no-attr-space|no-attr-spac|no-attr-spa|no-attr-sp|no-attr-s|no-attr-list|no-attr-lis|no-attr-li|no-attr-l|no-attr|no-assign|no-array-message|no-array-messag|no-array-messa|no-array-mess|no-array-mes|no-array-me|no-array-m|no-apply|no|next-word|next-prompt|next-frame|next-error|next|new-line|new-instance|new|nested|ne|native)\\b",
+        "match": "(?i)\\b(numeric|num-selected|num-copies|null|not-active|not|none|non-serializable|node-type|no-word-wrap|no-wait|no-undo|no-underline|no-underlin|no-underli|no-underl|no-under|no-unde|no-und|no-tab-stop|no-tab-sto|no-tab-st|no-tab-s|no-tab-|no-tab|no-separators|no-separate-connection|no-scrolling|no-scrollbar-vertical|no-scrollbar-vertica|no-scrollbar-vertic|no-scrollbar-verti|no-scrollbar-vert|no-scrollbar-ver|no-scrollbar-ve|no-scrollbar-v|no-schema-marshall|no-schema-marshal|no-row-markers|no-return-value|no-return-valu|no-return-val|no-query-unique-added|no-query-unique-adde|no-query-unique-add|no-query-unique-ad|no-query-unique-a|no-query-unique-|no-query-unique|no-query-uniqu|no-query-uniq|no-query-uni|no-query-un|no-query-u|no-query-order-added|no-query-order-adde|no-query-order-add|no-query-order-ad|no-query-order-a|no-query-order-|no-query-order|no-query-orde|no-query-ord|no-query-or|no-query-o|no-prefetch|no-prefetc|no-prefet|no-prefe|no-pause|no-message|no-messag|no-messa|no-mess|no-mes|no-map|no-lookahead|no-lock|no-lobs|no-labels|no-label|no-keycache-join|no-join-by-sqldb|no-inherit-fgcolor|no-inherit-fgcolo|no-inherit-fgcol|no-inherit-fgco|no-inherit-fgc|no-inherit-bgcolor|no-inherit-bgcolo|no-inherit-bgcol|no-inherit-bgco|no-inherit-bgc|no-index-hint|no-hide|no-help|no-firehose-cursor|no-fill|no-fil|no-fi|no-f|no-error|no-echo|no-drag|no-debug|no-convert-3d-colors|no-convert-3d-color|no-convert-3d-colo|no-convert-3d-col|no-convert-3d-co|no-convert-3d-c|no-convert-3d-|no-convert-3d|no-convert|no-console|no-column-scrolling|no-column-scrollin|no-column-scrolli|no-column-scroll|no-column-scrol|no-column-scro|no-column-scr|no-column-sc|no-box|no-bind-where|no-auto-validate|no-auto-trim|no-auto-tri|no-attr-space|no-attr-spac|no-attr-spa|no-attr-sp|no-attr-s|no-attr-list|no-attr-lis|no-attr-li|no-attr-l|no-attr|no-assign|no-array-message|no-array-messag|no-array-messa|no-array-mess|no-array-mes|no-array-me|no-array-m|no-apply|no|next-word|next-prompt|next-frame|next-error|next|new-line|new-instance|new|nested|ne|native|namespace-uri|namespace-prefix)\\b",
       "captures": {
         "1": {
           "name": "keyword.other.abl"
@@ -3582,7 +3717,7 @@
       }
     },
     "keywords-R": {
-      "match": "(?i)\\b(run-procedure|run-procedur|run-procedu|run-proced|run-proce|run-proc|run|rule-y|rule-row|rule|row-unmodified|row-of|row-modified|row-leave|row-height|row-entry|row-display|row-deleted|row-created|row|routine-level|right-end|right-aligned|right-aligne|right-align|right|revoke|revert|reverse-from|returns|return-to-start-dir|return-to-start-di|return|retry-cancel|retain|resume-display|result|request|reposition-parent-relation|reposition-parent-relatio|reposition-parent-relati|reposition-parent-relat|reposition-parent-rela|reposition-parent-rel|reposition-forwards|reposition-forward|reposition-forwar|reposition-forwa|reposition-forw|reposition-backwards|reposition-backward|reposition-backwar|reposition-backwa|reposition-backw|reposition-back|reposition|reports|replication-write|replication-delete|replication-create|repeat|release|reinstate|reference-only|rectangle|rectangl|rectang|rectan|recta|rect|recall|real|readkey|read-response|read-exact-num|read-available|rcode-information|rcode-informatio|rcode-informati|rcode-informat|rcode-informa|rcode-inform|rcode-infor|rcode-info|raw-transfer|raw|radio-set)\\b",
+      "match": "(?i)\\b(run-procedure|run-procedur|run-procedu|run-proced|run-proce|run-proc|run|rule-y|rule-row|rule|row-unmodified|row-of|row-modified|row-leave|row-height|row-entry|row-display|row-deleted|row-created|row|routine-level|right-end|right-aligned|right-aligne|right-align|right|revoke|revert|reverse-from|returns|return-value|return-to-start-dir|return-to-start-di|return|retry-cancel|retain|resume-display|result|request|reposition-parent-relation|reposition-parent-relatio|reposition-parent-relati|reposition-parent-relat|reposition-parent-rela|reposition-parent-rel|reposition-forwards|reposition-forward|reposition-forwar|reposition-forwa|reposition-forw|reposition-backwards|reposition-backward|reposition-backwar|reposition-backwa|reposition-backw|reposition-back|reposition|reports|replication-write|replication-delete|replication-create|repeat|release|reinstate|reference-only|rectangle|rectangl|rectang|rectan|recta|rect|recall|real|readkey|read-response|read-exact-num|read-available|rcode-information|rcode-informatio|rcode-informati|rcode-informat|rcode-informa|rcode-inform|rcode-infor|rcode-info|raw-transfer|raw|radio-set)\\b",
       "captures": {
         "1": {
           "name": "keyword.other.abl"
@@ -3630,7 +3765,7 @@
       }
     },
     "keywords-X": {
-      "match": "(?i)\\b(xref-xml|xref|xor|xcode|x-of|x-noderef|x-document)\\b",
+        "match": "(?i)\\b(xref-xml|xref|xor|xml-node-name|xcode|x-of|x-noderef|x-document)\\b",
       "captures": {
         "1": {
           "name": "keyword.other.abl"
@@ -3638,7 +3773,7 @@
       }
     },
     "keywords-Y": {
-      "match": "(?i)\\b(yes-no-cancel|yes-no|yes|year-offset|y-of)\\b",
+      "match": "(?i)\\b(yes-no-cancel|yes-no|yes|year-offset|year|y-of)\\b",
       "captures": {
         "1": {
           "name": "keyword.other.abl"
@@ -4614,7 +4749,7 @@
     },
     "abl-functions-F": {
       "name": "meta.function-call.abl",
-      "begin": "(?i)\\s*(function|frame-value|frame-valu|frame-val|frame-row|frame-name|frame-line|frame-index|frame-inde|frame-file|frame-field|frame-down|frame-db|frame-col|first-of|first|fill)\\s*(?=\\()",
+        "begin": "(?i)\\s*(frame-value|frame-valu|frame-val|frame-row|frame-name|frame-line|frame-index|frame-inde|frame-file|frame-field|frame-down|frame-db|frame-col|first-of|first|fill)\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "name": "support.function.abl"
@@ -4754,7 +4889,7 @@
     },
     "abl-functions-N": {
       "name": "meta.function-call.abl",
-      "begin": "(?i)\\s*(num-results|num-entries|num-dbs|num-aliases|num-aliase|num-alias|num-alia|num-ali|now|not|normalize|next-value|new)\\s*(?=\\()",
+        "begin": "(?i)\\s*(num-results|num-entries|num-dbs|num-aliases|num-aliase|num-alias|num-alia|num-ali|now|not entered|normalize|next-value|new)\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "name": "support.function.abl"

package/index.js

@@ -1,6 +1,6 @@
 // This script create 3 sections: keywords-<A>, handle-attributes-<Z> and abl-functions-<A> . ABL keywords can only be in
 // one of these sections.
-// kwlist.txt file can be generated with `prowin -zgenkwlist > kwlist.txt`
+// kwlist.txt file can be generated with `prowin -zgenkwlist > abl-keywords.txt`
 //
 // methods.txt can be created by copying the 'Related Links' from https://docs.progress.com/bundle/abl-reference/page/Handle-Attributes-and-Methods-Reference.html//
 // It will look something like:
@@ -14,7 +14,7 @@
 const fs = require('fs');
 
 let lineReaderMethods = require('readline').createInterface({
-  input: fs.createReadStream('methods.txt')
+  input: fs.createReadStream('abl-methods.txt')
 });
 
 let lineReaderFunctions = require('readline').createInterface({
@@ -22,7 +22,7 @@ let lineReaderFunctions = require('readline').createInterface({
 });
 
 let lineReaderKeywords = require('readline').createInterface({
-  input: fs.createReadStream('kwlist.txt')
+  input: fs.createReadStream('abl-keywords.txt')
 });
 
 let output = 'grammar.json';
@@ -38,16 +38,25 @@ const re = /(?:\w|-|\()+(?=\s|$)/g
 // it and any abbreviated versions will be added to the
 // appropriate scopes
 let alsoStatements = [];
+alsoStatements.push('ambiguous');
+alsoStatements.push('available');
 alsoStatements.push('centered');
+alsoStatements.push('delete');
 alsoStatements.push('first');
 alsoStatements.push('format');
 alsoStatements.push('initial');
 alsoStatements.push('label');
+alsoStatements.push('locked');
+alsoStatements.push('namespace-prefix');
+alsoStatements.push('namespace-uri');
 alsoStatements.push('nested');
+alsoStatements.push('return-value');
 alsoStatements.push('row');
 alsoStatements.push('serialize-name');
 alsoStatements.push('single-run');
 alsoStatements.push('transaction');
+alsoStatements.push('xml-node-name');
+
 
 let functionsNotStatements = [];
 functionsNotStatements.push('set-size');
@@ -64,28 +73,30 @@ lineReaderMethods.on('line', line => {
   let results;
   line = line.toLowerCase();
 
-  let kw = line.split(' ');
-  let charIdx = kw[0].charCodeAt(0) - 97;
-  let keyWord = kw[0].split('(')[0];
+  if (!line.startsWith("#")) {
+    let kw = line.split(' ');
+    let charIdx = kw[0].charCodeAt(0) - 97;
+    let keyWord = kw[0].split('(')[0];
 
-  if (kw.includes('attribute')) {
-    if (!attributeBlocks[charIdx].includes(keyWord)) {
-      attributeBlocks[charIdx].push(keyWord);
-    }
-  } else if (kw.includes('method')) {
-    if (!methodBlocks[charIdx].includes(keyWord)) {
-      methodBlocks[charIdx].push(keyWord);
+    if (kw.includes('attribute')) {
+      if (!attributeBlocks[charIdx].includes(keyWord)) {
+        attributeBlocks[charIdx].push(keyWord);
+      }
+    } else if (kw.includes('method')) {
+      if (!methodBlocks[charIdx].includes(keyWord)) {
+        methodBlocks[charIdx].push(keyWord);
+      }
     }
-  }
 
-  if (alsoStatements.includes(keyWord)) {
-    if (!keywordBlocks[charIdx].includes(keyWord)) {
-      keywordBlocks[charIdx].push(keyWord);
+    if (alsoStatements.includes(keyWord)) {
+      if (!keywordBlocks[charIdx].includes(keyWord)) {
+        keywordBlocks[charIdx].push(keyWord);
+      }
     }
-  }
-  if (alsoFunctions.includes(keyWord)) {
-    if (!functionBlocks[charIdx].includes(keyWord)) {
-      functionBlocks[charIdx].push(keyWord);
+    if (alsoFunctions.includes(keyWord)) {
+      if (!functionBlocks[charIdx].includes(keyWord)) {
+        functionBlocks[charIdx].push(keyWord);
+      }
     }
   }
 });
@@ -94,37 +105,49 @@ lineReaderFunctions.on('line', line => {
   let results;
   line = line.toLowerCase();
 
-  let kw = line.split(' ');
+  if (!line.startsWith("#")) {
 
-  if (kw.includes('function')) {
-    // CAPS letter alphabet
-    let charIdx = kw[0].charCodeAt(0) - 97;
+    let kw = line.split(' ');
+    let kwName = '';
 
-    if (!functionBlocks[charIdx].includes(kw[0]) && !kw[0].includes('...')) {
-      functionBlocks[charIdx].push(kw[0]);
-    }
+    // This is to skip the FUNCTION statement
+    if (kw.includes('function') && !kw.includes('statement')) {
 
-    if (alsoStatements.includes(kw[0])) {
-      if (!keywordBlocks[charIdx].includes(kw[0])) {
-        keywordBlocks[charIdx].push(kw[0]);
+      if (kw.includes('preprocessor')) {
+        kwName = kw[0];
+      } else {
+        kwName = kw.slice(0, kw.indexOf('function')).join(' ');
       }
-    }
-  } else if (kw.includes('statement')) {
-    for (const keyWord of kw) {
-      let charIdx = keyWord.charCodeAt(0) - 97;
 
-      if (keyWord == "statement") { break; }
+      // CAPS letter alphabet
+      let charIdx = kwName.charCodeAt(0) - 97;
 
-      if (keyWord.indexOf('(') !== -1) { continue; }
+      if (!functionBlocks[charIdx].includes(kwName) && !kwName.includes('...')) {
+        functionBlocks[charIdx].push(kwName);
+      }
+
+      if (alsoStatements.includes(kwName)) {
+        if (!keywordBlocks[charIdx].includes(kwName)) {
+          keywordBlocks[charIdx].push(kwName);
+        }
+      }
+    } else if (kw.includes('statement')) {
+      for (const keyWord of kw) {
+        let charIdx = keyWord.charCodeAt(0) - 97;
+
+        if (keyWord == "statement") { break; }
+
+        if (keyWord.indexOf('(') !== -1) { continue; }
 
-      if (keyWord.includes('...')) { break; }
+        if (keyWord.includes('...')) { break; }
 
-      kw2 = keyWord.replace(",", "");
+        kw2 = keyWord.replace(",", "");
 
-      if (charIdx > 0 && functionsNotStatements.includes(kw2)) {
-        functionBlocks[charIdx].push(kw2);
-      } else if (charIdx > 0 && !keywordBlocks[charIdx].includes(kw2)) {
-        keywordBlocks[charIdx].push(kw2);
+        if (charIdx > 0 && functionsNotStatements.includes(kw2)) {
+          functionBlocks[charIdx].push(kw2);
+        } else if (charIdx > 0 && !keywordBlocks[charIdx].includes(kw2)) {
+          keywordBlocks[charIdx].push(kw2);
+        }
       }
     }
   }
@@ -133,27 +156,28 @@ lineReaderFunctions.on('line', line => {
 lineReaderKeywords.on('line', line => {
   let results;
   line = line.toLowerCase();
+  if (!line.startsWith("#")) {
+    while ((results = re.exec(line)) !== null) {
+      let kw = results[0];
+      // CAPS letter alphabet
+      let charIdx = kw.charCodeAt(0) - 97;
 
-  while ((results = re.exec(line)) !== null) {
-    let kw = results[0];
-    // CAPS letter alphabet
-    let charIdx = kw.charCodeAt(0) - 97;
-
-    if (kw.indexOf('(') !== -1) {
-      let kwParts = kw.split('(');
-      let fullKw = kwParts[0] + kwParts[1];
+      if (kw.indexOf('(') !== -1) {
+        let kwParts = kw.split('(');
+        let fullKw = kwParts[0] + kwParts[1];
 
-      kw = kwParts[0];
-      addToBlock(charIdx, fullKw, kw);
+        kw = kwParts[0];
+        addToBlock(charIdx, fullKw, kw);
 
-      let kwComplete = kwParts[1];
-      for (const element of kwComplete) {
-        kw += element;
+        let kwComplete = kwParts[1];
+        for (const element of kwComplete) {
+          kw += element;
 
-        addToBlock(charIdx, fullKw, kw);
+          addToBlock(charIdx, fullKw, kw);
+        }
+      } else {
+        addToBlock(charIdx, kw, kw);
       }
-    } else {
-      addToBlock(charIdx, kw, kw);
     }
   }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abl-tmlanguage",
-  "version": "1.3.3",
+  "version": "1.3.5",
   "description": "Textmate grammar for Progress OpenEdge ABL Language",
   "main": "",
   "repository": {

package/spec/blocks/block-labels.spec.js

@@ -150,4 +150,29 @@ end.`;
     ]
   ]
   shared.itShouldMatchExpectedScopes(statement, expectedTokens);
+})
+
+describe('', () => {
+  let statement = `EXCLUSIVE-LOCK-BLOCK:
+for bCustomer exclusive-lock:
+end.`;
+  let expectedTokens = [
+    [
+      { "startIndex": 0, "endIndex": 20, "scopes": ["source.abl", "meta.block.label.abl"] },  // 'EXCLUSIVE-LOCK-BLOCK'
+      { "startIndex": 20, "endIndex": 21, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // ':'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 3, "scopes": ["source.abl", "keyword.other.abl"] },  // 'for'
+      { "startIndex": 3, "endIndex": 4, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 4, "endIndex": 13, "scopes": ["source.abl", "storage.data.table.abl"] },  // 'bCustomer'
+      { "startIndex": 13, "endIndex": 14, "scopes": ["source.abl"] },  // ' '
+      { "startIndex": 14, "endIndex": 28, "scopes": ["source.abl", "keyword.other.abl"] },  // 'exclusive-lock'
+      { "startIndex": 28, "endIndex": 29, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // ':'
+    ],
+    [
+      { "startIndex": 0, "endIndex": 3, "scopes": ["source.abl", "keyword.other.abl"] },  // 'end'
+      { "startIndex": 3, "endIndex": 4, "scopes": ["source.abl", "punctuation.terminator.abl"] }  // '.'
+    ]
+  ]
+  shared.itShouldMatchExpectedScopes(statement, expectedTokens);
 })