github-linguist 5.3.3 → 6.0.0

data/grammars/source.haxe.2.json

@@ -1,13 +1,6 @@
 {
-  "fileTypes": [
-    "hx",
-    "hxsl",
-    "hscript"
-  ],
-  "foldingStartMarker": "(\\{\\s*(//.*)?$|^\\s*// \\{\\{\\{|#if)",
-  "foldingStopMarker": "^\\s*(\\}|// \\}\\}\\}$|#end)",
-  "keyEquivalent": "^~H",
   "name": "Haxe",
+  "scopeName": "source.haxe.2",
   "patterns": [
     {
       "include": "#all"
@@ -58,19 +51,31 @@
       ]
     },
     "arrays": {
+      "name": "meta.array.haxe.2",
       "begin": "(\\[)",
+      "end": "(\\])",
+      "patterns": [
+        {
+          "include": "#block"
+        },
+        {
+          "include": "#block-contents"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.array.begin.haxe.2"
         }
       },
-      "end": "(\\])",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.array.end.haxe.2"
         }
-      },
-      "name": "meta.array.haxe.2",
+      }
+    },
+    "block": {
+      "begin": "(\\{)",
+      "end": "(\\})",
       "patterns": [
         {
           "include": "#block"
@@ -78,29 +83,17 @@
         {
           "include": "#block-contents"
         }
-      ]
-    },
-    "block": {
-      "begin": "(\\{)",
+      ],
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.block.begin.haxe.2"
         }
       },
-      "end": "(\\})",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.block.end.haxe.2"
         }
-      },
-      "patterns": [
-        {
-          "include": "#block"
-        },
-        {
-          "include": "#block-contents"
-        }
-      ]
+      }
     },
     "block-contents": {
       "patterns": [
@@ -163,67 +156,94 @@
     "comments": {
       "patterns": [
         {
+          "name": "comment.block.haxe.2",
           "begin": "(/\\*)",
+          "end": "(\\*/)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.comment.haxe.2"
             }
           },
-          "end": "(\\*/)",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.comment.haxe.2"
             }
-          },
-          "name": "comment.block.haxe.2"
+          }
         },
         {
+          "name": "comment.line.double-slash.haxe.2",
+          "match": "(//).*$\\n?",
           "captures": {
             "1": {
               "name": "punctuation.definition.comment.haxe.2"
             }
-          },
-          "match": "(//).*$\\n?",
-          "name": "comment.line.double-slash.haxe.2"
+          }
+        }
+      ]
+    },
+    "conditional-compilation": {
+      "patterns": [
+        {
+          "name": "keyword.control.directive.conditional.haxe.2",
+          "match": "(#(end|else))"
+        },
+        {
+          "match": "((#(if|elseif))\\s+([a-zA-Z0-9_]*)\\s)",
+          "captures": {
+            "0": {
+              "name": "meta.control.directive.conditional.haxe.2"
+            },
+            "2": {
+              "name": "keyword.control.directive.conditional.haxe.2"
+            }
+          }
+        },
+        {
+          "name": "meta.control.directive.conditional.haxe.2",
+          "begin": "((#(if|elseif))\\s*?\\()",
+          "end": "(\\))",
+          "beginCaptures": {
+            "0": {
+              "name": "meta.control.directive.conditional.haxe.2"
+            },
+            "2": {
+              "name": "keyword.control.directive.conditional.haxe.2"
+            }
+          }
+        },
+        {
+          "name": "meta.control.directive.conditional.haxe.2",
+          "match": "(#([a-zA-Z0-9_]*))\\s"
         }
       ]
     },
     "constants": {
       "patterns": [
         {
-          "match": "\\b(true|false|null)\\b",
-          "name": "constant.language.haxe.2"
+          "name": "constant.language.haxe.2",
+          "match": "\\b(true|false|null)\\b"
         },
         {
-          "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)\\b",
-          "name": "constant.numeric.haxe.2"
+          "name": "constant.numeric.haxe.2",
+          "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)\\b"
         }
       ]
     },
     "entity-name-class": {
-      "match": "\\b([_A-Za-z]\\w*)\\b",
-      "name": "entity.name.type.class.haxe.2"
+      "name": "entity.name.type.class.haxe.2",
+      "match": "\\b([_A-Za-z]\\w*)\\b"
     },
     "entity-name-function": {
-      "match": "([_A-Za-z]\\w*)\\b(?=\\s*[\\(])",
-      "name": "entity.name.function.haxe.2"
+      "name": "entity.name.function.haxe.2",
+      "match": "([_A-Za-z]\\w*)\\b(?=\\s*[\\(])"
     },
     "import": {
+      "name": "meta.import.haxe.2",
       "begin": "\\b(import)\\b",
-      "beginCaptures": {
-        "1": {
-          "name": "storage.type.import.haxe.2"
-        }
-      },
       "end": "(;)",
-      "endCaptures": {
-        "1": {
-          "name": "punctuation.terminator.haxe.2"
-        }
-      },
-      "name": "meta.import.haxe.2",
       "patterns": [
         {
+          "match": "((\\b[a-z]\\w*\\.)*)((\\b[A-Z]\\w*\\.?|\\*)+)(\\b[_a-z]\\w*|\\*)?",
           "captures": {
             "1": {
               "name": "support.package.haxe.2"
@@ -231,27 +251,27 @@
             "3": {
               "name": "support.class.haxe.2"
             }
-          },
-          "match": "((\\b[a-z]\\w*\\.)*)((\\b[A-Z]\\w*\\.?|\\*)+)(\\b[_a-z]\\w*|\\*)?"
+          }
         }
-      ]
-    },
-    "import-using": {
-      "begin": "\\b(using)\\b",
+      ],
       "beginCaptures": {
         "1": {
-          "name": "storage.type.using.haxe.2"
+          "name": "storage.type.import.haxe.2"
         }
       },
