abl-tmlanguage 1.3.15 → 1.3.18

package/abl.tmLanguage.json

@@ -58,7 +58,7 @@
     "procedure-definition": {
       "name": "meta.procedure.abl",
       "comment": "Look ahead to the procedure name, quoted or not. It will be resolved in the patterns. 'Names must begin with a letter.' from https://docs.progress.com/bundle/openedge-abl-manage-applications/page/Name-limits.html",
-      "begin": "(?i)\\b(proce(?:dure|dur|du|d)?)\\s+(?=[a-zA-Z_])",
+      "begin": "(?i)\\s*(proce(?:dure|dur|du|d)?)\\s+(?=[a-zA-Z_])",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.abl"
@@ -94,6 +94,9 @@
         {
           "include": "#argument-reference"
         },
+        {
+          "include": "#preprocessor-reference"
+        },
         {
           "include": "#numeric"
         },
@@ -479,6 +482,12 @@
         {
           "include": "#buffer-copy"
         },
+        {
+          "include": "#preprocessors"
+        },
+        {
+          "include": "#argument-reference"
+        },
         {
           "include": "#trigger-procedure"
         },
@@ -518,6 +527,9 @@
         {
           "include": "#event-un-subscribe"
         },
+        {
+          "include": "#dataset-name"
+        },
         {
           "include": "#buffer-name"
         },
@@ -634,12 +646,6 @@
         {
           "include": "#operator"
         },
-        {
-          "include": "#analyze-suspend-resume"
-        },
-        {
-          "include": "#global-scoped-define"
-        },
         {
           "include": "#label-variable"
         },
@@ -653,7 +659,7 @@
           "include": "#format-constant"
         },
         {
-          "include": "#preprocessors"
+          "include": "#escape-endline"
         },
         {
           "include": "#dll-type"
@@ -743,16 +749,95 @@
         }
       }
     },
+    "preprocessor-directives": {
+      "patterns": [
+        {
+          "match": "(?i)((&)(elseif|endif|else|then|if))\\s*",
+          "captures": {
+            "2": {
+              "name": "punctuation.definition.preprocessor.abl"
+            },
+            "3": {
+              "name": "keyword.control.directive.conditional.abl"
+            }
+          }
+        },
+        {
+          "match": "(?i)((&)(message))\\s*",
+          "captures": {
+            "2": {
+              "name": "punctuation.definition.preprocessor.abl"
+            },
+            "3": {
+              "name": "storage.type.function.abl"
+            }
+          }
+        }
+      ]
+    },
+    "preprocessor-reference": {
+      "patterns": [
+        {
+          "comment": "https://docs.progress.com/bundle/abl-reference/page/Preprocessor-name-reference.html#Preprocessor-name-reference",
+          "match": "(?i)\\s*(({)(&)(window-system|line-number|batch-mode|file-name|sequence|opsys|process-architecture)\\s*(}))",
+          "captures": {
+            "1": {
+              "name": "meta.preprocessor.abl"
+            },
+            "2": {
+              "name": "punctuation.section.abl"
+            },
+            "3": {
+              "name": "punctuation.definition.preprocessor.abl"
+            },
+            "4": {
+              "name": "entity.name.function.preprocessor.abl"
+            },
+            "5": {
+              "name": "punctuation.section.abl"
+            }
+          }
+        },
+        {
+          "match": "\\s*(({)(&)([a-zA-Z0-9_\\-#$%\\s\\(\\)]+)\\s*(}))",
+          "captures": {
+            "1": {
+              "name": "meta.preprocessor.abl"
+            },
+            "2": {
+              "name": "punctuation.section.abl"
+            },
+            "3": {
+              "name": "punctuation.definition.preprocessor.abl"
+            },
+            "4": {
+              "name": "entity.name.function.preprocessor.abl"
+            },
+            "5": {
+              "name": "punctuation.section.abl"
+            }
+          }
+        }
+      ]
+    },
     "preprocessors": {
-      "match": "(?i)(&window-system|&text-height|&line-number|&batch-mode|&file-name|&undefine|&sequence|&message|defined|&elseif|(?:&scop(?:ed-define|ed-defin|ed-defi|ed-def|ed-de|ed-d|ed-|ed|e)?)|(?:&glob(?:al-define|al-defin|al-defi|al-def|al-de|al-d|al-|al|a)?)|&opsys|&endif|&else|&then|&if)|({&[a-zA-Z0-9_\\-#$%\\s\\(\\)]+})|(&[a-zA-Z0-9_\\-#$%]+)",
-      "captures": {
-        "1": {
-          "name": "storage.type.function.abl"
+      "patterns": [
+        {
+          "include": "#analyze-suspend-resume"
         },
-        "2": {
-          "name": "storage.type.function.abl"
+        {
+          "include": "#global-scoped-define"
+        },
+        {
+          "include": "#preprocessor-directives"
+        },
+        {
+          "include": "#preprocessor-functions"
+        },
+        {
+          "include": "#preprocessor-reference"
         }
-      }
+      ]
     },
     "type-names": {
       "patterns": [
@@ -1952,7 +2037,7 @@
           "name": "variable.other.abl"
         }
       },
-      "end": "(?i)\\b(?=\\.)\\b",
+      "end": "(?i)(?=\\.\\s*)",
       "patterns": [
         {
           "match": "(?i)\\b(for|scrolling|(rcode-info(?:rmation|rmatio|rmati|rmat|rma|rm|r)?))\\b",
@@ -2132,6 +2217,17 @@
         }
       ]
     },
+    "dataset-name": {
+      "match": "(?i)\\s*(dataset)\\s+([a-zA-Z][a-zA-Z0-9_\\-]*)",
+      "captures": {
+        "1": {
+          "name": "keyword.other.abl"
+        },
+        "2": {
+          "name": "storage.data.dataset.abl"
+        }
+      }
+    },
     "buffer-name": {
       "match": "(?i)\\b(buffer)\\s+([a-zA-Z][a-zA-Z0-9_\\-#$%]*(\\.[a-zA-Z][a-zA-Z0-9_\\-#$%]*)?)",
       "captures": {
@@ -2826,19 +2922,17 @@
       "name": "meta.block.abl",
       "patterns": [
         {
-          "include": "#comment"
-        },
-        {
-          "include": "#for-record"
+          "match": "(?i)\\b((transact(?:ion|io|i)?)|stop-after|and|or)\\b",
+          "name": "keyword.other.abl"
         },
         {
-          "include": "#operator"
+          "include": "#logical-expression"
         },
         {
-          "include": "#from-to-by"
+          "include": "#while-expression"
         },
         {
-          "include": "#while-expression"
+          "include": "#for-record"
         },
         {
           "match": "(?i)\\b((transact(?:ion|io|i)?)|stop-after)\\b",
@@ -2864,15 +2958,6 @@
         },
         {
           "include": "#branch-options"
-        },
-        {
-          "include": "#keywords"
-        },
-        {
-          "include": "#expression"
-        },
-        {
-          "include": "#preprocessors"
         }
       ]
     },
@@ -3104,7 +3189,7 @@
           "name": "punctuation.definition.string.begin.abl"
         }
       },
