astro-vscode 0.8.2 → 0.8.6

package/CHANGELOG.md

@@ -1,5 +1,37 @@
 # astro-vscode
 
+## 0.8.6
+
+### Patch Changes
+
+- Updated dependencies [97559b6]
+- Updated dependencies [4c93d24]
+  - @astrojs/language-server@0.8.6
+
+## 0.8.5
+
+### Patch Changes
+
+- f1f3091: Fix commenting, namespaced elements, and Fragment typings
+- Updated dependencies [f1f3091]
+  - @astrojs/language-server@0.8.5
+  - @astrojs/ts-plugin@0.1.1
+
+## 0.8.4
+
+### Patch Changes
+
+- Updated dependencies [481e009]
+  - @astrojs/language-server@0.8.4
+
+## 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/languages/astro-language-configuration.json

@@ -15,6 +15,7 @@
     { "open": "(", "close": ")" },
     { "open": "'", "close": "'" },
     { "open": "\"", "close": "\"" },
+    { "open": "`", "close": "`" },
     { "open": "<!--", "close": "-->", "notIn": ["comment", "string"] },
     { "open": "/**", "close": " */", "notIn": ["string"] }
   ],

package/languages/astro-markdown-language-configuration.json

@@ -15,6 +15,7 @@
     { "open": "(", "close": ")" },
     { "open": "'", "close": "'" },
     { "open": "\"", "close": "\"" },
+    { "open": "`", "close": "`" },
     {
       "open": "<",
       "close": ">",

package/package.json

@@ -8,7 +8,7 @@
     "color": "#FFBE2D",
     "theme": "dark"
   },
-  "version": "0.8.2",
+  "version": "0.8.6",
   "author": "Astro",
   "license": "MIT",
   "publisher": "astro-build",
