abl-tmlanguage 1.3.8 → 1.3.9

package/abl.tmLanguage.json

@@ -40,7 +40,7 @@
           "include": "#string"
         },
         {
-          "match": "([a-zA-Z][a-zA-Z0-9\\#\\$\\-\\_\\%\\&\\.]+)(?<!\\.)",
+          "match": "([[:alpha:]][\\w\\#\\$\\-\\%\\&\\.]+)(?<!\\.)",
           "comment": "A procedure name may contain a . but cannot end in one, unless the procedure name is in quotes",
           "captures": {
             "1": {
@@ -69,7 +69,8 @@
       }
     },
     "language-functions": {
-      "match": "(?i)\\b(opsys|proversion)\\b",
+      "match": "(?i)\\b(opsys|proversion|guid|generate-uuid)\\b",
+      "comment": "These are functions that do not require parens when called.",
       "captures": {
         "1": {
           "name": "support.function.abl"
@@ -78,7 +79,7 @@
     },
     "function-definition": {
       "name": "meta.define.function.abl",
-      "begin": "(?i)\\b(function)\\s+([a-z0-9][a-z0-9#$\\-_%&]+)\\b",
+      "begin": "(?i)\\b(function)\\s+([[:alnum:]][\\w#$\\-%&]+)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.abl"
@@ -95,7 +96,7 @@
       },
       "patterns": [
         {
-          "match": "(?i)\\b(map|to)\\s+(?!to\\s+)([a-z0-9][a-z0-9#$\\-_%&]+)\\b",
+          "match": "(?i)\\b(map|to)\\s+(?!to\\s+)([[:alpha:]][\\w#$\\-%&]+)\\b",
           "captures": {
             "1": {
               "name": "keyword.other.abl"
@@ -185,8 +186,16 @@
           }
         },
         {
-          "comment": "The method name and parameters will only be correctly scoped if the method name and the opening brace/paren are on the same line.",
-          "begin": "(?i)\\s*([a-z_]+[\\w\\-{}#$%&]*)\\s*(\\()\\s*",
+          "comment": "The last word on the line is assumed to me the method name. Legal ABL can have each word of the method definition on its own line, so this rule may not return the correct values",
+          "match": "(?i)\\b([[:alpha:]_]+[\\w\\-{}#$%&]*)\\b\\R",
+          "captures": {
+            "1": {
+              "name": "entity.name.function.abl"
+            }
+          }
+        },
+        {
+          "begin": "(?i)\\s*([[:alpha:]_]+[\\w\\-{}#$%&]*)?\\s*(\\()\\s*",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.abl"
@@ -207,6 +216,9 @@
             }
           ]
         },
+        {
+          "include": "#parameter-as"
+        },
         {
           "include": "#string",
           "comment": "For the return type"
@@ -224,19 +236,7 @@
           "comment": "For the return type"
         },
         {
-          "include": "#type-name-generic-progress",
-          "comment": "For the return type"
-        },
-        {
-          "include": "#type-name-progress",
-          "comment": "For the return type"
-        },
-        {
-          "include": "#type-name-generic",
-          "comment": "For the return type"
-        },
-        {
-          "include": "#type-name",
+          "include": "#type-names",
           "comment": "For the return type"
         },
         {
@@ -272,16 +272,7 @@
           "include": "#primitive-type"
         },
         {
-          "include": "#type-name-generic-progress"
-        },
-        {
-          "include": "#type-name-progress"
-        },
-        {
-          "include": "#type-name-generic"
-        },
-        {
-          "include": "#type-name"
+          "include": "#type-names"
         }
       ]
     },
@@ -373,12 +364,6 @@
         {
           "include": "#constant"
         },
-        {
-          "include": "#type-name-generic-progress"
-        },
-        {
-          "include": "#type-name-progress"
-        },
         {
           "include": "#abl-system-handles"
         },
@@ -392,10 +377,7 @@
           "include": "#handle-methods"
         },
         {
-          "include": "#type-name-generic"
-        },
-        {
-          "include": "#type-name"
+          "include": "#type-names"
         },
         {
           "include": "#string"
@@ -560,6 +542,9 @@
         {
           "include": "#break-by"
         },
+        {
+          "include": "#new-record"
+        },
         {
           "include": "#type-reference"
         },
@@ -682,7 +667,7 @@
       }
     },
     "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)",
+      "match": "(?i)(&window-system|&text-height|&line-number|&batch-mode|&file-name|&undefine|&sequence|&message|defined|&elseif|&scoped|&global|&opsys|&endif|&else|&scop|&then|&glob|&if)|({\\&[\\w\\-\\s\\(\\)]+})|(\\&[\\w-])",
       "captures": {
         "1": {
           "name": "storage.type.function.abl"
@@ -694,12 +679,6 @@
     },
     "type-names": {
       "patterns": [
-        {
-          "include": "#type-name-generic-progress"
-        },
-        {
-          "include": "#type-name-progress"
-        },
         {
           "include": "#type-name-generic"
         },
@@ -777,52 +756,30 @@
         }
       ]
     },