-      "end": "(;)",
       "endCaptures": {
         "1": {
           "name": "punctuation.terminator.haxe.2"
         }
-      },
+      }
+    },
+    "import-using": {
       "name": "meta.using.haxe.2",
+      "begin": "\\b(using)\\b",
+      "end": "(;)",
       "patterns": [
         {
+          "match": "(([a-z]\\w*\\.)*)(([A-Z]\\w*\\.?)+)",
           "captures": {
             "1": {
               "name": "support.package.haxe.2"
@@ -259,122 +279,96 @@
             "3": {
               "name": "support.class.haxe.2"
             }
-          },
-          "match": "(([a-z]\\w*\\.)*)(([A-Z]\\w*\\.?)+)"
-        }
-      ]
-    },
-    "conditional-compilation": {
-      "patterns": [
-        {
-          "match": "(#(end|else))",
-          "name": "keyword.control.directive.conditional.haxe.2"
-        },
-        {
-          "match": "((#(if|elseif))\\s+([a-zA-Z0-9_]*)\\s)",
-          "captures": {
-            "0": {
-              "name": "meta.control.directive.conditional.haxe.2"
-            },
-            "2": {
-              "name": "keyword.control.directive.conditional.haxe.2"
-            }
           }
-        },
-        {
-          "begin": "((#(if|elseif))\\s*?\\()",
-          "beginCaptures": {
-            "0": {
-              "name": "meta.control.directive.conditional.haxe.2"
-            },
-            "2": {
-              "name": "keyword.control.directive.conditional.haxe.2"
-            }
-          },
-          "end": "(\\))",
-          "name": "meta.control.directive.conditional.haxe.2"
-        },
-        {
-          "match": "(#([a-zA-Z0-9_]*))\\s",
-          "name": "meta.control.directive.conditional.haxe.2"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "storage.type.using.haxe.2"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.terminator.haxe.2"
+        }
+      }
     },
     "keywords": {
       "patterns": [
         {
-          "match": "\\b(try|catch|throw)\\b",
-          "name": "keyword.control.catch-exception.haxe.2"
+          "name": "keyword.control.catch-exception.haxe.2",
+          "match": "\\b(try|catch|throw)\\b"
         },
         {
-          "match": "\\b(if|return|while|for|return|break|case|default|continue|do|while|for|switch|if|else)\\b",
-          "name": "keyword.control.haxe.flow-control.2"
+          "name": "keyword.control.haxe.flow-control.2",
+          "match": "\\b(if|return|while|for|return|break|case|default|continue|do|while|for|switch|if|else)\\b"
         },
         {
-          "match": "(\\.\\.\\.)",
-          "name": "keyword.control.directive.haxe.2"
+          "name": "keyword.control.directive.haxe.2",
+          "match": "(\\.\\.\\.)"
         },
         {
-          "match": "\\b(cast|untyped)\\b",
-          "name": "keyword.other.untyped.haxe.2"
+          "name": "keyword.other.untyped.haxe.2",
+          "match": "\\b(cast|untyped)\\b"
         },
         {
-          "match": "\\btrace\\b",
-          "name": "keyword.other.trace.haxe.2"
+          "name": "keyword.other.trace.haxe.2",
+          "match": "\\btrace\\b"
         },
         {
-          "match": "\\b(this|super)\\b",
-          "name": "variable.language.haxe.2"
+          "name": "variable.language.haxe.2",
+          "match": "\\b(this|super)\\b"
         },
         {
-          "match": "\\bnew\\b",
-          "name": "keyword.control.new.haxe.2"
+          "name": "keyword.control.new.haxe.2",
+          "match": "\\bnew\\b"
         },
         {
-          "match": "\\bvar\\b",
-          "name": "storage.type.variable.haxe.2"
+          "name": "storage.type.variable.haxe.2",
+          "match": "\\bvar\\b"
         },
         {
-          "match": "\\bfunction\\b",
-          "name": "storage.type.function.haxe.2"
+          "name": "storage.type.function.haxe.2",
+          "match": "\\bfunction\\b"
         },
         {
-          "match": "\\b(abstract|class|enum|interface|typedef)\\b",
-          "name": "storage.type.class.haxe.2"
+          "name": "storage.type.class.haxe.2",
+          "match": "\\b(abstract|class|enum|interface|typedef)\\b"
         }
       ]
     },
     "keywords-abstract": {
       "patterns": [
         {
-          "match": "\\b(from|to)\\b",
-          "name": "keyword.other.haxe.2"
+          "name": "keyword.other.haxe.2",
+          "match": "\\b(from|to)\\b"
         }
       ]
     },
     "keywords-accessor": {
       "patterns": [
         {
-          "match": "\\b(default|get|set|dynamic|never|null)\\b",
-          "name": "keyword.other.haxe.2"
+          "name": "keyword.other.haxe.2",
+          "match": "\\b(default|get|set|dynamic|never|null)\\b"
         }
       ]
     },
     "keywords-magic": {
       "patterns": [
         {
-          "match": "\\b__\\w*__\\b",
-          "name": "support.function.magic.haxe.2"
+          "name": "support.function.magic.haxe.2",
+          "match": "\\b__\\w*__\\b"
         },
         {
-          "match": "\\bprototype\\b",
-          "name": "support.variable.magic.haxe.2"
+          "name": "support.variable.magic.haxe.2",
+          "match": "\\bprototype\\b"
         }
       ]
     },
     "keywords-reification": {
       "patterns": [
         {
+          "match": "(\\$)([iea])\\(",
           "captures": {
             "1": {
               "name": "punctuation.definition.variable.haxe.2"
@@ -382,10 +376,10 @@
             "2": {
               "name": "support.reification.haxe.2"
             }
-          },
-          "match": "(\\$)([iea])\\("
+          }
         },
         {
+          "match": "((\\$)([a-zA-Z.]*))",
           "captures": {
             "2": {
               "name": "punctuation.definition.variable.haxe.2"
@@ -393,14 +387,14 @@
             "3": {
               "name": "support.reification.haxe.2"
             }
-          },
-          "match": "((\\$)([a-zA-Z.]*))"
+          }
         }
       ]
     },
     "macro": {
       "patterns": [
         {
+          "match": "((@:)(require|final|hack|native|coreApi|fakeEnum|macro|build|keep|keepSub|overload|extern|optional|feature|noCompletion|noUsing|allow|access|generic|publicFields|expose|defineFeature|runtime|initPackage|bind|bitmap|file|font|sound|ns|protected|getter|setter|meta|debug|noDebug|headerCode|headerClassCode|cppFileCode|functionCode|functionTailCode|buildXml|cppNamespaceCode|headerNamespaceCode|noStack|depend|include|internal|volatile|transient|functionBody|classContents|remove)\\b)",
           "captures": {
             "2": {
               "name": "punctuation.definition.variable.haxe.2"
@@ -408,10 +402,10 @@
             "3": {
               "name": "storage.modifier.macro.haxe.2"
             }
-          },
-          "match": "((@:)(require|final|hack|native|coreApi|fakeEnum|macro|build|keep|keepSub|overload|extern|optional|feature|noCompletion|noUsing|allow|access|generic|publicFields|expose|defineFeature|runtime|initPackage|bind|bitmap|file|font|sound|ns|protected|getter|setter|meta|debug|noDebug|headerCode|headerClassCode|cppFileCode|functionCode|functionTailCode|buildXml|cppNamespaceCode|headerNamespaceCode|noStack|depend|include|internal|volatile|transient|functionBody|classContents|remove)\\b)"
+          }
         },
         {
+          "match": "((@:?)([a-zA-Z_]*))",
           "captures": {
             "2": {
               "name": "punctuation.definition.variable.haxe.2"
@@ -419,20 +413,14 @@
             "3": {
               "name": "support.macro.haxe.2"
             }
-          },
-          "match": "((@:?)([a-zA-Z_]*))"
+          }
         }
       ]
     },
     "meta-static": {
-      "begin": "(static)",
-      "beginCaptures": {
-        "1": {
-          "name": "storage.modifier.haxe.2"
-        }
-      },
-      "end": "(?<=[\\};])",
       "name": "meta.static.haxe.2",
+      "begin": "(static)",
+      "end": "(?\u003c=[\\};])",
       "patterns": [
         {
           "include": "#modifiers"
@@ -446,12 +434,17 @@
         {
           "include": "#punctuation-terminator"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "storage.modifier.haxe.2"
+        }
+      }
     },
     "method": {
-      "begin": "(?=function)",
-      "end": "(?<=[\\};])",
       "name": "meta.method.haxe.2",
+      "begin": "(?=function)",
+      "end": "(?\u003c=[\\};])",
       "patterns": [
         {
           "include": "#method-name"
@@ -465,54 +458,46 @@
       ]
     },
     "method-block": {
-      "begin": "(?<=\\{)",
+      "name": "meta.method.block.haxe.2",
+      "begin": "(?\u003c=\\{)",
+      "end": "(\\})",
+      "patterns": [
+        {
+          "include": "#block"
+        },
+        {
+          "include": "#block-contents"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.block.begin.haxe.2"
         }
       },
-      "end": "(\\})",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.block.end.haxe.2"
         }
-      },
-      "name": "meta.method.block.haxe.2",
-      "patterns": [
-        {
-          "include": "#block"
-        },
-        {
-          "include": "#block-contents"
-        }
-      ]
+      }
     },
     "method-name": {
+      "name": "meta.method.name.haxe.2",
       "begin": "\\b(function)\\b",
+      "end": "([_A-Za-z]\\w*)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.function.haxe.2"
         }
       },
