github-linguist 5.3.3 → 6.0.0

data/grammars/source.data-weave.json

@@ -1,10 +1,6 @@
 {
   "name": "DataWeave",
   "scopeName": "source.data-weave",
-  "fileTypes": [
-    "dwl"
-  ],
-  "uuid": "ba6390ae-c50f-4dce-97f1-951dab8fc607",
   "patterns": [
     {
       "include": "#comments"
@@ -13,148 +9,116 @@
       "include": "#directives"
     },
     {
-      "match": "(---)",
-      "name": "keyword.operator.body-marker.dw"
+      "name": "keyword.operator.body-marker.dw",
+      "match": "(---)"
     },
     {
       "include": "#expressions"
     },
     {
-      "match": "([^\\s]+)",
-      "name": "invalid"
+      "name": "invalid",
+      "match": "([^\\s]+)"
     }
   ],
   "repository": {
-    "directives": {
-      "patterns": [
-        {
-          "include": "#dw-directive"
-        },
-        {
-          "include": "#import-directive"
-        },
-        {
-          "include": "#type-directive"
-        },
-        {
-          "include": "#fun-directive"
-        },
-        {
-          "include": "#var-directive"
-        },
-        {
-          "include": "#ns-directive"
-        },
-        {
-          "include": "#input-directive"
-        },
-        {
-          "include": "#output-directive"
-        }
-      ]
-    },
-    "function_call": {
-      "name": "function_call",
-      "begin": "\\s*\\(",
-      "end": "\\s*\\)",
+    "array-literal": {
+      "name": "meta.array.literal.dw",
+      "begin": "(?\u003c!\\w|}|])(\\[)",
+      "end": "\\]",
       "patterns": [
-        {
-          "include": "#punctuation-comma"
-        },
         {
           "include": "#expressions"
-        }
-      ]
-    },
-    "variable-reference": {
-      "patterns": [
-        {
-          "name": "variable.other.dw",
-          "match": "\\b(?!(fun|input|output|type|var|ns|import|%dw|private|---)\\b)((\\+\\+|\\-\\-|[A-Za-z])[a-zA-Z0-9_]*)"
-        },
-        {
-          "name": "invalid",
-          "match": "\\b(fun|input|output|type|var|ns|import|private)\\b"
         },
         {
-          "name": "variable.parameter.dw",
-          "match": "(\\$+)"
+          "include": "#punctuation-comma"
         }
-      ]
-    },
-    "cast": {
-      "begin": "(?<!\\.|\\$)\\b(as|is)\\s+",
+      ],
       "beginCaptures": {
-        "1": {
-          "name": "keyword.control.as.dw"
+        "0": {
+          "name": "meta.brace.square.dw"
         }
       },
-      "end": "(?=$|^|[;,:})\\]\\s])",
+      "endCaptures": {
+        "0": {
+          "name": "meta.brace.square.dw"
+        }
+      }
+    },
+    "attr-literal": {
+      "name": "meta.attributes.dw",
+      "begin": "\\@\\(",
+      "end": "\\)",
       "patterns": [
         {
-          "include": "#types"
+          "include": "#object-member"
         }
-      ]
-    },
-    "case-clause": {
-      "name": "case-clause.expr.dw",
-      "begin": "(?<!\\.|\\$)\\b(case|else(?=\\s*->))\\b(?!\\$|\\.)",
+      ],
       "beginCaptures": {
-        "1": {
-          "name": "keyword.control.switch.dw"
+        "0": {
+          "name": "keyword.operator.attributes.dw"
         }
       },
-      "end": "\\-\\>",
       "endCaptures": {
         "0": {
-          "name": "keyword.control.switch.dw"
+          "name": "keyword.operator.attributes.dw"
         }
-      },
+      }
+    },
+    "case-clause": {
+      "name": "case-clause.expr.dw",
+      "begin": "(?\u003c!\\.|\\$)\\b(case|else(?=\\s*-\u003e))\\b(?!\\$|\\.)",
+      "end": "\\-\\\u003e",
       "patterns": [
         {
-          "begin": "(?<!\\.|\\$)\\b(is)\\s+",
+          "begin": "(?\u003c!\\.|\\$)\\b(is)\\s+",
+          "end": "(?=\\-\\\u003e)",
+          "patterns": [
+            {
+              "include": "#types"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.is.dw"
             }
-          },
-          "end": "(?=\\-\\>)",
+          }
+        },
+        {
+          "begin": "(?\u003c!\\.|\\$)\\b(matches)\\b",
+          "end": "(?=\\-\\\u003e)",
           "patterns": [
             {
-              "include": "#types"
+              "include": "#expressions"
             }
-          ]
-        },
-        {
-          "begin": "(?<!\\.|\\$)\\b(matches)\\b",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.matches.dw"
             }
-          },
-          "end": "(?=\\-\\>)",
+          }
+        },
+        {
+          "begin": "(?\u003c!\\.|\\$)\\b([A-Za-z][a-zA-Z0-9_]*)\\s*:\\s+",
+          "end": "(?=\\-\\\u003e)",
           "patterns": [
             {
               "include": "#expressions"
             }
-          ]
-        },
-        {
-          "begin": "(?<!\\.|\\$)\\b([A-Za-z][a-zA-Z0-9_]*)\\s*:\\s+",
+          ],
           "beginCaptures": {
             "1": {
               "name": "entity.name.variable.dw"
             }
-          },
-          "end": "(?=\\-\\>)",
+          }
+        },
+        {
+          "begin": "(?\u003c!\\.|\\$)\\b([A-Za-z][a-zA-Z0-9_]*)\\s*(if|matches)\\s+",
+          "end": "(?=\\-\\\u003e)",
           "patterns": [
             {
               "include": "#expressions"
             }
-          ]
-        },
-        {
-          "begin": "(?<!\\.|\\$)\\b([A-Za-z][a-zA-Z0-9_]*)\\s*(if|matches)\\s+",
+          ],
           "beginCaptures": {
             "1": {
               "name": "entity.name.variable.dw"
@@ -162,18 +126,36 @@
             "2": {
               "name": "keyword.control.if.dw"
             }
-          },
-          "end": "(?=\\-\\>)",
-          "patterns": [
-            {
-              "include": "#expressions"
-            }
-          ]
+          }
         },
         {
           "include": "#expressions"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.switch.dw"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "keyword.control.switch.dw"
+        }
+      }
+    },
+    "cast": {
+      "begin": "(?\u003c!\\.|\\$)\\b(as|is)\\s+",
+      "end": "(?=$|^|[;,:})\\]\\s])",
+      "patterns": [
+        {
+          "include": "#types"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.as.dw"
+        }
+      }
     },
     "comments": {
       "patterns": [
@@ -212,17 +194,7 @@
         },
         {
           "begin": "\\|",
-          "beginCaptures": {
-            "0": {
-              "name": "constant.numeric.dw"
-            }
-          },
           "end": "\\|",
-          "endCaptures": {
-            "0": {
-              "name": "constant.numeric.dw"
-            }
-          },
           "patterns": [
             {
               "name": "constant.numeric.dw",
@@ -236,13 +208,89 @@
               "name": "invalid",
               "match": "([^\\|])"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "constant.numeric.dw"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "constant.numeric.dw"
+            }
+          }
+        }
+      ]
+    },
+    "directives": {
+      "patterns": [
+        {
+          "include": "#dw-directive"
+        },
+        {
+          "include": "#import-directive"
+        },
+        {
+          "include": "#type-directive"
+        },
+        {
+          "include": "#fun-directive"
+        },
+        {
+          "include": "#var-directive"
+        },
+        {
+          "include": "#ns-directive"
+        },
+        {
+          "include": "#input-directive"
+        },
+        {
+          "include": "#output-directive"
         }
       ]
     },
