github-linguist 5.3.3 → 6.0.0

data/grammars/source.ruby.gemfile.json

@@ -1,27 +1,24 @@
 {
   "name": "Gemfile",
   "scopeName": "source.ruby.gemfile",
-  "fileTypes": [
-    "Gemfile"
-  ],
   "patterns": [
     {
       "include": "source.ruby"
     },
     {
-      "begin": "\\b(?<!\\.|::)(gem|git|group|platforms|ruby|source)\\b(?![?!])",
-      "captures": {
-        "1": {
-          "name": "keyword.other.special-method.ruby.gemfile"
-        }
-      },
-      "end": "$|(?=#|})",
       "name": "meta.declaration.ruby.gemfile",
+      "begin": "\\b(?\u003c!\\.|::)(gem|git|group|platforms|ruby|source)\\b(?![?!])",
+      "end": "$|(?=#|})",
       "patterns": [
         {
           "include": "$self"
         }
-      ]
+      ],
+      "captures": {
+        "1": {
+          "name": "keyword.other.special-method.ruby.gemfile"
+        }
+      }
     }
   ]
-}
+}

data/grammars/source.ruby.json

@@ -1,48 +1,10 @@
 {
   "name": "Ruby",
   "scopeName": "source.ruby",
-  "fileTypes": [
-    "Appfile",
-    "Appraisals",
-    "arb",
-    "Berksfile",
-    "Brewfile",
-    "cap",
-    "Capfile",
-    "capfile",
-    "cgi",
-    "cr",
-    "Dangerfile",
-    "Deliverfile",
-    "Fastfile",
-    "fcgi",
-    "gemspec",
-    "Guardfile",
-    "irbrc",
-    "opal",
-    "Podfile",
-    "podspec",
-    "prawn",
-    "pryrc",
-    "Puppetfile",
-    "rabl",
-    "rake",
-    "Rakefile",
-    "Rantfile",
-    "rb",
-    "rbx",
-    "rjs",
-    "ru",
-    "ruby",
-    "Schemafile",
-    "Snapfile",
-    "thor",
-    "Thorfile",
-    "Vagrantfile"
-  ],
-  "firstLineMatch": "(?x)\n# Hashbang\n^\\#!.*(?:\\s|\\/)\n  (?:ruby|macruby|rake|jruby|rbx|ruby_executable_hooks)\n(?:$|\\s)\n|\n# Modeline\n(?i:\n  # Emacs\n  -\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)\n    ruby\n  (?=[\\s;]|(?<![-*])-\\*-).*?-\\*-\n  |\n  # Vim\n  (?:(?:\\s|^)vi(?:m[<=>]?\\d+|m)?|\\sex)(?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s*set?\\s))(?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*[\\s:](?:filetype|ft|syntax)\\s*=\n    ruby\n  (?=\\s|:|$)\n)",
   "patterns": [
     {
+      "name": "meta.class.ruby",
+      "match": "(?x)\n^\\s*(class)\\s+\n(\n  (\n    [.a-zA-Z0-9_:]+\n    (\\s*(\u003c)\\s*[.a-zA-Z0-9_:]+)?   # class A \u003c B\n  )\n  |\n  ((\u003c\u003c)\\s*[.a-zA-Z0-9_:]+)         # class \u003c\u003c C\n)",
       "captures": {
         "1": {
           "name": "keyword.control.class.ruby"
@@ -62,11 +24,11 @@
         "7": {
           "name": "punctuation.definition.variable.ruby"
         }
-      },
-      "match": "(?x)\n^\\s*(class)\\s+\n(\n  (\n    [.a-zA-Z0-9_:]+\n    (\\s*(<)\\s*[.a-zA-Z0-9_:]+)?   # class A < B\n  )\n  |\n  ((<<)\\s*[.a-zA-Z0-9_:]+)         # class << C\n)",
-      "name": "meta.class.ruby"
+      }
     },
     {
+      "name": "meta.module.ruby",
+      "match": "(?x)\n^\\s*(module)\\s+\n(\n  ([A-Z]\\w*(::))?\n  ([A-Z]\\w*(::))?\n  ([A-Z]\\w*(::))*\n  [A-Z]\\w*\n)",
       "captures": {
         "1": {
           "name": "keyword.control.module.ruby"
@@ -92,180 +54,155 @@
         "8": {
           "name": "punctuation.separator.inheritance.ruby"
         }
-      },
-      "match": "(?x)\n^\\s*(module)\\s+\n(\n  ([A-Z]\\w*(::))?\n  ([A-Z]\\w*(::))?\n  ([A-Z]\\w*(::))*\n  [A-Z]\\w*\n)",
-      "name": "meta.module.ruby"
+      }
     },
     {
-      "comment": "else if is a common mistake carried over from other languages. it works if you put in a second end, but it’s never what you want.",
-      "match": "(?<!\\.)\\belse(\\s)+if\\b",
-      "name": "invalid.deprecated.ruby"
+      "name": "invalid.deprecated.ruby",
+      "match": "(?\u003c!\\.)\\belse(\\s)+if\\b"
     },
     {
+      "name": "constant.other.symbol.hashkey.ruby",
+      "match": "(?\u003e[a-zA-Z_]\\w*(?\u003e[?!])?)(:)(?!:)",
       "captures": {
         "1": {
           "name": "punctuation.definition.constant.hashkey.ruby"
         }
-      },
-      "comment": "symbols as hash key (1.9 syntax)",
-      "match": "(?>[a-zA-Z_]\\w*(?>[?!])?)(:)(?!:)",
-      "name": "constant.other.symbol.hashkey.ruby"
+      }
     },
     {
+      "name": "constant.other.symbol.hashkey.ruby",
+      "match": "(?\u003c!:)(:)(?\u003e[a-zA-Z_]\\w*(?\u003e[?!])?)(?=\\s*=\u003e)",
       "captures": {
         "1": {
           "name": "punctuation.definition.constant.ruby"
         }
-      },
-      "comment": "symbols as hash key (1.8 syntax)",
-      "match": "(?<!:)(:)(?>[a-zA-Z_]\\w*(?>[?!])?)(?=\\s*=>)",
-      "name": "constant.other.symbol.hashkey.ruby"
+      }
     },
     {
-      "comment": "everything being a reserved word, not a value and needing a 'end' is a..",
-      "match": "(?<!\\.)\\b(BEGIN|begin|case|class|else|elsif|END|end|ensure|for|if|in|module|rescue|then|unless|until|when|while)\\b(?![?!])",
-      "name": "keyword.control.ruby"
+      "name": "keyword.control.ruby",
+      "match": "(?\u003c!\\.)\\b(BEGIN|begin|case|class|else|elsif|END|end|ensure|for|if|in|module|rescue|then|unless|until|when|while)\\b(?![?!])"
     },
     {
-      "comment": "contextual smart pair support for block parameters",
-      "match": "(?<!\\.)\\bdo\\b",
-      "name": "keyword.control.start-block.ruby"
+      "name": "keyword.control.start-block.ruby",
+      "match": "(?\u003c!\\.)\\bdo\\b"
     },
     {
-      "comment": "contextual smart pair support",
-      "match": "(?<={)(\\s+)",
-      "name": "meta.syntax.ruby.start-block"
+      "name": "meta.syntax.ruby.start-block",
+      "match": "(?\u003c={)(\\s+)"
     },
     {
-      "match": "(?<!\\.)\\b(alias|alias_method|break|next|redo|retry|return|super|undef|yield)\\b(?![?!])|\\bdefined\\?|\\b(block_given|iterator)\\?",
-      "name": "keyword.control.pseudo-method.ruby"
+      "name": "keyword.control.pseudo-method.ruby",
+      "match": "(?\u003c!\\.)\\b(alias|alias_method|break|next|redo|retry|return|super|undef|yield)\\b(?![?!])|\\bdefined\\?|\\b(block_given|iterator)\\?"
     },
     {
-      "match": "\\bnil\\b(?![?!])",
-      "name": "constant.language.nil.ruby"
+      "name": "constant.language.nil.ruby",
+      "match": "\\bnil\\b(?![?!])"
     },
     {
-      "match": "\\b(true|false)\\b(?![?!])",
-      "name": "constant.language.boolean.ruby"
+      "name": "constant.language.boolean.ruby",
+      "match": "\\b(true|false)\\b(?![?!])"
     },
     {
-      "match": "\\b(__(FILE|LINE)__)\\b(?![?!])",
-      "name": "variable.language.ruby"
+      "name": "variable.language.ruby",
+      "match": "\\b(__(FILE|LINE)__)\\b(?![?!])"
     },
     {
-      "match": "\\bself\\b(?![?!])",
-      "name": "variable.language.self.ruby"
+      "name": "variable.language.self.ruby",
+      "match": "\\bself\\b(?![?!])"
     },
     {
-      "comment": " everything being a method but having a special function is a..",
-      "match": "\\b(initialize|new|loop|include|extend|prepend|raise|fail|attr_reader|attr_writer|attr_accessor|attr|catch|throw|private|private_class_method|module_function|public|public_class_method|protected|refine|using)\\b(?![?!])",
-      "name": "keyword.other.special-method.ruby"
+      "name": "keyword.other.special-method.ruby",
+      "match": "\\b(initialize|new|loop|include|extend|prepend|raise|fail|attr_reader|attr_writer|attr_accessor|attr|catch|throw|private|private_class_method|module_function|public|public_class_method|protected|refine|using)\\b(?![?!])"
     },
     {
-      "begin": "\\b(?<!\\.|::)(require|require_relative)\\b(?![?!])",
-      "captures": {
-        "1": {
-          "name": "keyword.other.special-method.ruby"
-        }
-      },
-      "end": "$|(?=#|})",
       "name": "meta.require.ruby",
+      "begin": "\\b(?\u003c!\\.|::)(require|require_relative)\\b(?![?!])",
+      "end": "$|(?=#|})",
       "patterns": [
         {
           "include": "$self"
         }
-      ]
+      ],
+      "captures": {
+        "1": {
+          "name": "keyword.other.special-method.ruby"
+        }
+      }
     },
     {
+      "name": "variable.other.readwrite.instance.ruby",
+      "match": "(@)[a-zA-Z_]\\w*",
       "captures": {
         "1": {
           "name": "punctuation.definition.variable.ruby"
         }
-      },
-      "match": "(@)[a-zA-Z_]\\w*",
-      "name": "variable.other.readwrite.instance.ruby"
+      }
     },
     {
+      "name": "variable.other.readwrite.class.ruby",
+      "match": "(@@)[a-zA-Z_]\\w*",
       "captures": {
         "1": {
           "name": "punctuation.definition.variable.ruby"
         }
-      },
-      "match": "(@@)[a-zA-Z_]\\w*",
-      "name": "variable.other.readwrite.class.ruby"
+      }
     },
     {
+      "name": "variable.other.readwrite.global.ruby",
+      "match": "(\\$)[a-zA-Z_]\\w*",
       "captures": {
         "1": {
           "name": "punctuation.definition.variable.ruby"
         }
-      },
-      "match": "(\\$)[a-zA-Z_]\\w*",
-      "name": "variable.other.readwrite.global.ruby"
+      }
     },
     {
+      "name": "variable.other.readwrite.global.pre-defined.ruby",
+      "match": "(\\$)(!|@|\u0026|`|'|\\+|\\d+|~|=|/|\\\\|,|;|\\.|\u003c|\u003e|_|\\*|\\$|\\?|:|\"|-[0adFiIlpv])",
       "captures": {
         "1": {
           "name": "punctuation.definition.variable.ruby"
         }
-      },
-      "match": "(\\$)(!|@|&|`|'|\\+|\\d+|~|=|/|\\\\|,|;|\\.|<|>|_|\\*|\\$|\\?|:|\"|-[0adFiIlpv])",
-      "name": "variable.other.readwrite.global.pre-defined.ruby"
+      }
     },
     {
+      "name": "meta.environment-variable.ruby",
       "begin": "\\b(ENV)\\[",
-      "beginCaptures": {
-        "1": {
-          "name": "variable.other.constant.ruby"
-        }
-      },
       "end": "]",
-      "name": "meta.environment-variable.ruby",
       "patterns": [
         {
           "include": "$self"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "variable.other.constant.ruby"
+        }
+      }
     },
     {
-      "match": "\\b[A-Z]\\w*(?=((\\.|::)[A-Za-z]|\\[))",
-      "name": "support.class.ruby"
+      "name": "support.class.ruby",
+      "match": "\\b[A-Z]\\w*(?=((\\.|::)[A-Za-z]|\\[))"
     },
     {
-      "match": "\\b((abort|at_exit|autoload|binding|callcc|caller|caller_locations|chomp|chop|eval|exec|exit|fork|format|gets|global_variables|gsub|lambda|load|local_variables|open|p|print|printf|proc|putc|puts|rand|readline|readlines|select|set_trace_func|sleep|spawn|sprintf|srand|sub|syscall|system|test|trace_var|trap|untrace_var|warn)\\b(?![?!])|autoload\\?|exit!)",
-      "name": "support.function.kernel.ruby"
+      "name": "support.function.kernel.ruby",
+      "match": "\\b((abort|at_exit|autoload|binding|callcc|caller|caller_locations|chomp|chop|eval|exec|exit|fork|format|gets|global_variables|gsub|lambda|load|local_variables|open|p|print|printf|proc|putc|puts|rand|readline|readlines|select|set_trace_func|sleep|spawn|sprintf|srand|sub|syscall|system|test|trace_var|trap|untrace_var|warn)\\b(?![?!])|autoload\\?|exit!)"
     },
     {
-      "match": "\\b[_A-Z]\\w*\\b",
-      "name": "variable.other.constant.ruby"
+      "name": "variable.other.constant.ruby",
+      "match": "\\b[_A-Z]\\w*\\b"
     },
     {
-      "begin": "(?x)\n(?=def\\b)                          # optimization to help Oniguruma fail fast\n(?<=^|\\s)(def)\\s+\n(\n  (?>[a-zA-Z_]\\w*(?>\\.|::))?      # method prefix\n  (?>                               # method name\n    [a-zA-Z_]\\w*(?>[?!]|=(?!>))?\n    |\n    ===?|!=|>[>=]?|<=>|<[<=]?|[%&`/\\|]|\\*\\*?|=?~|[-+]@?|\\[]=?\n  )\n)\n\\s*(\\()",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.control.def.ruby"
-        },
-        "2": {
-          "name": "entity.name.function.ruby"
-        },
-        "3": {
-          "name": "punctuation.definition.parameters.ruby"
-        }
-      },
-      "comment": "The method pattern comes from the symbol pattern. See there for an explanation.",
-      "end": "\\)",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.parameters.ruby"
-        }
-      },
       "name": "meta.function.method.with-arguments.ruby",
