astro-vscode 0.8.2 → 0.8.3

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # astro-vscode
 
+## 0.8.3
+
+### Patch Changes
+
+- cad5430: Fix plain script and style blocks
+- Updated dependencies [fef3091]
+  - @astrojs/language-server@0.8.3
+
 ## 0.8.2
 
 ### Patch Changes

package/package.json

@@ -8,7 +8,7 @@
     "color": "#FFBE2D",
     "theme": "dark"
   },
-  "version": "0.8.2",
+  "version": "0.8.3",
   "author": "Astro",
   "license": "MIT",
   "publisher": "astro-build",
@@ -24,7 +24,7 @@
     "onLanguage:astro"
   ],
   "dependencies": {
-    "@astrojs/language-server": "0.8.2",
+    "@astrojs/language-server": "0.8.3",
     "@astrojs/ts-plugin": "0.1.0",
     "vscode-emmet-helper": "2.1.2",
     "vscode-html-languageservice": "^3.0.3",

package/syntaxes/astro.tmLanguage.json

@@ -103,7 +103,7 @@
       }
     },
     "astro:lang": {
-      "begin": "(<)(?:(S(?i:cript|tyle))|((?i:script|style)))\\b",
+      "begin": "(<)(?:(S(?i:cript|tyle))|((?i:script|style)))(?![\\w:-])",
       "beginCaptures": {
         "0": {
           "name": "meta.tag.metadata.$2$3.start.html"
@@ -118,7 +118,7 @@
           "name": "entity.name.tag.html"
         }
       },
-      "end": "(</)(?:(S(?i:cript|tyle))|((?i:script|style)))\\s*(>)",
+      "end": "(</)(?:(S(?i:cript|tyle))|((?i:script|style)))(?![\\w:-])\\s*(>)",
       "endCaptures": {
         "0": {
           "name": "meta.tag.metadata.$2$3.end.html"
@@ -152,9 +152,9 @@
           ]
         },
         {
-          "name": "source.css.embedded.html",
           "begin": "(?<=(?i:lang)=(['\"`]?)(?i:css)\\1[^>]*>)(?!\\G)",
-          "end": "(?=</(?i:script|style))",
+          "end": "(?=</[\\w:-])",
+          "contentName": "source.css",
           "patterns": [
             {
               "include": "source.css"
@@ -162,9 +162,9 @@
           ]
         },
         {
-          "name": "source.js.embedded.html",
           "begin": "(?<=(?i:lang)=(['\"`]?)(?i:jsx?)\\1[^>]*>)(?!\\G)",
-          "end": "(?=</(?i:script|style))",
+          "end": "(?=</[\\w:-])",
+          "contentName": "source.js",
           "patterns": [
             {
               "include": "source.js"
@@ -172,9 +172,9 @@
           ]
         },
         {
-          "name": "source.less.embedded.html",
           "begin": "(?<=(?i:lang)=(['\"`]?)(?i:less)\\1[^>]*>)(?!\\G)",
-          "end": "(?=</(?i:script|style))",
+          "end": "(?=</[\\w:-])",
+          "contentName": "source.css.css",
           "patterns": [
             {
               "include": "source.css.less"
@@ -182,9 +182,9 @@
           ]
         },
         {
-          "name": "source.sass.embedded.html",
           "begin": "(?<=(?i:lang)=(['\"`]?)(?i:sass)\\1[^>]*>)(?!\\G)",
-          "end": "(?=</(?i:script|style))",
+          "end": "(?=</[\\w:-])",
+          "contentName": "source.sass",
           "patterns": [
             {
               "include": "source.sass"
@@ -192,9 +192,9 @@
           ]
         },
         {
-          "name": "source.scss.embedded.html",
           "begin": "(?<=(?i:lang)=(['\"`]?)(?i:scss)\\1[^>]*>)(?!\\G)",
-          "end": "(?=</(?i:script|style))",
+          "end": "(?=</[\\w:-])",
+          "contentName": "source.css.scss",
           "patterns": [
             {
               "include": "source.css.scss"
@@ -202,9 +202,9 @@
           ]
         },
         {
-          "name": "source.stylus.embedded.html",
           "begin": "(?<=(?i:lang)=(['\"`]?)(?i:styl(?:us)?)\\1[^>]*>)(?!\\G)",
-          "end": "(?=</(?i:script|style))",
+           "end": "(?=</[\\w:-])",
+          "contentName": "source.stylus",
           "patterns": [
             {
               "include": "source.stylus"
@@ -212,9 +212,19 @@
           ]
         },
         {
-          "name": "source.ts.embedded.html",
-          "begin": "(?<=(?i:lang)=(['\"`]?)(?i:tsx?)\\1[^>]*>)(?!\\G)",
-          "end": "(?=</(?i:script|style))",
+          "begin": "(?<=(?i:lang)=(['\"`]?)(?i:ts)\\1[^>]*>)(?!\\G)",
+          "end": "(?=</[\\w:-])",
+          "contentName": "source.ts",
+          "patterns": [
+            {
+              "include": "source.ts"
+            }
+          ]
+        },
+        {
+          "begin": "(?<=(?i:lang)=(['\"`]?)(?i:tsx)\\1[^>]*>)(?!\\G)",
+          "end": "(?=</[\\w:-])",
+          "contentName": "source.tsx",
           "patterns": [
             {
               "include": "source.tsx"
@@ -222,9 +232,9 @@
           ]
         },
         {
-          "name": "source.js.embedded.html",
-          "begin": "(?<=<(?i:script|style)[^>]*>)(?!\\G)",
-          "end": "(?=</(?i:script|style))",
+          "begin": "(?<=<(?i:script)[^>]*>)(?!\\G)",
+          "end": "(?=</[\\w:-])",
+          "contentName": "source.js",
           "patterns": [
             {
               "include": "source.js"
@@ -232,9 +242,9 @@
           ]
         },
         {
-          "name": "source.css.embedded.html",
-          "begin": "(?<=<(?i:script|style)[^>]*>)(?!\\G)",
-          "end": "(?=</(?i:script|style))",
+          "begin": "(?<=<(?i:style)[^>]*>)(?!\\G)",
+          "end": "(?=</[\\w:-])",
+          "contentName": "source.css",
           "patterns": [
             {
               "include": "source.css"