github-linguist 5.3.3 → 6.0.0

data/grammars/source.ebnf.json

@@ -1,17 +1,22 @@
 {
-  "fileTypes": [
-    "ebnf"
-  ],
-  "foldingStartMarker": "\\(\\*",
-  "foldingStopMarker": "\\*\\)",
-  "keyEquivalent": "^~E",
   "name": "EBNF",
+  "scopeName": "source.ebnf",
   "patterns": [
     {
       "include": "#comment"
     },
     {
+      "name": "meta.syntax-rule.ebnf",
       "begin": "\\s*(\\b(?:\\w|\\s|[\\-_0-9])+\\b)\\s*(=)",
+      "end": ";",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#subrules"
+        }
+      ],
       "captures": {
         "1": {
           "name": "entity.name.function.ebnf"
@@ -20,60 +25,50 @@
           "name": "keyword.operator.definition.ebnf"
         }
       },
-      "end": ";",
       "endCaptures": {
         "0": {
           "name": "punctuation.terminator.syntax-rule.ebnf"
         }
-      },
-      "name": "meta.syntax-rule.ebnf",
-      "patterns": [
-        {
-          "include": "#comment"
-        },
-        {
-          "include": "#subrules"
-        }
-      ]
+      }
     }
   ],
   "repository": {
     "comment": {
+      "name": "comment.block.ebnf",
       "begin": "\\(\\*(?!\\))",
-      "end": "\\*\\)",
-      "name": "comment.block.ebnf"
+      "end": "\\*\\)"
     },
     "double-quote-string": {
+      "name": "string.quoted.double.ebnf",
       "begin": "\"",
-      "end": "\"",
-      "name": "string.quoted.double.ebnf"
+      "end": "\""
     },
     "group": {
       "begin": "\\(",
+      "end": "\\)",
+      "patterns": [
+        {
+          "include": "#subrules"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "keyword.other.group.begin.ebnf"
         }
       },
-      "end": "\\)",
       "endCaptures": {
         "0": {
           "name": "keyword.other.group.end.ebnf"
         }
-      },
-      "patterns": [
-        {
-          "include": "#subrules"
-        }
-      ]
+      }
     },
     "invalid": {
-      "match": "\\(\\s*[*:/]\\s*\\)",
-      "name": "invalid.illegal.ebnf"
+      "name": "invalid.illegal.ebnf",
+      "match": "\\(\\s*[*:/]\\s*\\)"
     },
     "non-terminal": {
-      "match": "\\w[\\w\\-_0-9]*\\w",
-      "name": "variable.other.non-terminal.ebnf"
+      "name": "variable.other.non-terminal.ebnf",
+      "match": "\\w[\\w\\-_0-9]*\\w"
     },
     "operator": {
       "patterns": [
@@ -89,56 +84,57 @@
       ]
     },
     "operator-alternative": {
-      "match": "\\|",
-      "name": "keyword.operator.alternative.ebnf"
+      "name": "keyword.operator.alternative.ebnf",
+      "match": "\\|"
     },
     "operator-concatenation": {
-      "match": ",",
-      "name": "keyword.operator.concatenation.ebnf"
+      "name": "keyword.operator.concatenation.ebnf",
+      "match": ","
     },
     "operator-exception": {
-      "match": "-",
-      "name": "keyword.operator.exception.ebnf"
+      "name": "keyword.operator.exception.ebnf",
+      "match": "-"
     },
     "optional": {
       "begin": "\\[",
+      "end": "\\]",
+      "patterns": [
+        {
+          "include": "#subrules"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "keyword.other.optional.begin.ebnf"
         }
       },
-      "end": "\\]",
       "endCaptures": {
         "0": {
           "name": "keyword.other.optional.end.ebnf"
         }
-      },
+      }
+    },
+    "repetition": {
+      "begin": "{",
+      "end": "}",
       "patterns": [
         {
           "include": "#subrules"
         }
-      ]
-    },
-    "repetition": {
-      "begin": "{",
+      ],
       "beginCaptures": {
         "0": {
           "name": "keyword.other.repetition.begin.ebnf"
         }
       },
-      "end": "}",
       "endCaptures": {
         "0": {
           "name": "keyword.other.repetition.end.ebnf"
         }
-      },
-      "patterns": [
-        {
-          "include": "#subrules"
-        }
-      ]
+      }
     },
     "repetition-numbered": {
+      "match": "(\\d+)\\s*(\\*)",
       "captures": {
         "1": {
           "name": "constant.numeric.integer.ebnf"
@@ -146,28 +142,27 @@
         "2": {
           "name": "keyword.operator.repetition.ebnf"
         }
-      },
-      "match": "(\\d+)\\s*(\\*)"
+      }
     },
     "single-quote-string": {
+      "name": "string.quoted.single.ebnf",
       "begin": "'",
-      "end": "'",
-      "name": "string.quoted.single.ebnf"
+      "end": "'"
     },
     "special-sequence": {
+      "name": "entity.other.attribute-name.ebnf",
       "begin": "\\?",
+      "end": "\\?",
       "beginCaptures": {
         "0": {
           "name": "keyword.other.special-sequence.begin.ebnf"
         }
       },
-      "end": "\\?",
       "endCaptures": {
         "0": {
           "name": "keyword.other.special-sequence.end.ebnf"
         }
-      },
-      "name": "entity.other.attribute-name.ebnf"
+      }
     },
     "subrules": {
       "patterns": [
@@ -203,7 +198,5 @@
         }
       ]
     }
-  },
-  "scopeName": "source.ebnf",
-  "uuid": "D9954069-097B-4361-818D-EF4986D442E7"
-}
+  }
+}

data/grammars/source.eiffel.json

