github-linguist 5.3.3 → 6.0.0

data/grammars/source.yaml-ext.json

@@ -1,16 +1,19 @@
 {
-  "scopeName": "source.yaml-ext",
   "name": "YAML-ext",
-  "fileTypes": [
-    ".analysis_options",
-    "pubspec.lock"
-  ],
+  "scopeName": "source.yaml-ext",
   "patterns": [
     {
       "include": "#erb"
     },
     {
-      "begin": "^(\\s*)(?!-\\s*)(\\S+\\s*(:))\\s*(\\||>)",
+      "name": "string.unquoted.block.yaml-ext",
+      "begin": "^(\\s*)(?!-\\s*)(\\S+\\s*(:))\\s*(\\||\u003e)",
+      "end": "^(?!\\1\\s+)(?=\\s*(-|\\S+\\s*:|#))",
+      "patterns": [
+        {
+          "include": "#erb"
+        }
+      ],
       "beginCaptures": {
         "2": {
           "name": "entity.name.tag.yaml-ext"
@@ -18,17 +21,17 @@
         "3": {
           "name": "punctuation.separator.key-value.yaml-ext"
         }
-      },
-      "end": "^(?!\\1\\s+)(?=\\s*(-|\\S+\\s*:|#))",
+      }
+    },
+    {
       "name": "string.unquoted.block.yaml-ext",
+      "begin": "^(\\s*)(?:(-)|(?:(-(\\s*))?(\\S+\\s*(:))))\\s*(\\||\u003e)",
+      "end": "^(?!\\1 \\4\\s+)(?=\\s*(-|\\S+\\s*:|#))",
       "patterns": [
         {
           "include": "#erb"
         }
-      ]
-    },
-    {
-      "begin": "^(\\s*)(?:(-)|(?:(-(\\s*))?(\\S+\\s*(:))))\\s*(\\||>)",
+      ],
       "beginCaptures": {
         "2": {
           "name": "punctuation.definition.entry.yaml-ext"
@@ -42,16 +45,11 @@
         "6": {
           "name": "punctuation.separator.key-value.yaml-ext"
         }
-      },
-      "end": "^(?!\\1 \\4\\s+)(?=\\s*(-|\\S+\\s*:|#))",
-      "name": "string.unquoted.block.yaml-ext",
-      "patterns": [
-        {
-          "include": "#erb"
-        }
-      ]
+      }
     },
     {
+      "name": "constant.numeric.yaml-ext",
+      "match": "(?:(?:(-\\s*)?([^\\s#].*?(:)(?=\\s)))|(-))\\s*((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f)?\\s*($|(?=#)(?!#\\{))",
       "captures": {
         "1": {
           "name": "punctuation.definition.entry.yaml-ext"
@@ -65,26 +63,11 @@
         "4": {
           "name": "punctuation.definition.entry.yaml-ext"
         }
-      },
-      "match": "(?:(?:(-\\s*)?([^\\s#].*?(:)(?=\\s)))|(-))\\s*((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)(L|l|UL|ul|u|U|F|f)?\\s*($|(?=#)(?!#\\{))",
-      "name": "constant.numeric.yaml-ext"
+      }
     },
     {
+      "name": "string.unquoted.yaml-ext",
       "begin": "(?:(?:(-\\s*)?([^\\s#].*?(:)(?=\\s)))|(-))[ \t]*",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.definition.entry.yaml-ext"
-        },
-        "2": {
-          "name": "entity.name.tag.yaml-ext"
-        },
-        "3": {
-          "name": "punctuation.separator.key-value.yaml-ext"
-        },
-        "4": {
-          "name": "punctuation.definition.entry.yaml-ext"
-        }
-      },
       "end": "$|(?=#)(?!#\\{)",
       "patterns": [
         {
@@ -99,12 +82,27 @@
         },
         {
           "name": "string.unquoted.yaml-ext",
-          "match": "[^\"'#\\n]([^#\\n]|((?<!\\s)#))*"
+          "match": "[^\"'#\\n]([^#\\n]|((?\u003c!\\s)#))*"
         }
       ],