+    "do-statement": {
+      "name": "do-statement.expr.dw",
+      "begin": "(?\u003c!\\.|\\$)\\b(do)\\s*(\\{)",
+      "end": "(\\})",
+      "patterns": [
+        {
+          "include": "#comments"
+        },
+        {
+          "include": "#directives"
+        },
+        {
+          "name": "keyword.operator.body-marker.dw",
+          "match": "(---)"
+        },
+        {
+          "include": "#expressions"
+        },
+        {
+          "name": "invalid",
+          "match": "([^\\s]+)"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.do.dw"
+        },
+        "2": {
+          "name": "punctuation.definitions.begin.dw"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definitions.end.dw"
+        }
+      }
+    },
     "dw-directive": {
       "name": "meta.directive.version.dw",
-      "begin": "(?<!\\.|\\$)(%dw)\\s+([0-9]\\.[0-9])(?!\\$|\\.)",
+      "begin": "(?\u003c!\\.|\\$)(%dw)\\s+([0-9]\\.[0-9])(?!\\$|\\.)",
+      "end": "(?=\\n)",
       "beginCaptures": {
         "1": {
           "name": "comment.dw"
@@ -250,12 +298,7 @@
         "2": {
           "name": "comment.dw"
         }
-      },
-      "end": "(?=\\n)"
-    },
-    "infix": {
-      "name": "support.function.dw",
-      "match": "(?<!^|,|\\[|\\(|=|\\+|>|<|\\-|\\*|:|\\{|case|is|else|not|as|and|or)(?<=[a-zA-Z0-9_$\\}\\])\"'`|/])\\s*(?!(var|match|case|else|fun|input|output|is|as|default|ns|import|null|false|true|using|do|not|and|or)\\s)(\\+\\+|\\-\\-|[a-zA-Z][a-zA-Z_0-9]*)(\\s+|\\s*(?=[\"'/|{]))"
+      }
     },
     "expressions": {
       "name": "expression",
@@ -320,67 +363,195 @@
         }
       ]
     },
-    "generics": {
+    "fun-directive": {
+      "name": "meta.directive.fun.dw",
+      "begin": "(\\s*(fun)\\s+([a-zA-Z][a-zA-Z0-9]*))",
+      "end": "(=)",
       "patterns": [
         {
-          "begin": "(:)",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.operator.declaration.dw"
-            }
-          },
-          "end": "(?=,|>)",
+          "begin": "\u003c",
+          "end": "\u003e",
           "patterns": [
             {
-              "include": "#types"
+              "include": "#generics"
             }
           ]
         },
         {
-          "name": "keyword.operator.extends.dw",
-          "match": "<:"
-        },
-        {
-          "include": "#keywords"
+          "begin": "\\(",
+          "end": "\\)",
+          "patterns": [
+            {
+              "include": "#parameters"
+            }
+          ]
         },
         {
-          "name": "entity.name.type.parameter.dw",
-          "match": "\\w+"
-        }
-      ]
-    },
-    "input-directive": {
-      "name": "meta.directive.ns.dw",
-      "begin": "(?<!\\.|\\$)\\b(input)\\s+([[:alpha:]][[:alnum:]]*)\\s*",
-      "end": "(?=\\n)",
+          "begin": "(:)",
+          "end": "(?==)",
+          "patterns": [
+            {
+              "include": "#types"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.operator.declaration.dw"
+            }
+          }
+        }
+      ],
       "beginCaptures": {
-        "1": {
+        "2": {
           "name": "storage.type.dw"
         },
-        "2": {
-          "name": "entity.name.variable.dw"
+        "3": {
+          "name": "entity.name.function.dw"
         }
       },
+      "endCaptures": {
+        "0": {
+          "name": "keyword.operator.assignment.dw"
+        }
+      }
+    },
+    "function_call": {
+      "name": "function_call",
+      "begin": "\\s*\\(",
+      "end": "\\s*\\)",
       "patterns": [
         {
-          "begin": "(\\:\\s*)",
+          "include": "#punctuation-comma"
+        },
+        {
+          "include": "#expressions"
+        }
+      ]
+    },
+    "generics": {
+      "patterns": [
+        {
+          "begin": "(:)",
+          "end": "(?=,|\u003e)",
+          "patterns": [
+            {
+              "include": "#types"
+            }
+          ],
           "beginCaptures": {
+            "1": {
+              "name": "keyword.operator.declaration.dw"
+            }
+          }
+        },
+        {
+          "name": "keyword.operator.extends.dw",
+          "match": "\u003c:"
+        },
+        {
+          "include": "#keywords"
+        },
+        {
+          "name": "entity.name.type.parameter.dw",
+          "match": "\\w+"
+        }
+      ]
+    },
+    "if-statement": {
+      "name": "meta.if.dw",
+      "begin": "(?\u003c!\\.|\\$)\\b(if\\s*)\\(",
+      "end": "\\)",
+      "patterns": [
+        {
+          "include": "#expressions"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.if.dw"
+        }
+      }
+    },
+    "import-directive": {
+      "name": "meta.directive.import.dw",
+      "begin": "(\\s*(import)\\s+)",
+      "end": "(?=(fun|input|output|type|var|ns|import|%dw|private|---)\\s|$)",
+      "patterns": [
+        {
+          "include": "#comments"
+        },
+        {
+          "match": "(,)"
+        },
+        {
+          "match": "(\\*)"
+        },
+        {
+          "match": "\\b(from)\\s+",
+          "captures": {
+            "1": {
+              "name": "storage.type.dw"
+            }
+          }
+        },
+        {
+          "name": "entity.name.other.dw",
+          "match": "(?:[a-zA-Z][a-zA-Z0-9]*(?:::[a-zA-Z][a-zA-Z0-9]*)*)\n"
+        },
+        {
+          "match": "\\s+(as)\\s+([a-zA-Z][a-zA-Z0-9]*)",
+          "captures": {
             "1": {
               "name": "keyword.other.dw"
+            },
+            "2": {
+              "name": "entity.name.other.dw"
             }
-          },
+          }
+        }
+      ],
+      "beginCaptures": {
+        "2": {
+          "name": "storage.type.dw"
+        }
+      }
+    },
+    "infix": {
+      "name": "support.function.dw",
+      "match": "(?\u003c!^|,|\\[|\\(|=|\\+|\u003e|\u003c|\\-|\\*|:|\\{|case|is|else|not|as|and|or)(?\u003c=[a-zA-Z0-9_$\\}\\])\"'`|/])\\s*(?!(var|match|case|else|fun|input|output|is|as|default|ns|import|null|false|true|using|do|not|and|or)\\s)(\\+\\+|\\-\\-|[a-zA-Z][a-zA-Z_0-9]*)(\\s+|\\s*(?=[\"'/|{]))"
+    },
+    "input-directive": {
+      "name": "meta.directive.ns.dw",
+      "begin": "(?\u003c!\\.|\\$)\\b(input)\\s+([[:alpha:]][[:alnum:]]*)\\s*",
+      "end": "(?=\\n)",
+      "patterns": [
+        {
+          "begin": "(\\:\\s*)",
           "end": "(\\s|\\n)",
           "patterns": [
             {
               "include": "#types"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.dw"
+            }
+          }
         },
         {
-          "match": "([^{\\n\\s])",
-          "name": "string.mime.dw"
+          "name": "string.mime.dw",
+          "match": "([^{\\n\\s])"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "storage.type.dw"
+        },
+        "2": {
+          "name": "entity.name.variable.dw"
+        }
+      }
     },
     "keywords": {
       "patterns": [
@@ -398,7 +569,7 @@
         },
         {
           "name": "keyword.operator.comparison.dw",
-          "match": "(~=|==|!=|!=|<=|>=|<|>)"
+          "match": "(~=|==|!=|!=|\u003c=|\u003e=|\u003c|\u003e)"
         },
         {
           "name": "keyword.operator.assignment.dw",
@@ -421,11 +592,6 @@
     "match-block": {
       "name": "match-block.expr.dw",
       "begin": "\\{",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.block.dw"
-        }
-      },
       "end": "(?=\\})",
       "patterns": [
         {
@@ -434,296 +600,231 @@
         {
           "include": "#expressions"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.block.dw"
+        }
+      }
     },
     "match-statement": {
       "name": "match-statement.expr.dw",
-      "begin": "(?<!\\.|\\$)\\b(match)\\s*(?=\\{)",
+      "begin": "(?\u003c!\\.|\\$)\\b(match)\\s*(?=\\{)",
+      "end": "\\}",
+      "patterns": [
+        {
+          "include": "#match-block"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.control.switch.dw"
         }
       },
-      "end": "\\}",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.block.dw"
         }
-      },
-      "patterns": [
-        {
-          "include": "#match-block"
-        }
-      ]
+      }
     },