@@ -1,128 +1,125 @@
 {
-  "fileTypes": [
-    "e"
-  ],
-  "keyEquivalent": "^~E",
   "name": "Eiffel",
+  "scopeName": "source.eiffel",
   "patterns": [
     {
       "begin": "(^[ \\t]+)?(?=--)",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.whitespace.comment.leading.eiffel"
-        }
-      },
       "end": "(?!\\G)",
       "patterns": [
         {
+          "name": "comment.line.double-dash.eiffel",
           "begin": "--",
+          "end": "\\n",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.eiffel"
             }
-          },
-          "end": "\\n",
-          "name": "comment.line.double-dash.eiffel"
+          }
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.comment.leading.eiffel"
+        }
+      }
     },
     {
-      "match": "\\b(Indexing|indexing|deferred|expanded|class|inherit|rename|as|export|undefine|redefine|select|all|create|creation|feature|prefix|infix|separate|frozen|obsolete|local|is|unique|do|once|external|alias|require|ensure|invariant|variant|rescue|retry|like|check|if|else|elseif|then|inspect|when|from|loop|until|debug|not|or|and|xor|implies|old|end)\\b",
-      "name": "keyword.control.eiffel"
+      "name": "keyword.control.eiffel",
+      "match": "\\b(Indexing|indexing|deferred|expanded|class|inherit|rename|as|export|undefine|redefine|select|all|create|creation|feature|prefix|infix|separate|frozen|obsolete|local|is|unique|do|once|external|alias|require|ensure|invariant|variant|rescue|retry|like|check|if|else|elseif|then|inspect|when|from|loop|until|debug|not|or|and|xor|implies|old|end)\\b"
     },
     {
-      "match": "[a-zA-Z_]+",
-      "name": "variable.other.eiffel"
+      "name": "variable.other.eiffel",
+      "match": "[a-zA-Z_]+"
     },
     {
-      "match": "\\b(True|true|False|false|Void|void|Result|result)\\b",
-      "name": "constant.language.eiffel"
+      "name": "constant.language.eiffel",
+      "match": "\\b(True|true|False|false|Void|void|Result|result)\\b"
     },
     {
+      "name": "meta.features.eiffel",
       "begin": "feature",
-      "end": "end",
-      "name": "meta.features.eiffel"
+      "end": "end"
     },
     {
+      "name": "meta.effective_routine_body.eiffel",
       "begin": "(do|once)",
-      "end": "(ensure|end)",
-      "name": "meta.effective_routine_body.eiffel"
+      "end": "(ensure|end)"
     },
     {
+      "name": "meta.rescue.eiffel",
       "begin": "rescue",
-      "end": "end",
-      "name": "meta.rescue.eiffel"
+      "end": "end"
     },
     {
+      "name": "string.quoted.double.eiffel",
       "begin": "\"",
+      "end": "\"",
+      "patterns": [
+        {
+          "name": "constant.character.escape.eiffel",
+          "match": "\\\\."
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.eiffel"
         }
       },
-      "end": "\"",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.eiffel"
         }
-      },
-      "name": "string.quoted.double.eiffel",
-      "patterns": [
-        {
-          "match": "\\\\.",
-          "name": "constant.character.escape.eiffel"
-        }
-      ]
+      }
     },
     {
-      "match": "[0-9]+",
-      "name": "constant.numeric.eiffel"
+      "name": "constant.numeric.eiffel",
+      "match": "[0-9]+"
     },
     {
-      "match": "\\b(deferred|expanded)\\b",
-      "name": "storage.modifier.eiffel"
+      "name": "storage.modifier.eiffel",
+      "match": "\\b(deferred|expanded)\\b"
     },
     {
+      "name": "meta.definition.class.eiffel",
       "begin": "^\\s*\n\t\t\t\t\t((?:\\b(deferred|expanded)\\b\\s*)*) # modifier\n\t\t\t\t\t(class)\\s+\n\t\t\t\t\t(\\w+)\\s* # identifier",
-      "captures": {
-        "1": {
-          "name": "storage.modifier.eiffel"
-        }
-      },
       "end": "(?=end)",
-      "name": "meta.definition.class.eiffel",
       "patterns": [
         {
+          "name": "meta.definition.class.extends.java",
           "begin": "\\b(extends)\\b\\s+",
-          "captures": {
-            "1": {
-              "name": "storage.modifier.java"
-            }
-          },
           "end": "(?={|implements)",
-          "name": "meta.definition.class.extends.java",
           "patterns": [
             {
               "include": "#all-types"
             }
-          ]
-        },
-        {
-          "begin": "\\b(implements)\\b\\s+",
+          ],
           "captures": {
             "1": {
               "name": "storage.modifier.java"
             }
-          },
-          "end": "(?={|extends)",
+          }
+        },
+        {
           "name": "meta.definition.class.implements.java",
+          "begin": "\\b(implements)\\b\\s+",
+          "end": "(?={|extends)",
           "patterns": [
             {
               "include": "#all-types"
             }
-          ]
+          ],
+          "captures": {
+            "1": {
+              "name": "storage.modifier.java"
+            }
+          }
+        }
+      ],
+      "captures": {
+        "1": {
+          "name": "storage.modifier.eiffel"
         }
-      ]
+      }
     }
   ],
   "repository": {
@@ -132,7 +129,5 @@
     "variable": {
       "match": "[a-zA-Z0-9_]+"
     }
-  },
-  "scopeName": "source.eiffel",
-  "uuid": "34672373-DED9-45B8-AF7E-2E4B6C3D6B76"
-}
+  }
+}

data/grammars/source.elixir.json

@@ -1,37 +1,34 @@
 {
-  "comment": "Textmate bundle for Elixir Programming Language.",
-  "fileTypes": [
-    "ex",
-    "exs"
-  ],
-  "firstLineMatch": "^#!/.*\\belixir",
-  "foldingStartMarker": "(after|else|catch|rescue|\\-\\>|\\{|\\[|do)\\s*$",
-  "foldingStopMarker": "^\\s*((\\}|\\]|after|else|catch|rescue)\\s*$|end\\b)",
-  "keyEquivalent": "^~E",
   "name": "Elixir",
+  "scopeName": "source.elixir",
   "patterns": [
     {
-      "begin": "\\b(fn)\\b(?!.*->)",
+      "begin": "\\b(fn)\\b(?!.*-\u003e)",
+      "end": "$",
+      "patterns": [
+        {
+          "include": "#core_syntax"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.control.elixir"
         }
-      },
-      "end": "$",
+      }
+    },
+    {
+      "begin": "\\b(fn)\\b(?=.*-\u003e)",
+      "end": "(?\u003e(-\u003e)|(when)|(\\)))",
       "patterns": [
         {
           "include": "#core_syntax"
         }
-      ]
-    },
-    {
-      "begin": "\\b(fn)\\b(?=.*->)",
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.control.elixir"
         }
       },