@@ -24,8 +24,8 @@
     "onLanguage:astro"
   ],
   "dependencies": {
-    "@astrojs/language-server": "0.8.2",
-    "@astrojs/ts-plugin": "0.1.0",
+    "@astrojs/language-server": "0.8.6",
+    "@astrojs/ts-plugin": "0.1.1",
     "vscode-emmet-helper": "2.1.2",
     "vscode-html-languageservice": "^3.0.3",
     "vscode-languageclient": "~7.0.0"
@@ -168,14 +168,14 @@
         "scopeName": "text.html.astro",
         "path": "./syntaxes/astro.tmLanguage.json",
         "embeddedLanguages": {
-          "text.html.astro": "astro",
-          "text.html.markdown.astro": "astro-markdown",
-          "text.html": "html",
           "source.css": "css",
-          "source.scss": "scss",
           "source.sass": "sass",
+          "source.scss": "scss",
+          "source.ts": "typescript",
           "source.tsx": "typescriptreact",
-          "meta.embedded.block.frontmatter": "typescriptreact"
+          "text.html.astro": "astro",
+          "text.html.markdown.astro": "astro-markdown",
+          "text.html": "html"
         }
       },
       {
@@ -186,52 +186,53 @@
           "text.html.astro"
         ],
         "embeddedLanguages": {
-          "text.html.astro": "astro",
-          "text.html.markdown.astro": "astro-markdown",
-          "text.html.markdown": "markdown",
-          "source.tsx": "typescriptreact",
-          "source.js": "javascript",
-          "source.css": "css",
-          "meta.embedded.block.css": "css",
           "meta.embedded.block.astro": "astro",
-          "meta.embedded.block.ini": "ini",
-          "meta.embedded.block.java": "java",
-          "meta.embedded.block.lua": "lua",
-          "meta.embedded.block.makefile": "makefile",
-          "meta.embedded.block.perl": "perl",
-          "meta.embedded.block.r": "r",
-          "meta.embedded.block.ruby": "ruby",
-          "meta.embedded.block.php": "php",
-          "meta.embedded.block.sql": "sql",
-          "meta.embedded.block.vs_net": "vs_net",
-          "meta.embedded.block.xml": "xml",
-          "meta.embedded.block.xsl": "xsl",
-          "meta.embedded.block.yaml": "yaml",
-          "meta.embedded.block.dosbatch": "dosbatch",
+          "meta.embedded.block.c": "c",
           "meta.embedded.block.clojure": "clojure",
           "meta.embedded.block.coffee": "coffee",
-          "meta.embedded.block.c": "c",
           "meta.embedded.block.cpp": "cpp",
+          "meta.embedded.block.csharp": "csharp",
+          "meta.embedded.block.css": "css",
           "meta.embedded.block.diff": "diff",
           "meta.embedded.block.dockerfile": "dockerfile",
+          "meta.embedded.block.dosbatch": "dosbatch",
+          "meta.embedded.block.fsharp": "fsharp",
           "meta.embedded.block.go": "go",
           "meta.embedded.block.groovy": "groovy",
-          "meta.embedded.block.pug": "jade",
+          "meta.embedded.block.ini": "ini",
+          "meta.embedded.block.java": "java",
           "meta.embedded.block.javascript": "javascript",
           "meta.embedded.block.json": "json",
           "meta.embedded.block.less": "less",
+          "meta.embedded.block.lua": "lua",
+          "meta.embedded.block.makefile": "makefile",
           "meta.embedded.block.objc": "objc",
-          "meta.embedded.block.scss": "scss",
+          "meta.embedded.block.perl": "perl",
           "meta.embedded.block.perl6": "perl6",
+          "meta.embedded.block.php": "php",
           "meta.embedded.block.powershell": "powershell",
+          "meta.embedded.block.pug": "jade",
           "meta.embedded.block.python": "python",
+          "meta.embedded.block.r": "r",
+          "meta.embedded.block.ruby": "ruby",
           "meta.embedded.block.rust": "rust",
           "meta.embedded.block.scala": "scala",
+          "meta.embedded.block.scss": "scss",
           "meta.embedded.block.shellscript": "shellscript",
+          "meta.embedded.block.sql": "sql",
           "meta.embedded.block.typescript": "typescript",
           "meta.embedded.block.typescriptreact": "typescriptreact",
-          "meta.embedded.block.csharp": "csharp",
-          "meta.embedded.block.fsharp": "fsharp"
+          "meta.embedded.block.vs_net": "vs_net",
+          "meta.embedded.block.xml": "xml",
+          "meta.embedded.block.xsl": "xsl",
+          "meta.embedded.block.yaml": "yaml",
+          "source.css": "css",
+          "source.js": "javascript",
+          "source.ts": "typescript",
+          "source.tsx": "typescriptreact",
+          "text.html.astro": "astro",
+          "text.html.markdown.astro": "astro-markdown",
+          "text.html.markdown": "markdown"
         }
       },
       {

package/syntaxes/astro.tmLanguage.json

@@ -66,7 +66,7 @@
     },
     "astro:component": {
       "name": "meta.tag.component.astro",
-      "begin": "(</?)([$A-Z_][^/?!\\s:<>]*|[^/?!\\s:<>.]+\\.[^/?!\\s:<>]+)\\b",
+      "begin": "(</?)([$A-Z_][^/?!\\s<>]*|[^/?!\\s<>.]+\\.[^/?!\\s<>]+)\\b",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.astro"
@@ -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"
@@ -323,7 +333,7 @@
       "patterns": [
         {
           "name": "meta.tag.any.$2.start.html",
-          "begin": "(<)([^/?!\\s:<>]+)(?=\\s|/?>)",
+          "begin": "(<)([^/?!\\s<>]+)(?=\\s|/?>)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.tag.begin.html"
@@ -346,7 +356,7 @@
         },
         {
           "name": "meta.tag.any.$2.end.html",
-          "begin": "(</)([^/?!\\s:<>]+)(?=\\s|/?>)",
+          "begin": "(</)([^/?!\\s<>]+)(?=\\s|/?>)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.tag.begin.html"
@@ -409,6 +419,7 @@
             }
           },
           "name": "expression.embbeded.astro",
+          "contentName": "source.tsx",
           "patterns": [
             {
               "include": "source.tsx"