-    "using-statement": {
-      "name": "using-statement.expr.dw",
-      "begin": "(?<!\\.|\\$)\\b(using)\\s*(\\()",
+    "ns-directive": {
+      "name": "meta.directive.ns.dw",
+      "begin": "(?\u003c!\\.|\\$)\\b(ns)\\s+([A-Za-z][a-zA-Z0-9_]*)\\s+([^\\n]*)(?!\\$|\\.)",
+      "end": "(?=\\n)",
       "beginCaptures": {
         "1": {
-          "name": "keyword.control.using.dw"
+          "name": "storage.type.dw"
         },
         "2": {
-          "name": "punctuation.definitions.begin.dw"
-        }
-      },
-      "end": "(\\))",
-      "endCaptures": {
-        "1": {
-          "name": "punctuation.definitions.end.dw"
+          "name": "entity.name.namespace.dw"
+        },
+        "3": {
+          "name": "meta.definition.ns.dw string.url.dw"
         }
-      },
+      }
+    },
+    "object-key": {
       "patterns": [
         {
-          "match": "((?:\\+\\+|\\-\\-|[A-Za-z])(?:[a-zA-Z0-9_]*))(\\s*=)",
+          "name": "meta.object.member.dw meta.object-literal.namespace.dw",
+          "match": "\\b([[:alpha:]][_[:alnum:]]+#)",
           "captures": {
-            "1": {
-              "name": "entity.name.variable.dw"
-            },
-            "2": {
-              "name": "keyword.operator.dw"
+            "0": {
+              "name": "variable.language.dw"
             }
           }
         },
         {
-          "include": "#expressions"
+          "name": "meta.object.member.dw meta.object-literal.key.dw",
+          "begin": "(?=[\\'\\\"\\`])",
+          "end": "(?=@\\(|:)",
+          "patterns": [
+            {
+              "include": "#strings"
+            }
+          ]
+        },
+        {
+          "name": "meta.object.member.dw",
+          "match": "(?:[_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:|@\\()",
+          "end": "(?=,|\\}|\\))",
+          "captures": {
+            "1": {
+              "name": "meta.object-literal.key.dw"
+            }
+          }
         }
       ]
     },
-    "do-statement": {
-      "name": "do-statement.expr.dw",
-      "begin": "(?<!\\.|\\$)\\b(do)\\s*(\\{)",
+    "object-literal": {
+      "name": "meta.objectliteral.dw",
+      "begin": "\\{",
+      "end": "\\}",
+      "patterns": [
+        {
+          "include": "#object-member"
+        }
+      ],
       "beginCaptures": {
-        "1": {
-          "name": "keyword.control.do.dw"
-        },
-        "2": {
-          "name": "punctuation.definitions.begin.dw"
+        "0": {
+          "name": "punctuation.definition.block.dw"
         }
       },
-      "end": "(\\})",
       "endCaptures": {
-        "1": {
-          "name": "punctuation.definitions.end.dw"
+        "0": {
+          "name": "punctuation.definition.block.dw"
         }
-      },
+      }
+    },
+    "object-member": {
       "patterns": [
         {
           "include": "#comments"
         },
         {
-          "include": "#directives"
+          "include": "#paren-expression"
+        },
+        {
+          "begin": "\\s+if\\b",
+          "end": "(?=,|})",
+          "patterns": [
+            {
+              "include": "#expressions"
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.control.dw"
+            }
+          }
         },
         {
-          "match": "(---)",
-          "name": "keyword.operator.body-marker.dw"
+          "include": "#object-key"
         },
         {
-          "include": "#expressions"
+          "include": "#attr-literal"
+        },
+        {
+          "include": "#object-member-body"
         },
         {
-          "match": "([^\\s]+)",
-          "name": "invalid"
+          "include": "#punctuation-comma"
         }
       ]
     },
-    "if-statement": {
-      "name": "meta.if.dw",
-      "begin": "(?<!\\.|\\$)\\b(if\\s*)\\(",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.control.if.dw"
-        }
-      },
-      "end": "\\)",
+    "object-member-body": {
+      "name": "meta.object.member.dw",
+      "begin": ":",
+      "end": "(?=,|\\}|\\))",
       "patterns": [
         {
           "include": "#expressions"
         }
-      ]
-    },
-    "ns-directive": {
-      "name": "meta.directive.ns.dw",
-      "begin": "(?<!\\.|\\$)\\b(ns)\\s+([A-Za-z][a-zA-Z0-9_]*)\\s+([^\\n]*)(?!\\$|\\.)",
-      "beginCaptures": {
-        "1": {
-          "name": "storage.type.dw"
-        },
-        "2": {
-          "name": "entity.name.namespace.dw"
-        },
-        "3": {
-          "name": "meta.definition.ns.dw string.url.dw"
-        }
-      },
-      "end": "(?=\\n)"
-    },
-    "object-literal": {
-      "name": "meta.objectliteral.dw",
-      "begin": "\\{",
+      ],
       "beginCaptures": {
         "0": {
-          "name": "punctuation.definition.block.dw"
-        }
-      },
-      "end": "\\}",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.block.dw"
-        }
-      },
-      "patterns": [
-        {
-          "include": "#object-member"
+          "name": "meta.object-literal.key.dw punctuation.separator.key-value.dw"
         }
-      ]
+      }
     },