-      "end": "(?>(->)|(when)|(\\)))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.other.elixir"
@@ -40,26 +37,26 @@
           "name": "keyword.control.elixir"
         },
         "3": {
-          "name": "punctuation.definition.parameters.elixir"
-        }
-      },
-      "patterns": [
-        {
-          "include": "#core_syntax"
+          "name": "punctuation.section.function.elixir"
         }
-      ]
+      }
     },
     {
       "include": "#core_syntax"
     },
     {
-      "begin": "^(?=.*->)((?![^\"']*(\"|')[^\"']*->)|(?=.*->[^\"']*(\"|')[^\"']*->))((?!.*\\([^\\)]*->)|(?=[^\\(\\)]*->)|(?=\\s*\\(.*\\).*->))((?!.*\\b(fn)\\b)|(?=.*->.*\\bfn\\b))",
+      "begin": "^(?=.*-\u003e)((?![^\"']*(\"|')[^\"']*-\u003e)|(?=.*-\u003e[^\"']*(\"|')[^\"']*-\u003e))((?!.*\\([^\\)]*-\u003e)|(?=[^\\(\\)]*-\u003e)|(?=\\s*\\(.*\\).*-\u003e))((?!.*\\b(fn)\\b)|(?=.*-\u003e.*\\bfn\\b))",
+      "end": "(?\u003e(-\u003e)|(when)|(\\)))",
+      "patterns": [
+        {
+          "include": "#core_syntax"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.control.elixir"
         }
       },
-      "end": "(?>(->)|(when)|(\\)))",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.other.elixir"
@@ -68,84 +65,104 @@
           "name": "keyword.control.elixir"
         },
         "3": {
-          "name": "punctuation.definition.parameters.elixir"
-        }
-      },
-      "patterns": [
-        {
-          "include": "#core_syntax"
+          "name": "punctuation.section.function.elixir"
         }
-      ]
+      }
     }
   ],
   "repository": {
     "core_syntax": {
       "patterns": [
         {
+          "name": "meta.module.elixir",
           "begin": "^\\s*(defmodule)\\b",
+          "end": "\\b(do)\\b",
+          "patterns": [
+            {
+              "name": "entity.name.class.elixir",
+              "match": "\\b[A-Z]\\w*\\b"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.module.elixir"
             }
           },
-          "end": "\\b(do)\\b",
           "endCaptures": {
             "1": {
               "name": "keyword.control.module.elixir"
             }
-          },
-          "name": "meta.module.elixir",
-          "patterns": [
-            {
-              "match": "\\b[A-Z]\\w*\\b",
-              "name": "entity.name.class.elixir"
-            }
-          ]
+          }
         },
         {
+          "name": "meta.protocol_declaration.elixir",
           "begin": "^\\s*(defprotocol)\\b",
+          "end": "\\b(do)\\b",
+          "patterns": [
+            {
+              "name": "entity.name.protocol.elixir",
+              "match": "\\b[A-Z]\\w*\\b"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.protocol.elixir"
             }
           },
-          "end": "\\b(do)\\b",
           "endCaptures": {
             "1": {
               "name": "keyword.control.protocol.elixir"
             }
-          },
-          "name": "meta.protocol_declaration.elixir",
-          "patterns": [
-            {
-              "match": "\\b[A-Z]\\w*\\b",
-              "name": "entity.name.protocol.elixir"
-            }
-          ]
+          }
         },
         {
+          "name": "meta.protocol_implementation.elixir",
           "begin": "^\\s*(defimpl)\\b",
+          "end": "\\b(do)\\b",
+          "patterns": [
+            {
+              "name": "entity.name.protocol.elixir",
+              "match": "\\b[A-Z]\\w*\\b"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.protocol.elixir"
             }
           },
-          "end": "\\b(do)\\b",
           "endCaptures": {
             "1": {
               "name": "keyword.control.protocol.elixir"
             }
-          },
-          "name": "meta.protocol_implementation.elixir",
+          }
+        },
+        {
+          "name": "meta.function.public.elixir",
+          "begin": "^\\s*(def|defmacro)\\s+((?\u003e[a-zA-Z_]\\w*(?\u003e\\.|::))?(?\u003e[a-zA-Z_]\\w*(?\u003e[?!]|=(?!\u003e))?|===?|\u003e[\u003e=]?|\u003c=\u003e|\u003c[\u003c=]?|[%\u0026`/\\|]|\\*\\*?|=?~|[-+]@?|\\[\\]=?))((\\()|\\s*)",
+          "end": "(\\bdo:)|(\\bdo\\b)|(?=\\s+(def|defmacro)\\b)",
           "patterns": [
             {
-              "match": "\\b[A-Z]\\w*\\b",
-              "name": "entity.name.protocol.elixir"
+              "include": "$self"
+            },
+            {
+              "begin": "\\s(\\\\\\\\)",
+              "end": ",|\\)|$",
+              "patterns": [
+                {
+                  "include": "$self"
+                }
+              ],
+              "beginCaptures": {
+                "1": {
+                  "name": "keyword.operator.other.elixir"
+                }
+              }
+            },
+            {
+              "name": "keyword.control.elixir",
+              "match": "\\b(is_atom|is_binary|is_bitstring|is_boolean|is_float|is_function|is_integer|is_list|is_map|is_nil|is_number|is_pid|is_port|is_record|is_reference|is_tuple|is_exception|abs|bit_size|byte_size|div|elem|hd|length|map_size|node|rem|round|tl|trunc|tuple_size)\\b"
             }
-          ]
-        },
-        {
-          "begin": "^\\s*(def|defmacro)\\s+((?>[a-zA-Z_]\\w*(?>\\.|::))?(?>[a-zA-Z_]\\w*(?>[?!]|=(?!>))?|===?|>[>=]?|<=>|<[<=]?|[%&`/\\|]|\\*\\*?|=?~|[-+]@?|\\[\\]=?))((\\()|\\s*)",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.module.elixir"
@@ -154,10 +171,9 @@
               "name": "entity.name.function.public.elixir"
             },
             "4": {
-              "name": "punctuation.definition.parameters.elixir"
+              "name": "punctuation.section.function.elixir"
             }
           },