+      "begin": "(?x)\n(?=def\\b)                          # optimization to help Oniguruma fail fast\n(?\u003c=^|\\s)(def)\\s+\n(\n  (?\u003e[a-zA-Z_]\\w*(?\u003e\\.|::))?      # method prefix\n  (?\u003e                               # method name\n    [a-zA-Z_]\\w*(?\u003e[?!]|=(?!\u003e))?\n    |\n    ===?|!=|\u003e[\u003e=]?|\u003c=\u003e|\u003c[\u003c=]?|[%\u0026`/\\|]|\\*\\*?|=?~|[-+]@?|\\[]=?\n  )\n)\n\\s*(\\()",
+      "end": "\\)",
       "patterns": [
         {
           "begin": "(?![\\s,)])",
           "end": "(?=,|\\)\\s*$)",
           "patterns": [
             {
+              "match": "\\G([\u0026*]?)(?:([_a-zA-Z]\\w*(:))|([_a-zA-Z]\\w*))",
               "captures": {
                 "1": {
                   "name": "storage.type.variable.ruby"
@@ -279,35 +216,42 @@
                 "4": {
                   "name": "variable.parameter.function.ruby"
                 }
-              },
-              "match": "\\G([&*]?)(?:([_a-zA-Z]\\w*(:))|([_a-zA-Z]\\w*))"
+              }
             },
             {
               "include": "$self"
             }
           ]
         }
-      ]
-    },
-    {
-      "begin": "(?x)\n(?=def\\b)                          # optimization to help Oniguruma fail fast\n(?<=^|\\s)(def)\\s+\n(\n  (?>[a-zA-Z_]\\w*(?>\\.|::))?      # method prefix\n  (?>                               # method name\n    [a-zA-Z_]\\w*(?>[?!]|=(?!>))?\n    |\n    ===?|!=|>[>=]?|<=>|<[<=]?|[%&`/\\|]|\\*\\*?|=?~|[-+]@?|\\[]=?\n  )\n)\n[ \\t]\n(?=[ \\t]*[^\\s#;])                 # make sure the following is not comment",
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.control.def.ruby"
         },
         "2": {
           "name": "entity.name.function.ruby"
+        },
+        "3": {
+          "name": "punctuation.definition.parameters.ruby"
         }
       },
-      "comment": "same as the previous rule, but without parentheses around the arguments",
-      "end": "$",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.parameters.ruby"
+        }
+      }
+    },
+    {
       "name": "meta.function.method.with-arguments.ruby",
+      "begin": "(?x)\n(?=def\\b)                          # optimization to help Oniguruma fail fast\n(?\u003c=^|\\s)(def)\\s+\n(\n  (?\u003e[a-zA-Z_]\\w*(?\u003e\\.|::))?      # method prefix\n  (?\u003e                               # method name\n    [a-zA-Z_]\\w*(?\u003e[?!]|=(?!\u003e))?\n    |\n    ===?|!=|\u003e[\u003e=]?|\u003c=\u003e|\u003c[\u003c=]?|[%\u0026`/\\|]|\\*\\*?|=?~|[-+]@?|\\[]=?\n  )\n)\n[ \\t]\n(?=[ \\t]*[^\\s#;])                 # make sure the following is not comment",
+      "end": "$",
       "patterns": [
         {
           "begin": "(?![\\s,])",
           "end": "(?=,|$)",
           "patterns": [
             {
+              "match": "\\G([\u0026*]?)(?:([_a-zA-Z]\\w*(:))|([_a-zA-Z]\\w*))",
               "captures": {
                 "1": {
                   "name": "storage.type.variable.ruby"
@@ -321,17 +265,26 @@
                 "4": {
                   "name": "variable.parameter.function.ruby"
                 }
-              },
-              "match": "\\G([&*]?)(?:([_a-zA-Z]\\w*(:))|([_a-zA-Z]\\w*))"
+              }
             },
             {
               "include": "$self"
             }
           ]
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.def.ruby"
+        },
+        "2": {
+          "name": "entity.name.function.ruby"
+        }
+      }
     },
     {
+      "name": "meta.function.method.without-arguments.ruby",
+      "match": "(?x)\n(?=def\\b)                            # optimization to help Oniguruma fail fast\n(?\u003c=^|\\s)(def)\\b\n(\n  \\s+\n  (\n    (?\u003e[a-zA-Z_]\\w*(?\u003e\\.|::))?      # method prefix\n    (?\u003e                               # method name\n      [a-zA-Z_]\\w*(?\u003e[?!]|=(?!\u003e))?\n      |\n      ===?|!=|\u003e[\u003e=]?|\u003c=\u003e|\u003c[\u003c=]?|[%\u0026`/\\|]|\\*\\*?|=?~|[-+]@?|\\[]=?\n    )\n  )\n)?",
       "captures": {
         "1": {
           "name": "keyword.control.def.ruby"
@@ -339,52 +292,37 @@
         "3": {
           "name": "entity.name.function.ruby"
         }
-      },
-      "comment": " the optional name is just to catch the def also without a method-name",
-      "match": "(?x)\n(?=def\\b)                            # optimization to help Oniguruma fail fast\n(?<=^|\\s)(def)\\b\n(\n  \\s+\n  (\n    (?>[a-zA-Z_]\\w*(?>\\.|::))?      # method prefix\n    (?>                               # method name\n      [a-zA-Z_]\\w*(?>[?!]|=(?!>))?\n      |\n      ===?|!=|>[>=]?|<=>|<[<=]?|[%&`/\\|]|\\*\\*?|=?~|[-+]@?|\\[]=?\n    )\n  )\n)?",
-      "name": "meta.function.method.without-arguments.ruby"
+      }
     },
     {
-      "match": "(?x)\n\\b\n(\n  [\\d](?>_?\\d)*                             # 100_000\n  (\\.(?![^[:space:][:digit:]])(?>_?\\d)*)?   # fractional part\n  ([eE][-+]?\\d(?>_?\\d)*)?                   # 1.23e-4\n  |\n  0\n  (?:\n    [xX]\\h(?>_?\\h)*|\n    [oO]?[0-7](?>_?[0-7])*|\n    [bB][01](?>_?[01])*|\n    [dD]\\d(?>_?\\d)*\n  )                                           # A base indicator can only be used with an integer\n)\\b",
-      "name": "constant.numeric.ruby"
+      "name": "constant.numeric.ruby",
+      "match": "(?x)\n\\b\n(\n  [\\d](?\u003e_?\\d)*                             # 100_000\n  (\\.(?![^[:space:][:digit:]])(?\u003e_?\\d)*)?   # fractional part\n  ([eE][-+]?\\d(?\u003e_?\\d)*)?                   # 1.23e-4\n  |\n  0\n  (?:\n    [xX][[:xdigit:]](?\u003e_?[[:xdigit:]])*|\n    [oO]?[0-7](?\u003e_?[0-7])*|\n    [bB][01](?\u003e_?[01])*|\n    [dD]\\d(?\u003e_?\\d)*\n  )                                           # A base indicator can only be used with an integer\n)\\b"
     },
     {
+      "name": "constant.other.symbol.ruby",
       "begin": ":'",
+      "end": "'",
+      "patterns": [
+        {
+          "name": "constant.character.escape.ruby",
+          "match": "\\\\['\\\\]"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.symbol.begin.ruby"
         }
       },
-      "comment": "symbol literal with '' delimitor",
-      "end": "'",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.symbol.end.ruby"
         }