-    "attr-literal": {
-      "name": "meta.attributes.dw",
-      "begin": "\\@\\(",
-      "beginCaptures": {
-        "0": {
-          "name": "keyword.operator.attributes.dw"
-        }
-      },
-      "end": "\\)",
-      "endCaptures": {
-        "0": {
-          "name": "keyword.operator.attributes.dw"
-        }
-      },
+    "object-member-type": {
       "patterns": [
         {
-          "include": "#object-member"
-        }
-      ]
-    },
-    "selectors": {
-      "name": "meta.selector.data-weave",
-      "begin": "(?<![\\[\\(:+*/\\-])(\\s*\\.\\.\\*|\\s*\\.\\.|\\s*\\.\\*|\\s*\\.\\@|\\s*\\.#|\\s*\\.&|\\s*\\.|(?=\\[)|\\:\\:)",
-      "end": "(?=\\s|,|\\}|\\)|\\n|\\]|\\(|-|$)",
-      "patterns": [
+          "include": "#comments"
+        },
         {
-          "name": "meta.object.member.dw",
-          "match": "\\b([[:alpha:]][_[:alnum:]]+#)",
-          "captures": {
-            "0": {
-              "name": "variable.language.dw"
-            }
-          }
+          "name": "variable.language.dw",
+          "match": "_"
         },
         {
-          "match": "((?:[A-Za-z])([a-zA-Z0-9_]*)[?!]?|(\\$)+)",
-          "name": "meta.object.member.dw"
+          "name": "variable.language.dw",
+          "match": "([a-zA-Z0-9]+#)"
         },
         {
-          "include": "#strings"
+          "name": "entity.name.type.dw",
+          "match": "\\(\\s*([a-zA-Z][a-zA-Z0-9]*)\\s*\\)"
         },
         {
-          "begin": "(\\[(@|\\^)?)",
-          "end": "(\\])",
-          "patterns": [
-            {
-              "include": "#expressions"
-            },
-            {
-              "match": "([\\)])",
-              "name": "invalid"
-            }
-          ]
+          "name": "meta.object.member.dw",
+          "match": "([a-zA-Z][a-zA-Z0-9]*)"
         },
         {
-          "include": "#selectors"
-        }
-      ]
-    },
-    "object-key": {
-      "patterns": [
+          "include": "#strings"
+        },
         {
-          "name": "meta.object.member.dw meta.object-literal.namespace.dw",
-          "match": "\\b([[:alpha:]][_[:alnum:]]+#)",
-          "captures": {
-            "0": {
-              "name": "variable.language.dw"
-            }
-          }
+          "name": "keyword.operator.optional.dw",
+          "match": "\\?"
         },
         {
-          "name": "meta.object.member.dw meta.object-literal.key.dw",
-          "begin": "(?=[\\'\\\"\\`])",
-          "end": "(?=@\\(|:)",
+          "name": "keyword.operator.optional.dw",
+          "match": "\\*"
+        },
+        {
+          "begin": "(\\@\\()",
+          "end": "(\\))",
           "patterns": [
             {
-              "include": "#strings"
+              "include": "#punctuation-comma"
+            },
+            {
+              "include": "#object-member-type"
             }
-          ]
-        },
-        {
-          "name": "meta.object.member.dw",
-          "end": "(?=,|\\}|\\))",
-          "match": "(?:[_$[:alpha:]][_$[:alnum:]]*)\\s*(?=:|@\\()",
-          "captures": {
+          ],
+          "beginCaptures": {
             "1": {
-              "name": "meta.object-literal.key.dw"
+              "name": "keyword.operator.attributes.dw"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "keyword.operator.attributes.dw"
             }
           }
-        }
-      ]
-    },
-    "object-member": {
-      "patterns": [
-        {
-          "include": "#comments"
         },
         {
-          "include": "#paren-expression"
-        },
-        {
-          "begin": "\\s+if\\b",
-          "beginCaptures": {
-            "0": {
-              "name": "keyword.control.dw"
-            }
-          },
-          "end": "(?=,|})",
+          "begin": "(:)",
+          "end": "(?=,|}|\\)|\\|}|\\-}|\\|\\-})",
           "patterns": [
             {
-              "include": "#expressions"
+              "include": "#types"
             }
-          ]
-        },
-        {
-          "include": "#object-key"
-        },
-        {
-          "include": "#attr-literal"
-        },
-        {
-          "include": "#object-member-body"
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.operator.declaration.dw"
+            }
+          }
         },
         {
-          "include": "#punctuation-comma"
-        }
-      ]
-    },
-    "object-member-body": {
-      "name": "meta.object.member.dw",
-      "begin": ":",
-      "beginCaptures": {
-        "0": {
-          "name": "meta.object-literal.key.dw punctuation.separator.key-value.dw"
-        }
-      },
-      "end": "(?=,|\\}|\\))",
-      "patterns": [
-        {
-          "include": "#expressions"
+          "name": "invalid",
+          "match": "([^\\s])"
         }
       ]
     },
     "output-directive": {
       "name": "meta.directive.ns.dw",
-      "begin": "(?<!\\.|\\$)\\b(output)\\s+([^\\n{\\s]*)(?!\\$|\\.)",
+      "begin": "(?\u003c!\\.|\\$)\\b(output)\\s+([^\\n{\\s]*)(?!\\$|\\.)",
+      "end": "(?=\\n)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.dw"
@@ -731,38 +832,37 @@
         "2": {
           "name": "string.other.dw"
         }
-      },
-      "end": "(?=\\n)"
+      }
     },
     "parameters": {
       "patterns": [
         {
           "begin": "(:)",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.operator.declaration.dw"
-            }
-          },
           "end": "(?=,|\\)|=)",
           "patterns": [
             {
               "include": "#types"
             }
-          ]
-        },
-        {
-          "begin": "(=)",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.operator.declaration.dw"
             }
-          },
+          }
+        },
+        {
+          "begin": "(=)",
           "end": "(?=,|\\))",
           "patterns": [
             {
               "include": "#expressions"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.operator.declaration.dw"
+            }
+          }
         },
         {
           "name": "variable.parameter.dw",
@@ -772,56 +872,59 @@
     },
     "paren-expression": {
       "begin": "(\\()",
+      "end": "(\\))",
+      "patterns": [
+        {
+          "include": "#expressions"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "punctuation.expression.begin.dw"
         }
       },
-      "end": "(\\))",
       "endCaptures": {
         "1": {
           "name": "punctuation.expression.end.dw"
         }
-      },
-      "patterns": [
-        {
-          "include": "#expressions"
-        }
-      ]
+      }
     },
     "punctuation-comma": {
       "name": "punctuation.separator.comma.dw",
       "match": ","
     },