-      "end": "([_A-Za-z]\\w*)",
       "endCaptures": {
         "1": {
           "name": "entity.name.function.haxe.2"
         }
-      },
-      "name": "meta.method.name.haxe.2"
+      }
     },
     "method-name-post": {
-      "begin": "(?<=\\w)",
+      "begin": "(?\u003c=\\w)",
       "end": "(\\{)|(;)",
-      "endCaptures": {
-        "1": {
-          "name": "punctuation.definition.block.begin.haxe.2"
-        },
-        "2": {
-          "name": "punctuation.terminator.haxe.2"
-        }
-      },
       "patterns": [
         {
           "include": "#block"
@@ -520,49 +505,59 @@
         {
           "include": "#block-contents"
         }
-      ]
+      ],
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.block.begin.haxe.2"
+        },
+        "2": {
+          "name": "punctuation.terminator.haxe.2"
+        }
+      }
     },
     "modifiers": {
-      "match": "\\b(public|private|static|dynamic|inline|macro|extern|override)\\b",
-      "name": "storage.modifier.haxe.2"
+      "name": "storage.modifier.haxe.2",
+      "match": "\\b(public|private|static|dynamic|inline|macro|extern|override)\\b"
     },
     "modifiers-inheritance": {
-      "match": "\\b(implements|extends)\\b",
-      "name": "storage.modifier.haxe.2"
+      "name": "storage.modifier.haxe.2",
+      "match": "\\b(implements|extends)\\b"
     },
     "operator-assignment": {
-      "match": "(=)",
-      "name": "keyword.operator.assignment.haxe.2"
+      "name": "keyword.operator.assignment.haxe.2",
+      "match": "(=)"
     },
     "operator-optional": {
-      "match": "(\\?)(?!\\s)",
-      "name": "punctuation.definition.variable.haxe.2"
+      "name": "punctuation.definition.variable.haxe.2",
+      "match": "(\\?)(?!\\s)"
     },
     "operators": {
       "patterns": [
         {
-          "match": "(!|&&|\\|\\|)",
-          "name": "keyword.operator.logical.haxe.2"
+          "name": "keyword.operator.logical.haxe.2",
+          "match": "(!|\u0026\u0026|\\|\\|)"
         },
         {
-          "match": "(~|&|\\||\\^|<<|>>|>>>)",
-          "name": "keyword.operator.bitwise.haxe.2"
+          "name": "keyword.operator.bitwise.haxe.2",
+          "match": "(~|\u0026|\\||\\^|\u003c\u003c|\u003e\u003e|\u003e\u003e\u003e)"
         },
         {
-          "match": "(==|!=|<=|>=|<>|<|>)",
-          "name": "keyword.operator.comparison.haxe.2"
+          "name": "keyword.operator.comparison.haxe.2",
+          "match": "(==|!=|\u003c=|\u003e=|\u003c\u003e|\u003c|\u003e)"
         },
         {
-          "match": "(\\-\\-|\\+\\+)",
-          "name": "keyword.operator.increment-decrement.haxe.2"
+          "name": "keyword.operator.increment-decrement.haxe.2",
+          "match": "(\\-\\-|\\+\\+)"
         },
         {
-          "match": "(\\-|\\+|\\*|\\/|%)",
-          "name": "keyword.operator.arithmetic.haxe.2"
+          "name": "keyword.operator.arithmetic.haxe.2",
+          "match": "(\\-|\\+|\\*|\\/|%)"
         }
       ]
     },
     "package": {
+      "name": "meta.package.haxe.2",
+      "match": "\\b(package)(\\s+([\\w.*]*))?\\s*(;)",
       "captures": {
         "1": {
           "name": "storage.type.package.haxe.2"
@@ -573,24 +568,12 @@
         "4": {
           "name": "punctuation.terminator.haxe.2"
         }
-      },
-      "match": "\\b(package)(\\s+([\\w.*]*))?\\s*(;)",
-      "name": "meta.package.haxe.2"
+      }
     },
     "parameters": {
+      "name": "meta.parameters.haxe.2",
       "begin": "(\\()",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.definition.parameters.begin.haxe.2"
-        }
-      },
       "end": "(\\))",