-      },
-      "name": "constant.other.symbol.ruby",
-      "patterns": [
-        {
-          "match": "\\\\['\\\\]",
-          "name": "constant.character.escape.ruby"
-        }
-      ]
+      }
     },
     {
+      "name": "constant.other.symbol.interpolated.ruby",
       "begin": ":\"",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.section.symbol.begin.ruby"
-        }
-      },
-      "comment": "symbol literal with \"\" delimitor",
       "end": "\"",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.section.symbol.end.ruby"
-        }
-      },
-      "name": "constant.other.symbol.interpolated.ruby",
       "patterns": [
         {
           "include": "#interpolated_ruby"
@@ -392,50 +330,47 @@
         {
           "include": "#escaped_char"
         }
-      ]
-    },
-    {
-      "comment": "Needs higher precidence than regular expressions.",
-      "match": "(?<!\\()/=",
-      "name": "keyword.operator.assignment.augmented.ruby"
-    },
-    {
-      "begin": "'",
+      ],
       "beginCaptures": {
         "0": {
-          "name": "punctuation.definition.string.begin.ruby"
+          "name": "punctuation.section.symbol.begin.ruby"
         }
       },
-      "comment": "string literal with '' delimitor",
-      "end": "'",
       "endCaptures": {
         "0": {
-          "name": "punctuation.definition.string.end.ruby"
+          "name": "punctuation.section.symbol.end.ruby"
         }
-      },
+      }
+    },
+    {
+      "name": "keyword.operator.assignment.augmented.ruby",
+      "match": "(?\u003c!\\()/="
+    },
+    {
       "name": "string.quoted.single.ruby",
+      "begin": "'",
+      "end": "'",
       "patterns": [
         {
-          "match": "\\\\'|\\\\\\\\",
-          "name": "constant.character.escape.ruby"
+          "name": "constant.character.escape.ruby",
+          "match": "\\\\'|\\\\\\\\"
         }
-      ]
-    },
-    {
-      "begin": "\"",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.ruby"
         }
       },
-      "comment": "string literal with interpolation and \"\" delimitor",
-      "end": "\"",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "string.quoted.double.interpolated.ruby",
+      "begin": "\"",
+      "end": "\"",
       "patterns": [
         {
           "include": "#interpolated_ruby"
@@ -443,23 +378,22 @@
         {
           "include": "#escaped_char"
         }
-      ]
-    },
-    {
-      "begin": "`",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.ruby"
         }
       },
-      "comment": "execute string (allows for interpolation)",
-      "end": "`",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "string.interpolated.ruby",
+      "begin": "`",
+      "end": "`",
       "patterns": [
         {
           "include": "#interpolated_ruby"
@@ -467,10 +401,27 @@
         {
           "include": "#escaped_char"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.ruby"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.ruby"
+        }
+      }
     },
     {
-      "begin": "(?x)\n(?<![\\w)])((/))(?![?*+])\n(?=\n  (?:\\\\/|[^/])*+          # Do NOT change the order\n  /[eimnosux]*\\s*\n  (?:\n    [)\\]}#.,?:]|\\|\\||&&|<=>|=>|==|=~|!~|!=|;|$|\n    if|else|elsif|then|do|end|unless|while|until|or|and\n  )\n  |\n  $\n)",
+      "contentName": "string.regexp.interpolated.ruby",
+      "begin": "(?x)\n(?\u003c![\\w)])((/))(?![?*+])\n(?=\n  (?:\\\\/|[^/])*+          # Do NOT change the order\n  /[eimnosux]*\\s*\n  (?:\n    [)\\]}#.,?:]|\\|\\||\u0026\u0026|\u003c=\u003e|=\u003e|==|=~|!~|!=|;|$|\n    if|else|elsif|then|do|end|unless|while|until|or|and\n  )\n  |\n  $\n)",
+      "end": "((/[eimnosux]*))",
+      "patterns": [
+        {
+          "include": "#regex_sub"
+        }
+      ],
       "captures": {
         "1": {
           "name": "string.regexp.interpolated.ruby"
@@ -478,30 +429,12 @@
         "2": {
           "name": "punctuation.section.regexp.ruby"
         }
-      },
-      "comment": "regular expression literal with interpolation",
-      "contentName": "string.regexp.interpolated.ruby",
-      "end": "((/[eimnosux]*))",
-      "patterns": [
-        {
-          "include": "#regex_sub"
-        }
-      ]
+      }
     },
     {
+      "name": "string.regexp.interpolated.ruby",
       "begin": "%r{",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.section.regexp.begin.ruby"
-        }
-      },
       "end": "}[eimnosux]*",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.section.regexp.end.ruby"
-        }
-      },
-      "name": "string.regexp.interpolated.ruby",
       "patterns": [
         {
           "include": "#regex_sub"
@@ -509,22 +442,22 @@
         {
           "include": "#nest_curly_r"
         }
-      ]
-    },
-    {
-      "begin": "%r\\[",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.regexp.begin.ruby"
         }
       },
-      "end": "][eimnosux]*",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.regexp.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "string.regexp.interpolated.ruby",
+      "begin": "%r\\[",
+      "end": "][eimnosux]*",
       "patterns": [
         {
           "include": "#regex_sub"
@@ -532,22 +465,22 @@
         {
           "include": "#nest_brackets_r"
         }
-      ]
-    },
-    {
-      "begin": "%r\\(",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.regexp.begin.ruby"
         }
       },
-      "end": "\\)[eimnosux]*",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.regexp.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "string.regexp.interpolated.ruby",
+      "begin": "%r\\(",
+      "end": "\\)[eimnosux]*",
       "patterns": [
         {
           "include": "#regex_sub"
@@ -555,22 +488,22 @@
         {
           "include": "#nest_parens_r"
         }
-      ]
-    },
-    {
-      "begin": "%r<",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.regexp.begin.ruby"
         }
       },
-      "end": ">[eimnosux]*",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.regexp.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "string.regexp.interpolated.ruby",
+      "begin": "%r\u003c",
+      "end": "\u003e[eimnosux]*",
       "patterns": [
         {
           "include": "#regex_sub"
@@ -578,42 +511,42 @@
         {
           "include": "#nest_ltgt_r"
         }
-      ]
-    },
-    {
-      "begin": "%r([^\\w])",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.regexp.begin.ruby"
         }
       },
-      "end": "\\1[eimnosux]*",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.regexp.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "string.regexp.interpolated.ruby",
+      "begin": "%r([^\\w])",
+      "end": "\\1[eimnosux]*",
       "patterns": [
         {
           "include": "#regex_sub"
         }
-      ]
-    },
-    {
-      "begin": "%I\\[",
+      ],
       "beginCaptures": {
         "0": {
-          "name": "punctuation.section.array.begin.ruby"
+          "name": "punctuation.section.regexp.begin.ruby"
         }
       },
-      "end": "]",
       "endCaptures": {
         "0": {
-          "name": "punctuation.section.array.end.ruby"
+          "name": "punctuation.section.regexp.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "constant.other.symbol.interpolated.ruby",
+      "begin": "%I\\[",
+      "end": "]",
       "patterns": [
         {
           "include": "#interpolated_ruby"
@@ -624,22 +557,22 @@
         {
           "include": "#nest_brackets_i"
         }
-      ]
-    },
-    {
-      "begin": "%I\\(",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.array.begin.ruby"
         }
       },
-      "end": "\\)",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.array.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "constant.other.symbol.interpolated.ruby",
+      "begin": "%I\\(",
+      "end": "\\)",
       "patterns": [
         {
           "include": "#interpolated_ruby"
@@ -650,22 +583,22 @@
         {
           "include": "#nest_parens_i"
         }
-      ]
-    },
-    {
-      "begin": "%I<",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.array.begin.ruby"
         }
       },
-      "end": ">",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.array.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "constant.other.symbol.interpolated.ruby",
+      "begin": "%I\u003c",
+      "end": "\u003e",
       "patterns": [
         {
           "include": "#interpolated_ruby"
@@ -676,22 +609,22 @@
         {
           "include": "#nest_ltgt_i"
         }
-      ]
-    },
-    {
-      "begin": "%I{",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.array.begin.ruby"
         }
       },
-      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.array.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "constant.other.symbol.interpolated.ruby",
+      "begin": "%I{",
+      "end": "}",
       "patterns": [
         {
           "include": "#interpolated_ruby"
@@ -702,22 +635,22 @@
         {
           "include": "#nest_curly_i"
         }
-      ]
-    },
-    {
-      "begin": "%I([^\\w])",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.array.begin.ruby"
         }
       },
-      "end": "\\1",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.array.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "constant.other.symbol.interpolated.ruby",
+      "begin": "%I([^\\w])",
+      "end": "\\1",
       "patterns": [
         {
           "include": "#interpolated_ruby"
@@ -725,139 +658,138 @@
         {
           "include": "#escaped_char"
         }
-      ]
-    },
-    {
-      "begin": "%i\\[",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.array.begin.ruby"
         }
       },
-      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.array.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "constant.other.symbol.ruby",
+      "begin": "%i\\[",
+      "end": "]",
       "patterns": [
         {
-          "match": "\\\\]|\\\\\\\\",
-          "name": "constant.character.escape.ruby"
+          "name": "constant.character.escape.ruby",
+          "match": "\\\\]|\\\\\\\\"
         },
         {
           "include": "#nest_brackets"
         }
-      ]
-    },
-    {
-      "begin": "%i\\(",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.array.begin.ruby"
         }
       },
-      "end": "\\)",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.array.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "constant.other.symbol.ruby",
+      "begin": "%i\\(",
+      "end": "\\)",
       "patterns": [
         {
-          "match": "\\\\\\)|\\\\\\\\",
-          "name": "constant.character.escape.ruby"
+          "name": "constant.character.escape.ruby",
+          "match": "\\\\\\)|\\\\\\\\"
         },
         {
           "include": "#nest_parens"
         }
-      ]
-    },
-    {
-      "begin": "%i<",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.array.begin.ruby"
         }
       },
-      "end": ">",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.array.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "constant.other.symbol.ruby",
+      "begin": "%i\u003c",
+      "end": "\u003e",
       "patterns": [
         {
-          "match": "\\\\>|\\\\\\\\",
-          "name": "constant.character.escape.ruby"
+          "name": "constant.character.escape.ruby",
+          "match": "\\\\\u003e|\\\\\\\\"
         },
         {
           "include": "#nest_ltgt"
         }
-      ]
-    },
-    {
-      "begin": "%i{",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.array.begin.ruby"
         }
       },