-          "end": "(\\bdo:)|(\\bdo\\b)|(?=\\s+(def|defmacro)\\b)",
           "endCaptures": {
             "1": {
               "name": "constant.other.keywords.elixir"
@@ -165,34 +181,35 @@
             "2": {
               "name": "keyword.control.module.elixir"
             }
-          },
-          "name": "meta.function.public.elixir",
+          }
+        },
+        {
+          "name": "meta.function.private.elixir",
+          "begin": "^\\s*(defp|defmacrop)\\s+((?\u003e[a-zA-Z_]\\w*(?\u003e\\.|::))?(?\u003e[a-zA-Z_]\\w*(?\u003e[?!]|=(?!\u003e))?|===?|\u003e[\u003e=]?|\u003c=\u003e|\u003c[\u003c=]?|[%\u0026`/\\|]|\\*\\*?|=?~|[-+]@?|\\[\\]=?))((\\()|\\s*)",
+          "end": "(\\bdo:)|(\\bdo\\b)|(?=\\s+(defp|defmacrop)\\b)",
           "patterns": [
             {
               "include": "$self"
             },
             {
               "begin": "\\s(\\\\\\\\)",
-              "beginCaptures": {
-                "1": {
-                  "name": "keyword.operator.other.elixir"
-                }
-              },
               "end": ",|\\)|$",
               "patterns": [
                 {
                   "include": "$self"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "1": {
+                  "name": "keyword.operator.other.elixir"
+                }
+              }
             },
             {
-              "match": "\\b(is_atom|is_binary|is_bitstring|is_boolean|is_float|is_function|is_integer|is_list|is_map|is_nil|is_number|is_pid|is_port|is_record|is_reference|is_tuple|is_exception|abs|bit_size|byte_size|div|elem|hd|length|map_size|node|rem|round|tl|trunc|tuple_size)\\b",
-              "name": "keyword.control.elixir"
+              "name": "keyword.control.elixir",
+              "match": "\\b(is_atom|is_binary|is_bitstring|is_boolean|is_float|is_function|is_integer|is_list|is_map|is_nil|is_number|is_pid|is_port|is_record|is_reference|is_tuple|is_exception|abs|bit_size|byte_size|div|elem|hd|length|map_size|node|rem|round|tl|trunc|tuple_size)\\b"
             }
-          ]
-        },
-        {
-          "begin": "^\\s*(defp|defmacrop)\\s+((?>[a-zA-Z_]\\w*(?>\\.|::))?(?>[a-zA-Z_]\\w*(?>[?!]|=(?!>))?|===?|>[>=]?|<=>|<[<=]?|[%&`/\\|]|\\*\\*?|=?~|[-+]@?|\\[\\]=?))((\\()|\\s*)",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.module.elixir"
@@ -201,10 +218,9 @@
               "name": "entity.name.function.private.elixir"
             },
             "4": {
-              "name": "punctuation.definition.parameters.elixir"
+              "name": "punctuation.section.function.elixir"
             }
           },