-      "endCaptures": {
-        "1": {
-          "name": "punctuation.definition.parameters.end.haxe.2"
-        }
-      },
-      "name": "meta.parameters.haxe.2",
       "patterns": [
         {
           "include": "#operator-optional"
@@ -601,32 +584,49 @@
         {
           "include": "#block-contents"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.definition.parameters.begin.haxe.2"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.parameters.end.haxe.2"
+        }
+      }
     },
     "punctuation-brackets": {
       "patterns": [
         {
-          "match": "([\\(\\<\\)\\>])",
-          "name": "punctuation.definition.other.haxe.2"
+          "name": "punctuation.definition.other.haxe.2",
+          "match": "([\\(\\\u003c\\)\\\u003e])"
         }
       ]
     },
     "punctuation-separator": {
-      "match": "([,:.?])",
-      "name": "punctuation.separator.haxe.2"
+      "name": "punctuation.separator.haxe.2",
+      "match": "([,:.?])"
     },
     "punctuation-terminator": {
-      "match": ";",
-      "name": "punctuation.terminator.haxe.2"
+      "name": "punctuation.terminator.haxe.2",
+      "match": ";"
     },
     "regex": {
+      "name": "string.regexp.haxe.2",
       "begin": "~/",
+      "end": "(/[gimsu]*)|(\\n$)",
+      "patterns": [
+        {
+          "name": "constant.character.escape.haxe.2",
+          "match": "\\\\."
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "string.regexp.begin.haxe.2"
         }
       },
-      "end": "(/[gimsu]*)|(\\n$)",
       "endCaptures": {
         "1": {
           "name": "string.regexp.end.haxe.2"
@@ -634,62 +634,46 @@
         "2": {
           "name": "invalid.illegal.haxe.2"
         }
-      },
-      "name": "string.regexp.haxe.2",
-      "patterns": [
-        {
-          "match": "\\\\.",
-          "name": "constant.character.escape.haxe.2"
-        }
-      ]
+      }
     },
     "strings": {
       "patterns": [
         {
+          "name": "string.quoted.double.haxe.2",
           "begin": "\"",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.begin.haxe.2"
-            }
-          },
           "end": "\"",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.end.haxe.2"
-            }
-          },
-          "name": "string.quoted.double.haxe.2",
           "patterns": [
             {
-              "match": "\\\\.",
-              "name": "constant.character.escape.haxe.2"
+              "name": "constant.character.escape.haxe.2",
+              "match": "\\\\."
             }
-          ]
-        },
-        {
-          "begin": "'",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.haxe.2"
             }
           },