-      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.array.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "constant.other.symbol.ruby",
+      "begin": "%i{",
+      "end": "}",
       "patterns": [
         {
-          "match": "\\\\}|\\\\\\\\",
-          "name": "constant.character.escape.ruby"
+          "name": "constant.character.escape.ruby",
+          "match": "\\\\}|\\\\\\\\"
         },
         {
           "include": "#nest_curly"
         }
-      ]
-    },
-    {
-      "begin": "%i([^\\w])",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.array.begin.ruby"
         }
       },
-      "end": "\\1",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.array.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "constant.other.symbol.ruby",
+      "begin": "%i([^\\w])",
+      "end": "\\1",
       "patterns": [
         {
-          "comment": "Cant be named because its not neccesarily an escape.",
           "match": "\\\\."
         }
-      ]
-    },
-    {
-      "begin": "%W\\[",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.array.begin.ruby"
         }
       },
-      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.array.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "string.quoted.other.interpolated.ruby",
+      "begin": "%W\\[",
+      "end": "]",
       "patterns": [
         {
           "include": "#interpolated_ruby"
@@ -868,22 +800,22 @@
         {
           "include": "#nest_brackets_i"
         }
-      ]
-    },
-    {
-      "begin": "%W\\(",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.array.begin.ruby"
         }
       },
-      "end": "\\)",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.array.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "string.quoted.other.interpolated.ruby",
+      "begin": "%W\\(",
+      "end": "\\)",
       "patterns": [
         {
           "include": "#interpolated_ruby"
@@ -894,22 +826,22 @@
         {
           "include": "#nest_parens_i"
         }
-      ]
-    },
-    {
-      "begin": "%W<",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.array.begin.ruby"
         }
       },
-      "end": ">",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.array.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "string.quoted.other.interpolated.ruby",
+      "begin": "%W\u003c",
+      "end": "\u003e",
       "patterns": [
         {
           "include": "#interpolated_ruby"
@@ -920,22 +852,22 @@
         {
           "include": "#nest_ltgt_i"
         }
-      ]
-    },
-    {
-      "begin": "%W{",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.array.begin.ruby"
         }
       },
-      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.array.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "string.quoted.other.interpolated.ruby",
+      "begin": "%W{",
+      "end": "}",
       "patterns": [
         {
           "include": "#interpolated_ruby"
@@ -946,22 +878,22 @@
         {
           "include": "#nest_curly_i"
         }
-      ]
-    },
-    {
-      "begin": "%W([^\\w])",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.array.begin.ruby"
         }
       },
-      "end": "\\1",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.array.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "string.quoted.other.interpolated.ruby",
+      "begin": "%W([^\\w])",
+      "end": "\\1",
       "patterns": [
         {
           "include": "#interpolated_ruby"
@@ -969,139 +901,138 @@
         {
           "include": "#escaped_char"
         }
-      ]
-    },
-    {
-      "begin": "%w\\[",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.array.begin.ruby"
         }
       },
-      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.array.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "string.quoted.other.ruby",
+      "begin": "%w\\[",
+      "end": "]",
       "patterns": [
         {
-          "match": "\\\\]|\\\\\\\\",
-          "name": "constant.character.escape.ruby"
+          "name": "constant.character.escape.ruby",
+          "match": "\\\\]|\\\\\\\\"
         },
         {
           "include": "#nest_brackets"
         }
-      ]
-    },
-    {
-      "begin": "%w\\(",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.array.begin.ruby"
         }
       },
-      "end": "\\)",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.array.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "string.quoted.other.ruby",
+      "begin": "%w\\(",
+      "end": "\\)",
       "patterns": [
         {
-          "match": "\\\\\\)|\\\\\\\\",
-          "name": "constant.character.escape.ruby"
+          "name": "constant.character.escape.ruby",
+          "match": "\\\\\\)|\\\\\\\\"
         },
         {
           "include": "#nest_parens"
         }
-      ]
-    },
-    {
-      "begin": "%w<",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.array.begin.ruby"
         }
       },
-      "end": ">",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.array.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "string.quoted.other.ruby",
+      "begin": "%w\u003c",
+      "end": "\u003e",
       "patterns": [
         {
-          "match": "\\\\>|\\\\\\\\",
-          "name": "constant.character.escape.ruby"
+          "name": "constant.character.escape.ruby",
+          "match": "\\\\\u003e|\\\\\\\\"
         },
         {
           "include": "#nest_ltgt"
         }
-      ]
-    },
-    {
-      "begin": "%w{",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.array.begin.ruby"
         }
       },
-      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.array.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "string.quoted.other.ruby",
+      "begin": "%w{",
+      "end": "}",
       "patterns": [
         {
-          "match": "\\\\}|\\\\\\\\",
-          "name": "constant.character.escape.ruby"
+          "name": "constant.character.escape.ruby",
+          "match": "\\\\}|\\\\\\\\"
         },
         {
           "include": "#nest_curly"
         }
-      ]
-    },
-    {
-      "begin": "%w([^\\w])",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.array.begin.ruby"
         }
       },
-      "end": "\\1",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.array.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "string.quoted.other.ruby",
+      "begin": "%w([^\\w])",
+      "end": "\\1",
       "patterns": [
         {
-          "comment": "Cant be named because its not neccesarily an escape.",
           "match": "\\\\."
         }
-      ]
-    },
-    {
-      "begin": "%[Qx]?\\(",
+      ],
       "beginCaptures": {
         "0": {
-          "name": "punctuation.definition.string.begin.ruby"
+          "name": "punctuation.section.array.begin.ruby"
         }
       },
-      "end": "\\)",
       "endCaptures": {
         "0": {
-          "name": "punctuation.definition.string.end.ruby"
+          "name": "punctuation.section.array.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "string.quoted.other.interpolated.ruby",
+      "begin": "%[Qx]?\\(",
+      "end": "\\)",
       "patterns": [
         {
           "include": "#interpolated_ruby"
@@ -1112,22 +1043,22 @@
         {
           "include": "#nest_parens_i"
         }
-      ]
-    },
-    {
-      "begin": "%[Qx]?\\[",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.ruby"
         }
       },
-      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "string.quoted.other.interpolated.ruby",
+      "begin": "%[Qx]?\\[",
+      "end": "]",
       "patterns": [
         {
           "include": "#interpolated_ruby"
@@ -1138,22 +1069,22 @@
         {
           "include": "#nest_brackets_i"
         }
-      ]
-    },
-    {
-      "begin": "%[Qx]?{",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.ruby"
         }
       },
-      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "string.quoted.other.interpolated.ruby",
+      "begin": "%[Qx]?{",
+      "end": "}",
       "patterns": [
         {
           "include": "#interpolated_ruby"
@@ -1164,22 +1095,22 @@
         {
           "include": "#nest_curly_i"
         }
-      ]
-    },
-    {
-      "begin": "%[Qx]?<",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.ruby"
         }
       },
-      "end": ">",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "string.quoted.other.interpolated.ruby",
+      "begin": "%[Qx]?\u003c",
+      "end": "\u003e",
       "patterns": [
         {
           "include": "#interpolated_ruby"
@@ -1190,22 +1121,22 @@
         {
           "include": "#nest_ltgt_i"
         }
-      ]
-    },
-    {
-      "begin": "%[Qx]([^\\w])",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.ruby"
         }
       },
-      "end": "\\1",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "string.quoted.other.interpolated.ruby",
+      "begin": "%[Qx]([^\\w])",
+      "end": "\\1",
       "patterns": [
         {
           "include": "#interpolated_ruby"
@@ -1213,361 +1144,354 @@
         {
           "include": "#escaped_char"
         }
-      ]
-    },
-    {
-      "begin": "%([^\\w\\s=])",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.ruby"
         }
       },
-      "end": "\\1",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "string.quoted.other.interpolated.ruby",
-      "patterns": [
+      "begin": "%([^\\w\\s=])",
+      "end": "\\1",
+      "patterns": [
         {
           "include": "#interpolated_ruby"
         },
         {
           "include": "#escaped_char"
         }
-      ]
-    },
-    {
-      "begin": "%q\\(",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.ruby"
         }
       },
-      "end": "\\)",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "string.quoted.other.ruby",
+      "begin": "%q\\(",
+      "end": "\\)",
       "patterns": [
         {
-          "match": "\\\\\\)|\\\\\\\\",
-          "name": "constant.character.escape.ruby"
+          "name": "constant.character.escape.ruby",
+          "match": "\\\\\\)|\\\\\\\\"
         },
         {
           "include": "#nest_parens"
         }
-      ]
-    },
-    {
-      "begin": "%q<",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.ruby"
         }
       },
-      "end": ">",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "string.quoted.other.ruby",
+      "begin": "%q\u003c",
+      "end": "\u003e",
       "patterns": [
         {
-          "match": "\\\\>|\\\\\\\\",
-          "name": "constant.character.escape.ruby"
+          "name": "constant.character.escape.ruby",
+          "match": "\\\\\u003e|\\\\\\\\"
         },
         {
           "include": "#nest_ltgt"
         }
-      ]
-    },
-    {
-      "begin": "%q\\[",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.ruby"
         }
       },
-      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "string.quoted.other.ruby",
+      "begin": "%q\\[",
+      "end": "]",
       "patterns": [
         {
-          "match": "\\\\]|\\\\\\\\",
-          "name": "constant.character.escape.ruby"
+          "name": "constant.character.escape.ruby",
+          "match": "\\\\]|\\\\\\\\"
         },
         {
           "include": "#nest_brackets"
         }
-      ]
-    },
-    {
-      "begin": "%q{",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.ruby"
         }
       },
-      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "string.quoted.other.ruby",
+      "begin": "%q{",
+      "end": "}",
       "patterns": [
         {
-          "match": "\\\\}|\\\\\\\\",
-          "name": "constant.character.escape.ruby"
+          "name": "constant.character.escape.ruby",
+          "match": "\\\\}|\\\\\\\\"
         },
         {
           "include": "#nest_curly"
         }
-      ]
-    },
-    {
-      "begin": "%q([^\\w])",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.ruby"
         }
       },
-      "end": "\\1",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "string.quoted.other.ruby",
+      "begin": "%q([^\\w])",
+      "end": "\\1",
       "patterns": [
         {
-          "comment": "Cant be named because its not neccesarily an escape.",
           "match": "\\\\."
         }
-      ]
-    },
-    {
-      "begin": "%s\\(",
+      ],
       "beginCaptures": {
         "0": {
-          "name": "punctuation.definition.symbol.begin.ruby"
+          "name": "punctuation.definition.string.begin.ruby"
         }
       },