-    "type-name-generic-progress": {
-      "name": "entity.name.type.generic.abl",
-      "begin": "(?i)\\s*((progress)(\\.[\\w\\#\\$\\%\\-]+)*)\\s*<",
+    "type-name-generic": {
+      "comment": "Scope names from https://www.sublimetext.com/docs/scope_naming.html",
+      "name": "meta.generic.abl",
+      "begin": "(?i)\\s*(([\\w\\#\\$\\%\\-]+)(\\.[\\w\\#\\$\\%\\-]+)*\\s*)\\s*(<)",
       "beginCaptures": {
         "1": {
           "name": "entity.name.type.abl"
+        },
+        "4": {
+          "name": "punctuation.definition.generic.begin.abl"
         }
       },
-      "end": "\\>",
-      "patterns": [
-        {
-          "include": "#generic-types"
-        }
-      ]
-    },
-    "type-name-generic": {
-      "name": "entity.name.type.generic.abl",
-      "begin": "(?i)\\s*(([\\w\\#\\$\\%\\-]+)(\\.[\\w\\#\\$\\%\\-]+)*\\s*)\\s*<",
-      "beginCaptures": {
+      "end": "(>)",
+      "endCaptures": {
         "1": {
-          "name": "entity.name.type.abl"
+          "name": "punctuation.definition.generic.end.abl"
         }
       },
-      "end": "\\>",
       "patterns": [
         {
-          "include": "#generic-types"
-        }
-      ]
-    },
-    "generic-types": {
-      "patterns": [
-        {
-          "include": "#type-name-comma-progress"
-        },
-        {
-          "include": "#type-name-comma"
-        },
-        {
-          "include": "#type-name-generic-progress"
-        },
-        {
-          "include": "#type-name-progress"
+          "include": "#type-name-generic"
         },
         {
-          "include": "#type-name-generic"
+          "include": "#punctuation-comma"
         },
         {
           "include": "#type-name"
@@ -837,50 +794,6 @@
         }
       }
     },
-    "type-name-comma": {
-      "match": "(?i)\\s*(,*)\\s*(class)?\\s+(([\\w\\#\\$\\%]+)(\\.?[\\w\\#\\$\\%]*)*(?<!\\.))\\s*(,*)\\s*",
-      "comment": "Capture group 3 is the <T> type name",
-      "captures": {
-        "1": {
-          "name": "punctuation.separator.comma.abl"
-        },
-        "2": {
-          "name": "keyword.other.abl"
-        },
-        "3": {
-          "name": "entity.name.type.abl"
-        },
-        "6": {
-          "name": "punctuation.separator.comma.abl"
-        }
-      }
-    },
-    "type-name-progress": {
-      "match": "(?i)\\s*((progress\\.)([\\.\\w\\#\\$\\%]+)*)\\s*(?<!\\.)",
-      "captures": {
-        "1": {
-          "name": "entity.name.type.abl"
-        }
-      }
-    },
-    "type-name-comma-progress": {
-      "match": "(?i)\\s*(,*)\\s*(class)?\\s*((progress\\.|map|set)(\\.?[\\w\\#\\$\\%]*)*(?<!\\.))\\s*(,*)\\s*",
-      "comment": "Capture group 3 is the <T> type name",
-      "captures": {
-        "1": {
-          "name": "punctuation.separator.comma.abl"
-        },
-        "2": {
-          "name": "keyword.other.abl"
-        },
-        "3": {
-          "name": "entity.name.type.abl"
-        },
-        "6": {
-          "name": "punctuation.separator.comma.abl"
-        }
-      }
-    },
     "define-class": {
       "name": "meta.define.class.abl",
       "begin": "(?i)\\b(?<![\\#\\$\\-\\_\\%\\&])(class)\\b(?![\\#\\$\\-\\_\\%\\&])",
@@ -905,22 +818,7 @@
           }
         },
         {
-          "include": "#type-name-generic-progress"
-        },
-        {
-          "include": "#type-name-generic"
-        },
-        {
-          "include": "#type-name-comma-progress"
-        },
-        {
-          "include": "#type-name-progress"
-        },
-        {
-          "include": "#type-name-comma"
-        },
-        {
-          "include": "#type-name"
+          "include": "#type-names"
         },
         {
           "include": "#punctuation-comma"
@@ -959,9 +857,6 @@
         {
           "include": "#type-names"
         },
-        {
-          "include": "#type-name-comma"
-        },
         {
           "include": "#punctuation-comma"
         }
@@ -986,7 +881,7 @@
       },
       "patterns": [
         {
-          "include": "#type-name-comma"
+          "include": "#type-names"
         }
       ]
     },
@@ -1061,22 +956,7 @@
       "end": "(?=\\()",
       "patterns": [
         {
-          "include": "#type-name-generic-progress"
-        },
-        {
-          "include": "#type-name-generic"
-        },
-        {
-          "include": "#type-name-comma-progress"
-        },
-        {
-          "include": "#type-name-progress"
-        },
-        {
-          "include": "#type-name-comma"
-        },
-        {
-          "include": "#type-name"
+          "include": "#type-names"
         },
         {
           "include": "#string"
@@ -1354,13 +1234,10 @@
     },
     "type-argument-function": {
       "name": "meta.function-call.abl",
-      "begin": "(?i)\\s*(cast|type-of)\\s*(\\()",
+      "begin": "(?i)\\s*(cast|type-of)\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "name": "support.function.abl"
-        },
-        "2": {
-          "name": "meta.brace.round.js"
         }
       },
       "end": "(?<=\\))",