-          "end": "'",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.haxe.2"
             }
-          },
+          }
+        },
+        {
           "name": "string.quoted.single.haxe.2",
+          "begin": "'",
+          "end": "'",
           "patterns": [
             {
-              "match": "\\\\.",
-              "name": "constant.character.escape.haxe.2"
+              "name": "constant.character.escape.haxe.2",
+              "match": "\\\\."
             },
             {
-              "match": "\\$\\$",
-              "name": "constant.character.escape.haxe.2"
+              "name": "constant.character.escape.haxe.2",
+              "match": "\\$\\$"
             },
             {
+              "match": "(\\$)(\\{)([^}]*)(\\})",
               "captures": {
                 "1": {
                   "name": "variable.other.haxe.2"
@@ -703,11 +687,10 @@
                 "4": {
                   "name": "variable.other.haxe.2"
                 }
-              },
-              "comment": "String interpolation : \"${test.ole}\"",
-              "match": "(\\$)(\\{)([^}]*)(\\})"
+              }
             },
             {
+              "match": "(\\$)([\\w]*)",
               "captures": {
                 "1": {
                   "name": "variable.other.haxe.2"
@@ -715,15 +698,24 @@
                 "2": {
                   "name": "variable.other.haxe.2"
                 }
-              },
-              "comment": "String interpolation : \"$test\"",
-              "match": "(\\$)([\\w]*)"
+              }
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.haxe.2"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.end.haxe.2"
             }
-          ]
+          }
         }
       ]
     },
     "support-class-name": {
+      "match": "\\b(([a-z][a-zA-Z0-9]*\\.)*)(([A-Z]\\w*\\.?)+)\\b",
       "captures": {
         "1": {
           "name": "support.package.haxe.2"
@@ -731,18 +723,12 @@
         "3": {
           "name": "support.class.haxe.2"
         }
-      },
-      "match": "\\b(([a-z][a-zA-Z0-9]*\\.)*)(([A-Z]\\w*\\.?)+)\\b"
+      }
     },
     "type-abstract": {
-      "begin": "(?=abstract)",
-      "end": "(?<=\\})|(;)",
-      "endCaptures": {
-        "1": {
-          "name": "punctuation.terminator.haxe.2"
-        }
-      },
       "name": "meta.type.abstract.haxe.2",
+      "begin": "(?=abstract)",
+      "end": "(?\u003c=\\})|(;)",
       "patterns": [
         {
           "include": "#type-abstract-name"
@@ -753,17 +739,17 @@
         {
           "include": "#type-abstract-block"
         }
-      ]
-    },
-    "type-abstract-block": {
-      "begin": "(?<=\\{)",
-      "end": "(\\})",
+      ],
       "endCaptures": {
         "1": {
-          "name": "punctuation.definition.block.end.haxe.2"
+          "name": "punctuation.terminator.haxe.2"
         }
-      },
+      }
+    },
+    "type-abstract-block": {
       "name": "meta.type.block.haxe.2",
+      "begin": "(?\u003c=\\{)",
+      "end": "(\\})",
       "patterns": [
         {
           "include": "#meta-static"
@@ -783,31 +769,31 @@
         {
           "include": "#block-contents"
         }
-      ]
+      ],
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.block.end.haxe.2"
+        }
+      }
     },
     "type-abstract-name": {
+      "name": "meta.type.name.haxe.2",
       "begin": "\\b(abstract)\\b",
+      "end": "([_A-Za-z]\\w*)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.class.haxe.2"
         }
       },