-          "end": "(\\bdo:)|(\\bdo\\b)|(?=\\s+(defp|defmacrop)\\b)",
           "endCaptures": {
             "1": {
               "name": "constant.other.keywords.elixir"
@@ -212,37 +228,12 @@
             "2": {
               "name": "keyword.control.module.elixir"
             }
-          },
-          "name": "meta.function.private.elixir",
-          "patterns": [
-            {
-              "include": "$self"
-            },
-            {
-              "begin": "\\s(\\\\\\\\)",
-              "beginCaptures": {
-                "1": {
-                  "name": "keyword.operator.other.elixir"
-                }
-              },
-              "end": ",|\\)|$",
-              "patterns": [
-                {
-                  "include": "$self"
-                }
-              ]
-            },
-            {
-              "match": "\\b(is_atom|is_binary|is_bitstring|is_boolean|is_float|is_function|is_integer|is_list|is_map|is_nil|is_number|is_pid|is_port|is_record|is_reference|is_tuple|is_exception|abs|bit_size|byte_size|div|elem|hd|length|map_size|node|rem|round|tl|trunc|tuple_size)\\b",
-              "name": "keyword.control.elixir"
-            }
-          ]
+          }
         },
         {
+          "name": "comment.documentation.heredoc",
           "begin": "@(module|type)?doc (~[a-z])?\"\"\"",
-          "comment": "@doc with heredocs is treated as documentation",
           "end": "\\s*\"\"\"",
-          "name": "comment.documentation.heredoc",
           "patterns": [
             {
               "include": "#interpolated_elixir"
@@ -253,16 +244,14 @@
           ]
         },
         {
+          "name": "comment.documentation.heredoc",
           "begin": "@(module|type)?doc ~[A-Z]\"\"\"",
-          "comment": "@doc with heredocs is treated as documentation",
-          "end": "\\s*\"\"\"",
-          "name": "comment.documentation.heredoc"
+          "end": "\\s*\"\"\""
         },
         {
+          "name": "comment.documentation.heredoc",
           "begin": "@(module|type)?doc (~[a-z])?'''",
-          "comment": "@doc with heredocs is treated as documentation",
           "end": "\\s*'''",
-          "name": "comment.documentation.heredoc",
           "patterns": [
             {
               "include": "#interpolated_elixir"
@@ -273,21 +262,18 @@
           ]
         },
         {
+          "name": "comment.documentation.heredoc",
           "begin": "@(module|type)?doc ~[A-Z]'''",
-          "comment": "@doc with heredocs is treated as documentation",
-          "end": "\\s*'''",
-          "name": "comment.documentation.heredoc"
+          "end": "\\s*'''"
         },
         {
-          "comment": "@doc false is treated as documentation",
-          "match": "@(module|type)?doc false",
-          "name": "comment.documentation.false"
+          "name": "comment.documentation.false",
+          "match": "@(module|type)?doc false"
         },
         {
+          "name": "comment.documentation.string",
           "begin": "@(module|type)?doc \"",
-          "comment": "@doc with string is treated as documentation",
           "end": "\"",
-          "name": "comment.documentation.string",
           "patterns": [
             {
               "include": "#interpolated_elixir"
@@ -298,90 +284,60 @@
           ]
         },
         {
-          "begin": "(::)",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.binary.elixir"
-            }
-          },
-          "end": "(,|>>|$)",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.binary.elixir"
-            }
-          },
-          "patterns": [
-            {
-              "match": "\\b[a-z]\\w*\\b",
-              "name": "support.type.binary.elixir"
-            },
-            {
-              "match": "\\b(0x[0-9A-Fa-f](?>_?[0-9A-Fa-f])*|\\d(?>_?\\d)*(\\.(?![^[:space:][:digit:]])(?>_?\\d)*)?([eE][-+]?\\d(?>_?\\d)*)?|0b[01]+|0o[0-7]+)\\b",
-              "name": "constant.numeric.elixir"
-            }
-          ]
-        },
-        {
-          "match": "(?<!\\.)\\b(do|end|case|bc|lc|for|if|cond|unless|try|receive|fn|defmodule|defp?|defprotocol|defimpl|defrecord|defstruct|defmacrop?|defdelegate|defcallback|defmacrocallback|defexception|defoverridable|exit|after|rescue|catch|else|raise|throw|import|require|alias|use|quote|unquote|super|with)\\b(?![?!:])",
-          "name": "keyword.control.elixir"
+          "name": "keyword.control.elixir",
+          "match": "(?\u003c!\\.)\\b(do|end|case|bc|lc|for|if|cond|unless|try|receive|fn|defmodule|defp?|defprotocol|defimpl|defrecord|defstruct|defmacrop?|defdelegate|defcallback|defmacrocallback|defexception|defoverridable|exit|after|rescue|catch|else|raise|throw|import|require|alias|use|quote|unquote|super|with)\\b(?![?!:])"
         },
         {
-          "comment": " as above, just doesn't need a 'end' and does a logic operation",
-          "match": "(?<!\\.)\\b(and|not|or|when|xor|in)\\b",
-          "name": "keyword.operator.elixir"
+          "name": "keyword.operator.elixir",
+          "match": "(?\u003c!\\.)\\b(and|not|or|when|xor|in)\\b"
         },
         {
-          "match": "\\b[A-Z]\\w*\\b",
-          "name": "entity.name.class.elixir"
+          "name": "entity.name.class.elixir",
+          "match": "\\b[A-Z]\\w*\\b"
         },
         {
-          "match": "\\b(nil|true|false)\\b(?![?!])",
-          "name": "constant.language.elixir"
+          "name": "constant.language.elixir",
+          "match": "\\b(nil|true|false)\\b(?![?!])"
         },
         {
-          "match": "\\b(__(CALLER|ENV|MODULE|DIR)__)\\b(?![?!])",
-          "name": "variable.language.elixir"
+          "name": "variable.language.elixir",
+          "match": "\\b(__(CALLER|ENV|MODULE|DIR)__)\\b(?![?!])"
         },
         {
+          "name": "variable.other.readwrite.module.elixir",
+          "match": "(@)[a-zA-Z_]\\w*",
           "captures": {
             "1": {
               "name": "punctuation.definition.variable.elixir"
             }
-          },
-          "match": "(@)[a-zA-Z_]\\w*",
-          "name": "variable.other.readwrite.module.elixir"
+          }
         },
         {
+          "name": "variable.other.anonymous.elixir",
+          "match": "(\u0026)\\d+",
           "captures": {
             "1": {
               "name": "punctuation.definition.variable.elixir"
             }
-          },
-          "match": "(&)\\d+",
-          "name": "variable.other.anonymous.elixir"
+          }
         },
         {
+          "name": "variable.other.capture.elixir",
+          "match": "\\^[a-z_]\\w*",
           "captures": {
             "1": {
               "name": "punctuation.definition.variable.elixir"
             }
-          },
-          "match": "\\^[a-z_]\\w*",
-          "name": "variable.other.capture.elixir"
+          }
         },
         {
-          "match": "\\b(0x[0-9A-Fa-f](?>_?[0-9A-Fa-f])*|\\d(?>_?\\d)*(\\.(?![^[:space:][:digit:]])(?>_?\\d)*)?([eE][-+]?\\d(?>_?\\d)*)?|0b[01]+|0o[0-7]+)\\b",
-          "name": "constant.numeric.elixir"
+          "name": "constant.numeric.elixir",
+          "match": "\\b(0x[0-9A-Fa-f](?\u003e_?[0-9A-Fa-f])*|\\d(?\u003e_?\\d)*(\\.(?![^[:space:][:digit:]])(?\u003e_?\\d)*)?([eE][-+]?\\d(?\u003e_?\\d)*)?|0b[01]+|0o[0-7]+)\\b"
         },
         {
+          "name": "constant.other.symbol.single-quoted.elixir",
           "begin": ":'",
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.constant.elixir"
-            }
-          },
           "end": "'",
-          "name": "constant.other.symbol.single-quoted.elixir",
           "patterns": [
             {
               "include": "#interpolated_elixir"
@@ -389,17 +345,17 @@
             {
               "include": "#escaped_char"
             }
-          ]
-        },
-        {
-          "begin": ":\"",
+          ],
           "captures": {
             "0": {
               "name": "punctuation.definition.constant.elixir"
             }
-          },
-          "end": "\"",
+          }
+        },
+        {
           "name": "constant.other.symbol.double-quoted.elixir",
+          "begin": ":\"",
+          "end": "\"",
           "patterns": [
             {
               "include": "#interpolated_elixir"
@@ -407,23 +363,17 @@
             {
               "include": "#escaped_char"
             }
-          ]
-        },
-        {
-          "begin": "(?>''')",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.begin.elixir"
-            }
-          },
-          "comment": "Single-quoted heredocs",
-          "end": "^\\s*'''",
-          "endCaptures": {
+          ],
+          "captures": {
             "0": {
-              "name": "punctuation.definition.string.end.elixir"
+              "name": "punctuation.definition.constant.elixir"
             }
-          },
+          }
+        },
+        {
           "name": "string.quoted.single.heredoc.elixir",
+          "begin": "(?\u003e''')",
+          "end": "^\\s*'''",
           "patterns": [
             {
               "include": "#interpolated_elixir"
@@ -431,23 +381,22 @@
             {
               "include": "#escaped_char"
             }
-          ]
-        },
-        {
-          "begin": "'",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.elixir"
             }
           },
-          "comment": "single quoted string (allows for interpolation)",
-          "end": "'",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.elixir"
             }
-          },
+          }
+        },
+        {
           "name": "string.quoted.single.elixir",
+          "begin": "'",
+          "end": "'",
           "patterns": [
             {
               "include": "#interpolated_elixir"
@@ -455,23 +404,22 @@
             {
               "include": "#escaped_char"
             }
-          ]
-        },
-        {
-          "begin": "(?>\"\"\")",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.elixir"
             }
           },
-          "comment": "Double-quoted heredocs",
-          "end": "^\\s*\"\"\"",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.elixir"
             }