@@ -1371,83 +1248,39 @@
       },
       "patterns": [
         {
-          "comment": "This can only be table.field, never db.table.field, since only TT's can hold objects",
-          "match": "\\s*(([\\w\\-#$%]+)\\.([\\w\\-#$%]+))\\s*(,)",
-          "captures": {
-            "1": {
-              "name": "storage.data.table.abl"
-            },
-            "4": {
-              "name": "punctuation.separator.comma.abl"
-            }
-          }
-        },
-        {
-          "match": "\\s*([a-zA-Z][a-zA-Z0-9\\#\\$\\-\\_\\%\\&]*)\\s*((,)|(?=:))",
-          "captures": {
+          "begin": "(?<=\\()",
+          "end": "(,)",
+          "endCaptures": {
             "1": {
-              "name": "variable.other.abl"
-            },
-            "3": {
               "name": "punctuation.separator.comma.abl"
             }
-          }
-        },
-        {
-          "match": "\\s*:([\\w-]+)\\s*(,)",
-          "captures": {
-            "1": {
-              "name": "entity.name.function.abl"
+          },
+          "patterns": [
+            {
+              "include": "#function-arguments-no-parens"
             },
-            "2": {
-              "name": "punctuation.separator.comma.abl"
+            {
+              "include": "#parens"
             }
-          }
-        },
-        {
-          "include": "#type-argument-function"
-        },
-        {
-          "include": "#expression"
-        },
-        {
-          "include": "#property-call"
-        },
-        {
-          "include": "#static-object-property-call"
-        },
-        {
-          "include": "#doublequotedstring"
-        },
-        {
-          "include": "#singlequotedstring"
-        },
-        {
-          "include": "#translation-attribute"
-        },
-        {
-          "include": "#type-name-generic-progress"
-        },
-        {
-          "include": "#type-name-generic"
-        },
-        {
-          "include": "#type-name-comma-progress"
+          ]
         },
         {
-          "include": "#type-name-progress"
+          "include": "#type-names"
         },
         {
-          "include": "#type-name-comma"
+          "include": "#comment"
         },
         {
-          "include": "#type-name"
+          "include": "#string"
         },
         {
           "include": "#parens"
         },
         {
           "include": "#punctuation-comma"
+        },
+        {
+          "include": "#preprocessors"
         }
       ]
     },
@@ -1504,6 +1337,9 @@
         {
           "include": "#property-call"
         },
+        {
+          "include": "#new-record"
+        },
         {
           "include": "#type-reference"
         },
@@ -1609,7 +1445,7 @@
           "name": "keyword.other.abl"
         }
       },
-      "end": "(?=\\s|\\)|\\.)",
+      "end": "(?=\\s|\\)|\\.|,)",
       "patterns": [
         {
           "match": "(?i)\\s*(class)\\s*",
@@ -1626,13 +1462,7 @@
           "include": "#dll-type"
         },
         {
-          "include": "#type-name-progress"
-        },
-        {
-          "include": "#type-name-generic"
-        },
-        {
-          "include": "#type-name"
+          "include": "#type-names"
         },
         {
           "include": "#parens"
@@ -1649,7 +1479,7 @@
       ]
     },
     "define-variable-name": {
-      "match": "(?i)(var|vari|varia|variab|variabl|variable)\\s+([a-z][a-z0-9#$-_%&])+\\s*",
+      "match": "(?i)(variable|variabl|variab|varia|vari|var)\\s+([[:alpha:]][\\w#$-%&])+\\s*",
       "captures": {
         "1": {
           "name": "keyword.other.abl"
@@ -1710,7 +1540,7 @@
     },
     "annotation-simple": {
       "name": "meta.declaration.annotation.abl",
-      "match": "(?i)(^|\\s*)(\\@[a-z][a-z0-9#\\$-_%&]*)\\s*(?=\\.)",
+      "match": "(^|\\s*)(\\@[[:alpha:]][\\w#\\$-%&]*)\\s*(?=\\.)",
       "captures": {
         "2": {
           "name": "entity.name.tag.abl"
@@ -1719,7 +1549,7 @@
     },
     "annotation-attributes": {
       "name": "meta.declaration.annotation.abl",
-      "begin": "(?i)(^|\\s+)(\\@[a-z][a-z0-9#\\$-_%&]*)\\s*(?=\\()",
+      "begin": "(^|\\s+)(\\@[[:alpha:]][\\w#\\$-%&]*)\\s*(?=\\()",
       "beginCaptures": {
         "2": {
           "name": "entity.name.tag.abl"
@@ -1731,7 +1561,7 @@
           "include": "#parens"
         },
         {
-          "match": "(?i)\\s*([a-z][a-z0-9#\\$-_%&]+)(?=[\\=\\s$])",
+          "match": "\\s*([[:alpha:]][\\w#\\$-%&]+)(?=[\\=\\s$])",
           "captures": {
             "1": {
               "name": "entity.other.attribute-name.abl"
@@ -1793,6 +1623,15 @@
         {
           "include": "#define-dataset"
         },
+        {
+          "include": "#define-query"
+        },
+        {
+          "include": "#define-browse"
+        },
+        {
+          "include": "#fields-except-list"
+        },
         {
           "include": "#define-event"
         },
@@ -1868,9 +1707,6 @@
         {
           "include": "#dll-type"
         },
-        {
-          "include": "#type-name-progress"
-        },
         {
           "include": "#abl-system-handles"
         },
@@ -1899,10 +1735,7 @@
           "include": "#label-variable"
         },
         {
-          "include": "#type-name-generic"
-        },
-        {
-          "include": "#type-name"
+          "include": "#type-names"
         }
       ]
     },
@@ -1917,6 +1750,30 @@
         }
       }
     },
+    "define-query": {
+      "begin": "(?i)\\b(query)\\s+([[:alpha:]][\\w\\#\\$\\-\\%\\&]*)\\s*",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.other.abl"
+        },
+        "2": {
+          "name": "variable.other.abl"
+        }
+      },
+      "end": "(?i)\\b(?=for|display|share-lock|no-lock|exclusive-lock)\\b"
+    },
+    "define-browse": {
+      "begin": "(?i)\\b(browse)\\s+([[:alpha:]][\\w\\#\\$\\-\\%\\&]*)\\s*",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.other.abl"
+        },
+        "2": {
+          "name": "variable.other.abl"
+        }
+      },
+      "end": "(?i)\\b(?=query)\\b"
+    },
     "define-parameter": {
       "begin": "(?i)\\b(parameter|paramete|paramet|parame|param)\\b",
       "beginCaptures": {
@@ -1942,7 +1799,7 @@
           }
         },
         {
-          "match": "(?i)\\b(table-handle|dataset-handle)\\s+([a-zA-Z][a-zA-Z0-9\\#\\$\\-\\_\\%\\&]*)\\b",
+          "match": "(?i)\\b(table-handle|dataset-handle)\\s+([[:alpha:]][\\w\\#\\$\\-\\%\\&]*)\\b",
           "captures": {
             "1": {
               "name": "keyword.other.abl"
@@ -2011,14 +1868,6 @@
         {
           "include": "#numeric"
         },
-        {
-          "comment": "needs to be before the #keywords include",
-          "include": "#type-name-generic-progress"
-        },
-        {
-          "comment": "needs to be before the #keywords include",
-          "include": "#type-name-progress"
-        },
         {
           "include": "#keywords"
         },
@@ -2026,10 +1875,7 @@
           "include": "#string"
         },
         {
-          "include": "#type-name-generic"
-        },
-        {
-          "include": "#type-name"
+          "include": "#type-names"
         }
       ]
     },