-    "strings": {
+    "qstring-backtick": {
+      "begin": "`",
+      "end": "`",
       "patterns": [
         {
-          "include": "#qstring-single"
+          "include": "#template-substitution-element"
         },
         {
-          "include": "#qstring-double"
+          "include": "#template-dollar"
         },
         {
-          "include": "#qstring-backtick"
+          "include": "#string-character-escape"
         },
         {
-          "include": "#template"
+          "name": "string.template.dw",
+          "match": "([^`])"
         }
-      ]
-    },
-    "qstring-backtick": {
-      "begin": "`",
+      ],
       "beginCaptures": {
         "0": {
           "name": "string.quoted.double.dw punctuation.definition.string.begin.dw"
         }
       },
-      "end": "`",
       "endCaptures": {
         "0": {
           "name": "string.quoted.double.dw punctuation.definition.string.end.dw"
         }
-      },
+      }
+    },
+    "qstring-double": {
+      "begin": "\"",
+      "end": "\"",
       "patterns": [
         {
           "include": "#template-substitution-element"
@@ -833,27 +936,24 @@
           "include": "#string-character-escape"
         },
         {
-          "match": "([^`])",
-          "name": "string.template.dw"
+          "name": "string.quoted.double.dw",
+          "match": "([^\"])"
         }
-      ]
-    },
-    "template": {
-      "begin": "([$[:alpha:]][_$[:alnum:]]*)\\s*(`)",
+      ],
       "beginCaptures": {
-        "1": {
-          "name": "support.function.dw"
-        },
-        "2": {
-          "name": "string.template.dw punctuation.definition.string.template.begin.dw"
+        "0": {
+          "name": "string.quoted.double.dw punctuation.definition.string.begin.dw"
         }
       },
-      "end": "`",
       "endCaptures": {
         "0": {
-          "name": "string.template.dw punctuation.definition.string.template.end.dw"
+          "name": "string.quoted.double.dw punctuation.definition.string.end.dw"
         }
-      },
+      }
+    },
+    "qstring-single": {
+      "begin": "'",
+      "end": "(\\')|((?:[^\\\\\\n])$)",
       "patterns": [
         {
           "include": "#template-substitution-element"
@@ -865,52 +965,15 @@
           "include": "#string-character-escape"
         },
         {
-          "match": "([^`])",
-          "name": "string.template.dw"
+          "name": "string.quoted.single.dw",
+          "match": "([^'])"
         }
-      ]
-    },
-    "string-character-escape": {
-      "name": "constant.character.escape.dw",
-      "match": "\\\\(u\\h{4}|$|.)"
-    },
-    "qstring-double": {
-      "begin": "\"",
-      "beginCaptures": {
-        "0": {
-          "name": "string.quoted.double.dw punctuation.definition.string.begin.dw"
-        }
-      },
-      "end": "\"",
-      "endCaptures": {
-        "0": {
-          "name": "string.quoted.double.dw punctuation.definition.string.end.dw"
-        }
-      },
-      "patterns": [
-        {
-          "include": "#template-substitution-element"
-        },
-        {
-          "include": "#template-dollar"
-        },
-        {
-          "include": "#string-character-escape"
-        },
-        {
-          "match": "([^\"])",
-          "name": "string.quoted.double.dw"
-        }
-      ]
-    },
-    "qstring-single": {
-      "begin": "'",
+      ],
       "beginCaptures": {
         "0": {
           "name": "string.quoted.single.dw punctuation.definition.string.begin.dw"
         }
       },
-      "end": "(\\')|((?:[^\\\\\\n])$)",
       "endCaptures": {
         "1": {
           "name": "string.quoted.single.dw punctuation.definition.string.end.dw"
@@ -918,302 +981,337 @@
         "2": {
           "name": "invalid.illegal.newline.dw"
         }
-      },
+      }
+    },
+    "regex": {
       "patterns": [
         {
-          "include": "#template-substitution-element"
-        },
-        {
-          "include": "#template-dollar"
-        },
-        {
-          "include": "#string-character-escape"
+          "name": "string.regexp.dw",
+          "begin": "(?\u003c=[=(:,\\[?+!]|replace|match|scan|matches|contains|---|case|-\u003e|and|or|\\*\\/)\\s*(\\/)(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+\\/(?![\\/*])(?!\\s*[a-zA-Z0-9_$]))",
+          "end": "(/)",
+          "patterns": [
+            {
+              "include": "#regexp"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.string.begin.dw"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.string.end.dw"
+            }
+          }
         },
         {
-          "match": "([^'])",
-          "name": "string.quoted.single.dw"
+          "name": "string.regexp.dw",
+          "begin": "(?\u003c![_$[:alnum:])])\\/(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+\\/(?![\\/*])(?!\\s*[a-zA-Z0-9_$]))",
+          "end": "(/)",
+          "patterns": [
+            {
+              "include": "#regexp"
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.dw"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.string.end.dw"
+            }
+          }
         }
       ]
     },
-    "template-dollar": {
+    "regex-character-class": {
       "patterns": [
         {
-          "match": "(\\$(\\$)+)",
-          "name": "variable.parameter.dw"
+          "name": "constant.other.character-class.regexp",
+          "match": "\\\\[wWsSdDtrnvf]|\\."
         },
         {
-          "match": "(\\$)(?![a-zA-Z(])",
-          "name": "variable.parameter.dw"
+          "name": "constant.character.numeric.regexp",
+          "match": "\\\\([0-7]{3}|x[[:xdigit:]][[:xdigit:]]|u[[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]])"
         },
         {
-          "match": "(\\$)([a-zA-Z][a-zA-Z0-9_]*)",
-          "captures": {
-            "1": {
-              "name": "keyword.other.dw"
-            },
-            "2": {
-              "name": "variable.other.dw"
-            }
-          },
-          "name": "variable.parameter.dw"
-        }
-      ]
-    },
-    "template-substitution-element": {
-      "name": "meta.template.expression.dw",
-      "begin": "\\$\\(",
-      "beginCaptures": {
-        "0": {
-          "name": "keyword.other.dw"
-        }
-      },
-      "end": "\\)",
-      "endCaptures": {
-        "0": {
-          "name": "keyword.other.dw"
-        }
-      },
-      "patterns": [
+          "name": "constant.character.control.regexp",
+          "match": "\\\\c[A-Z]"
+        },
         {
-          "include": "#expressions"
+          "name": "constant.character.escape.backslash.regexp",
+          "match": "\\\\."
         }
       ]
     },