-          },
+          }
+        },
+        {
           "name": "string.quoted.double.heredoc.elixir",
+          "begin": "(?\u003e\"\"\")",
+          "end": "^\\s*\"\"\"",
           "patterns": [
             {
               "include": "#interpolated_elixir"
@@ -479,23 +427,22 @@
             {
               "include": "#escaped_char"
             }
-          ]
-        },
-        {
-          "begin": "\"",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.elixir"
             }
           },
-          "comment": "double quoted string (allows for interpolation)",
-          "end": "\"",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.elixir"
             }
-          },
+          }
+        },
+        {
           "name": "string.quoted.double.elixir",
+          "begin": "\"",
+          "end": "\"",
           "patterns": [
             {
               "include": "#interpolated_elixir"
@@ -503,23 +450,22 @@
             {
               "include": "#escaped_char"
             }
-          ]
-        },
-        {
-          "begin": "~[a-z](?>\"\"\")",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.elixir"
             }
           },
-          "comment": "Double-quoted heredocs sigils",
-          "end": "^\\s*\"\"\"",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.elixir"
             }
-          },
+          }
+        },
+        {
           "name": "string.quoted.double.heredoc.elixir",
+          "begin": "~[a-z](?\u003e\"\"\")",
+          "end": "^\\s*\"\"\"",
           "patterns": [
             {
               "include": "#interpolated_elixir"
@@ -527,23 +473,22 @@
             {
               "include": "#escaped_char"
             }
-          ]
-        },
-        {
-          "begin": "~[a-z]\\{",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.elixir"
             }
           },
-          "comment": "sigil (allow for interpolation)",
-          "end": "\\}[a-z]*",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.elixir"
             }
-          },
+          }
+        },
+        {
           "name": "string.interpolated.elixir",
+          "begin": "~[a-z]\\{",
+          "end": "\\}[a-z]*",
           "patterns": [
             {
               "include": "#interpolated_elixir"
@@ -551,23 +496,22 @@
             {
               "include": "#escaped_char"
             }
-          ]
-        },
-        {
-          "begin": "~[a-z]\\[",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.elixir"
             }
           },
-          "comment": "sigil (allow for interpolation)",
-          "end": "\\][a-z]*",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.elixir"
             }
-          },
+          }
+        },
+        {
           "name": "string.interpolated.elixir",
+          "begin": "~[a-z]\\[",
+          "end": "\\][a-z]*",
           "patterns": [
             {
               "include": "#interpolated_elixir"
@@ -575,23 +519,22 @@
             {
               "include": "#escaped_char"
             }
-          ]
-        },
-        {
-          "begin": "~[a-z]\\<",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.elixir"
             }
           },
-          "comment": "sigil (allow for interpolation)",
-          "end": "\\>[a-z]*",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.elixir"
             }
-          },
+          }
+        },
+        {
           "name": "string.interpolated.elixir",
+          "begin": "~[a-z]\\\u003c",
+          "end": "\\\u003e[a-z]*",
           "patterns": [
             {
               "include": "#interpolated_elixir"
@@ -599,23 +542,22 @@
             {
               "include": "#escaped_char"
             }
-          ]
-        },
-        {
-          "begin": "~[a-z]\\(",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.elixir"
             }
           },
-          "comment": "sigil (allow for interpolation)",
-          "end": "\\)[a-z]*",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.elixir"
             }
-          },
+          }
+        },
+        {
           "name": "string.interpolated.elixir",
+          "begin": "~[a-z]\\(",
+          "end": "\\)[a-z]*",
           "patterns": [
             {
               "include": "#interpolated_elixir"
@@ -623,23 +565,22 @@
             {
               "include": "#escaped_char"
             }
-          ]
-        },
-        {
-          "begin": "~[a-z]([^\\w])",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.elixir"
             }
           },
-          "comment": "sigil (allow for interpolation)",
-          "end": "\\1[a-z]*",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.elixir"
             }
-          },
+          }
+        },
+        {
           "name": "string.interpolated.elixir",
+          "begin": "~[a-z]([^\\w])",
+          "end": "\\1[a-z]*",
           "patterns": [
             {
               "include": "#interpolated_elixir"
@@ -650,208 +591,227 @@
             {
               "include": "#escaped_char"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.elixir"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.end.elixir"
+            }
+          }
         },
         {
-          "begin": "~[A-Z](?>\"\"\")",
+          "name": "string.quoted.other.literal.upper.elixir",
+          "begin": "~[A-Z](?\u003e\"\"\")",
+          "end": "^\\s*\"\"\"",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.elixir"
             }
           },
-          "comment": "Double-quoted heredocs sigils",
-          "end": "^\\s*\"\"\"",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.elixir"
             }
-          },
-          "name": "string.quoted.other.literal.upper.elixir"
+          }
         },
         {
+          "name": "string.quoted.other.literal.upper.elixir",
           "begin": "~[A-Z]\\{",
+          "end": "\\}[a-z]*",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.elixir"
             }
           },
-          "comment": "sigil (without interpolation)",
-          "end": "\\}[a-z]*",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.elixir"
             }
-          },
-          "name": "string.quoted.other.literal.upper.elixir"
+          }
         },
         {
+          "name": "string.quoted.other.literal.upper.elixir",
           "begin": "~[A-Z]\\[",
+          "end": "\\][a-z]*",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.elixir"
             }
           },
-          "comment": "sigil (without interpolation)",
-          "end": "\\][a-z]*",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.elixir"
             }
-          },
-          "name": "string.quoted.other.literal.upper.elixir"
+          }
         },
         {
-          "begin": "~[A-Z]\\<",
+          "name": "string.quoted.other.literal.upper.elixir",
+          "begin": "~[A-Z]\\\u003c",
+          "end": "\\\u003e[a-z]*",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.elixir"
             }
           },
-          "comment": "sigil (without interpolation)",
-          "end": "\\>[a-z]*",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.elixir"
             }
-          },
-          "name": "string.quoted.other.literal.upper.elixir"
+          }
         },
         {
+          "name": "string.quoted.other.literal.upper.elixir",
           "begin": "~[A-Z]\\(",
+          "end": "\\)[a-z]*",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.elixir"
             }
           },
-          "comment": "sigil (without interpolation)",
-          "end": "\\)[a-z]*",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.elixir"
             }