-      "name": "string.unquoted.yaml-ext"
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.definition.entry.yaml-ext"
+        },
+        "2": {
+          "name": "entity.name.tag.yaml-ext"
+        },
+        "3": {
+          "name": "punctuation.separator.key-value.yaml-ext"
+        },
+        "4": {
+          "name": "punctuation.definition.entry.yaml-ext"
+        }
+      }
     },
     {
+      "name": "constant.other.date.yaml-ext",
+      "match": "(?:(?:(-\\s*)?(\\w+\\s*(:)))|(-))\\s*([0-9]{4}-[0-9]{2}-[0-9]{2})\\s*($|(?=#)(?!#\\{))",
       "captures": {
         "1": {
           "name": "punctuation.definition.entry.yaml-ext"
@@ -118,11 +116,11 @@
         "4": {
           "name": "punctuation.definition.entry.yaml-ext"
         }
-      },
-      "match": "(?:(?:(-\\s*)?(\\w+\\s*(:)))|(-))\\s*([0-9]{4}-[0-9]{2}-[0-9]{2})\\s*($|(?=#)(?!#\\{))",
-      "name": "constant.other.date.yaml-ext"
+      }
     },
     {
+      "name": "meta.tag.yaml-ext",
+      "match": "(\\w.*?)(:)\\s*((\\!\\!)omap)?",
       "captures": {
         "1": {
           "name": "entity.name.tag.yaml-ext"
@@ -136,18 +134,16 @@
         "4": {
           "name": "punctuation.definition.keyword.yaml-ext"
         }
-      },
-      "match": "(\\w.*?)(:)\\s*((\\!\\!)omap)?",
-      "name": "meta.tag.yaml-ext"
+      }
     },
     {
+      "name": "variable.other.yaml-ext",
+      "match": "(\\\u0026|\\*)\\w.*?$",
       "captures": {
         "1": {
           "name": "punctuation.definition.variable.yaml-ext"
         }
-      },
-      "match": "(\\&|\\*)\\w.*?$",
-      "name": "variable.other.yaml-ext"
+      }
     },
     {
       "include": "#double_quoted_string"
@@ -156,29 +152,31 @@
       "include": "#single_quoted_string"
     },
     {
+      "name": "string.interpolated.yaml-ext",
       "begin": "`",
+      "end": "`",
+      "patterns": [
+        {
+          "include": "#escaped_char"
+        },
+        {
+          "include": "#erb"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.yaml-ext"
         }
       },
-      "end": "`",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.yaml-ext"
         }
-      },
-      "name": "string.interpolated.yaml-ext",
-      "patterns": [
-        {
-          "include": "#escaped_char"
-        },
-        {
-          "include": "#erb"
-        }
-      ]
+      }
     },
     {
+      "name": "keyword.operator.merge-key.yaml-ext",
+      "match": "(\\\u003c\\\u003c): ((\\*).*)$",
       "captures": {
         "1": {
           "name": "entity.name.tag.yaml-ext"
@@ -189,46 +187,45 @@
         "3": {
           "name": "punctuation.definition.keyword.yaml-ext"
         }
-      },
-      "match": "(\\<\\<): ((\\*).*)$",
-      "name": "keyword.operator.merge-key.yaml-ext"
+      }
     },
     {
-      "disabled": "1",
+      "name": "invalid.deprecated.trailing-whitespace.yaml-ext",
       "match": "( |\t)+$",
-      "name": "invalid.deprecated.trailing-whitespace.yaml-ext"
+      "disabled": true
     },
     {
-      "begin": "(^[ \\t]+)?(?<!\\$)(?<=^|[ \\t])(?=#)(?!#\\{)",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.whitespace.comment.leading.yaml-ext"
-        }
-      },
+      "begin": "(^[ \\t]+)?(?\u003c!\\$)(?\u003c=^|[ \\t])(?=#)(?!#\\{)",
       "end": "(?!\\G)",
       "patterns": [
         {
+          "name": "comment.line.number-sign.yaml-ext",
           "begin": "#",
+          "end": "\\n",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.yaml-ext"
             }
-          },
-          "end": "\\n",
-          "name": "comment.line.number-sign.yaml-ext"
+          }
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.comment.leading.yaml-ext"
+        }
+      }
     },
     {
-      "match": "-",
-      "name": "keyword.operator.symbol"
+      "name": "keyword.operator.symbol",
+      "match": "-"
     },
     {
+      "name": "meta.leading-tabs.yaml-ext",
       "begin": "^(?=\\t)",
       "end": "(?=[^\\t])",
-      "name": "meta.leading-tabs.yaml-ext",
       "patterns": [
         {
+          "match": "(\\t)(\\t)?",
           "captures": {
             "1": {
               "name": "meta.odd-tab"
@@ -236,64 +233,74 @@
             "2": {
               "name": "meta.even-tab"
             }
-          },
-          "match": "(\\t)(\\t)?"
+          }
         }
       ]
     }
   ],
   "repository": {
-    "erb": {
-      "begin": "<%+(?!>)=?",
+    "double_quoted_string": {
+      "name": "string.quoted.double.yaml-ext",
+      "begin": "\"",
+      "end": "\"",
+      "patterns": [
+        {
+          "include": "#escaped_char"
+        },
+        {
+          "include": "#erb"
+        }
+      ],
       "beginCaptures": {
         "0": {
-          "name": "punctuation.definition.embedded.begin.ruby"
+          "name": "punctuation.definition.string.begin.yaml-ext"
         }
       },
-      "contentName": "source.ruby.rails",
-      "end": "(%)>",
       "endCaptures": {
         "0": {
-          "name": "punctuation.definition.embedded.end.ruby"
-        },
-        "1": {
-          "name": "source.ruby.rails"
+          "name": "punctuation.definition.string.end.yaml-ext"
         }
-      },
+      }
+    },
+    "erb": {
       "name": "meta.embedded.line.ruby",
+      "contentName": "source.ruby.rails",
+      "begin": "\u003c%+(?!\u003e)=?",
+      "end": "(%)\u003e",
       "patterns": [
         {
+          "name": "comment.line.number-sign.ruby",
+          "match": "(#).*?(?=%\u003e)",
           "captures": {
             "1": {
               "name": "punctuation.definition.comment.ruby"
             }
-          },
-          "match": "(#).*?(?=%>)",
-          "name": "comment.line.number-sign.ruby"
+          }
         },
-        {
-          "include": "source.ruby.rails"
-        }
-      ]
-    },
-    "escaped_char": {
-      "match": "\\\\.",
-      "name": "constant.character.escape.yaml-ext"
-    },
-    "double_quoted_string": {
-      "begin": "\"",
+        {}
+      ],
       "beginCaptures": {
         "0": {
-          "name": "punctuation.definition.string.begin.yaml-ext"
+          "name": "punctuation.definition.embedded.begin.ruby"
         }
       },