-      "end": "\\)",
       "endCaptures": {
         "0": {
-          "name": "punctuation.definition.symbol.end.ruby"
+          "name": "punctuation.definition.string.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "constant.other.symbol.ruby",
+      "begin": "%s\\(",
+      "end": "\\)",
       "patterns": [
         {
-          "match": "\\\\\\)|\\\\\\\\",
-          "name": "constant.character.escape.ruby"
+          "name": "constant.character.escape.ruby",
+          "match": "\\\\\\)|\\\\\\\\"
         },
         {
           "include": "#nest_parens"
         }
-      ]
-    },
-    {
-      "begin": "%s<",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.symbol.begin.ruby"
         }
       },
-      "end": ">",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.symbol.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "constant.other.symbol.ruby",
+      "begin": "%s\u003c",
+      "end": "\u003e",
       "patterns": [
         {
-          "match": "\\\\>|\\\\\\\\",
-          "name": "constant.character.escape.ruby"
+          "name": "constant.character.escape.ruby",
+          "match": "\\\\\u003e|\\\\\\\\"
         },
         {
           "include": "#nest_ltgt"
         }
-      ]
-    },
-    {
-      "begin": "%s\\[",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.symbol.begin.ruby"
         }
       },
-      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.symbol.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "constant.other.symbol.ruby",
+      "begin": "%s\\[",
+      "end": "]",
       "patterns": [
         {
-          "match": "\\\\]|\\\\\\\\",
-          "name": "constant.character.escape.ruby"
+          "name": "constant.character.escape.ruby",
+          "match": "\\\\]|\\\\\\\\"
         },
         {
           "include": "#nest_brackets"
         }
-      ]
-    },
-    {
-      "begin": "%s{",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.symbol.begin.ruby"
         }
       },
-      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.symbol.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "constant.other.symbol.ruby",
+      "begin": "%s{",
+      "end": "}",
       "patterns": [
         {
-          "match": "\\\\}|\\\\\\\\",
-          "name": "constant.character.escape.ruby"
+          "name": "constant.character.escape.ruby",
+          "match": "\\\\}|\\\\\\\\"
         },
         {
           "include": "#nest_curly"
         }
-      ]
-    },
-    {
-      "begin": "%s([^\\w])",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.symbol.begin.ruby"
         }
       },
-      "end": "\\1",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.symbol.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "constant.other.symbol.ruby",
+      "begin": "%s([^\\w])",
+      "end": "\\1",
       "patterns": [
         {
-          "comment": "Cant be named because its not neccesarily an escape.",
           "match": "\\\\."
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.symbol.begin.ruby"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.symbol.end.ruby"
+        }
+      }
     },
     {
+      "name": "constant.other.symbol.ruby",
+      "match": "(?x)\n(?\u003c!:)(:)\n(?\u003e\n  [$a-zA-Z_]\\w*(?\u003e[?!]|=(?![\u003e=]))?\n  |\n  ===?|\u003c=\u003e|\u003e[\u003e=]?|\u003c[\u003c=]?|[%\u0026`/\\|]|\\*\\*?|=?~|[-+]@?|\\[]=?\n  |\n  @@?[a-zA-Z_]\\w*\n)",
       "captures": {
         "1": {
           "name": "punctuation.definition.constant.ruby"
         }
-      },
-      "comment": "symbols",
-      "match": "(?x)\n(?<!:)(:)\n(?>\n  [$a-zA-Z_]\\w*(?>[?!]|=(?![>=]))?\n  |\n  ===?|<=>|>[>=]?|<[<=]?|[%&`/\\|]|\\*\\*?|=?~|[-+]@?|\\[]=?\n  |\n  @@?[a-zA-Z_]\\w*\n)",
-      "name": "constant.other.symbol.ruby"
+      }
     },
     {
+      "name": "comment.block.documentation.ruby",
       "begin": "^=begin",
+      "end": "^=end",
       "captures": {
         "0": {
           "name": "punctuation.definition.comment.ruby"
         }
-      },
-      "comment": "multiline comments",
-      "end": "^=end",
-      "name": "comment.block.documentation.ruby"
+      }
     },
     {
       "begin": "(^[ \\t]+)?(?=#)",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.whitespace.comment.leading.ruby"
-        }
-      },
       "end": "(?!\\G)",
       "patterns": [
         {
+          "name": "comment.line.number-sign.ruby",
           "begin": "#",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.comment.ruby"
-            }
-          },
           "end": "\\n",
-          "name": "comment.line.number-sign.ruby",
           "patterns": [
             {
               "include": "#yard"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.comment.ruby"
+            }
+          }
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.comment.leading.ruby"
+        }
+      }
     },
     {
-      "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 (2nd alternation = octal):\n\t\t\t?\\0      ?\\07     ?\\017\n\n\t\t\texamples (3rd alternation = escaped):\n\t\t\t?\\n      ?\\b\n\n\t\t\texamples (4th alternation = meta-ctrl):\n\t\t\t?\\C-a    ?\\M-a    ?\\C-\\M-\\C-\\M-a\n\n\t\t\texamples (4th alternation = normal):\n\t\t\t?a       ?A       ?0 \n\t\t\t?*       ?\"       ?( \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\\h{1,2}(?!\\h)\\b|0[0-7]{0,2}(?![0-7])\\b|[^x0MC])|(\\\\[MC]-)+\\w|[^\\s\\\\])",
-      "name": "constant.numeric.ruby"
+      "name": "constant.numeric.ruby",
+      "match": "(?\u003c!\\w)\\?(\\\\(x[[:xdigit:]]{1,2}(?![[:xdigit:]])\\b|0[0-7]{0,2}(?![0-7])\\b|[^x0MC])|(\\\\[MC]-)+\\w|[^\\s\\\\])"
     },
     {
-      "begin": "^__END__\\n",
-      "captures": {
-        "0": {
-          "name": "string.unquoted.program-block.ruby"
-        }
-      },
-      "comment": "__END__ marker",
       "contentName": "text.plain",
+      "begin": "^__END__\\n",
       "end": "(?=not)impossible",
       "patterns": [
         {
-          "begin": "(?=<?xml|<(?i:html\\b)|!DOCTYPE (?i:html\\b))",
-          "end": "(?=not)impossible",
           "name": "text.html.embedded.ruby",
+          "begin": "(?=\u003c?xml|\u003c(?i:html\\b)|!DOCTYPE (?i:html\\b))",
+          "end": "(?=not)impossible",
           "patterns": [
             {
               "include": "text.html.basic"
             }
           ]
         }
-      ]
+      ],
+      "captures": {
+        "0": {
+          "name": "string.unquoted.program-block.ruby"
+        }
+      }
     },
     {
-      "begin": "(?=(?><<[-~](\"?)((?:[_\\w]+_|)HTML)\\b\\1))",
-      "comment": "Heredoc with embedded html",
-      "end": "(?!\\G)",
       "name": "meta.embedded.block.html",
+      "begin": "(?=(?\u003e\u003c\u003c[-~](\"?)((?:[_\\w]+_|)HTML)\\b\\1))",
+      "end": "(?!\\G)",
       "patterns": [
         {
-          "begin": "(?><<[-~](\"?)((?:[_\\w]+_|)HTML)\\b\\1)",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.begin.ruby"
-            }
-          },
+          "name": "string.unquoted.heredoc.ruby",
           "contentName": "text.html",
+          "begin": "(?\u003e\u003c\u003c[-~](\"?)((?:[_\\w]+_|)HTML)\\b\\1)",
           "end": "^\\s*\\2$\\n?",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.end.ruby"
-            }
-          },
-          "name": "string.unquoted.heredoc.ruby",
           "patterns": [
             {
               "include": "#heredoc"
@@ -1581,31 +1505,30 @@
             {
               "include": "#escaped_char"
             }
-          ]
-        }
-      ]
-    },
-    {
-      "begin": "(?=(?><<[-~](\"?)((?:[_\\w]+_|)XML)\\b\\1))",
-      "comment": "Heredoc with embedded xml",
-      "end": "(?!\\G)",
-      "name": "meta.embedded.block.xml",
-      "patterns": [
-        {
-          "begin": "(?><<[-~](\"?)((?:[_\\w]+_|)XML)\\b\\1)",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.ruby"
             }
           },
-          "contentName": "text.xml",
-          "end": "^\\s*\\2$\\n?",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.ruby"
             }