-    "types": {
+    "regexp": {
       "patterns": [
         {
-          "include": "#comments"
-        },
-        {
-          "name": "support.class.dw",
-          "match": "\\b(String|Boolean|Number|Range|Namespace|Uri|DateTime|LocalDateTime|Date|LocalTime|Time|TimeZone|Period|Binary|Null|Regex|Nothing|Any|Object|Key)\\b"
-        },
-        {
-          "begin": "\\b(Array|Type)\\s*<\\b",
-          "beginCaptures": {
-            "1": {
-              "name": "support.type.dw"
-            }
-          },
-          "end": ">",
-          "patterns": [
-            {
-              "match": ",",
-              "name": "invalid"
-            },
-            {
-              "include": "#types"
-            }
-          ]
+          "name": "keyword.control.anchor.regexp",
+          "match": "\\\\[bB]|\\^|\\$"
         },
         {
-          "name": "keyword.operator.declaration.dw",
-          "match": "(&|\\|)"
+          "name": "keyword.other.back-reference.regexp",
+          "match": "\\\\[1-9]\\d*"
         },
         {
-          "name": "keyword.operator.declaration.dw",
-          "match": "<:"
+          "name": "keyword.operator.quantifier.regexp",
+          "match": "[?+*]|\\{(\\d+,\\d+|\\d+,|,\\d+|\\d+)\\}\\??"
         },
         {
-          "name": "support.class.dw",
-          "match": "\\b([A-Z][a-zA-Z0-9_]*)"
+          "name": "keyword.operator.or.regexp",
+          "match": "\\|"
         },
         {
-          "begin": "<",
-          "end": ">",
+          "name": "meta.group.assertion.regexp",
+          "begin": "(\\()((\\?=)|(\\?!))",
+          "end": "(\\))",
           "patterns": [
             {
-              "include": "#types"
-            },
-            {
-              "include": "#punctuation-comma"
-            },
-            {
-              "include": "#comments"
+              "include": "#regexp"
             }
-          ]
-        },
-        {
-          "begin": "\\(",
+          ],
           "beginCaptures": {
             "1": {
-              "name": "keyword.operator.tuple.dw"
+              "name": "punctuation.definition.group.regexp"
+            },
+            "2": {
+              "name": "punctuation.definition.group.assertion.regexp"
+            },
+            "3": {
+              "name": "meta.assertion.look-ahead.regexp"
+            },
+            "4": {
+              "name": "meta.assertion.negative-look-ahead.regexp"
             }
           },
-          "end": "(\\)\\s*\\-\\>)",
-          "patterns": [
-            {
-              "include": "#types"
-            },
-            {
-              "include": "#parameters"
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.group.regexp"
             }
-          ]
+          }
         },
         {
-          "begin": "\\{\\-\\|",
-          "end": "\\|\\-\\}",
+          "name": "meta.group.regexp",
+          "begin": "\\((\\?:)?",
+          "end": "\\)",
           "patterns": [
             {
-              "include": "#punctuation-comma"
-            },
-            {
-              "include": "#object-member-type"
+              "include": "#regexp"
             }
-          ]
-        },
-        {
-          "begin": "\\{\\|",
-          "end": "\\|\\}",
-          "patterns": [
-            {
-              "include": "#punctuation-comma"
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.group.regexp"
             },
-            {
-              "include": "#object-member-type"
+            "1": {
+              "name": "punctuation.definition.group.capture.regexp"
             }
-          ]
-        },
-        {
-          "begin": "\\{\\-",
-          "end": "\\-\\}",
-          "patterns": [
-            {
-              "include": "#punctuation-comma"
-            },
-            {
-              "include": "#object-member-type"
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.group.regexp"
             }
-          ]
+          }
         },
         {
-          "begin": "\\{",
-          "end": "\\}",
+          "name": "constant.other.character-class.set.regexp",
+          "begin": "(\\[)(\\^)?",
+          "end": "(\\])",
           "patterns": [
             {
-              "include": "#punctuation-comma"
+              "name": "constant.other.character-class.range.regexp",
+              "match": "(?:.|(\\\\(?:[0-7]{3}|x[[:xdigit:]][[:xdigit:]]|u[[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]]))|(\\\\c[A-Z])|(\\\\.))\\-(?:[^\\]\\\\]|(\\\\(?:[0-7]{3}|x[[:xdigit:]][[:xdigit:]]|u[[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]]))|(\\\\c[A-Z])|(\\\\.))",
+              "captures": {
+                "1": {
+                  "name": "constant.character.numeric.regexp"
+                },
+                "2": {
+                  "name": "constant.character.control.regexp"
+                },
+                "3": {
+                  "name": "constant.character.escape.backslash.regexp"
+                },
+                "4": {
+                  "name": "constant.character.numeric.regexp"
+                },
+                "5": {
+                  "name": "constant.character.control.regexp"
+                },
+                "6": {
+                  "name": "constant.character.escape.backslash.regexp"
+                }
+              }
             },
             {
-              "include": "#object-member-type"
+              "include": "#regex-character-class"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.character-class.regexp"
+            },
+            "2": {
+              "name": "keyword.operator.negation.regexp"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.character-class.regexp"
+            }
+          }
         },
         {
-          "begin": "\\(",
-          "end": "\\)",
-          "patterns": [
-            {
-              "include": "#types"
+          "include": "#regex-character-class"
+        }
+      ]
+    },
+    "selectors": {
+      "name": "meta.selector.data-weave",
+      "begin": "(?\u003c![\\[\\(:+*/\\-])(\\s*\\.\\.\\*|\\s*\\.\\.|\\s*\\.\\*|\\s*\\.\\@|\\s*\\.#|\\s*\\.\u0026|\\s*\\.|(?=\\[)|\\:\\:)",
+      "end": "(?=\\s|,|\\}|\\)|\\n|\\]|\\(|-|$)",
+      "patterns": [
+        {
+          "name": "meta.object.member.dw",
+          "match": "\\b([[:alpha:]][_[:alnum:]]+#)",
+          "captures": {
+            "0": {
+              "name": "variable.language.dw"
             }
-          ]
+          }
         },
         {
-          "match": "\\b(var|fun|ns)\\b"
+          "name": "meta.object.member.dw",
+          "match": "((?:[A-Za-z])([a-zA-Z0-9_]*)[?!]?|(\\$)+)"
         },
         {
-          "name": "invalid",
-          "match": "\\b(input|output|var|ns|import|try|catch|throw|do|for|yield|enum|private|async)\\b"
+          "include": "#strings"
         },
         {
-          "name": "invalid",
-          "match": "\\b(if|else|while|for|do|using|unless|default|match)\\b"
+          "begin": "(\\[(@|\\^)?)",
+          "end": "(\\])",
+          "patterns": [
+            {
+              "include": "#expressions"
+            },
+            {
+              "name": "invalid",
+              "match": "([\\)])"
+            }
+          ]
         },
         {
-          "name": "invalid",
-          "match": "(~=|==|!=|===|!==|<=|>=|<|>|\\$+)"
+          "include": "#selectors"
         }
       ]
     },
-    "object-member-type": {
+    "string-character-escape": {
+      "name": "constant.character.escape.dw",
+      "match": "\\\\(u[[:xdigit:]]{4}|$|.)"
+    },
+    "strings": {
       "patterns": [
         {
-          "include": "#comments"
+          "include": "#qstring-single"
         },
         {
-          "match": "_",
-          "name": "variable.language.dw"
+          "include": "#qstring-double"
         },
         {
-          "match": "([a-zA-Z0-9]+#)",
-          "name": "variable.language.dw"
+          "include": "#qstring-backtick"
         },
         {
-          "match": "\\(\\s*([a-zA-Z][a-zA-Z0-9]*)\\s*\\)",
-          "name": "entity.name.type.dw"
+          "include": "#template"
+        }
+      ]
+    },
+    "template": {
+      "begin": "([$[:alpha:]][_$[:alnum:]]*)\\s*(`)",
+      "end": "`",
+      "patterns": [
+        {
+          "include": "#template-substitution-element"
         },
         {
-          "match": "([a-zA-Z][a-zA-Z0-9]*)",
-          "name": "meta.object.member.dw"
+          "include": "#template-dollar"
         },
         {
-          "include": "#strings"
+          "include": "#string-character-escape"
         },
         {
-          "match": "\\?",
-          "name": "keyword.operator.optional.dw"
+          "name": "string.template.dw",
+          "match": "([^`])"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "support.function.dw"
         },
+        "2": {
+          "name": "string.template.dw punctuation.definition.string.template.begin.dw"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "string.template.dw punctuation.definition.string.template.end.dw"
+        }
+      }
+    },
+    "template-dollar": {
+      "patterns": [
         {
-          "match": "\\*",
-          "name": "keyword.operator.optional.dw"
+          "name": "variable.parameter.dw",
+          "match": "(\\$(\\$)+)"
         },
         {
-          "begin": "(\\@\\()",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.operator.attributes.dw"
-            }
-          },
-          "end": "(\\))",
-          "endCaptures": {
-            "1": {
-              "name": "keyword.operator.attributes.dw"
-            }
-          },
-          "patterns": [
-            {
-              "include": "#punctuation-comma"
-            },
-            {
-              "include": "#object-member-type"
-            }
-          ]
+          "name": "variable.parameter.dw",
+          "match": "(\\$)(?![a-zA-Z(])"
         },
         {
-          "begin": "(:)",
-          "beginCaptures": {
+          "name": "variable.parameter.dw",
+          "match": "(\\$)([a-zA-Z][a-zA-Z0-9_]*)",
+          "captures": {
             "1": {
-              "name": "keyword.operator.declaration.dw"
-            }
-          },
-          "end": "(?=,|}|\\)|\\|}|\\-}|\\|\\-})",
-          "patterns": [
-            {
-              "include": "#types"
+              "name": "keyword.other.dw"
+            },
+            "2": {
+              "name": "variable.other.dw"
             }
-          ]
-        },
-        {
-          "match": "([^\\s])",
-          "name": "invalid"
+          }
         }
       ]
     },
