astro-vscode 2.14.1 → 2.15.0

package/package.json

@@ -24,7 +24,7 @@
     "color": "#17191E",
     "theme": "dark"
   },
-  "version": "2.14.1",
+  "version": "2.15.0",
   "author": "withastro",
   "license": "MIT",
   "publisher": "astro-build",
@@ -154,6 +154,12 @@
           "type": "boolean",
           "default": false,
           "description": "Enable experimental support for content collection intellisense inside Markdown, MDX and Markdoc. Note that this require also enabling the feature in your Astro config (experimental.contentCollectionIntellisense) (Astro 4.14+)"
+        },
+        "astro.updateImportsOnFileMove.enabled": {
+          "scope": "resource",
+          "type": "boolean",
+          "default": false,
+          "description": "Controls whether the extension updates imports when a file is moved to a new location. In most cases, you'll want to keep this disabled as TypeScript and the Astro TypeScript plugin already handles this for you. Having multiple tools updating imports at the same time can lead to corrupted files."
         }
       }
     },
@@ -217,26 +223,27 @@
         }
       },
       {
-        "scopeName": "text.mdx.astro.codeblock",
+        "scopeName": "source.mdx.astro",
         "path": "./syntaxes/mdx.astro.tmLanguage.json",
         "injectTo": [
           "source.mdx"
         ],
         "embeddedLanguages": {
-          "mdx.embedded.astro": "astro"
+          "mdx.embedded.astro": "astro",
+          "mdx.embedded.astro.frontmatter": "typescriptreact"
         }
       }
     ]
   },
   "devDependencies": {
-    "@astrojs/language-server": "^2.14.1",
-    "@astrojs/ts-plugin": "^1.10.1",
+    "@astrojs/language-server": "^2.15.0",
+    "@astrojs/ts-plugin": "^1.10.2",
     "@types/glob": "^8.1.0",
     "@types/mocha": "^10.0.1",
     "@types/node": "^18.17.8",
     "@types/vscode": "^1.82.0",
-    "@volar/language-server": "~2.4.0",
-    "@volar/vscode": "~2.4.0",
+    "@volar/language-server": "~2.4.5",
+    "@volar/vscode": "~2.4.5",
     "@vscode/test-electron": "^2.3.2",
     "@vscode/vsce": "2.30.0",
     "esbuild": "^0.17.19",

package/syntaxes/mdx.astro.tmLanguage.json

@@ -1,84 +1,61 @@
 {
-  "fileTypes": [],
-  "scopeName": "text.mdx.astro.codeblock",
+  "scopeName": "source.mdx.astro",
   "injectionSelector": "L:source.mdx",
   "patterns": [
     {
-      "begin": "(?:^|\\G)[\\t ]*(`{3,})(?:[\\t ]*((?i:(?:.*\\.)?astro))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
-      "beginCaptures": {
-        "1": {
-          "name": "string.other.begin.code.fenced.mdx"
-        },
-        "2": {
-          "name": "entity.name.function.mdx"
-        }
-      },
-      "contentName": "meta.embedded.astro",
-      "end": "(\\1)(?:[\\t ]*$)",
-      "endCaptures": {
-        "1": {
-          "name": "string.other.end.code.fenced.mdx"
-        }
-      },
-      "name": "markup.code.astro.mdx",
-      "patterns": [
-        {
-          "include": "#astro-code-block"
-        }
-      ]
-    },
-    {
-      "begin": "(?:^|\\G)[\\t ]*(~{3,})(?:[\\t ]*((?i:(?:.*\\.)?astro))(?:[\\t ]+((?:[^\\n\\r])+))?)(?:[\\t ]*$)",
+      "include": "#mdx_fenced_code_block_astro"
+    }
+  ],
+  "repository": {
+    "mdx_fenced_code_block_astro": {
+      "begin": "(?:^|\\G)[\\t ]*([`~]{3,})(?:[\\t ]*((?:astro|(?:.*\\.)?(?:astro)))(?:[\\t ]+((?:[^\\n\\r`])+))?)(?:[\\t ]*$)",
       "beginCaptures": {
         "1": {
-          "name": "string.other.begin.code.fenced.mdx"
+          "name": "punctuation.definition.markdown"
         },
         "2": {
-          "name": "entity.name.function.mdx"
+          "name": "entity.name.function.markdown"
         }
       },
-      "contentName": "meta.embedded.astro",
-      "end": "(\\1)(?:[\\t ]*$)",
+      "end": "(^\\1)\\s*$",
       "endCaptures": {
-        "1": {
-          "name": "string.other.end.code.fenced.mdx"
+        "3": {
+          "name": "punctuation.definition.markdown"
         }
       },
       "name": "markup.code.astro.mdx",
       "patterns": [
         {
-          "include": "#astro-code-block"
-        }
-      ]
-    }
-  ],
-  "repository": {
-    "astro-code-block": {
-      "patterns": [
-        {
-          "begin": "^\\s*---\\s*$",
-          "end": "^\\s*---\\s*$",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.tag.xi.begin.t"
-            }
-          },
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.tag.xi.end.t"
-            }
-          },
-          "contentName": "meta.embedded.block.astro.frontmatter",
+          "begin": "(^|\\G)(\\s*)(.*)",
+          "while": "(^|\\G)(?!\\s*([`~]{3,})\\s*$)",
           "patterns": [
             {
-              "include": "source.tsx"
+              "begin": "^\\s*---\\s*$",
+              "end": "^\\s*---\\s*$",
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.definition.tag.xi.begin.t"
+                }
+              },
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.tag.xi.end.t"
+                }
+              },
+              "contentName": "mdx.embedded.astro.frontmatter",
+              "patterns": [
+                {
+                  "include": "source.tsx"
+                }
+              ]
+            },
+            {
+              "contentName": "mdx.embedded.astro",
+              "include": "source.astro"
             }
           ]
-        },
-        {
-          "include": "source.astro"
         }
       ]
     }
   }
-}
+}