-          },
+          }
+        }
+      ]
+    },
+    {
+      "name": "meta.embedded.block.xml",
+      "begin": "(?=(?\u003e\u003c\u003c[-~](\"?)((?:[_\\w]+_|)XML)\\b\\1))",
+      "end": "(?!\\G)",
+      "patterns": [
+        {
           "name": "string.unquoted.heredoc.ruby",
+          "contentName": "text.xml",
+          "begin": "(?\u003e\u003c\u003c[-~](\"?)((?:[_\\w]+_|)XML)\\b\\1)",
+          "end": "^\\s*\\2$\\n?",
           "patterns": [
             {
               "include": "#heredoc"
@@ -1619,31 +1542,30 @@
             {
               "include": "#escaped_char"
             }
-          ]
-        }
-      ]
-    },
-    {
-      "begin": "(?=(?><<[-~](\"?)((?:[_\\w]+_|)SQL)\\b\\1))",
-      "comment": "Heredoc with embedded sql",
-      "end": "(?!\\G)",
-      "name": "meta.embedded.block.sql",
-      "patterns": [
-        {
-          "begin": "(?><<[-~](\"?)((?:[_\\w]+_|)SQL)\\b\\1)",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.ruby"
             }
           },
-          "contentName": "source.sql",
-          "end": "^\\s*\\2$\\n?",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.ruby"
             }
-          },
+          }
+        }
+      ]
+    },
+    {
+      "name": "meta.embedded.block.sql",
+      "begin": "(?=(?\u003e\u003c\u003c[-~](\"?)((?:[_\\w]+_|)SQL)\\b\\1))",
+      "end": "(?!\\G)",
+      "patterns": [
+        {
           "name": "string.unquoted.heredoc.ruby",
+          "contentName": "source.sql",
+          "begin": "(?\u003e\u003c\u003c[-~](\"?)((?:[_\\w]+_|)SQL)\\b\\1)",
+          "end": "^\\s*\\2$\\n?",
           "patterns": [
             {
               "include": "#heredoc"
@@ -1657,31 +1579,30 @@
             {
               "include": "#escaped_char"
             }
-          ]
-        }
-      ]
-    },
-    {
-      "begin": "(?=(?><<[-~](\"?)((?:[_\\w]+_|)GRAPHQL)\\b\\1))",
-      "comment": "Heredoc with embedded GraphQL",
-      "end": "(?!\\G)",
-      "name": "meta.embedded.block.graphql",
-      "patterns": [
-        {
-          "begin": "(?><<[-~](\"?)((?:[_\\w]+_|)GRAPHQL)\\b\\1)",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.ruby"
             }
           },
-          "contentName": "source.graphql",
-          "end": "^\\s*\\2$\\n?",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.ruby"
             }
-          },
+          }
+        }
+      ]
+    },
+    {
+      "name": "meta.embedded.block.graphql",
+      "begin": "(?=(?\u003e\u003c\u003c[-~](\"?)((?:[_\\w]+_|)GRAPHQL)\\b\\1))",
+      "end": "(?!\\G)",
+      "patterns": [
+        {
           "name": "string.unquoted.heredoc.ruby",
+          "contentName": "source.graphql",
+          "begin": "(?\u003e\u003c\u003c[-~](\"?)((?:[_\\w]+_|)GRAPHQL)\\b\\1)",
+          "end": "^\\s*\\2$\\n?",
           "patterns": [
             {
               "include": "#heredoc"
@@ -1695,31 +1616,30 @@
             {
               "include": "#escaped_char"
             }
-          ]
-        }
-      ]
-    },
-    {
-      "begin": "(?=(?><<[-~](\"?)((?:[_\\w]+_|)CSS)\\b\\1))",
-      "comment": "Heredoc with embedded css",
-      "end": "(?!\\G)",
-      "name": "meta.embedded.block.css",
-      "patterns": [
-        {
-          "begin": "(?><<[-~](\"?)((?:[_\\w]+_|)CSS)\\b\\1)",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.ruby"
             }
           },
-          "contentName": "source.css",
-          "end": "^\\s*\\2$\\n?",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.ruby"
             }
-          },
+          }
+        }
+      ]
+    },
+    {
+      "name": "meta.embedded.block.css",
+      "begin": "(?=(?\u003e\u003c\u003c[-~](\"?)((?:[_\\w]+_|)CSS)\\b\\1))",
+      "end": "(?!\\G)",
+      "patterns": [
+        {
           "name": "string.unquoted.heredoc.ruby",
+          "contentName": "source.css",
+          "begin": "(?\u003e\u003c\u003c[-~](\"?)((?:[_\\w]+_|)CSS)\\b\\1)",
+          "end": "^\\s*\\2$\\n?",
           "patterns": [
             {
               "include": "#heredoc"
@@ -1733,31 +1653,30 @@
             {
               "include": "#escaped_char"
             }
-          ]
-        }
-      ]
-    },
-    {
-      "begin": "(?=(?><<[-~](\"?)((?:[_\\w]+_|)CPP)\\b\\1))",
-      "comment": "Heredoc with embedded c++",
-      "end": "(?!\\G)",
-      "name": "meta.embedded.block.cpp",
-      "patterns": [
-        {
-          "begin": "(?><<[-~](\"?)((?:[_\\w]+_|)CPP)\\b\\1)",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.ruby"
             }
           },
-          "contentName": "source.cpp",
-          "end": "^\\s*\\2$\\n?",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.ruby"
             }
-          },
+          }
+        }
+      ]
+    },
+    {
+      "name": "meta.embedded.block.cpp",
+      "begin": "(?=(?\u003e\u003c\u003c[-~](\"?)((?:[_\\w]+_|)CPP)\\b\\1))",
+      "end": "(?!\\G)",
+      "patterns": [
+        {
           "name": "string.unquoted.heredoc.ruby",
+          "contentName": "source.cpp",
+          "begin": "(?\u003e\u003c\u003c[-~](\"?)((?:[_\\w]+_|)CPP)\\b\\1)",
+          "end": "^\\s*\\2$\\n?",
           "patterns": [
             {
               "include": "#heredoc"
@@ -1766,36 +1685,35 @@
               "include": "#interpolated_ruby"
             },
             {
-              "include": "source.cpp"
+              "include": "source.c++"
             },
             {
               "include": "#escaped_char"
             }
-          ]
-        }
-      ]
-    },
-    {
-      "begin": "(?=(?><<[-~](\"?)((?:[_\\w]+_|)C)\\b\\1))",
-      "comment": "Heredoc with embedded c",
-      "end": "(?!\\G)",
-      "name": "meta.embedded.block.c",
-      "patterns": [
-        {
-          "begin": "(?><<[-~](\"?)((?:[_\\w]+_|)C)\\b\\1)",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.ruby"
             }
           },
-          "contentName": "source.c",
-          "end": "^\\s*\\2$\\n?",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.ruby"
             }
-          },
+          }
+        }
+      ]
+    },
+    {
+      "name": "meta.embedded.block.c",
+      "begin": "(?=(?\u003e\u003c\u003c[-~](\"?)((?:[_\\w]+_|)C)\\b\\1))",
+      "end": "(?!\\G)",
+      "patterns": [
+        {
           "name": "string.unquoted.heredoc.ruby",
+          "contentName": "source.c",
+          "begin": "(?\u003e\u003c\u003c[-~](\"?)((?:[_\\w]+_|)C)\\b\\1)",
+          "end": "^\\s*\\2$\\n?",
           "patterns": [
             {
               "include": "#heredoc"
@@ -1809,31 +1727,30 @@
             {
               "include": "#escaped_char"
             }
-          ]
-        }
-      ]
-    },
-    {
-      "begin": "(?=(?><<[-~](\"?)((?:[_\\w]+_|)(?:JS|JAVASCRIPT))\\b\\1))",
-      "comment": "Heredoc with embedded javascript",
-      "end": "(?!\\G)",
-      "name": "meta.embedded.block.js",
-      "patterns": [
-        {
-          "begin": "(?><<[-~](\"?)((?:[_\\w]+_|)(?:JS|JAVASCRIPT))\\b\\1)",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.ruby"
             }
           },
-          "contentName": "source.js",
-          "end": "^\\s*\\2$\\n?",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.ruby"
             }
-          },
+          }
+        }
+      ]
+    },
+    {
+      "name": "meta.embedded.block.js",
+      "begin": "(?=(?\u003e\u003c\u003c[-~](\"?)((?:[_\\w]+_|)(?:JS|JAVASCRIPT))\\b\\1))",
+      "end": "(?!\\G)",
+      "patterns": [
+        {
           "name": "string.unquoted.heredoc.ruby",
+          "contentName": "source.js",
+          "begin": "(?\u003e\u003c\u003c[-~](\"?)((?:[_\\w]+_|)(?:JS|JAVASCRIPT))\\b\\1)",
+          "end": "^\\s*\\2$\\n?",
           "patterns": [
             {
               "include": "#heredoc"
@@ -1847,31 +1764,30 @@
             {
               "include": "#escaped_char"
             }
-          ]
-        }
-      ]
-    },
-    {
-      "begin": "(?=(?><<[-~](\"?)((?:[_\\w]+_|)JQUERY)\\b\\1))",
-      "comment": "Heredoc with embedded jQuery javascript",
-      "end": "(?!\\G)",
-      "name": "meta.embedded.block.js.jquery",
-      "patterns": [
-        {
-          "begin": "(?><<[-~](\"?)((?:[_\\w]+_|)JQUERY)\\b\\1)",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.ruby"
             }
           },
-          "contentName": "source.js.jquery",
-          "end": "^\\s*\\2$\\n?",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.ruby"
             }
-          },
+          }
+        }
+      ]
+    },
+    {
+      "name": "meta.embedded.block.js.jquery",
+      "begin": "(?=(?\u003e\u003c\u003c[-~](\"?)((?:[_\\w]+_|)JQUERY)\\b\\1))",
+      "end": "(?!\\G)",
+      "patterns": [
+        {
           "name": "string.unquoted.heredoc.ruby",
+          "contentName": "source.js.jquery",
+          "begin": "(?\u003e\u003c\u003c[-~](\"?)((?:[_\\w]+_|)JQUERY)\\b\\1)",
+          "end": "^\\s*\\2$\\n?",
           "patterns": [
             {
               "include": "#heredoc"
@@ -1879,37 +1795,34 @@
             {
               "include": "#interpolated_ruby"
             },
-            {
-              "include": "source.js.jquery"
-            },
+            {},
             {
               "include": "#escaped_char"
             }
-          ]
-        }
-      ]
-    },
-    {
-      "begin": "(?=(?><<[-~](\"?)((?:[_\\w]+_|)(?:SH|SHELL))\\b\\1))",
-      "comment": "Heredoc with embedded shell",
-      "end": "(?!\\G)",
-      "name": "meta.embedded.block.shell",
-      "patterns": [
-        {
-          "begin": "(?><<[-~](\"?)((?:[_\\w]+_|)(?:SH|SHELL))\\b\\1)",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.ruby"
             }
           },
-          "contentName": "source.shell",
-          "end": "^\\s*\\2$\\n?",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.ruby"
             }
-          },
+          }
+        }
+      ]
+    },
+    {
+      "name": "meta.embedded.block.shell",
+      "begin": "(?=(?\u003e\u003c\u003c[-~](\"?)((?:[_\\w]+_|)(?:SH|SHELL))\\b\\1))",
+      "end": "(?!\\G)",
+      "patterns": [
+        {
           "name": "string.unquoted.heredoc.ruby",
+          "contentName": "source.shell",
+          "begin": "(?\u003e\u003c\u003c[-~](\"?)((?:[_\\w]+_|)(?:SH|SHELL))\\b\\1)",
+          "end": "^\\s*\\2$\\n?",
           "patterns": [
             {
               "include": "#heredoc"
@@ -1923,31 +1836,30 @@
             {
               "include": "#escaped_char"
             }
-          ]
-        }
-      ]
-    },
-    {
-      "begin": "(?=(?><<[-~](\"?)((?:[_\\w]+_|)LUA)\\b\\1))",
-      "comment": "Heredoc with embedded lua",
-      "end": "(?!\\G)",
-      "name": "meta.embedded.block.lua",
-      "patterns": [
-        {
-          "begin": "(?><<[-~](\"?)((?:[_\\w]+_|)LUA)\\b\\1)",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.ruby"
             }
           },
-          "contentName": "source.lua",
-          "end": "^\\s*\\2$\\n?",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.ruby"
             }
-          },
+          }
+        }
+      ]
+    },
+    {
+      "name": "meta.embedded.block.lua",
+      "begin": "(?=(?\u003e\u003c\u003c[-~](\"?)((?:[_\\w]+_|)LUA)\\b\\1))",
+      "end": "(?!\\G)",
+      "patterns": [
+        {
           "name": "string.unquoted.heredoc.ruby",
+          "contentName": "source.lua",
+          "begin": "(?\u003e\u003c\u003c[-~](\"?)((?:[_\\w]+_|)LUA)\\b\\1)",
+          "end": "^\\s*\\2$\\n?",
           "patterns": [
             {
               "include": "#heredoc"
@@ -1961,31 +1873,30 @@
             {
               "include": "#escaped_char"
             }
-          ]
-        }
-      ]
-    },
-    {
-      "begin": "(?=(?><<[-~](\"?)((?:[_\\w]+_|)RUBY)\\b\\1))",
-      "comment": "Heredoc with embedded ruby",
-      "end": "(?!\\G)",
-      "name": "meta.embedded.block.ruby",
-      "patterns": [
-        {
-          "begin": "(?><<[-~](\"?)((?:[_\\w]+_|)RUBY)\\b\\1)",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.ruby"
             }
           },
-          "contentName": "source.ruby",
-          "end": "^\\s*\\2$\\n?",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.ruby"
             }
-          },
+          }
+        }
+      ]
+    },
+    {
+      "name": "meta.embedded.block.ruby",
+      "begin": "(?=(?\u003e\u003c\u003c[-~](\"?)((?:[_\\w]+_|)RUBY)\\b\\1))",
+      "end": "(?!\\G)",
+      "patterns": [
+        {
           "name": "string.unquoted.heredoc.ruby",
+          "contentName": "source.ruby",
+          "begin": "(?\u003e\u003c\u003c[-~](\"?)((?:[_\\w]+_|)RUBY)\\b\\1)",
+          "end": "^\\s*\\2$\\n?",
           "patterns": [
             {
               "include": "#heredoc"
@@ -1999,24 +1910,24 @@
             {
               "include": "#escaped_char"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.ruby"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.end.ruby"
+            }
+          }
         }
       ]
     },
     {
-      "begin": "(?>=\\s*<<(\\w+))",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.begin.ruby"
-        }
-      },
-      "end": "^\\1$",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.end.ruby"
-        }
-      },
       "name": "string.unquoted.heredoc.ruby",