+    "template-substitution-element": {
+      "name": "meta.template.expression.dw",
+      "begin": "\\$\\(",
+      "end": "\\)",
+      "patterns": [
+        {
+          "include": "#expressions"
+        }
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.other.dw"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "keyword.other.dw"
+        }
+      }
+    },
     "type-directive": {
       "name": "meta.directive.type.dw",
       "begin": "(\\s*(type)\\s+([a-zA-Z][a-zA-Z0-9]*))",
       "end": "(?=(fun|input|output|type|var|ns|import|%dw|private|---)\\s)",
-      "beginCaptures": {
-        "2": {
-          "name": "storage.type.dw"
-        },
-        "3": {
-          "name": "entity.name.type.dw"
-        }
-      },
       "patterns": [
         {
-          "begin": "<",
-          "end": ">",
+          "begin": "\u003c",
+          "end": "\u003e",
           "patterns": [
             {
               "include": "#generics"
@@ -1227,358 +1325,256 @@
         {
           "include": "#types"
         }
-      ]
-    },
-    "import-directive": {
-      "name": "meta.directive.import.dw",
-      "begin": "(\\s*(import)\\s+)",
-      "end": "(?=(fun|input|output|type|var|ns|import|%dw|private|---)\\s|$)",
+      ],
       "beginCaptures": {
         "2": {
           "name": "storage.type.dw"
+        },
+        "3": {
+          "name": "entity.name.type.dw"
         }
-      },
+      }
+    },
+    "types": {
       "patterns": [
         {
           "include": "#comments"
         },
         {
-          "match": "(,)"
-        },
-        {
-          "match": "(\\*)"
+          "name": "support.class.dw",
+          "match": "\\b(String|Boolean|Number|Range|Namespace|Uri|DateTime|LocalDateTime|Date|LocalTime|Time|TimeZone|Period|Binary|Null|Regex|Nothing|Any|Object|Key)\\b"
         },
         {
-          "match": "\\b(from)\\s+",
-          "captures": {
+          "begin": "\\b(Array|Type)\\s*\u003c\\b",
+          "end": "\u003e",
+          "patterns": [
+            {
+              "name": "invalid",
+              "match": ","
+            },
+            {
+              "include": "#types"
+            }
+          ],
+          "beginCaptures": {
             "1": {
-              "name": "storage.type.dw"
+              "name": "support.type.dw"
             }
           }
         },
         {
-          "match": "(?:[a-zA-Z][a-zA-Z0-9]*(?:::[a-zA-Z][a-zA-Z0-9]*)*)\n",
-          "name": "entity.name.other.dw"
+          "name": "keyword.operator.declaration.dw",
+          "match": "(\u0026|\\|)"
         },
         {
-          "match": "\\s+(as)\\s+([a-zA-Z][a-zA-Z0-9]*)",
-          "captures": {
-            "1": {
-              "name": "keyword.other.dw"
-            },
-            "2": {
-              "name": "entity.name.other.dw"
-            }
-          }
-        }
-      ]
-    },
-    "var-directive": {
-      "name": "meta.directive.var.dw",
-      "begin": "(\\s*(var)\\s+([a-zA-Z][a-zA-Z0-9]*))",
-      "end": "(=)",
-      "beginCaptures": {
-        "2": {
-          "name": "storage.type.dw"
+          "name": "keyword.operator.declaration.dw",
+          "match": "\u003c:"
+        },
+        {
+          "name": "support.class.dw",
+          "match": "\\b([A-Z][a-zA-Z0-9_]*)"
         },
-        "3": {
-          "name": "entity.name.variable.dw"
-        }
-      },
-      "endCaptures": {
-        "0": {
-          "name": "keyword.operator.assignment.dw"
-        }
-      },
-      "patterns": [
         {
-          "begin": "<",
-          "end": ">",
+          "begin": "\u003c",
+          "end": "\u003e",
           "patterns": [
             {
-              "include": "#generics"
+              "include": "#types"
+            },
+            {
+              "include": "#punctuation-comma"
+            },
+            {
+              "include": "#comments"
             }
           ]
         },
         {
-          "begin": "(:)",
+          "begin": "\\(",
+          "end": "(\\)\\s*\\-\\\u003e)",
+          "patterns": [
+            {
+              "include": "#types"
+            },
+            {
+              "include": "#parameters"
+            }
+          ],
           "beginCaptures": {
             "1": {
-              "name": "keyword.operator.declaration.dw"
+              "name": "keyword.operator.tuple.dw"
             }
-          },
-          "end": "(?==|$)",
+          }
+        },
+        {
+          "begin": "\\{\\-\\|",
+          "end": "\\|\\-\\}",
           "patterns": [
             {
-              "include": "#comments"
+              "include": "#punctuation-comma"
             },
             {
-              "include": "#types"
+              "include": "#object-member-type"
             }
           ]
-        }
-      ]
-    },
-    "fun-directive": {
-      "name": "meta.directive.fun.dw",
-      "begin": "(\\s*(fun)\\s+([a-zA-Z][a-zA-Z0-9]*))",
-      "end": "(=)",
-      "beginCaptures": {
-        "2": {
-          "name": "storage.type.dw"
         },
-        "3": {
-          "name": "entity.name.function.dw"
-        }
-      },
-      "endCaptures": {
-        "0": {
-          "name": "keyword.operator.assignment.dw"
-        }
-      },
-      "patterns": [
         {
-          "begin": "<",
-          "end": ">",
+          "begin": "\\{\\|",
+          "end": "\\|\\}",
           "patterns": [
             {
-              "include": "#generics"
-            }
-          ]
-        },
-        {
-          "begin": "\\(",
-          "end": "\\)",
-          "patterns": [
+              "include": "#punctuation-comma"
+            },
             {
-              "include": "#parameters"
+              "include": "#object-member-type"
             }
           ]
         },
         {
-          "begin": "(:)",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.operator.declaration.dw"
-            }
-          },
-          "end": "(?==)",
+          "begin": "\\{\\-",
+          "end": "\\-\\}",
           "patterns": [
             {
-              "include": "#types"
+              "include": "#punctuation-comma"
+            },
+            {
+              "include": "#object-member-type"
             }
           ]
-        }
-      ]
-    },
-    "array-literal": {
-      "name": "meta.array.literal.dw",
-      "begin": "(?<!\\w|}|])(\\[)",
-      "beginCaptures": {
-        "0": {
-          "name": "meta.brace.square.dw"
-        }
-      },
-      "end": "\\]",
-      "endCaptures": {
-        "0": {
-          "name": "meta.brace.square.dw"
-        }
-      },
-      "patterns": [
-        {
-          "include": "#expressions"
         },
         {
-          "include": "#punctuation-comma"
-        }
-      ]
-    },
-    "regex": {
-      "patterns": [
-        {
-          "name": "string.regexp.dw",
-          "begin": "(?<=[=(:,\\[?+!]|replace|match|scan|matches|contains|---|case|->|and|or|\\*\\/)\\s*(\\/)(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+\\/(?![\\/*])(?!\\s*[a-zA-Z0-9_$]))",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.string.begin.dw"
-            }
-          },
-          "end": "(/)",
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.definition.string.end.dw"
-            }
-          },
+          "begin": "\\{",
+          "end": "\\}",
           "patterns": [
             {
-              "include": "#regexp"
+              "include": "#punctuation-comma"
+            },
+            {
+              "include": "#object-member-type"
             }
           ]
         },
         {
-          "name": "string.regexp.dw",
-          "begin": "(?<![_$[:alnum:])])\\/(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+\\/(?![\\/*])(?!\\s*[a-zA-Z0-9_$]))",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.begin.dw"
-            }
-          },
-          "end": "(/)",
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.definition.string.end.dw"
-            }
-          },
+          "begin": "\\(",
+          "end": "\\)",
           "patterns": [
             {
-              "include": "#regexp"
+              "include": "#types"
             }
           ]