-          },
-          "name": "string.quoted.other.literal.upper.elixir"
+          }
         },
         {
+          "name": "string.quoted.other.literal.upper.elixir",
           "begin": "~[A-Z]([^\\w])",
+          "end": "\\1[a-z]*",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.elixir"
             }
           },
-          "comment": "sigil (without interpolation)",
-          "end": "\\1[a-z]*",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.elixir"
             }
-          },
-          "name": "string.quoted.other.literal.upper.elixir"
+          }
         },
         {
+          "name": "constant.other.symbol.elixir",
+          "match": "(?\u003c!:)(:)(?\u003e[a-zA-Z_][\\w@]*(?\u003e[?!]|=(?![\u003e=]))?|\\\u003c\\\u003e|===?|!==?|\u003c\u003c\u003e\u003e|\u003c\u003c\u003c|\u003e\u003e\u003e|~~~|::|\u003c\\-|\\|\u003e|=\u003e|=~|=|/|\\\\\\\\|\\*\\*?|\\.\\.?\\.?|\u003e=?|\u003c=?|\u0026\u0026?\u0026?|\\+\\+?|\\-\\-?|\\|\\|?\\|?|\\!|@|\\%?\\{\\}|%|\\[\\]|\\^(\\^\\^)?)",
           "captures": {
             "1": {
               "name": "punctuation.definition.constant.elixir"
             }
-          },
-          "comment": "symbols",
-          "match": "(?<!:)(:)(?>[a-zA-Z_][\\w@]*(?>[?!]|=(?![>=]))?|\\<\\>|===?|!==?|<<>>|<<<|>>>|~~~|::|<\\-|\\|>|=>|=~|=|/|\\\\\\\\|\\*\\*?|\\.\\.?\\.?|>=?|<=?|&&?&?|\\+\\+?|\\-\\-?|\\|\\|?\\|?|\\!|@|\\%?\\{\\}|%|\\[\\]|\\^(\\^\\^)?)",
-          "name": "constant.other.symbol.elixir"
+          }
         },
         {
+          "name": "constant.other.keywords.elixir",
+          "match": "(?\u003e[a-zA-Z_][\\w@]*(?\u003e[?!])?)(:)(?!:)",
           "captures": {
             "1": {
               "name": "punctuation.definition.constant.elixir"
             }
-          },
-          "comment": "symbols",
-          "match": "(?>[a-zA-Z_][\\w@]*(?>[?!])?)(:)(?!:)",
-          "name": "constant.other.keywords.elixir"
+          }
         },
         {
+          "name": "comment.line.section.elixir",
+          "match": "^\\s*(##).*$\\n?",
           "captures": {
             "1": {
               "name": "punctuation.definition.comment.elixir"
             }
-          },
-          "match": "^\\s*(##).*$\\n?",
-          "name": "comment.line.section.elixir"
+          }
         },
         {
+          "name": "comment.line.number-sign.elixir",
+          "match": "(?:^[ \\t]+)?(#).*$\\n?",
           "captures": {
             "1": {
               "name": "punctuation.definition.comment.elixir"
             }
-          },
-          "match": "(?:^[ \\t]+)?(#).*$\\n?",
-          "name": "comment.line.number-sign.elixir"
+          }
         },
         {
-          "comment": "\n\t\t\tmatches questionmark-letters.\n\n\t\t\texamples (1st alternation = hex):\n\t\t\t?\\x1     ?\\x61\n\n\t\t\texamples (2rd alternation = escaped):\n\t\t\t?\\n      ?\\b\n\n\t\t\texamples (3rd alternation = normal):\n\t\t\t?a       ?A       ?0 \n\t\t\t?*       ?\"       ?( \n\t\t\t?.       ?#\n\t\t\t\n\t\t\tthe negative lookbehind prevents against matching\n\t\t\tp(42.tainted?)\n\t\t\t",
-          "match": "(?<!\\w)\\?(\\\\(x[0-9A-Fa-f]{1,2}(?![0-9A-Fa-f])\\b|[^xMC])|[^\\s\\\\])",
-          "name": "constant.numeric.elixir"
+          "name": "constant.numeric.elixir",
+          "match": "(?\u003c!\\w)\\?(\\\\(x[0-9A-Fa-f]{1,2}(?![0-9A-Fa-f])\\b|[^xMC])|[^\\s\\\\])"
         },
         {
-          "match": "===?|!==?|<=?|>=?",
-          "name": "keyword.operator.comparison.elixir"
+          "name": "keyword.operator.concatenation.elixir",
+          "match": "\\+\\+|\\-\\-|\u003c\\|\u003e"
         },
         {
-          "match": "(\\|\\|\\||&&&|^^^|<<<|>>>|~~~)",
-          "name": "keyword.operator.bitwise.elixir"
+          "name": "keyword.operator.sigils_1.elixir",
+          "match": "\\|\\\u003e|\u003c~\u003e|\u003c\u003e|\u003c\u003c\u003c|\u003e\u003e\u003e|~\u003e\u003e|\u003c\u003c~|~\u003e|\u003c~|\u003c\\|\u003e"
         },
         {
-          "match": "(?<=[ \\t])!+|\\bnot\\b|&&|\\band\\b|\\|\\||\\bor\\b|\\bxor\\b",
-          "name": "keyword.operator.logical.elixir"
+          "name": "keyword.operator.sigils_2.elixir",
+          "match": "\u0026\u0026\u0026|\u0026\u0026"
         },
         {
-          "match": "(\\*|\\+|\\-|/)",
-          "name": "keyword.operator.arithmetic.elixir"
+          "name": "keyword.operator.sigils_3.elixir",
+          "match": "\u003c\\-|\\\\\\\\"
         },
         {
-          "match": "\\||\\+\\+|\\-\\-|\\*\\*|\\\\\\\\|\\<\\-|\\<\\>|\\<\\<|\\>\\>|\\:\\:|\\.\\.|\\|>|~|=>|&",
-          "name": "keyword.operator.other.elixir"
+          "name": "keyword.operator.comparison.elixir",
+          "match": "===?|!==?|\u003c=?|\u003e=?"
         },
         {
-          "match": "=",
-          "name": "keyword.operator.assignment.elixir"
+          "name": "keyword.operator.bitwise.elixir",
+          "match": "(\\|\\|\\||\u0026\u0026\u0026|^^^|\u003c\u003c\u003c|\u003e\u003e\u003e|~~~)"
         },
         {
-          "match": ":",
-          "name": "punctuation.separator.other.elixir"
+          "name": "keyword.operator.logical.elixir",
+          "match": "(?\u003c=[ \\t])!+|\\bnot\\b|\u0026\u0026|\\band\\b|\\|\\||\\bor\\b|\\bxor\\b"
         },
         {
-          "match": "\\;",
-          "name": "punctuation.separator.statement.elixir"
+          "name": "keyword.operator.arithmetic.elixir",
+          "match": "(\\*|\\+|\\-|/)"
         },
         {
-          "match": ",",
-          "name": "punctuation.separator.object.elixir"
+          "name": "keyword.operator.other.elixir",
+          "match": "\\||\\+\\+|\\-\\-|\\*\\*|\\\\\\\\|\\\u003c\\-|\\\u003c\\\u003e|\\\u003c\\\u003c|\\\u003e\\\u003e|\\:\\:|\\.\\.|\\|\u003e|~|=\u003e|\u0026"
         },
         {
-          "match": "\\.",
-          "name": "punctuation.separator.method.elixir"
+          "name": "keyword.operator.assignment.elixir",
+          "match": "="
         },
         {
-          "match": "\\{|\\}",
-          "name": "punctuation.section.scope.elixir"
+          "name": "punctuation.separator.other.elixir",
+          "match": ":"
         },
         {
-          "match": "\\[|\\]",
-          "name": "punctuation.section.array.elixir"
+          "name": "punctuation.separator.statement.elixir",
+          "match": "\\;"
         },
         {
-          "match": "\\(|\\)",
-          "name": "punctuation.section.function.elixir"
+          "name": "punctuation.separator.object.elixir",
+          "match": ","
+        },
+        {
+          "name": "punctuation.separator.method.elixir",
+          "match": "\\."
+        },
+        {
+          "name": "punctuation.section.scope.elixir",
+          "match": "\\{|\\}"
+        },
+        {
+          "name": "punctuation.section.array.elixir",
+          "match": "\\[|\\]"
+        },
+        {
+          "name": "punctuation.section.function.elixir",
+          "match": "\\(|\\)"
         }
       ]
     },
     "escaped_char": {
-      "match": "\\\\(x[\\da-fA-F]{1,2}|.)",
-      "name": "constant.character.escaped.elixir"
+      "name": "constant.character.escaped.elixir",
+      "match": "\\\\(x[\\da-fA-F]{1,2}|.)"
     },
     "interpolated_elixir": {
       "patterns": [
         {
+          "name": "source.elixir.embedded.source",
+          "match": "#\\{(\\})",
           "captures": {
             "0": {
               "name": "punctuation.section.embedded.elixir"
@@ -859,19 +819,12 @@
             "1": {
               "name": "source.elixir.embedded.source.empty"
             }
-          },
-          "match": "#\\{(\\})",
-          "name": "source.elixir.embedded.source"
+          }
         },
         {
+          "name": "source.elixir.embedded.source",
           "begin": "#\\{",
-          "captures": {
-            "0": {
-              "name": "punctuation.section.embedded.elixir"
-            }
-          },
           "end": "\\}",
-          "name": "source.elixir.embedded.source",
           "patterns": [
             {
               "include": "#nest_curly_and_self"
@@ -879,7 +832,12 @@
             {
               "include": "$self"
             }
-          ]
+          ],
+          "captures": {
+            "0": {
+              "name": "punctuation.section.embedded.elixir"
+            }
+          }
         }
       ]
     },