-      "name": "string.single.complex.abl",
+      "name": "string.quoted.single.abl",
       "end": "(')",
       "endCaptures": {
         "1": {
@@ -3121,6 +3206,14 @@
       "match": "~.",
       "name": "constant.character.escape.abl"
     },
+    "escape-endline": {
+      "match": "(~)\\s*$",
+      "captures": {
+        "1": {
+          "name": "punctuation.separator.continuation"
+        }
+      }
+    },
     "branch-return-value-double": {
       "comment": "RETURN \"return-value\"",
       "begin": "(?i)\\s*(return)(\\s+(error))?\\s+(\")",
@@ -3206,7 +3299,7 @@
           "name": "punctuation.separator.comma.abl"
         }
       },
-      "end": "(?=\\.|:)",
+      "end": "(?=[\\.:](?![a-zA-Z0-9_\\-#$%]))",
       "patterns": [
         {
           "include": "#string"
@@ -3237,6 +3330,12 @@
         {
           "include": "#function-arguments"
         },
+        {
+          "include": "#function-arguments-no-parens"
+        },
+        {
+          "include": "#parens"
+        },
         {
           "include": "#expression"
         },
@@ -3280,20 +3379,10 @@
       "end": "(?i)(?=(transact(?:ion|io|i)?)|on|:|with)",
       "patterns": [
         {
-          "comment": "The comment scopes are included in the statements pattern, but the operator trumps these",
-          "include": "#comment"
-        },
-        {
-          "include": "#operator"
-        },
-        {
-          "include": "#property-call"
+          "include": "#logical-expression"
         },
         {
           "include": "#branch-options"
-        },
-        {
-          "include": "#expression"
         }
       ]
     },
@@ -3303,25 +3392,119 @@
       "name": "comment.preprocessor.analyze-suspend.abl"
     },
     "global-scoped-define": {
-      "begin": "(?i)((?:&scop(?:ed-define|ed-defin|ed-defi|ed-def|ed-de|ed-d|ed-|ed|e)?)|(?:&glob(?:al-define|al-defin|al-defi|al-def|al-de|al-d|al-|al|a)?))\\s*([\\.a-zA-Z0-9_\\-#$%\\\\/]*)\\s*",
+      "patterns": [
+        {
+          "begin": "(?i)^\\s*((&)(scop(?:ed-define|ed-defin|ed-defi|ed-def|ed-de|ed-d|ed-|ed|e)?))\\s*",
+          "name": "meta.preprocessor.abl",
+          "beginCaptures": {
+            "2": {
+              "name": "punctuation.definition.preprocessor.abl"
+            },
+            "3": {
+              "name": "keyword.control.directive.define.abl"
+            },
+            "4": {
+              "name": "entity.name.function.preprocessor.abl"
+            }
+          },
+          "end": "([\\.a-zA-Z0-9_\\-#$%\\/]+)\\s*",
+          "endCaptures": {
+            "1": {
+              "name": "entity.name.function.preprocessor.abl"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#escape-endline"
+            }
+          ]
+        },
+        {
+          "begin": "(?i)^\\s*((&)(glob(?:al-define|al-defin|al-defi|al-def|al-de|al-d|al-|al|a)?))\\s*",
+          "name": "meta.preprocessor.abl",
+          "beginCaptures": {
+            "2": {
+              "name": "punctuation.definition.preprocessor.abl"
+            },
+            "3": {
+              "name": "keyword.control.directive.define.abl"
+            },
+            "4": {
+              "name": "entity.name.function.preprocessor.abl"
+            }
+          },
+          "end": "([\\.a-zA-Z0-9_\\-#$%\\/]+)\\s*",
+          "endCaptures": {
+            "1": {
+              "name": "entity.name.function.preprocessor.abl"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#escape-endline"
+            }
+          ]
+        },
+        {
+          "begin": "(?i)((&)(undef(?:ine|in|i)?))\\s*([\\.a-zA-Z0-9_\\-#$%\\/]*)\\s*",
+          "name": "meta.preprocessor.abl",
+          "beginCaptures": {
+            "2": {
+              "name": "punctuation.definition.preprocessor.abl"
+            },
+            "3": {
+              "name": "keyword.control.directive.define.abl"
+            },
+            "4": {
+              "name": "entity.name.function.preprocessor.abl"
+            }
+          },
+          "end": "([\\.a-zA-Z0-9_\\-#$%\\/]+)\\s*",
+          "endCaptures": {
+            "1": {
+              "name": "entity.name.function.preprocessor.abl"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#escape-char"
+            }
+          ]
+        }
+      ]
+    },
+    "preprocessor-functions": {
+      "begin": "\\s*([Dd][Ee][Ff][Ii][Nn][Ee][Dd])\\b",
       "beginCaptures": {
         "1": {
-          "name": "keyword.other.abl"
-        },
-        "2": {
-          "name": "entity.name.function.preprocessor.abl"
+          "name": "storage.type.function.abl"
         }
       },
-      "end": "(?=//|/\\*)|$",
-      "name": "meta.preprocessor.define.abl",
       "patterns": [
         {
-          "include": "#string"
+          "include": "#parens"
+        },
+        {
+          "include": "#comment"
+        },
+        {
+          "match": "([a-zA-Z0-9_\\-#$%]+)",
+          "captures": {
+            "1": {
+              "name": "entity.name.function.preprocessor.abl"
+            }
+          }
         }
-      ]
+      ],
+      "end": "(\\))",
+      "endCaptures": {
+        "1": {
+          "name": "meta.brace.round.js"
+        }
+      }
     },
     "if-then": {
-      "begin": "(?i)\\b(if)\\b",
+      "begin": "\\b([Ii][Ff])\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.abl"
@@ -3329,7 +3512,15 @@
       },
       "patterns": [
         {
-          "match": "(?i)\\b(and|or)\\b",
+          "include": "#logical-expression"
+        }
+      ],
+      "end": "\\b(?=[Tt][Hh][Ee][Nn])\\b"
+    },
+    "logical-expression": {
+      "patterns": [
+        {
+          "match": "\\b([Aa][Nn][Dd]|[Oo][Rr])\\b",
           "captures": {
             "1": {
               "name": "keyword.other.abl"
@@ -3343,10 +3534,7 @@
           "include": "#function-arguments"
         },
         {
-          "include": "#property-call"
-        },
-        {
-          "include": "#static-object-property-call"
+          "include": "#type-member-call"
         },
         {
           "include": "#db-dot-table-dot-field"
@@ -3366,14 +3554,19 @@
         {
           "include": "#preprocessors"
         },
+        {
+          "include": "#language-functions"
+        },
+        {
+          "include": "#abl-functions"
+        },
         {
           "include": "#abl-system-handles"
         },
         {
           "include": "#keywords"
         }
-      ],
-      "end": "(?i)\\b(?=then)\\b"
+      ]
     },
     "function-arguments": {
       "name": "meta.function.arguments.abl",
@@ -3672,6 +3865,9 @@
         {
           "include": "#string"
         },
+        {
+          "include": "#preprocessor-reference"
+        },
         {
           "include": "#argument-reference"
         },
@@ -3712,6 +3908,9 @@
         }
       },
       "patterns": [
+        {
+          "include": "#preprocessor-reference"
+        },
         {
           "include": "#argument-reference"
         },
@@ -3749,6 +3948,9 @@
             }
           }
         },