-      "end": "\"",
       "endCaptures": {
         "0": {
-          "name": "punctuation.definition.string.end.yaml-ext"
+          "name": "punctuation.definition.embedded.end.ruby"
+        },
+        "1": {
+          "name": "source.ruby.rails"
         }
-      },
-      "name": "string.quoted.double.yaml-ext",
+      }
+    },
+    "escaped_char": {
+      "name": "constant.character.escape.yaml-ext",
+      "match": "\\\\."
+    },
+    "single_quoted_string": {
+      "name": "string.quoted.single.yaml-ext",
+      "begin": "'",
+      "end": "'",
       "patterns": [
         {
           "include": "#escaped_char"
@@ -301,30 +308,17 @@
         {
           "include": "#erb"
         }
-      ]
-    },
-    "single_quoted_string": {
-      "begin": "'",
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.yaml-ext"
         }
       },
-      "end": "'",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.yaml-ext"
         }
-      },
-      "name": "string.quoted.single.yaml-ext",
-      "patterns": [
-        {
-          "include": "#escaped_char"
-        },
-        {
-          "include": "#erb"
-        }
-      ]
+      }
     }
   }
-}
+}

data/grammars/source.yaml.json

@@ -1,23 +1,6 @@
 {
-  "scopeName": "source.yaml",
   "name": "YAML",
-  "fileTypes": [
-    "clang-format",
-    "eslintrc",
-    "eyaml",
-    "eyml",
-    "yaml",
-    "yamllint",
-    "yaml.erb",
-    "yml",
-    "yml.erb",
-    "sls",
-    "stylelintrc",
-    "sublime-syntax",
-    "Boxfile",
-    "ksy"
-  ],
-  "firstLineMatch": "^(#cloud-config|---)",
+  "scopeName": "source.yaml",
   "patterns": [
     {
       "include": "#erb"
@@ -26,19 +9,38 @@
       "include": "#comment"
     },
     {
-      "match": "\\t+",
-      "name": "invalid.illegal.whitespace.yaml"
+      "name": "invalid.illegal.whitespace.yaml",
+      "match": "\\t+"
     },
     {
-      "match": "^---",
-      "name": "punctuation.definition.directives.end.yaml"
+      "name": "punctuation.definition.directives.end.yaml",
+      "match": "^---"
     },
     {
-      "match": "^\\.\\.\\.",
-      "name": "punctuation.definition.document.end.yaml"
+      "name": "punctuation.definition.document.end.yaml",
+      "match": "^\\.\\.\\."
     },
     {
-      "begin": "^(\\s*)(?!-\\s*)([^!@#%&*>,][^#]*\\S)\\s*(:)(?:\\s+((!)[^!\\s]+))?\\s+(?=\\||>)",
+      "contentName": "string.unquoted.block.yaml",
+      "begin": "^(\\s*)(?!-\\s*)([^!@#%\u0026*\u003e,][^#]*\\S)\\s*(:)(?:\\s+((!)[^!\\s]+))?\\s+(?=\\||\u003e)",
+      "end": "^(?!$)(?!\\1\\s+)",
+      "patterns": [
+        {
+          "begin": "\\G",
+          "end": "$",
+          "patterns": [
+            {
+              "include": "#comment"
+            }
+          ]
+        },
+        {
+          "include": "#constants"
+        },
+        {
+          "include": "#erb"
+        }
+      ],
       "beginCaptures": {
         "2": {
           "name": "entity.name.tag.yaml"
@@ -52,9 +54,12 @@
         "5": {
           "name": "punctuation.definition.tag.local.yaml"
         }
-      },
-      "end": "^(?!$)(?!\\1\\s+)",
+      }
+    },
+    {
       "contentName": "string.unquoted.block.yaml",
+      "begin": "^(\\s*)(?:(-)|(?:(?:(-)(\\s*))?([^!@#%\u0026*\u003e,][^#]*\\S)\\s*(:)))(?:\\s+((!)[^!\\s]+))?\\s+(?=\\||\u003e)",
+      "end": "^((?!$)(?!\\1\\s+)|(?=\\s\\4(-|[^\\s!@#%\u0026*\u003e,].*:\\s+)))",
       "patterns": [
         {
           "begin": "\\G",
@@ -71,10 +76,7 @@
         {
           "include": "#erb"
         }
-      ]
-    },
-    {
-      "begin": "^(\\s*)(?:(-)|(?:(?:(-)(\\s*))?([^!@#%&*>,][^#]*\\S)\\s*(:)))(?:\\s+((!)[^!\\s]+))?\\s+(?=\\||>)",
+      ],
       "beginCaptures": {
         "2": {
           "name": "punctuation.definition.entry.yaml"
@@ -94,29 +96,10 @@
         "8": {
           "name": "punctuation.definition.tag.local.yaml"
         }
-      },
-      "end": "^((?!$)(?!\\1\\s+)|(?=\\s\\4(-|[^\\s!@#%&*>,].*:\\s+)))",
-      "contentName": "string.unquoted.block.yaml",
-      "patterns": [
-        {
-          "begin": "\\G",
-          "end": "$",
-          "patterns": [
-            {
-              "include": "#comment"
-            }
-          ]
-        },
-        {
-          "include": "#constants"
-        },
-        {
-          "include": "#erb"
-        }
-      ]
+      }
     },
     {
-      "match": "(<<)\\s*(:)\\s+(.+)$",
+      "match": "(\u003c\u003c)\\s*(:)\\s+(.+)$",
       "captures": {
         "1": {
           "name": "entity.name.tag.merge.yaml"
@@ -134,7 +117,13 @@
       }
     },
     {
-      "begin": "(?>^(\\s*)(-)?\\s*)([^!{@#%&*>,'\"][^#]*?)(:)\\s+((!!)omap)?",
+      "begin": "(?\u003e^(\\s*)(-)?\\s*)([^!{@#%\u0026*\u003e,'\"][^#]*?)(:)\\s+((!!)omap)?",
+      "end": "^((?!\\1\\s+)|(?=\\1\\s*(-|[^!@#%\u0026*\u003e,].*:\\s+|#)))",
+      "patterns": [
+        {
+          "include": "#scalar-content"
+        }
+      ],
       "beginCaptures": {
         "2": {
           "name": "punctuation.definition.entry.yaml"
@@ -151,17 +140,29 @@
         "6": {
           "name": "punctuation.definition.tag.omap.yaml"
         }
-      },
-      "end": "^((?!\\1\\s+)|(?=\\1\\s*(-|[^!@#%&*>,].*:\\s+|#)))",
+      }
+    },
+    {
+      "begin": "^(\\s*)(-)?\\s*(?:((')([^']*?)('))|((\")([^\"]*?)(\")))(:)\\s+((!!)omap)?",
+      "end": "^((?!\\1\\s+)|(?=\\1\\s*(-|[^!@#%\u0026*\u003e,].*:\\s+|#)))",
       "patterns": [
         {
           "include": "#scalar-content"
         }
-      ]
-    },
-    {
-      "begin": "^(\\s*)(-)?\\s*(?:((')([^']*?)('))|((\")([^\"]*?)(\")))(:)\\s+((!!)omap)?",
+      ],
       "beginCaptures": {
+        "10": {
+          "name": "punctuation.definition.string.end.yaml"
+        },
+        "11": {
+          "name": "punctuation.separator.key-value.yaml"
+        },
+        "12": {
+          "name": "keyword.other.omap.yaml"
+        },
+        "13": {
+          "name": "punctuation.definition.tag.omap.yaml"
+        },
         "2": {
           "name": "punctuation.definition.entry.yaml"
         },
@@ -185,29 +186,17 @@
         },
         "9": {
           "name": "entity.name.tag.yaml"
-        },
-        "10": {
-          "name": "punctuation.definition.string.end.yaml"
-        },
-        "11": {
-          "name": "punctuation.separator.key-value.yaml"
-        },
-        "12": {
-          "name": "keyword.other.omap.yaml"
-        },
-        "13": {
-          "name": "punctuation.definition.tag.omap.yaml"
         }
-      },
-      "end": "^((?!\\1\\s+)|(?=\\1\\s*(-|[^!@#%&*>,].*:\\s+|#)))",
+      }
+    },
+    {
+      "begin": "^(\\s*)(-)\\s+(?:((!!)omap)|((!)[^!\\s]+)|(?![!@#%\u0026*\u003e,]))",
+      "end": "^((?!\\1\\s+)|(?=\\1\\s*(-|[^!@#%\u0026*\u003e,].*:\\s+|#)))",
       "patterns": [
         {
           "include": "#scalar-content"
         }
-      ]
-    },
-    {
-      "begin": "^(\\s*)(-)\\s+(?:((!!)omap)|((!)[^!\\s]+)|(?![!@#%&*>,]))",
+      ],
       "beginCaptures": {
         "2": {
           "name": "punctuation.definition.entry.yaml"
@@ -224,13 +213,7 @@
         "6": {
           "name": "punctuation.definition.tag.local.yaml"
         }
-      },
-      "end": "^((?!\\1\\s+)|(?=\\1\\s*(-|[^!@#%&*>,].*:\\s+|#)))",
-      "patterns": [
-        {
-          "include": "#scalar-content"
-        }
-      ]
+      }
     },
     {
       "include": "#variables"
@@ -241,18 +224,18 @@
   ],
   "repository": {
     "comment": {
-      "begin": "(?<=^|\\s)#(?!{)",
+      "name": "comment.line.number-sign.yaml",
+      "begin": "(?\u003c=^|\\s)#(?!{)",
+      "end": "$",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.comment.yaml"
         }
-      },
-      "end": "$",
-      "name": "comment.line.number-sign.yaml"
+      }
     },
     "constants": {
-      "match": "(?<=\\s)(true|false|null|True|False|Null|TRUE|FALSE|NULL|~)(?=\\s*$)",
-      "name": "constant.language.yaml"
+      "name": "constant.language.yaml",
+      "match": "(?\u003c=\\s)(true|false|null|True|False|Null|TRUE|FALSE|NULL|~)(?=\\s*$)"
     },
     "date": {
       "match": "([0-9]{4}-[0-9]{2}-[0-9]{2})\\s*($|(?=#)(?!#{))",
@@ -263,14 +246,27 @@
       }
     },
     "erb": {
-      "begin": "<%+(?!>)=?",
+      "name": "meta.embedded.line.ruby",
+      "contentName": "source.ruby.rails",
+      "begin": "\u003c%+(?!\u003e)=?",
+      "end": "(%)\u003e",
+      "patterns": [
+        {
+          "name": "comment.line.number-sign.ruby",
+          "match": "(#).*?(?=%\u003e)",
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.comment.ruby"
+            }
+          }
+        },
+        {}
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.embedded.begin.ruby"
         }
       },