-      "end": "([_A-Za-z]\\w*)",
       "endCaptures": {
         "1": {
           "name": "entity.name.type.class.haxe.2"
         }
-      },
-      "name": "meta.type.name.haxe.2"
+      }
     },
     "type-abstract-name-post": {
-      "begin": "(?<=\\w)",
+      "begin": "(?\u003c=\\w)",
       "end": "([\\{;])",
-      "endCaptures": {
-        "1": {
-          "name": "punctuation.definition.block.begin.haxe.2"
-        }
-      },
       "patterns": [
         {
           "include": "#parameters"
@@ -824,17 +810,17 @@
         {
           "include": "#support-class-name"
         }
-      ]
-    },
-    "type-class": {
-      "begin": "(?=class)",
-      "end": "(?<=\\})|(;)",
+      ],
       "endCaptures": {
         "1": {
-          "name": "punctuation.terminator.haxe.2"
+          "name": "punctuation.definition.block.begin.haxe.2"
         }
-      },
+      }
+    },
+    "type-class": {
       "name": "meta.type.class.haxe.2",
+      "begin": "(?=class)",
+      "end": "(?\u003c=\\})|(;)",
       "patterns": [
         {
           "include": "#type-class-name"
@@ -845,17 +831,17 @@
         {
           "include": "#type-class-block"
         }
-      ]
-    },
-    "type-class-block": {
-      "begin": "(?<=\\{)",
-      "end": "(\\})",
+      ],
       "endCaptures": {
         "1": {
-          "name": "punctuation.definition.block.end.haxe.2"
+          "name": "punctuation.terminator.haxe.2"
         }
-      },
+      }
+    },
+    "type-class-block": {
       "name": "meta.type.block.haxe.2",
+      "begin": "(?\u003c=\\{)",
+      "end": "(\\})",
       "patterns": [
         {
           "include": "#meta-static"
@@ -875,31 +861,31 @@
         {
           "include": "#block-contents"
         }
-      ]
+      ],
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.block.end.haxe.2"
+        }
+      }
     },
     "type-class-name": {
+      "name": "meta.type.name.haxe.2",
       "begin": "\\b(class)\\b",
+      "end": "([_A-Za-z]\\w*)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.class.haxe.2"
         }
       },
-      "end": "([_A-Za-z]\\w*)",
       "endCaptures": {
         "1": {
           "name": "entity.name.type.class.haxe.2"
         }
-      },
-      "name": "meta.type.name.haxe.2"
+      }
     },
     "type-class-name-post": {
-      "begin": "(?<=\\w)",
+      "begin": "(?\u003c=\\w)",
       "end": "([\\{;])",
-      "endCaptures": {
-        "1": {
-          "name": "punctuation.definition.block.begin.haxe.2"
-        }
-      },
       "patterns": [
         {
           "include": "#type-parameters"
@@ -916,17 +902,17 @@
         {
           "include": "#support-class-name"
         }
-      ]
-    },
-    "type-enum": {
-      "begin": "(?=enum)",
-      "end": "(?<=\\})|(;)",
+      ],
       "endCaptures": {
         "1": {
-          "name": "punctuation.terminator.haxe.2"
+          "name": "punctuation.definition.block.begin.haxe.2"
         }
-      },
+      }
+    },
+    "type-enum": {
       "name": "meta.type.enum.haxe.2",
+      "begin": "(?=enum)",
+      "end": "(?\u003c=\\})|(;)",
       "patterns": [
         {
           "include": "#type-enum-name"
@@ -937,17 +923,17 @@
         {
           "include": "#type-enum-block"
         }
-      ]
-    },
-    "type-enum-block": {
-      "begin": "(?<=\\{)",
-      "end": "(\\})",
+      ],
       "endCaptures": {
         "1": {
-          "name": "punctuation.definition.block.end.haxe.2"
+          "name": "punctuation.terminator.haxe.2"
         }
-      },
+      }
+    },
+    "type-enum-block": {
       "name": "meta.type.block.haxe.2",
+      "begin": "(?\u003c=\\{)",
+      "end": "(\\})",
       "patterns": [
         {
           "include": "#type-parameters"
@@ -958,31 +944,31 @@
         {
           "include": "#block-contents"
         }
-      ]
+      ],
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.block.end.haxe.2"
+        }
+      }
     },
     "type-enum-name": {
+      "name": "meta.type.name.haxe.2",
       "begin": "\\b(enum)\\b",
+      "end": "([_A-Za-z]\\w*)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.class.haxe.2"
         }
       },