+      "begin": "(?\u003e=\\s*\u003c\u003c(\\w+))",
+      "end": "^\\1$",
       "patterns": [
         {
           "include": "#heredoc"
@@ -2027,23 +1938,22 @@
         {
           "include": "#escaped_char"
         }
-      ]
-    },
-    {
-      "begin": "(?>((<<[-~](\\w+),\\s?)*<<[-~](\\w+)))",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.ruby"
         }
       },
-      "comment": "heredoc with multiple inputs and indented terminator",
-      "end": "^\\s*\\4$",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.ruby"
         }
-      },
+      }
+    },
+    {
       "name": "string.unquoted.heredoc.ruby",
+      "begin": "(?\u003e((\u003c\u003c[-~](\\w+),\\s?)*\u003c\u003c[-~](\\w+)))",
+      "end": "^\\s*\\4$",
       "patterns": [
         {
           "include": "#heredoc"
@@ -2054,57 +1964,66 @@
         {
           "include": "#escaped_char"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.ruby"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.ruby"
+        }
+      }
     },
     {
-      "begin": "(?<={|{\\s|[^A-Za-z0-9_]do|^do|[^A-Za-z0-9_]do\\s|^do\\s)(\\|)",
-      "captures": {
-        "1": {
-          "name": "punctuation.separator.variable.ruby"
-        }
-      },
-      "end": "(?<!\\|)(\\|)(?!\\|)",
+      "begin": "(?\u003c={|{\\s|[^A-Za-z0-9_]do|^do|[^A-Za-z0-9_]do\\s|^do\\s)(\\|)",
+      "end": "(?\u003c!\\|)(\\|)(?!\\|)",
       "patterns": [
         {
           "include": "source.ruby"
         },
         {
-          "match": "[_a-zA-Z][_a-zA-Z0-9]*",
-          "name": "variable.other.block.ruby"
+          "name": "variable.other.block.ruby",
+          "match": "[_a-zA-Z][_a-zA-Z0-9]*"
         },
         {
-          "match": ",",
+          "name": "punctuation.separator.variable.ruby",
+          "match": ","
+        }
+      ],
+      "captures": {
+        "1": {
           "name": "punctuation.separator.variable.ruby"
         }
-      ]
+      }
     },
     {
-      "match": "=>",
-      "name": "punctuation.separator.key-value"
+      "name": "punctuation.separator.key-value",
+      "match": "=\u003e"
     },
     {
-      "match": "->",
-      "name": "support.function.kernel.ruby"
+      "name": "support.function.kernel.ruby",
+      "match": "-\u003e"
     },
     {
-      "match": "<<=|%=|&{1,2}=|\\*=|\\*\\*=|\\+=|-=|\\^=|\\|{1,2}=|<<",
-      "name": "keyword.operator.assignment.augmented.ruby"
+      "name": "keyword.operator.assignment.augmented.ruby",
+      "match": "\u003c\u003c=|%=|\u0026{1,2}=|\\*=|\\*\\*=|\\+=|-=|\\^=|\\|{1,2}=|\u003c\u003c"
     },
     {
-      "match": "<=>|<(?!<|=)|>(?!<|=|>)|<=|>=|===|==|=~|!=|!~|(?<=[ \\t])\\?",
-      "name": "keyword.operator.comparison.ruby"
+      "name": "keyword.operator.comparison.ruby",
+      "match": "\u003c=\u003e|\u003c(?!\u003c|=)|\u003e(?!\u003c|=|\u003e)|\u003c=|\u003e=|===|==|=~|!=|!~|(?\u003c=[ \\t])\\?"
     },
     {
-      "match": "(?<!\\.)\\b(and|not|or)\\b(?![?!])",
-      "name": "keyword.operator.logical.ruby"
+      "name": "keyword.operator.logical.ruby",
+      "match": "(?\u003c!\\.)\\b(and|not|or)\\b(?![?!])"
     },
     {
-      "match": "(?<=^|[ \\t])!|&&|\\|\\||\\^",
-      "name": "keyword.operator.logical.ruby"
+      "name": "keyword.operator.logical.ruby",
+      "match": "(?\u003c=^|[ \\t])!|\u0026\u0026|\\|\\||\\^"
     },
     {
-      "comment": "Safe navigation operator",
-      "match": "(&\\.)\\s*(?![A-Z])",
+      "match": "(\u0026\\.)\\s*(?![A-Z])",
       "captures": {
         "1": {
           "name": "punctuation.separator.method.ruby"
@@ -2112,27 +2031,26 @@
       }
     },
     {
-      "match": "(%|&|\\*\\*|\\*|\\+|-|/)",
-      "name": "keyword.operator.arithmetic.ruby"
+      "name": "keyword.operator.arithmetic.ruby",
+      "match": "(%|\u0026|\\*\\*|\\*|\\+|-|/)"
     },
     {
-      "match": "=",
-      "name": "keyword.operator.assignment.ruby"
+      "name": "keyword.operator.assignment.ruby",
+      "match": "="
     },
     {
-      "match": "\\||~|>>",
-      "name": "keyword.operator.other.ruby"
+      "name": "keyword.operator.other.ruby",
+      "match": "\\||~|\u003e\u003e"
     },
     {
-      "match": ";",
-      "name": "punctuation.separator.statement.ruby"
+      "name": "punctuation.separator.statement.ruby",
+      "match": ";"
     },
     {
-      "match": ",",
-      "name": "punctuation.separator.object.ruby"
+      "name": "punctuation.separator.object.ruby",
+      "match": ","
     },
     {
-      "comment": "Mark as namespace separator if double colons followed by capital letter",
       "match": "(::)\\s*(?=[A-Z])",
       "captures": {
         "1": {
@@ -2141,7 +2059,6 @@
       }
     },
     {
-      "comment": "Mark as method separator if double colons not followed by capital letter",
       "match": "(\\.|::)\\s*(?![A-Z])",
       "captures": {
         "1": {
@@ -2150,38 +2067,37 @@
       }
     },
     {
-      "comment": "Must come after method and constant separators to prefer double colons",
-      "match": ":",
-      "name": "punctuation.separator.other.ruby"
+      "name": "punctuation.separator.other.ruby",
+      "match": ":"
     },
     {
-      "match": "{",
-      "name": "punctuation.section.scope.begin.ruby"
+      "name": "punctuation.section.scope.begin.ruby",
+      "match": "{"
     },
     {
-      "match": "}",
-      "name": "punctuation.section.scope.end.ruby"
+      "name": "punctuation.section.scope.end.ruby",
+      "match": "}"
     },
     {
-      "match": "\\[",
-      "name": "punctuation.section.array.begin.ruby"
+      "name": "punctuation.section.array.begin.ruby",
+      "match": "\\["
     },
     {
-      "match": "]",
-      "name": "punctuation.section.array.end.ruby"
+      "name": "punctuation.section.array.end.ruby",
+      "match": "]"
     },
     {
-      "match": "\\(|\\)",
-      "name": "punctuation.section.function.ruby"
+      "name": "punctuation.section.function.ruby",
+      "match": "\\(|\\)"
     }
   ],
   "repository": {
     "escaped_char": {
-      "match": "\\\\(?:[0-7]{1,3}|x[\\da-fA-F]{1,2}|.)",
-      "name": "constant.character.escape.ruby"
+      "name": "constant.character.escape.ruby",
+      "match": "\\\\(?:[0-7]{1,3}|x[\\da-fA-F]{1,2}|.)"
     },
     "heredoc": {
-      "begin": "^<<[-~]?\\w+",
+      "begin": "^\u003c\u003c[-~]?\\w+",
       "end": "$",
       "patterns": [
         {
@@ -2192,79 +2108,74 @@
     "interpolated_ruby": {
       "patterns": [
         {
+          "name": "meta.embedded.line.ruby",
+          "contentName": "source.ruby",
           "begin": "#{",
+          "end": "}",
+          "patterns": [
+            {
+              "include": "#nest_curly_and_self"
+            },
+            {
+              "include": "$self"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.embedded.begin.ruby"
             }
           },
-          "contentName": "source.ruby",
-          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.embedded.end.ruby"
             }
-          },
-          "name": "meta.embedded.line.ruby",
-          "patterns": [
-            {
-              "include": "#nest_curly_and_self"
-            },
-            {
-              "include": "$self"
-            }
-          ]
+          }
         },
         {
+          "name": "variable.other.readwrite.instance.ruby",
+          "match": "(#@)[a-zA-Z_]\\w*",
           "captures": {
             "1": {
               "name": "punctuation.definition.variable.ruby"
             }
-          },
-          "match": "(#@)[a-zA-Z_]\\w*",
-          "name": "variable.other.readwrite.instance.ruby"
+          }
         },
         {
+          "name": "variable.other.readwrite.class.ruby",
+          "match": "(#@@)[a-zA-Z_]\\w*",
           "captures": {
             "1": {
               "name": "punctuation.definition.variable.ruby"
             }
-          },
-          "match": "(#@@)[a-zA-Z_]\\w*",
-          "name": "variable.other.readwrite.class.ruby"
+          }
         },
         {
+          "name": "variable.other.readwrite.global.ruby",
+          "match": "(#\\$)[a-zA-Z_]\\w*",
           "captures": {
             "1": {
               "name": "punctuation.definition.variable.ruby"
             }
-          },
-          "match": "(#\\$)[a-zA-Z_]\\w*",
-          "name": "variable.other.readwrite.global.ruby"
+          }
         }
       ]
     },
     "nest_brackets": {
       "begin": "\\[",
-      "captures": {
-        "0": {
-          "name": "punctuation.section.scope.ruby"
-        }
-      },
       "end": "]",
       "patterns": [
         {
           "include": "#nest_brackets"
         }
-      ]
-    },
-    "nest_brackets_i": {
-      "begin": "\\[",
+      ],
       "captures": {
         "0": {
           "name": "punctuation.section.scope.ruby"
         }
-      },
+      }
+    },
+    "nest_brackets_i": {
+      "begin": "\\[",
       "end": "]",
       "patterns": [
         {
@@ -2276,15 +2187,15 @@
         {
           "include": "#nest_brackets_i"
         }
-      ]
-    },
-    "nest_brackets_r": {
-      "begin": "\\[",
+      ],
       "captures": {
         "0": {
           "name": "punctuation.section.scope.ruby"
         }
-      },
+      }
+    },
+    "nest_brackets_r": {
+      "begin": "\\[",
       "end": "]",
       "patterns": [
         {
@@ -2293,37 +2204,42 @@
         {
           "include": "#nest_brackets_r"
         }
-      ]
-    },
-    "nest_curly": {
-      "begin": "{",
+      ],
       "captures": {
         "0": {
           "name": "punctuation.section.scope.ruby"
         }
-      },
+      }
+    },
+    "nest_curly": {
+      "begin": "{",
       "end": "}",
       "patterns": [
         {
           "include": "#nest_curly"
         }
-      ]
+      ],
+      "captures": {
+        "0": {
+          "name": "punctuation.section.scope.ruby"
+        }
+      }
     },
     "nest_curly_and_self": {
       "patterns": [
         {
           "begin": "{",
-          "captures": {
-            "0": {
-              "name": "punctuation.section.scope.ruby"
-            }
-          },
           "end": "}",
           "patterns": [
             {
               "include": "#nest_curly_and_self"
             }
-          ]
+          ],
+          "captures": {
+            "0": {
+              "name": "punctuation.section.scope.ruby"
+            }
+          }
         },
         {
           "include": "$self"
@@ -2332,11 +2248,6 @@
     },
     "nest_curly_i": {
       "begin": "{",
-      "captures": {
-        "0": {
-          "name": "punctuation.section.scope.ruby"
-        }
-      },
       "end": "}",
       "patterns": [
         {
@@ -2348,15 +2259,15 @@
         {
           "include": "#nest_curly_i"
         }
-      ]
-    },
-    "nest_curly_r": {
-      "begin": "{",
+      ],
       "captures": {
         "0": {
           "name": "punctuation.section.scope.ruby"
         }
-      },
+      }
+    },
+    "nest_curly_r": {
+      "begin": "{",
       "end": "}",
       "patterns": [
         {
@@ -2365,30 +2276,30 @@
         {
           "include": "#nest_curly_r"
         }
-      ]
-    },
-    "nest_ltgt": {
-      "begin": "<",
+      ],
       "captures": {
         "0": {
           "name": "punctuation.section.scope.ruby"
         }
-      },
-      "end": ">",
+      }
+    },
+    "nest_ltgt": {
+      "begin": "\u003c",
+      "end": "\u003e",
       "patterns": [
         {
           "include": "#nest_ltgt"
         }
-      ]
-    },
-    "nest_ltgt_i": {
-      "begin": "<",
+      ],
       "captures": {
         "0": {
           "name": "punctuation.section.scope.ruby"
         }
-      },
-      "end": ">",
+      }
+    },
+    "nest_ltgt_i": {
+      "begin": "\u003c",
+      "end": "\u003e",
       "patterns": [
         {
           "include": "#interpolated_ruby"
@@ -2399,16 +2310,16 @@
         {
           "include": "#nest_ltgt_i"
         }
-      ]
-    },
-    "nest_ltgt_r": {
-      "begin": "<",
+      ],
       "captures": {
         "0": {
           "name": "punctuation.section.scope.ruby"
         }
-      },
-      "end": ">",
+      }
+    },
+    "nest_ltgt_r": {
+      "begin": "\u003c",
+      "end": "\u003e",
       "patterns": [
         {
           "include": "#regex_sub"
@@ -2416,29 +2327,29 @@
         {
           "include": "#nest_ltgt_r"
         }
-      ]
-    },
-    "nest_parens": {
-      "begin": "\\(",
+      ],
       "captures": {
         "0": {
           "name": "punctuation.section.scope.ruby"
         }
-      },
+      }
+    },
+    "nest_parens": {
+      "begin": "\\(",
       "end": "\\)",
       "patterns": [
         {
           "include": "#nest_parens"
         }
-      ]
-    },
-    "nest_parens_i": {
-      "begin": "\\(",
+      ],
       "captures": {
         "0": {
           "name": "punctuation.section.scope.ruby"
         }
-      },
+      }
+    },
+    "nest_parens_i": {
+      "begin": "\\(",
       "end": "\\)",
       "patterns": [
         {
@@ -2450,15 +2361,15 @@
         {
           "include": "#nest_parens_i"
         }
-      ]
-    },
-    "nest_parens_r": {
-      "begin": "\\(",
+      ],
       "captures": {
         "0": {
           "name": "punctuation.section.scope.ruby"
         }
-      },
+      }
+    },
+    "nest_parens_r": {
+      "begin": "\\(",
       "end": "\\)",
       "patterns": [
         {
@@ -2467,7 +2378,12 @@
         {
           "include": "#nest_parens_r"
         }
-      ]
+      ],
+      "captures": {
+        "0": {
+          "name": "punctuation.section.scope.ruby"
+        }
+      }
     },
     "regex_sub": {
       "patterns": [
@@ -2478,6 +2394,8 @@
           "include": "#escaped_char"
         },
         {
+          "name": "string.regexp.arbitrary-repetition.ruby",
+          "match": "({)\\d+(,\\d+)?(})",
           "captures": {
             "1": {
               "name": "punctuation.definition.arbitrary-repetition.ruby"
@@ -2485,75 +2403,72 @@
             "3": {
               "name": "punctuation.definition.arbitrary-repetition.ruby"
             }
-          },
-          "match": "({)\\d+(,\\d+)?(})",
-          "name": "string.regexp.arbitrary-repetition.ruby"
+          }
         },
         {
+          "name": "string.regexp.character-class.ruby",
           "begin": "\\[(?:\\^?])?",
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.character-class.ruby"
-            }
-          },
           "end": "]",
