tm-grammars 1.26.0 → 1.27.0

package/grammars/razor.json

@@ -5,6 +5,13 @@
     "cshtml"
   ],
   "injections": {
+    "source.cs": {
+      "patterns": [
+        {
+          "include": "#inline-template"
+        }
+      ]
+    },
     "string.quoted.double.html": {
       "patterns": [
         {
@@ -132,7 +139,7 @@
           "name": "keyword.control.try.catch.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.catch.razor",
       "patterns": [
         {
@@ -362,7 +369,7 @@
           "name": "keyword.control.loop.do.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.do.razor",
       "patterns": [
         {
@@ -390,7 +397,7 @@
           "name": "keyword.control.loop.do.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.do.razor",
       "patterns": [
         {
@@ -414,7 +421,7 @@
           "name": "keyword.control.conditional.if.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.else.razor",
       "patterns": [
         {
@@ -466,7 +473,7 @@
           "name": "keyword.control.try.finally.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.finally.razor",
       "patterns": [
         {
@@ -491,7 +498,7 @@
           "name": "keyword.control.loop.for.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.for.razor",
       "patterns": [
         {
@@ -519,7 +526,7 @@
           "name": "keyword.control.loop.for.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.for.razor",
       "patterns": [
         {
@@ -612,7 +619,7 @@
           "name": "keyword.control.loop.foreach.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.foreach.razor",
       "patterns": [
         {
@@ -647,7 +654,7 @@
           "name": "keyword.control.loop.foreach.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.foreach.razor",
       "patterns": [
         {
@@ -696,7 +703,7 @@
           "name": "keyword.control.conditional.if.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.if.razor",
       "patterns": [
         {
@@ -724,7 +731,7 @@
           "name": "keyword.control.conditional.if.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.if.razor",
       "patterns": [
         {
@@ -937,6 +944,111 @@
       "match": "(@)(inject)\\s*([\\S\\s]+?)?\\s*([_[:alpha:]][_[:alnum:]]*)?\\s*(?=$)",
       "name": "meta.directive"
     },
+    "inline-template": {
+      "patterns": [
+        {
+          "include": "#inline-template-void-tag"
+        },
+        {
+          "include": "#inline-template-non-void-tag"
+        }
+      ]
+    },
+    "inline-template-non-void-tag": {
+      "begin": "(@)(<)(!)?([^/>\\s]+)(?=\\s|/?>)",
+      "beginCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#transition"
+            }
+          ]
+        },
+        "2": {
+          "name": "punctuation.definition.tag.begin.html"
+        },
+        "3": {
+          "name": "constant.character.escape.razor.tagHelperOptOut"
+        },
+        "4": {
+          "name": "entity.name.tag.html"
+        }
+      },
+      "end": "(</)(\\4)\\s*(>)|(/>)",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.tag.begin.html"
+        },
+        "2": {
+          "name": "entity.name.tag.html"
+        },
+        "3": {
+          "name": "punctuation.definition.tag.end.html"
+        },
+        "4": {
+          "name": "punctuation.definition.tag.end.html"
+        }
+      },
+      "patterns": [
+        {
+          "begin": "(?<=>)(?!$)",
+          "end": "(?=</)",
+          "patterns": [
+            {
+              "include": "#inline-template"
+            },
+            {
+              "include": "#wellformed-html"
+            },
+            {
+              "include": "#razor-control-structures"
+            }
+          ]
+        },
+        {
+          "include": "#razor-control-structures"
+        },
+        {
+          "include": "text.html.basic#attribute"
+        }
+      ]
+    },
+    "inline-template-void-tag": {
+      "begin": "(?i)(@)(<)(!)?(area|base|br|col|command|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)(?=\\s|/?>)",
+      "beginCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#transition"
+            }
+          ]
+        },
+        "2": {
+          "name": "punctuation.definition.tag.begin.html"
+        },
+        "3": {
+          "name": "constant.character.escape.razor.tagHelperOptOut"
+        },
+        "4": {
+          "name": "entity.name.tag.html"
+        }
+      },
+      "end": "/?>",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.tag.end.html"
+        }
+      },
+      "name": "meta.tag.structure.$4.void.html",
+      "patterns": [
+        {
+          "include": "#razor-control-structures"
+        },
+        {
+          "include": "text.html.basic#attribute"
+        }
+      ]
+    },
     "layout-directive": {
       "captures": {
         "1": {
@@ -974,7 +1086,7 @@
           "name": "keyword.other.lock.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.lock.razor",
       "patterns": [
         {
@@ -1002,7 +1114,7 @@
           "name": "keyword.other.lock.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.lock.razor",
       "patterns": [
         {
@@ -1271,6 +1383,9 @@
         {
           "include": "#text-tag"
         },
+        {
+          "include": "#inline-template"
+        },
         {
           "include": "#wellformed-html"
         },
@@ -1469,7 +1584,7 @@
           "name": "keyword.control.switch.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.switch.razor",
       "patterns": [
         {
@@ -1497,7 +1612,7 @@
           "name": "keyword.control.switch.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.switch.razor",
       "patterns": [
         {
@@ -1618,7 +1733,7 @@
           "name": "keyword.control.try.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.try.razor",
       "patterns": [
         {
@@ -1646,7 +1761,7 @@
           "name": "keyword.control.try.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.try.razor",
       "patterns": [
         {
@@ -1785,7 +1900,7 @@
           "name": "keyword.other.using.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.using.razor",
       "patterns": [
         {
@@ -1813,7 +1928,7 @@
           "name": "keyword.other.using.cs"
         }
       },
-      "end": "(?<=})",
+      "end": "(?<=})|(?<=;)|(?=^\\s*})",
       "name": "meta.statement.using.razor",
       "patterns": [
         {

package/grammars/svelte.json

@@ -22,15 +22,26 @@
     "L:(meta.script.svelte | meta.style.svelte) (meta.lang.ts | meta.lang.typescript) - (meta source)": {
       "patterns": [
         {
-          "begin": "(?<=>)(?!</)",
+          "begin": "(?<=>)(?=[^\\n]+</(s(?:cript|tyle))[>\\s])",
           "contentName": "source.ts",
-          "end": "(?=</)",
+          "end": "(?=</(s(?:cript|tyle))[>\\s])",
           "name": "meta.embedded.block.svelte",
           "patterns": [
             {
               "include": "source.ts"
             }
           ]
+        },
+        {
+          "begin": "(?<=>)(?!</)",
+          "contentName": "source.ts",
+          "name": "meta.embedded.block.svelte",
+          "patterns": [
+            {
+              "include": "source.ts"
+            }
+          ],
+          "while": "^(?!\\s*</(s(?:cript|tyle))[>\\s])"
         }
       ]
     },

package/grammars/vue-directives.json

@@ -11,7 +11,7 @@
   "name": "vue-directives",
   "patterns": [
     {
-      "include": "source.vue#vue-directives"
+      "include": "text.html.vue#vue-directives"
     }
   ],
   "scopeName": "vue.directives"

package/grammars/vue-interpolations.json

@@ -11,7 +11,7 @@
   "name": "vue-interpolations",
   "patterns": [
     {
-      "include": "source.vue#vue-interpolations"
+      "include": "text.html.vue#vue-interpolations"
     }
   ],
   "scopeName": "vue.interpolations"

package/grammars/vue.json

@@ -357,14 +357,24 @@
               "include": "#tag-stuff"
             },
             {
-              "begin": "(?<=>)",
-              "end": "(?=</)",
+              "begin": "(?<=>)(?=[^\\n]*</script[>\\s])",
+              "end": "(?=</script[>\\s])",
               "name": "source.ts",
               "patterns": [
                 {
                   "include": "source.ts"
                 }
               ]
+            },
+            {
+              "begin": "(?<=>)",
+              "name": "source.ts",
+              "patterns": [
+                {
+                  "include": "source.ts"
+                }
+              ],
+              "while": "^(?!\\s*</script[>\\s])"
             }
           ]
         },
@@ -421,14 +431,24 @@
               "include": "#tag-stuff"
             },
             {
-              "begin": "(?<=>)",
-              "end": "(?=</)",
+              "begin": "(?<=>)(?=[^\\n]*</script[>\\s])",
+              "end": "(?=</script[>\\s])",
               "name": "source.tsx",
               "patterns": [
                 {
                   "include": "source.tsx"
                 }
               ]
+            },
+            {
+              "begin": "(?<=>)",
+              "name": "source.tsx",
+              "patterns": [
+                {
+                  "include": "source.tsx"
+                }
+              ],
+              "while": "^(?!\\s*</script[>\\s])"
             }
           ]
         },
@@ -679,10 +699,10 @@
             {
               "begin": "(?<=>)",
               "end": "(?=</)",
-              "name": "source.vue",
+              "name": "text.html.vue",
               "patterns": [
                 {
-                  "include": "source.vue"
+                  "include": "text.html.vue"
                 }
               ]
             }
@@ -738,17 +758,7 @@
           },
           "patterns": [
             {
-              "include": "#tag-stuff"
-            },
-            {
-              "begin": "(?<=>)",
-              "end": "(?=</script[>\\s])",
-              "name": "source.js",
-              "patterns": [
-                {
-                  "include": "source.js"
-                }
-              ]
+              "include": "#multi-line-script-tag-stuff"
             }
           ]
         },
@@ -770,17 +780,7 @@
           },
           "patterns": [
             {
-              "include": "#tag-stuff"
-            },
-            {
-              "begin": "(?<=>)",
-              "end": "(?=</style[>\\s])",
-              "name": "source.css",
-              "patterns": [
-                {
-                  "include": "source.css"
-                }
-              ]
+              "include": "#multi-line-style-tag-stuff"
             }
           ]
         },
@@ -828,6 +828,246 @@
         }
       ]
     },
+    "multi-line-script-tag-stuff": {
+      "begin": "\\G",
+      "end": "(?=</script[>\\s])",
+      "patterns": [
+        {
+          "begin": "\\G(?!\\blang\\s*=\\s*[\"']?(?:tsx??|jsx|coffee)\\b)",
+          "end": "(?=\\blang\\s*=\\s*[\"']?(?:tsx??|jsx|coffee)\\b)|(>)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.tag.end.html.vue"
+            }
+          },
+          "name": "meta.tag-stuff",
+          "patterns": [
+            {
+              "include": "#vue-directives"
+            },
+            {
+              "include": "text.html.basic#attribute"
+            }
+          ]
+        },
+        {
+          "begin": "(?=\\blang\\s*=\\s*[\"']?ts\\b)",
+          "end": "(?=</script[>\\s])",
+          "patterns": [
+            {
+              "include": "#tag-stuff"
+            },
+            {
+              "begin": "(?<=>)(?=[^\\n]*</script[>\\s])",
+              "end": "(?=</script[>\\s])",
+              "name": "source.ts",
+              "patterns": [
+                {
+                  "include": "source.ts"
+                }
+              ]
+            },
+            {
+              "begin": "(?<=>)",
+              "name": "source.ts",
+              "patterns": [
+                {
+                  "include": "source.ts"
+                }
+              ],
+              "while": "^(?!\\s*</script[>\\s])"
+            }
+          ]
+        },
+        {
+          "begin": "(?=\\blang\\s*=\\s*[\"']?tsx\\b)",
+          "end": "(?=</script[>\\s])",
+          "patterns": [
+            {
+              "include": "#tag-stuff"
+            },
+            {
+              "begin": "(?<=>)(?=[^\\n]*</script[>\\s])",
+              "end": "(?=</script[>\\s])",
+              "name": "source.tsx",
+              "patterns": [
+                {
+                  "include": "source.tsx"
+                }
+              ]
+            },
+            {
+              "begin": "(?<=>)",
+              "name": "source.tsx",
+              "patterns": [
+                {
+                  "include": "source.tsx"
+                }
+              ],
+              "while": "^(?!\\s*</script[>\\s])"
+            }
+          ]
+        },
+        {
+          "begin": "(?=\\blang\\s*=\\s*[\"']?jsx\\b)",
+          "end": "(?=</script[>\\s])",
+          "patterns": [
+            {
+              "include": "#tag-stuff"
+            },
+            {
+              "begin": "(?<=>)",
+              "end": "(?=</script[>\\s])",
+              "name": "source.js.jsx",
+              "patterns": [
+                {
+                  "include": "source.js.jsx"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "begin": "(?=\\blang\\s*=\\s*[\"']?coffee\\b)",
+          "end": "(?=</script[>\\s])",
+          "patterns": [
+            {
+              "include": "#tag-stuff"
+            },
+            {
+              "begin": "(?<=>)",
+              "end": "(?=</script[>\\s])",
+              "name": "source.coffee",
+              "patterns": [
+                {
+                  "include": "source.coffee"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "begin": "(?<=>)",
+          "end": "(?=</script[>\\s])",
+          "name": "source.js",
+          "patterns": [
+            {
+              "include": "source.js"
+            }
+          ]
+        }
+      ]
+    },
+    "multi-line-style-tag-stuff": {
+      "begin": "\\G",
+      "end": "(?=</style[>\\s])",
+      "patterns": [
+        {
+          "begin": "\\G(?!\\blang\\s*=\\s*[\"']?(?:scss|stylus|less|postcss)\\b)",
+          "end": "(?=\\blang\\s*=\\s*[\"']?(?:scss|stylus|less|postcss)\\b)|(>)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.tag.end.html.vue"
+            }
+          },
+          "name": "meta.tag-stuff",
+          "patterns": [
+            {
+              "include": "#vue-directives"
+            },
+            {
+              "include": "text.html.basic#attribute"
+            }
+          ]
+        },
+        {
+          "begin": "(?=\\blang\\s*=\\s*[\"']?scss\\b)",
+          "end": "(?=</style[>\\s])",
+          "patterns": [
+            {
+              "include": "#tag-stuff"
+            },
+            {
+              "begin": "(?<=>)",
+              "end": "(?=</style[>\\s])",
+              "name": "source.css.scss",
+              "patterns": [
+                {
+                  "include": "source.css.scss"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "begin": "(?=\\blang\\s*=\\s*[\"']?stylus\\b)",
+          "end": "(?=</style[>\\s])",
+          "patterns": [
+            {
+              "include": "#tag-stuff"
+            },
+            {
+              "begin": "(?<=>)",
+              "end": "(?=</style[>\\s])",
+              "name": "source.stylus",
+              "patterns": [
+                {
+                  "include": "source.stylus"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "begin": "(?=\\blang\\s*=\\s*[\"']?less\\b)",
+          "end": "(?=</style[>\\s])",
+          "patterns": [
+            {
+              "include": "#tag-stuff"
+            },
+            {
+              "begin": "(?<=>)",
+              "end": "(?=</style[>\\s])",
+              "name": "source.css.less",
+              "patterns": [
+                {
+                  "include": "source.css.less"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "begin": "(?=\\blang\\s*=\\s*[\"']?postcss\\b)",
+          "end": "(?=</style[>\\s])",
+          "patterns": [
+            {
+              "include": "#tag-stuff"
+            },
+            {
+              "begin": "(?<=>)",
+              "end": "(?=</style[>\\s])",
+              "name": "source.postcss",
+              "patterns": [
+                {
+                  "include": "source.postcss"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "begin": "(?<=>)",
+          "end": "(?=</style[>\\s])",
+          "name": "source.css",
+          "patterns": [
+            {
+              "include": "source.css"
+            }
+          ]
+        }
+      ]
+    },
     "self-closing-tag": {
       "begin": "(<)([-0-:A-Za-z]+)(?=([^>]+/>))",
       "beginCaptures": {
@@ -1308,5 +1548,5 @@
       ]
     }
   },
-  "scopeName": "source.vue"
+  "scopeName": "text.html.vue"
 }