+        {
+          "include": "#preprocessor-reference"
+        },
         {
           "comment": "Argument references can be passed into includes as arguments",
           "include": "#argument-reference"
@@ -3759,11 +3961,20 @@
       ]
     },
     "argument-reference": {
-      "comment": "https://docs.progress.com/bundle/abl-reference/page/Argument-reference.html",
-      "match": "\\s*((\\{\\s*&[\\.a-zA-Z0-9_\\-#$%\\\/]+\\})|(\\{\\s*\\d+\\})|(\\{\\s*\\*\\}))\\s*",
+      "comment": "ONly unnamed arguments are captured here. Names arguments are treated as preprocessors, since its impossible to tell them apart https://docs.progress.com/bundle/abl-reference/page/Argument-reference.html",
+      "match": "\\s*(({)([0-9]+|\\*\\s*)(}))\\s*",
       "captures": {
         "1": {
+          "name": "meta.argument.abl"
+        },
+        "2": {
+          "name": "punctuation.section.abl"
+        },
+        "3": {
           "name": "support.other.argument.abl"
+        },
+        "4": {
+          "name": "punctuation.section.abl"
         }
       }
     },
@@ -3823,7 +4034,7 @@
           "name": "support.other.abl"
         }
       },
-      "name": "string.single.complex.abl",
+      "name": "string.quoted.single.abl",
       "patterns": [
         {
           "include": "#escape-char"
@@ -3846,7 +4057,7 @@
           "name": "support.other.abl"
         }
       },