-      "contentName": "source.ruby.rails",
-      "end": "(%)>",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.embedded.end.ruby"
@@ -278,44 +274,29 @@
         "1": {
           "name": "source.ruby.rails"
         }
-      },
-      "name": "meta.embedded.line.ruby",
-      "patterns": [
-        {
-          "captures": {
-            "1": {
-              "name": "punctuation.definition.comment.ruby"
-            }
-          },
-          "match": "(#).*?(?=%>)",
-          "name": "comment.line.number-sign.ruby"
-        },
-        {
-          "include": "source.ruby.rails"
-        }
-      ]
+      }
     },
     "escaped_char": {
       "patterns": [
         {
-          "match": "\\\\u[A-Fa-f0-9]{4}",
-          "name": "constant.character.escape.yaml"
+          "name": "constant.character.escape.yaml",
+          "match": "\\\\u[A-Fa-f0-9]{4}"
         },
         {
-          "match": "\\\\U[A-Fa-f0-9]{8}",
-          "name": "constant.character.escape.yaml"
+          "name": "constant.character.escape.yaml",
+          "match": "\\\\U[A-Fa-f0-9]{8}"
         },
         {
-          "match": "\\\\x[0-9A-Fa-f]{2}",
-          "name": "constant.character.escape.yaml"
+          "name": "constant.character.escape.yaml",
+          "match": "\\\\x[0-9A-Fa-f]{2}"
         },
         {
-          "match": "\\\\[0abtnvfre \"/\\\\N_LP]",
-          "name": "constant.character.escape.yaml"
+          "name": "constant.character.escape.yaml",
+          "match": "\\\\[0abtnvfre \"/\\\\N_LP]"
         },
         {
-          "match": "\\\\(u.{4}|U.{8}|x.{2}|.)",
-          "name": "invalid.illegal.escape.yaml"
+          "name": "invalid.illegal.escape.yaml",
+          "match": "\\\\(u.{4}|U.{8}|x.{2}|.)"
         }
       ]
     },