-          "name": "string.regexp.character-class.ruby",
           "patterns": [
             {
               "include": "#escaped_char"
             }
-          ]
+          ],
+          "captures": {
+            "0": {
+              "name": "punctuation.definition.character-class.ruby"
+            }
+          }
         },
         {
+          "name": "comment.line.number-sign.ruby",
           "begin": "\\(\\?#",
+          "end": "\\)",
+          "patterns": [
+            {
+              "include": "#escaped_char"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.begin.ruby"
             }
           },
-          "end": "\\)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.comment.end.ruby"
             }
-          },
-          "name": "comment.line.number-sign.ruby",
-          "patterns": [
-            {
-              "include": "#escaped_char"
-            }
-          ]
+          }
         },
         {
+          "name": "string.regexp.group.ruby",
           "begin": "\\(",
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.group.ruby"
-            }
-          },
           "end": "\\)",
-          "name": "string.regexp.group.ruby",
           "patterns": [
             {
               "include": "#regex_sub"
             }
-          ]
+          ],
+          "captures": {
+            "0": {
+              "name": "punctuation.definition.group.ruby"
+            }
+          }
         },
         {
-          "begin": "(?<=^|\\s)(#)\\s(?=[[a-zA-Z0-9,. \\t?!-][^\\x{00}-\\x{7F}]]*$)",
+          "name": "comment.line.number-sign.ruby",
+          "begin": "(?\u003c=^|\\s)(#)\\s(?=[[a-zA-Z0-9,. \\t?!-][^\\x{00}-\\x{7F}]]*$)",
+          "end": "$\\n?",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.comment.ruby"
             }
           },
-          "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.",
-          "end": "$\\n?",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.comment.ruby"
             }
-          },
-          "name": "comment.line.number-sign.ruby"
+          }
         }
       ]
     },
@@ -2578,7 +2493,6 @@
       ]
     },
     "yard_comment": {
-      "comment": "For YARD tags that follow the tag-comment pattern",
       "match": "(@)(abstract|api|author|deprecated|example|note|overload|since|todo|version)(?=\\s)(.*)$",
       "captures": {
         "1": {
@@ -2592,8 +2506,33 @@
         }
       }
     },
+    "yard_directive": {
+      "match": "(@!)(attribute|endgroup|group|macro|method|parse|scope|visibility)(\\s+((\\[).+(])))?(?=\\s)(.*)$",
+      "captures": {
+        "1": {
+          "name": "comment.line.keyword.punctuation.yard.ruby"
+        },
+        "2": {
+          "name": "comment.line.keyword.yard.ruby"
+        },
+        "3": {
+          "name": "comment.line.yard.ruby"
+        },
+        "4": {
+          "name": "comment.line.type.yard.ruby"
+        },
+        "5": {
+          "name": "comment.line.punctuation.yard.ruby"
+        },
+        "6": {
+          "name": "comment.line.punctuation.yard.ruby"
+        },
+        "7": {
+          "name": "comment.line.string.yard.ruby"
+        }
+      }
+    },
     "yard_name_types": {
-      "comment": "For YARD tags that follow the tag-name-types-comment pattern",
       "match": "(@)(attr|attr_reader|attr_writer|option|param|see|yieldparam)(?=\\s)(\\s+([a-z_][a-zA-Z_]*))?(\\s+((\\[).+(])))?(.*)$",
       "captures": {
         "1": {
@@ -2626,7 +2565,6 @@
       }
     },
     "yard_tag": {
-      "comment": "For YARD tags that are just the tag",
       "match": "(@)(private)$",
       "captures": {
         "1": {
@@ -2638,7 +2576,6 @@
       }
     },
     "yard_types": {
-      "comment": "For YARD tags that follow the tag-types-comment pattern",
       "match": "(@)(raise|return|yield(?:return)?)(?=\\s)(\\s+((\\[).+(])))?(.*)$",
       "captures": {
         "1": {
@@ -2663,33 +2600,6 @@
           "name": "comment.line.string.yard.ruby"
         }
       }
-    },
-    "yard_directive": {
-      "comment": "For YARD directives",
-      "match": "(@!)(attribute|endgroup|group|macro|method|parse|scope|visibility)(\\s+((\\[).+(])))?(?=\\s)(.*)$",
-      "captures": {
-        "1": {
-          "name": "comment.line.keyword.punctuation.yard.ruby"
-        },
-        "2": {
-          "name": "comment.line.keyword.yard.ruby"
-        },
-        "3": {
-          "name": "comment.line.yard.ruby"
-        },
-        "4": {
-          "name": "comment.line.type.yard.ruby"
-        },
-        "5": {
-          "name": "comment.line.punctuation.yard.ruby"
-        },
-        "6": {
-          "name": "comment.line.punctuation.yard.ruby"
-        },
-        "7": {
-          "name": "comment.line.string.yard.ruby"
-        }
-      }
     }
   }
-}
+}