-      "name": "string.double.complex.abl",
+      "name": "string.quoted.double.abl",
       "patterns": [
         {
           "include": "#escape-char"
@@ -3863,7 +4074,7 @@
       "comment": "https://docs.progress.com/bundle/abl-reference/page/Data-types.html"
     },
     "primitive-type": {
-      "match": "(?i)(?<=^|\\s)(blob|(char(?:acter|acte|act|ac|a)?)|cha|ch|c|clob|com-handle|date|da|datetime|datetime-tz|(dec(?:imal|ima|im|i)?)|de|handle|int64|(int(?:eger|ege|eg|e)?)|in|i|(log(?:ical|ica|ic|i)?)|lo|l|(longch(?:ar|a)?)|memptr|raw|recid|rowid|widget-handle)(?![=a-zA-Z0-9_\\-#$%\\-])",
+      "match": "(?i)(?<=^|\\s)(blob|(ch(?:aracter|aracte|aract|arac|ara|ar|a)?)|c|clob|com-handle|(da(?:tetime-tz|tetime|te|t)?)|(de(?:cimal|cima|cim|ci|c)?)|handle|int64|(int(?:eger|ege|eg|e)?)|in|i|(log(?:ical|ica|ic|i)?)|lo|l|(longch(?:ar|a)?)|memptr|raw|recid|rowid|widget-handle)(?![=a-zA-Z0-9_\\-#$%\\-])",
       "captures": {
         "1": {
           "name": "storage.type.abl"
@@ -3872,7 +4083,7 @@
       "comment": "https://docs.progress.com/bundle/abl-reference/page/Data-types.html"
     },
     "numeric": {
-      "match": "(?<![a-zA-Z0-9_\\-#$%-])(0[xX]\\h+)|(\\-?\\.?[0-9]+(\\.[0-9]+)?)",
+      "match": "(?<![a-zA-Z0-9_\\-#$%-])(0[xX]\\h+)|([+\\-]?\\.?(0|[1-9][0-9]*)(\\.[0-9]+)?([eE][+\\-]?[0-9]+)?)",
       "name": "constant.numeric.source.abl"
     },
     "abl-system-handles": {
@@ -5826,4 +6037,4 @@
   },
   "scopeName": "source.abl",
   "uuid": "075bb86e-03ea-4fea-bac0-e11b9dc73e03"
-}
+}

package/package.json

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