@@ -2111,7 +1957,7 @@
       ]
     },
     "define-index": {
-      "begin": "(?i)\\s*(index)\\s+([a-zA-Z][a-zA-Z0-9\\#\\$\\-\\_\\%\\&]*)",
+      "begin": "(?i)\\s*(index)\\s+([[:alpha:]][\\w\\#\\$\\-\\%\\&]*)",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.abl"
@@ -2131,7 +1977,7 @@
           }
         },
         {
-          "match": "\\b([a-zA-Z][a-zA-Z0-9\\#\\$\\-\\_\\%\\&]*)\\b",
+          "match": "\\b([[:alpha:]][\\w\\#\\$\\-\\%\\&]*)\\b",
           "captures": {
             "1": {
               "name": "storage.data.table.abl"
@@ -2141,7 +1987,7 @@
       ]
     },
     "define-dataset": {
-      "begin": "(?i)\\b(dataset)\\s+([a-zA-Z][a-zA-Z0-9\\#\\$\\-\\_\\%\\&]*)\\b",
+      "begin": "(?i)\\b(dataset)\\s+([[:alpha:]][\\w\\#\\$\\-\\%\\&]*)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.abl"
@@ -2160,7 +2006,7 @@
           "include": "#punctuation-comma"
         },
         {
-          "match": "(?i)\\b(data-relation|parent-id-relation)\\s*([a-z][a-z0-9#$\\-\\_\\%\\&]+)",
+          "match": "(?i)\\b(data-relation|parent-id-relation)\\s*([[:alpha:]][\\w#$\\-\\%\\&]+)",
           "comment": "Manually capture these so that we can name the relation name properly",
           "captures": {
             "1": {
@@ -2198,7 +2044,7 @@
       ]
     },
     "define-event": {
-      "match": "(?i)\\b(event)\\s+([a-zA-Z][a-zA-Z0-9\\#\\$\\-\\_\\%\\&]*)\\b",
+      "match": "(?i)\\b(event)\\s+([[:alpha:]][\\w\\#\\$\\-\\%\\&]*)\\b",
       "captures": {
         "1": {
           "name": "keyword.other.abl"
@@ -2209,7 +2055,7 @@
       }
     },
     "define-button": {
-      "begin": "(?i)\\s*(button)\\s+([a-z][a-z0-9#$\\-_%&]*)",
+      "begin": "(?i)\\s*(button)\\s+([[:alpha:]][\\w#$\\-%&]*)",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.abl"
@@ -2241,7 +2087,7 @@
       ]
     },
     "from-x-and-y": {
-      "match": "(?i)\\b(from)\\s+(X)\\s+((0(x)[0-9a-fA-F]+)|(\\-?[0-9]+(\\.[0-9]+)?))\\s+(y)\\s+((0(x)[0-9a-fA-F]+)|(\\-?[0-9]+(\\.[0-9]+)?))\\s+ ",
+      "match": "(?i)\\b(from)\\s+(X)\\s+((0(x)[[[:xdigit:]]]+)|(\\-?[[[:digit:]]]+(\\.[[[:digit:]]]+)?))\\s+(y)\\s+((0(x)[[[:xdigit:]]]+)|(\\-?[[[:digit:]]]+(\\.[[[:digit:]]]+)?))\\s+ ",
       "captures": {
         "1": {
           "name": "keyword.other.abl"
@@ -2261,7 +2107,7 @@
       }
     },
     "define-buffer": {
-      "begin": "(?i)\\s*(buffer)\\s*",
+      "begin": "(?i)\\s*(buffer)\\b(?![\\#\\$\\-\\_\\%\\&])",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.abl"
@@ -2287,7 +2133,7 @@
       ]
     },
     "define-frame": {
-      "match": "(?i)\\s*(frame)\\s*([a-z][a-z0-9#$\\-_%&]*)",
+      "match": "(?i)\\s*(frame)\\s*([[:alpha:]][\\w#$\\-%&]*)",
       "captures": {
         "1": {
           "name": "keyword.other.abl"
@@ -2336,22 +2182,8 @@
           "comment": "needs to be before the #keywords include",
           "include": "#type-names"
         },
-        {
-          "comment": "needs to be before the #keywords include",
-          "include": "#type-name-generic-progress"
-        },
-        {
-          "comment": "needs to be before the #keywords include",
-          "include": "#type-name-progress"
-        },
         {
           "include": "#string"
-        },
-        {
-          "include": "#type-name-generic"
-        },
-        {
-          "include": "#type-name"
         }
       ]
     },
@@ -2476,7 +2308,7 @@
       ]
     },
     "use-index": {
-      "match": "(?i)\\b(use-index)\\s+([a-z][a-z0-9\\-\\_\\$]*)\\b",
+      "match": "(?i)\\b(use-index)\\s+([[:alpha:]][\\w\\-\\$]*)\\b",
       "captures": {
         "1": {
           "name": "keyword.other.abl"
@@ -2531,11 +2363,11 @@
       }
     },
     "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",
-      "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",
+      "match": "(?i)^\\s*(?!(transaction|no-lock|exclusive-lock|exclusive-loc|exclusive-lo|exclusive-l|share-lock|share-loc|share-lo|share-|share):)([\\w\\-\\$\\#]+)(:)\\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. Scope name is per https://www.sublimetext.com/docs/scope_naming.html",
       "captures": {
         "2": {
-          "name": "meta.block.label.abl"
+          "name": "entity.name.label.abl"
         },
         "3": {
           "name": "punctuation.terminator.abl"
@@ -2590,6 +2422,9 @@
         {
           "include": "#type-member-call"
         },
+        {
+          "include": "#language-functions"
+        },
         {
           "include": "#abl-functions"
         },
@@ -2602,6 +2437,9 @@
         {
           "include": "#branch-options"
         },
+        {
+          "include":"#keywords"
+        },
         {
           "include": "#expression"
         },
@@ -2681,7 +2519,7 @@
         },
         {
           "comment": "Captures the variable before the : or , of Subscribe( [ subscriber-handle , ] handler-procedure ) or Subscribe ( [ subscriber : ] handler-method )",
-          "match": "\\s*([a-zA-Z][a-zA-Z0-9\\#\\$\\-\\_\\%\\&]*)\\s*((,)|(:))\\s*",
+          "match": "\\s*([[:alpha:]][\\w\\#\\$\\-\\%\\&]*)\\s*((,)|(:))\\s*",
           "captures": {
             "1": {
               "name": "variable.other.abl"
@@ -2696,7 +2534,7 @@
         },
         {
           "comment": "Subscribe( handler-procedure or handler-method)",
-          "match": "\\s*([a-zA-Z][a-zA-Z0-9\\#\\$\\-\\_\\%\\&]*)\\s*",
+          "match": "\\s*([[:alpha:]][\\w\\#\\$\\-\\%\\&]*)\\s*",
           "captures": {
             "1": {
               "name": "entity.name.function.abl"
@@ -2785,7 +2623,7 @@
       }
     },
     "on-error-endkey-stop": {
-      "match": "(?i)\\s*(on)\\s+(endkey|error|stop|quit)\\s+(undo)\\s*(?!leave|next|retry|return|throw)([a-z0-9\\-\\_\\$]*)?\\s*",
+      "match": "(?i)\\s*(on)\\s+(endkey|error|stop|quit)\\s+(undo)\\s*(?!leave|next|retry|return|throw)([\\w\\-\\$]*)?\\s*",
       "captures": {
         "1": {
           "name": "keyword.other.abl"
@@ -2797,30 +2635,30 @@
           "name": "keyword.other.abl"
         },
         "4": {
-          "name": "meta.block.label.abl"
+          "name": "entity.name.label.abl"
         }
       }
     },
     "block-undo-leave-next-retry": {
       "comment": "Covers NEXT, LEAVE, RETRY and UNDO with block labels that are not preceded by UNDO, ",
-      "match": "(?i)\\s*(?<!,)\\s*(leave|next|retry|undo)\\s*(?!on)([a-z0-9\\-\\_\\$]*)?\\s*",
+      "match": "(?i)\\s*(?<!,)\\s*(leave|next|retry|undo)\\s*(?!on)([\\w\\-\\$]*)?\\s*",
       "captures": {
         "1": {
           "name": "keyword.other.abl"
         },
         "2": {
-          "name": "meta.block.label.abl"
+          "name": "entity.name.label.abl"
         }
       }
     },
     "branch-leave-next-retry-throw": {
-      "match": "(?i)\\s*(?<=,)\\s*(leave|next|retry|throw)\\s*(?!on)([a-z0-9\\-\\_\\$]*)?\\s*",
+      "match": "(?i)\\s*(?<=,)\\s*(leave|next|retry|throw)\\s*(?!on)([\\w\\-\\$]*)?\\s*",
       "captures": {
         "1": {
           "name": "keyword.other.abl"
         },
         "2": {
-          "name": "meta.block.label.abl"
+          "name": "entity.name.label.abl"
         }
       }
     },
@@ -2928,13 +2766,13 @@
     },
     "undo-statement": {
       "comment": "https://docs.progress.com/bundle/abl-reference/page/UNDO-statement.html",
-      "begin": "(?i)\\s*(undo)\\s*([a-z0-9\\-\\_\\$]*)?\\s*(,)",
+      "begin": "(?i)\\s*(undo)\\s*([\\w\\-\\$]*)?\\s*(,)",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.abl"
         },
         "2": {
-          "name": "meta.block.label.abl"
+          "name": "entity.name.label.abl"
         },
         "3": {
           "name": "punctuation.separator.comma.abl"
@@ -2946,13 +2784,13 @@
           "include": "#string"
         },
         {
-          "match": "(?i)\\s*(leave|next|retry)\\s([a-z0-9\\-\\_\\$]*)?",
+          "match": "(?i)\\s*(leave|next|retry)\\s([\\w\\-\\$]*)?",
           "captures": {
             "1": {
               "name": "keyword.other.abl"
             },
             "2": {
-              "name": "meta.block.label.abl"
+              "name": "entity.name.label.abl"
             }
           }
         },
@@ -3028,9 +2866,6 @@
         },
         {
           "include": "#expression"
-        },
-        {
-          "include": "X-#statements"
         }
       ]
     },
@@ -3079,6 +2914,12 @@
         {
           "include": "#function-arguments"
         },
+        {
+          "include": "#property-call"
+        },
+        {
+          "include": "#static-object-property-call"
+        },
         {
           "include": "#db-dot-table-dot-field"
         },
@@ -3091,9 +2932,6 @@
         {
           "include": "#code-block"
         },
-        {
-          "include": "#property-call"
-        },
         {
           "include": "#handle-attributes"
         },
@@ -3125,6 +2963,14 @@
         {
           "include": "#parens"
         },
+        {
+          "include": "#function-arguments-no-parens"
+        }
+      ]
+    },
+    "function-arguments-no-parens": {
+      "name": "meta.function.arguments.abl",
+      "patterns": [
         {
           "match": "(?i)\\s*(input-output|input-outpu|input-outp|input-out|input-ou|input-o|output|input|table-handle|dataset-handle|APPEND|BY-VALUE|BY-REFERENCE|BIND)\\b(?![\\#\\$\\-\\_\\%\\&])",
           "captures": {
@@ -3170,6 +3016,9 @@
         {
           "include": "#can-find"
         },
+        {
+          "include": "#language-functions"
+        },
         {
           "include": "#abl-functions"
         },
@@ -3180,7 +3029,7 @@
           "include": "#handle-methods"
         },
         {
-          "include": "#unqualified-method-call"
+          "include": "#type-member-call"
         },
         {
           "include": "#expression"
@@ -3188,15 +3037,9 @@
         {
           "include": "#comment"
         },
-        {
-          "include": "#property-call"
-        },
         {
           "include": "#punctuation-comma"
         },
-        {
-          "include": "#static-object-property-call"
-        },
         {
           "include": "#preprocessors"
         }
@@ -3218,7 +3061,7 @@
       }
     },
     "unqualified-method-call": {
-      "match": "\\b([a-zA-Z][a-zA-Z0-9\\#\\$\\-\\_\\%\\&]*)\\b(?=\\()",
+      "match": "\\b([[:alpha:]][\\w\\#\\$\\-\\%\\&]*)\\b(?=\\()",
       "captures": {
         "1": {
           "name": "entity.name.function.abl"
@@ -3226,7 +3069,7 @@
       }
     },
     "property-call": {
-      "match": "(:)([a-zA-Z][a-zA-Z0-9\\#\\$\\-\\_\\%\\&]*)\\b",
+      "match": "(:)([[:alpha:]][\\w\\#\\$\\-\\%\\&]*)\\b",
       "captures": {
         "1": {
           "name": "punctuation.separator.colon.abl"
@@ -3251,11 +3094,11 @@
     },
     "variable-name": {
       "comment": "1 to 128 characters; can consist of any combination of letters (a-z or A-Z), numbers (0-9), and these special characters: #$-_%& Names must begin with a letter (from https://docs.progress.com/bundle/openedge-abl-manage-applications/page/Name-limits.html)",
-      "match": "(?<=^|\\s|\\[|\\(|,)([a-zA-Z][a-zA-Z0-9\\#\\$\\-\\_\\%\\&]*)(?=\\.\\s|\\.$|,|:|\\s|\\)|\\]|\\[|$)",
+      "match": "(?<=^|\\s|\\[|\\(|,)([[:alpha:]][\\w\\#\\$\\-\\%\\&]*)(?=\\.\\s|\\.$|,|:|\\s|\\)|\\]|\\[|$)",
       "name": "variable.other.abl"
     },
     "extent": {
-      "match": "(?i)\\s*(extent)\\s*((0x[0-9a-f]+)|([0-9]+)?)",
+      "match": "(?i)\\s*(extent)\\s*((0x)?[[:xdigit:]]+)?",
       "captures": {
         "1": {
           "name": "keyword.other.abl"
@@ -3266,7 +3109,7 @@
       }
     },
     "decimals": {
-      "match": "(?i)\\s*(decimals)\\s((0x[0-9a-f]+)|([0-9]+)?)",
+      "match": "(?i)\\s*(decimals)\\s((0x)?[[:xdigit:]]+)?",
       "captures": {
         "1": {
           "name": "keyword.other.abl"
@@ -3277,7 +3120,7 @@
       }
     },
     "ordinal": {
-      "match": "(?i)\\s*(ordinal)\\s((0x[0-9a-f]+)|([0-9]+)?)",
+      "match": "(?i)\\s*(ordinal)\\s((0x)?[[:xdigit:]]+)?",
       "captures": {
         "1": {
           "name": "keyword.other.abl"
@@ -3302,6 +3145,15 @@
         }
       },
       "patterns": [
+        {
+          "comment": "See https://docs.progress.com/bundle/abl-reference/page/Array-reference.html for array ranges",
+          "match":"(?i)\\s+(for)\\s+",
+          "captures": {
+            "1": {
+              "name": "keyword.other.abl"
+            }
+          }
+        },
         {
           "include": "#expression"
         },
@@ -3360,7 +3212,24 @@
       "name": "variable.parameter.abl"
     },
     "run-statement": {
-      "match": "(?i)\\s*(run)\\s+(?!value)(([a-z][a-z0-9\\/\\-\\_\\\\]+)(\\.[a-z]+)?)",
+      "patterns": [
+        {"include": "#run-unquoted"},
+        {"include": "#run-quoted"}
+      ]
+    },
+    "run-quoted": {
+      "match": "(?i)\\s*(run)\\s+(?!value)\\s*(['\"].*['\"])",
+      "captures": {
+        "1": {
+          "name": "keyword.other.abl"
+        },
+        "2": {
+          "name": "entity.name.procedure.abl"
+        }
+      }
+    },
+    "run-unquoted": {
+      "match": "(?i)\\s*(run)\\s+(?!value)\\s*([\\w\\-\\$\\@\\/\\\\]{1,253}(\\.[\\w@\\$\\-]{1,2})?)",
       "captures": {
         "1": {
           "name": "keyword.other.abl"
@@ -3373,7 +3242,7 @@
     "include-file": {
       "name": "meta.include.abl",
       "comment": "https://docs.progress.com/bundle/openedge-abl-reference-122/page/Include-file-reference.html",
-      "begin": "(?i)({)\\s*(([a-z][a-z0-9\\/\\-\\_\\\\]+)(\\.[a-z]+)?)",
+      "begin": "({)\\s*(([[:alpha:]][\\w\\/\\-\\\\]+)(\\.[[:alpha:]]+)?)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.section.abl"
@@ -3393,7 +3262,7 @@
           "include": "#argument-reference"
         },
         {
-          "match": "(?<=\\s)(&[a-zA-Z][a-zA-Z0-9\\#\\$\\-\\_\\%\\.]+)\\s*(=?)",
+          "match": "(?<=\\s)(&[[:alpha:]][\\w\\#\\$\\-\\%\\.]+)\\s*(=?)",
           "name": "meta.include.argument.abl",
           "comment": "This is intended to catch '&arg' and '&arg=' ",
           "captures": {
@@ -3410,9 +3279,9 @@
           "include": "#string"
         },
         {
-          "match": "(?<=\\s)(&[a-zA-Z][a-zA-Z0-9\\#\\$\\-\\_\\%\\.]+)\\s*(=?)",
+          "match": "(?<=\\s)(&[[:alpha:]][\\w\\#\\$\\-\\%\\.]+)\\s*(=?)",
           "comment": "non-string argument values after the &arg = ",
-          "name": "meta.include-named-argument",
+          "name": "meta.include.argument.abl",
           "captures": {
             "1": {
               "name": "support.other.argument.abl",
@@ -3427,9 +3296,9 @@
           "include": "#string"
         },
         {
-          "match": "(?<=\\s)(&[a-zA-Z][a-zA-Z0-9\\#\\$\\-\\_\\%\\.]+)\\s*(=?)",
+          "match": "(?<=\\s)(&[[:alpha:]][\\w\\#\\$\\-\\%\\.]+)\\s*(=?)",
           "comment": "non-string argument values after the &arg = ",
-          "name": "meta.include-named-argument",
+          "name": "meta.include.argument.abl",
           "captures": {
             "1": {
               "name": "support.other.argument.abl",
@@ -3441,7 +3310,7 @@
           }
         },
         {
-          "match": "(?<=\\s)([a-zA-Z][a-zA-Z0-9\\#\\$\\-\\_\\%\\.\\:]+)\\b",
+          "match": "(?<=\\s)([[:alpha:]][\\w\\#\\$\\-\\%\\.\\:]+)\\b",
           "comment": "non-string unnamed argument values",
           "captures": {
             "1": {
@@ -3566,7 +3435,7 @@
       "comment": "https://docs.progress.com/bundle/openedge-abl-reference-122/page/Data-types.html"
     },
     "numeric": {
-      "match": "(?<![\\w-])((0(x|X)[0-9a-fA-F]+)|(\\-?[0-9]+(\\.[0-9]+)?))",
+      "match": "(?<![\\w-])(0[xX][[:xdigit:]]+)|(\\-?[[:digit:]]+(\\.[[:digit:]]+)?)",
       "name": "constant.numeric.source.abl"
     },
     "abl-system-handles": {
@@ -3667,6 +3536,41 @@
         }
       }
     },
+    "new-record": {
+      "comment": "This scope MUST be called after before type-reference (especially new-class) to avoid types being captured as tables",
+      "patterns": [
+        {
+          "comment": " NEW\\s+( <buffer> )",
+          "match": "(?i)\\s*(new)\\s+(\\()\\s*([\\w\\-#$%]+(\\.[\\w\\-#$%]+)?)\\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"
+            }
+          }
+        },
+        {
+          "comment": " NEW <buffer>. The position of the negative lookahead (?!...) is very important",
+          "match": "(?i)\\s*((new)\\s+(?!.*\\()([\\w\\-#$%\\.]+))",
+          "captures": {
+            "2": {
+              "name": "support.function.abl"
+            },
+            "3": {
+              "name": "storage.data.table.abl"
+            }
+          }
+        }
+      ]
+    },
     "keywords": {
       "patterns": [
         {
@@ -3901,7 +3805,7 @@
     },
     "keywords-R": {
       "comment": "The keyword must not have a trailing variable character (one of #$-_%&)",
-      "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|relation-fields|reinstate|reference-only|recursive|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|recursive|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"
@@ -3910,7 +3814,7 @@
     },
     "keywords-S": {
       "comment": "The keyword must not have a trailing variable character (one of #$-_%&)",
-      "match": "(?i)\\b(system-help|system-dialog|suspend|super|summary|sum|substring|subscribe|sub-total|sub-minimum|sub-minimu|sub-minim|sub-mini|sub-min|sub-menu-help|sub-menu|sub-maximum|sub-maximu|sub-maxim|sub-maxi|sub-max|sub-count|sub-average|sub-averag|sub-avera|sub-aver|sub-ave|string-xref|stream-io|stream-handle|stream|stored-procedure|stored-procedur|stored-procedu|stored-proced|stored-proce|stored-proc|stop-mem-check|stop-display|stop-after|stop|stomp-frequency|stomp-detection|stdcall|status-area-msg|status|static|starting|start-search|start-row-resize|start-resize|start-move|start-mem-check|start-extend-box-selection|start-box-selection|start|sql|space|source-procedure|source|some|socket|soap-header-entryref|soap-header|soap-fault|smallint|slider|skip-schema-check|skip-group-duplicates|skip|size-pixels|size-pixel|size-pixe|size-pix|size-pi|size-p|size-chars|size-char|size-cha|size-ch|size-c|size|single-run|single-character|single|simple|silent|signature|side-label|side-labe|side-lab|show-stats|show-stat|short|shared|share-lock|share-loc|share-lo|share-l|share-|share|settings|set-state|set-pointer-value|set-pointer-valu|set-pointer-val|set-option|set-event-manager-option|set-db-logging|set-contents|set-cell-focus|set-byte-order|set-attr-call-type|set|session|server-socket|server|serialize-name|serialize-hidden|serializable|separate-connection|send|self|selection-list|selection-extend|selection|selected-items|select-repositioned-row|select-on-join|select-extend|select|seek|security-policy|section|search-target|search-self|scrolling|scrolled-row-position|scrolled-row-positio|scrolled-row-positi|scrolled-row-posit|scrolled-row-posi|scrolled-row-pos|scrollbar-drag|scroll-vertical|scroll-right|scroll-notify|scroll-mode|scroll-left|scroll-horizontal|scroll|screen-io|screen|schema|sax-xml|sax-writer|sax-write-tag|sax-write-idle|sax-write-error|sax-write-element|sax-write-content|sax-write-complete|sax-write-begin|sax-uninitialized|sax-running|sax-reader|sax-parser-error|sax-complete|sax-complet|sax-comple|sax-attributes|save-as|save)\\b(?![\\#\\$\\-\\_\\%\\&])",
+      "match": "(?i)\\b(system-help|system-dialog|suspend|super|summary|sum|substring|subscribe|sub-total|sub-minimum|sub-minimu|sub-minim|sub-mini|sub-min|sub-menu-help|sub-menu|sub-maximum|sub-maximu|sub-maxim|sub-maxi|sub-max|sub-count|sub-average|sub-averag|sub-avera|sub-aver|sub-ave|string-xref|stream-io|stream-handle|stream|stored-procedure|stored-procedur|stored-procedu|stored-proced|stored-proce|stored-proc|stop-mem-check|stop-display|stop-after|stop|stomp-frequency|stomp-detection|stdcall|status-area-msg|status|static|starting|start-search|start-row-resize|start-resize|start-move|start-mem-check|start-extend-box-selection|start-box-selection|start|sql|space|source-procedure|source|some|socket|soap-header-entryref|soap-header|soap-fault|smallint|slider|skip-schema-check|skip-group-duplicates|skip|size-pixels|size-pixel|size-pixe|size-pix|size-pi|size-p|size-chars|size-char|size-cha|size-ch|size-c|size|single-run|single-character|single|simple|silent|signature|side-label|side-labe|side-lab|show-stats|show-stat|short|shared|share-lock|share-loc|share-lo|share-l|share-|share|settings|set-state|set-pointer-value|set-pointer-valu|set-pointer-val|set-option|set-event-manager-option|set-db-logging|set-contents|set-cell-focus|set-byte-order|set-attr-call-type|set|session|server-socket|server|serialize-name|serialize-hidden|serializable|separators|separate-connection|send|self|selection-list|selection-extend|selection|selected-items|select-repositioned-row|select-on-join|select-extend|select|seek|security-policy|section|search-target|search-self|scrolling|scrolled-row-position|scrolled-row-positio|scrolled-row-positi|scrolled-row-posit|scrolled-row-posi|scrolled-row-pos|scrollbar-drag|scroll-vertical|scroll-right|scroll-notify|scroll-mode|scroll-left|scroll-horizontal|scroll|screen-io|screen|schema|sax-xml|sax-writer|sax-write-tag|sax-write-idle|sax-write-error|sax-write-element|sax-write-content|sax-write-complete|sax-write-begin|sax-uninitialized|sax-running|sax-reader|sax-parser-error|sax-complete|sax-complet|sax-comple|sax-attributes|save-as|save)\\b(?![\\#\\$\\-\\_\\%\\&])",
       "captures": {
         "1": {
           "name": "keyword.other.abl"