-      "end": "([_A-Za-z]\\w*)",
       "endCaptures": {
         "1": {
           "name": "entity.name.type.class.haxe.2"
         }
-      },
-      "name": "meta.type.name.haxe.2"
+      }
     },
     "type-enum-name-post": {
-      "begin": "(?<=\\w)",
+      "begin": "(?\u003c=\\w)",
       "end": "([\\{;])",
-      "endCaptures": {
-        "1": {
-          "name": "punctuation.definition.block.begin.haxe.2"
-        }
-      },
       "patterns": [
         {
           "include": "#type-parameters"
@@ -996,17 +982,17 @@
         {
           "include": "#support-class-name"
         }
-      ]
-    },
-    "type-interface": {
-      "begin": "(?=interface)",
-      "end": "(?<=\\})|(;)",
+      ],
       "endCaptures": {
         "1": {
-          "name": "punctuation.terminator.haxe.2"
+          "name": "punctuation.definition.block.begin.haxe.2"
         }
-      },
+      }
+    },
+    "type-interface": {
       "name": "meta.type.interface.haxe.2",
+      "begin": "(?=interface)",
+      "end": "(?\u003c=\\})|(;)",
       "patterns": [
         {
           "include": "#type-interface-name"
@@ -1017,17 +1003,17 @@
         {
           "include": "#type-interface-block"
         }
-      ]
-    },
-    "type-interface-block": {
-      "begin": "(?<=\\{)",
-      "end": "(\\})",
+      ],
       "endCaptures": {
         "1": {
-          "name": "punctuation.definition.block.end.haxe.2"
+          "name": "punctuation.terminator.haxe.2"
         }
-      },
+      }
+    },
+    "type-interface-block": {
       "name": "meta.type.block.haxe.2",
+      "begin": "(?\u003c=\\{)",
+      "end": "(\\})",
       "patterns": [
         {
           "include": "#method"
@@ -1041,31 +1027,31 @@
         {
           "include": "#block-contents"
         }
-      ]
+      ],
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.block.end.haxe.2"
+        }
+      }
     },
     "type-interface-name": {
+      "name": "meta.type.name.haxe.2",
       "begin": "\\b(interface)\\b",
+      "end": "([_A-Za-z]\\w*)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.class.haxe.2"
         }
       },
-      "end": "([_A-Za-z]\\w*)",
       "endCaptures": {
         "1": {
           "name": "entity.name.type.class.haxe.2"
         }
-      },
-      "name": "meta.type.name.haxe.2"
+      }
     },
     "type-interface-name-post": {
-      "begin": "(?<=\\w)",
+      "begin": "(?\u003c=\\w)",
       "end": "([\\{;])",
-      "endCaptures": {
-        "1": {
-          "name": "punctuation.definition.block.begin.haxe.2"
-        }
-      },
       "patterns": [
         {
           "include": "#modifiers-inheritance"
@@ -1079,22 +1065,17 @@
         {
           "include": "#support-class-name"
         }
-      ]
-    },
-    "type-parameters": {
-      "begin": "(\\<)",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.definition.parameters.begin.haxe.2"
-        }
-      },
-      "end": "(\\>)",
+      ],
       "endCaptures": {
         "1": {
-          "name": "punctuation.definition.parameters.end.haxe.2"
+          "name": "punctuation.definition.block.begin.haxe.2"
         }
-      },
+      }
+    },
+    "type-parameters": {
       "name": "meta.type.parameters.haxe.2",
+      "begin": "(\\\u003c)",
+      "end": "(\\\u003e)",
       "patterns": [
         {
           "include": "#block"
@@ -1102,17 +1083,22 @@
         {
           "include": "#block-contents"
         }
-      ]
-    },
-    "type-typedef": {
-      "begin": "(?=typedef)",
-      "end": "(?<=\\})|(;)",
-      "endCaptures": {
+      ],
+      "beginCaptures": {
         "1": {
-          "name": "punctuation.terminator.haxe.2"
+          "name": "punctuation.definition.parameters.begin.haxe.2"
         }
       },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.parameters.end.haxe.2"
+        }
+      }
+    },
+    "type-typedef": {
       "name": "meta.type.typedef.haxe.2",
+      "begin": "(?=typedef)",
+      "end": "(?\u003c=\\})|(;)",
       "patterns": [
         {
           "include": "#type-typedef-name"
@@ -1123,17 +1109,17 @@
         {
           "include": "#type-typedef-block"
         }
-      ]
-    },
-    "type-typedef-block": {
-      "begin": "(?<=\\{)",
-      "end": "(\\})",
+      ],
       "endCaptures": {
         "1": {
-          "name": "punctuation.definition.block.end.haxe.2"
+          "name": "punctuation.terminator.haxe.2"
         }
-      },
+      }
+    },
+    "type-typedef-block": {
       "name": "meta.type.block.haxe.2",
+      "begin": "(?\u003c=\\{)",
+      "end": "(\\})",
       "patterns": [
         {
           "include": "#block"
@@ -1141,31 +1127,31 @@
         {
           "include": "#block-contents"
         }
-      ]
+      ],
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.block.end.haxe.2"
+        }
+      }
     },
     "type-typedef-name": {
+      "name": "meta.type.name.haxe.2",
       "begin": "\\b(typedef)\\b",
+      "end": "([_A-Za-z]\\w*)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.class.haxe.2"
         }
       },