@@ -327,22 +308,35 @@
         }
       }
     },
+    "scalar-content": {
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "name": "punctuation.definition.tag.non-specific.yaml",
+          "match": "!(?=\\s)"
+        },
+        {
+          "include": "#constants"
+        },
+        {
+          "include": "#date"
+        },
+        {
+          "include": "#numeric"
+        },
+        {
+          "include": "#strings"
+        }
+      ]
+    },
     "strings": {
       "patterns": [
         {
+          "name": "string.quoted.double.yaml",
           "begin": "\"",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.begin.yaml"
-            }
-          },
           "end": "\"",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.end.yaml"
-            }
-          },
-          "name": "string.quoted.double.yaml",
           "patterns": [
             {
               "include": "#escaped_char"
@@ -350,47 +344,47 @@
             {
               "include": "#erb"
             }
-          ]
-        },
-        {
-          "begin": "'",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.yaml"
             }
           },
-          "end": "'",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.yaml"
             }
-          },
+          }
+        },
+        {
           "name": "string.quoted.single.yaml",
-          "applyEndPatternLast": true,
+          "begin": "'",
+          "end": "'",
           "patterns": [
             {
-              "match": "''",
-              "name": "constant.character.escape.yaml"
+              "name": "constant.character.escape.yaml",
+              "match": "''"
             },
             {
               "include": "#erb"
             }
-          ]
-        },
-        {
-          "begin": "`",
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.yaml"
             }
           },