@@ -887,17 +845,17 @@
       "patterns": [
         {
           "begin": "\\{",
-          "captures": {
-            "0": {
-              "name": "punctuation.section.scope.elixir"
-            }
-          },
           "end": "\\}",
           "patterns": [
             {
               "include": "#nest_curly_and_self"
             }
-          ]
+          ],
+          "captures": {
+            "0": {
+              "name": "punctuation.section.scope.elixir"
+            }
+          }
         },
         {
           "include": "$self"
@@ -913,6 +871,8 @@
           "include": "#escaped_char"
         },
         {
+          "name": "string.regexp.arbitrary-repitition.elixir",
+          "match": "(\\{)\\d+(,\\d+)?(\\})",
           "captures": {
             "1": {
               "name": "punctuation.definition.arbitrary-repitition.elixir"
@@ -920,53 +880,48 @@
             "3": {
               "name": "punctuation.definition.arbitrary-repitition.elixir"
             }
-          },
-          "match": "(\\{)\\d+(,\\d+)?(\\})",
-          "name": "string.regexp.arbitrary-repitition.elixir"
+          }
         },
         {
+          "name": "string.regexp.character-class.elixir",
           "begin": "\\[(?:\\^?\\])?",
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.character-class.elixir"
-            }
-          },
           "end": "\\]",
-          "name": "string.regexp.character-class.elixir",
           "patterns": [
             {
               "include": "#escaped_char"
             }
-          ]
-        },
-        {
-          "begin": "\\(",
+          ],
           "captures": {
             "0": {
-              "name": "punctuation.definition.group.elixir"
+              "name": "punctuation.definition.character-class.elixir"
             }
-          },
-          "end": "\\)",
+          }
+        },
+        {
           "name": "string.regexp.group.elixir",
+          "begin": "\\(",
+          "end": "\\)",
           "patterns": [
             {
               "include": "#regex_sub"
             }
-          ]
+          ],
+          "captures": {
+            "0": {
+              "name": "punctuation.definition.group.elixir"
+            }
+          }
         },
         {
+          "name": "comment.line.number-sign.elixir",
+          "match": "(?\u003c=^|\\s)(#)\\s[[a-zA-Z0-9,. \\t?!-][^\\x{00}-\\x{7F}]]*$",
           "captures": {
             "1": {
               "name": "punctuation.definition.comment.elixir"
             }
-          },
-          "comment": "We are restrictive in what we allow to go after the comment character to avoid false positives, since the availability of comments depend on regexp flags.",
-          "match": "(?<=^|\\s)(#)\\s[[a-zA-Z0-9,. \\t?!-][^\\x{00}-\\x{7F}]]*$",
-          "name": "comment.line.number-sign.elixir"
+          }
         }
       ]
     }
-  },
-  "scopeName": "source.elixir",
-  "uuid": "D00C06B9-71B2-4FEB-A0E3-37237F579456"
-}
+  }
+}