-        }
-      ]
-    },
-    "regexp": {
-      "patterns": [
-        {
-          "name": "keyword.control.anchor.regexp",
-          "match": "\\\\[bB]|\\^|\\$"
         },
         {
-          "name": "keyword.other.back-reference.regexp",
-          "match": "\\\\[1-9]\\d*"
+          "match": "\\b(var|fun|ns)\\b"
         },
         {
-          "name": "keyword.operator.quantifier.regexp",
-          "match": "[?+*]|\\{(\\d+,\\d+|\\d+,|,\\d+|\\d+)\\}\\??"
+          "name": "invalid",
+          "match": "\\b(input|output|var|ns|import|try|catch|throw|do|for|yield|enum|private|async)\\b"
         },
         {
-          "name": "keyword.operator.or.regexp",
-          "match": "\\|"
+          "name": "invalid",
+          "match": "\\b(if|else|while|for|do|using|unless|default|match)\\b"
         },
         {
-          "name": "meta.group.assertion.regexp",
-          "begin": "(\\()((\\?=)|(\\?!))",
-          "beginCaptures": {
+          "name": "invalid",
+          "match": "(~=|==|!=|===|!==|\u003c=|\u003e=|\u003c|\u003e|\\$+)"
+        }
+      ]
+    },
+    "using-statement": {
+      "name": "using-statement.expr.dw",
+      "begin": "(?\u003c!\\.|\\$)\\b(using)\\s*(\\()",
+      "end": "(\\))",
+      "patterns": [
+        {
+          "match": "((?:\\+\\+|\\-\\-|[A-Za-z])(?:[a-zA-Z0-9_]*))(\\s*=)",
+          "captures": {
             "1": {
-              "name": "punctuation.definition.group.regexp"
+              "name": "entity.name.variable.dw"
             },
             "2": {
-              "name": "punctuation.definition.group.assertion.regexp"
-            },
-            "3": {
-              "name": "meta.assertion.look-ahead.regexp"
-            },
-            "4": {
-              "name": "meta.assertion.negative-look-ahead.regexp"
-            }
-          },
-          "end": "(\\))",
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.definition.group.regexp"
-            }
-          },
-          "patterns": [
-            {
-              "include": "#regexp"
+              "name": "keyword.operator.dw"
             }
-          ]
+          }
         },
         {
-          "name": "meta.group.regexp",
-          "begin": "\\((\\?:)?",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.group.regexp"
-            },
-            "1": {
-              "name": "punctuation.definition.group.capture.regexp"
-            }
-          },
-          "end": "\\)",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.group.regexp"
-            }
-          },
+          "include": "#expressions"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.using.dw"
+        },
+        "2": {
+          "name": "punctuation.definitions.begin.dw"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definitions.end.dw"
+        }
+      }
+    },
+    "var-directive": {
+      "name": "meta.directive.var.dw",
+      "begin": "(\\s*(var)\\s+([a-zA-Z][a-zA-Z0-9]*))",
+      "end": "(=)",
+      "patterns": [
+        {
+          "begin": "\u003c",
+          "end": "\u003e",
           "patterns": [
             {
-              "include": "#regexp"
+              "include": "#generics"
             }
           ]
         },
         {
-          "name": "constant.other.character-class.set.regexp",
-          "begin": "(\\[)(\\^)?",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.character-class.regexp"
-            },
-            "2": {
-              "name": "keyword.operator.negation.regexp"
-            }
-          },
-          "end": "(\\])",
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.definition.character-class.regexp"
-            }
-          },
+          "begin": "(:)",
+          "end": "(?==|$)",
           "patterns": [
             {
-              "name": "constant.other.character-class.range.regexp",
-              "match": "(?:.|(\\\\(?:[0-7]{3}|x\\h\\h|u\\h\\h\\h\\h))|(\\\\c[A-Z])|(\\\\.))\\-(?:[^\\]\\\\]|(\\\\(?:[0-7]{3}|x\\h\\h|u\\h\\h\\h\\h))|(\\\\c[A-Z])|(\\\\.))",
-              "captures": {
-                "1": {
-                  "name": "constant.character.numeric.regexp"
-                },
-                "2": {
-                  "name": "constant.character.control.regexp"
-                },
-                "3": {
-                  "name": "constant.character.escape.backslash.regexp"
-                },
-                "4": {
-                  "name": "constant.character.numeric.regexp"
-                },
-                "5": {
-                  "name": "constant.character.control.regexp"
-                },
-                "6": {
-                  "name": "constant.character.escape.backslash.regexp"
-                }
-              }
+              "include": "#comments"
             },
             {
-              "include": "#regex-character-class"
+              "include": "#types"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.operator.declaration.dw"
+            }
+          }
+        }
+      ],
+      "beginCaptures": {
+        "2": {
+          "name": "storage.type.dw"
         },
-        {
-          "include": "#regex-character-class"
+        "3": {
+          "name": "entity.name.variable.dw"
         }
-      ]
+      },
+      "endCaptures": {
+        "0": {
+          "name": "keyword.operator.assignment.dw"
+        }
+      }
     },
-    "regex-character-class": {
+    "variable-reference": {
       "patterns": [
         {
-          "name": "constant.other.character-class.regexp",
-          "match": "\\\\[wWsSdDtrnvf]|\\."
-        },
-        {
-          "name": "constant.character.numeric.regexp",
-          "match": "\\\\([0-7]{3}|x\\h\\h|u\\h\\h\\h\\h)"
+          "name": "variable.other.dw",
+          "match": "\\b(?!(fun|input|output|type|var|ns|import|%dw|private|---)\\b)((\\+\\+|\\-\\-|[A-Za-z])[a-zA-Z0-9_]*)"
         },
         {
-          "name": "constant.character.control.regexp",
-          "match": "\\\\c[A-Z]"
+          "name": "invalid",
+          "match": "\\b(fun|input|output|type|var|ns|import|private)\\b"
         },
         {
-          "name": "constant.character.escape.backslash.regexp",
-          "match": "\\\\."
+          "name": "variable.parameter.dw",
+          "match": "(\\$+)"
         }
       ]
     }
   }
-}
+}