-          "end": "`",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.yaml"
             }
           },
+          "applyEndPatternLast": true
+        },
+        {
           "name": "string.interpolated.yaml",
+          "begin": "`",
+          "end": "`",
           "patterns": [
             {
               "include": "#escaped_char"
@@ -398,45 +392,32 @@
             {
               "include": "#erb"
             }
-          ]
-        },
-        {
-          "match": "[^\\s\"'\\n](?!\\s*#(?!{))([^#\\n]|((?<!\\s)#))*",
-          "name": "string.unquoted.yaml"
-        }
-      ]
-    },
-    "scalar-content": {
-      "patterns": [
-        {
-          "include": "#comment"
-        },
-        {
-          "match": "!(?=\\s)",
-          "name": "punctuation.definition.tag.non-specific.yaml"
-        },
-        {
-          "include": "#constants"
-        },
-        {
-          "include": "#date"
-        },
-        {
-          "include": "#numeric"
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.begin.yaml"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.string.end.yaml"
+            }
+          }
         },
         {
-          "include": "#strings"
+          "name": "string.unquoted.yaml",
+          "match": "[^\\s\"'\\n](?!\\s*#(?!{))([^#\\n]|((?\u003c!\\s)#))*"
         }
       ]
     },
     "variables": {
+      "name": "variable.other.yaml",
+      "match": "(\u0026|\\*)\\w+$",
       "captures": {
         "1": {
           "name": "punctuation.definition.variable.yaml"
         }
-      },
-      "match": "(&|\\*)\\w+$",
-      "name": "variable.other.yaml"
+      }
     }
   }
-}
+}