-      "end": "([_A-Za-z]\\w*)",
       "endCaptures": {
         "1": {
           "name": "entity.name.type.class.haxe.2"
         }
-      },
-      "name": "meta.type.name.haxe.2"
+      }
     },
     "type-typedef-name-post": {
-      "begin": "(?<=\\w)",
+      "begin": "(?\u003c=\\w)",
       "end": "(\\{)|(?=;)",
-      "endCaptures": {
-        "1": {
-          "name": "punctuation.definition.block.begin.haxe.2"
-        }
-      },
       "patterns": [
         {
           "include": "#punctuation-brackets"
@@ -1179,17 +1165,17 @@
         {
           "include": "#support-class-name"
         }
-      ]
-    },
-    "variable": {
-      "begin": "(?=var)",
-      "end": "(;)",
+      ],
       "endCaptures": {
         "1": {
-          "name": "punctuation.terminator.haxe.2"
+          "name": "punctuation.definition.block.begin.haxe.2"
         }
-      },
+      }
+    },
+    "variable": {
       "name": "meta.variable.haxe.2",
+      "begin": "(?=var)",
+      "end": "(;)",
       "patterns": [
         {
           "include": "#variable-name"
@@ -1200,22 +1186,17 @@
         {
           "include": "#variable-name-post"
         }
-      ]
-    },
-    "variable-accessors": {
-      "begin": "(\\()",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.definition.parameters.begin.haxe.2"
-        }
-      },
-      "end": "(\\))",
+      ],
       "endCaptures": {
         "1": {
-          "name": "punctuation.definition.parameters.end.haxe.2"
+          "name": "punctuation.terminator.haxe.2"
         }
-      },
+      }
+    },
+    "variable-accessors": {
       "name": "meta.parameters.haxe.2",
+      "begin": "(\\()",
+      "end": "(\\))",
       "patterns": [
         {
           "include": "#operator-optional"
@@ -1226,15 +1207,20 @@
         {
           "include": "#punctuation-separator"
         }
-      ]
-    },
-    "variable-assign": {
-      "begin": "(=)",
+      ],
       "beginCaptures": {
         "1": {
-          "name": "keyword.operator.assignment.haxe.2"
+          "name": "punctuation.definition.parameters.begin.haxe.2"
         }
       },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.parameters.end.haxe.2"
+        }
+      }
+    },
+    "variable-assign": {
+      "begin": "(=)",
       "end": "(?=;)",
       "patterns": [
         {
@@ -1243,25 +1229,30 @@
         {
           "include": "#block-contents"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.operator.assignment.haxe.2"
+        }
+      }
     },
     "variable-name": {
+      "name": "meta.variable.name.haxe.2",
       "begin": "\\b(var)\\b",
+      "end": "([_a-zA-Z]\\w*)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.variable.haxe.2"
         }
       },
-      "end": "([_a-zA-Z]\\w*)",
       "endCaptures": {
         "1": {
           "name": "entity.name.variable.haxe.2"
         }
-      },
-      "name": "meta.variable.name.haxe.2"
+      }
     },
     "variable-name-post": {
-      "begin": "(?<=\\w)",
+      "begin": "(?\u003c=\\w)",
       "end": "(?=;)|(?==)",
       "patterns": [
         {
@@ -1272,7 +1263,5 @@
         }
       ]
     }
-  },
-  "scopeName": "source.haxe.2",
-  "uuid": "fd62cd72-48d1-4e06-9ecd-76267656ac18"
-}
+  }
+}