@astrojs/language-server 2.8.3 → 2.9.0

package/dist/check.js

@@ -56,7 +56,9 @@ class AstroCheck {
      * @return {CheckResult} The result of the lint, including a list of errors, the file's content and its file path.
      */
     async lint({ fileNames = undefined, cancel = () => false, logErrors = undefined, }) {
-        let files = (fileNames !== undefined ? fileNames : this.linter.languageHost.getScriptFileNames()).filter((file) => {
+        let files = (fileNames !== undefined
+            ? fileNames
+            : this.linter.language.typescript.projectHost.getScriptFileNames()).filter((file) => {
             // We don't have the same understanding of Svelte and Vue files as their own respective tools (vue-tsc, svelte-check)
             // So we don't want to check them here
             return !file.endsWith('.vue') && !file.endsWith('.svelte');
@@ -92,7 +94,7 @@ class AstroCheck {
                 if (logErrors !== undefined && errorText) {
                     console.info(errorText);
                 }
-                const fileSnapshot = this.linter.languageHost.getScriptSnapshot(file);
+                const fileSnapshot = this.linter.language.typescript.projectHost.getScriptSnapshot(file);
                 const fileContent = fileSnapshot?.getText(0, fileSnapshot.getLength());
                 result.fileResult.push({
                     errors: fileDiagnostics,

package/dist/core/index.js

@@ -35,21 +35,26 @@ const parseHTML_1 = require("./parseHTML");
 const parseJS_js_1 = require("./parseJS.js");
 function getLanguageModule(astroInstall, ts) {
     return {
-        createVirtualCode(fileId, languageId, snapshot) {
+        getLanguageId(scriptId) {
+            if (scriptId.endsWith('.astro')) {
+                return 'astro';
+            }
+        },
+        createVirtualCode(scriptId, languageId, snapshot) {
             if (languageId === 'astro') {
-                const fileName = fileId.includes('://')
-                    ? vscode_uri_1.URI.parse(fileId).fsPath.replace(/\\/g, '/')
-                    : fileId;
+                const fileName = scriptId.includes('://')
+                    ? vscode_uri_1.URI.parse(scriptId).fsPath.replace(/\\/g, '/')
+                    : scriptId;
                 return new AstroVirtualCode(fileName, snapshot);
             }
         },
-        updateVirtualCode(_fileId, astroCode, snapshot) {
+        updateVirtualCode(_scriptId, astroCode, snapshot) {
             astroCode.update(snapshot);
             return astroCode;
         },
         typescript: {
             extraFileExtensions: [{ extension: 'astro', isMixedContent: true, scriptKind: 7 }],
-            getScript(astroCode) {
+            getServiceScript(astroCode) {
                 for (const code of (0, language_core_1.forEachEmbeddedCode)(astroCode)) {
                     if (code.id === 'tsx') {
                         return {
@@ -61,7 +66,7 @@ function getLanguageModule(astroInstall, ts) {
                 }
                 return undefined;
             },
-            getExtraScripts(fileName, astroCode) {
+            getExtraServiceScripts(fileName, astroCode) {
                 const result = [];
                 for (const code of (0, language_core_1.forEachEmbeddedCode)(astroCode)) {
                     if (code.id.endsWith('.mjs') || code.id.endsWith('.mts')) {

package/dist/core/svelte.js

@@ -6,21 +6,26 @@ const vscode_uri_1 = require("vscode-uri");
 const utils_js_1 = require("./utils.js");
 function getSvelteLanguageModule() {
     return {
-        createVirtualCode(fileId, languageId, snapshot) {
+        getLanguageId(scriptId) {
+            if (scriptId.endsWith('.svelte')) {
+                return 'svelte';
+            }
+        },
+        createVirtualCode(scriptId, languageId, snapshot) {
             if (languageId === 'svelte') {
-                const fileName = fileId.includes('://')
-                    ? vscode_uri_1.URI.parse(fileId).fsPath.replace(/\\/g, '/')
-                    : fileId;
+                const fileName = scriptId.includes('://')
+                    ? vscode_uri_1.URI.parse(scriptId).fsPath.replace(/\\/g, '/')
+                    : scriptId;
                 return new SvelteVirtualCode(fileName, snapshot);
             }
         },
-        updateVirtualCode(_fileId, svelteCode, snapshot) {
+        updateVirtualCode(_scriptId, svelteCode, snapshot) {
             svelteCode.update(snapshot);
             return svelteCode;
         },
         typescript: {
             extraFileExtensions: [{ extension: 'svelte', isMixedContent: true, scriptKind: 7 }],
-            getScript(svelteCode) {
+            getServiceScript(svelteCode) {
                 for (const code of (0, language_core_1.forEachEmbeddedCode)(svelteCode)) {
                     if (code.id === 'tsx') {
                         return {

package/dist/core/vue.js

@@ -6,21 +6,26 @@ const vscode_uri_1 = require("vscode-uri");
 const utils_js_1 = require("./utils.js");
 function getVueLanguageModule() {
     return {
-        createVirtualCode(fileId, languageId, snapshot) {
+        getLanguageId(scriptId) {
+            if (scriptId.endsWith('.vue')) {
+                return 'vue';
+            }
+        },
+        createVirtualCode(scriptId, languageId, snapshot) {
             if (languageId === 'vue') {
-                const fileName = fileId.includes('://')
-                    ? vscode_uri_1.URI.parse(fileId).fsPath.replace(/\\/g, '/')
-                    : fileId;
+                const fileName = scriptId.includes('://')
+                    ? vscode_uri_1.URI.parse(scriptId).fsPath.replace(/\\/g, '/')
+                    : scriptId;
                 return new VueVirtualCode(fileName, snapshot);
             }
         },
-        updateVirtualCode(_fileId, vueCode, snapshot) {
+        updateVirtualCode(_scriptId, vueCode, snapshot) {
             vueCode.update(snapshot);
             return vueCode;
         },
         typescript: {
             extraFileExtensions: [{ extension: 'vue', isMixedContent: true, scriptKind: 7 }],
-            getScript(vueCode) {
+            getServiceScript(vueCode) {
                 for (const code of (0, language_core_1.forEachEmbeddedCode)(vueCode)) {
                     if (code.id === 'tsx') {
                         return {

package/dist/languageServerPlugin.d.ts

@@ -1,3 +1,3 @@
-import { Connection } from '@volar/language-server/node';
-import type { ServerOptions } from '@volar/language-server/lib/server.js';
-export declare function createServerOptions(connection: Connection, ts: typeof import('typescript')): ServerOptions;
+import { Connection, LanguagePlugin, ServiceEnvironment, VirtualCode } from '@volar/language-server/node';
+export declare function getLanguagePlugins(connection: Connection, ts: typeof import('typescript'), serviceEnv: ServiceEnvironment, tsconfig: string | undefined): LanguagePlugin<VirtualCode>[];
+export declare function getLanguageServicePlugins(connection: Connection, ts: typeof import('typescript')): import("@volar/language-server/node").LanguageServicePlugin<any>[];

package/dist/languageServerPlugin.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createServerOptions = void 0;
+exports.getLanguageServicePlugins = exports.getLanguagePlugins = void 0;
 const node_1 = require("@volar/language-server/node");
 const vscode_uri_1 = require("vscode-uri");
 const core_1 = require("./core");
@@ -17,79 +17,66 @@ const astro_js_1 = require("./plugins/astro.js");
 const html_js_1 = require("./plugins/html.js");
 const index_js_1 = require("./plugins/typescript-addons/index.js");
 const index_js_2 = require("./plugins/typescript/index.js");
-function createServerOptions(connection, ts) {
-    return {
-        watchFileExtensions: [
-            'js',
-            'cjs',
-            'mjs',
-            'ts',
-            'cts',
-            'mts',
-            'jsx',
-            'tsx',
-            'json',
-            'astro',
-            'vue',
-            'svelte',
-        ],
-        getServicePlugins() {
-            return [
-                (0, html_js_1.create)(),
-                (0, volar_service_css_1.create)(),
-                (0, volar_service_emmet_1.create)(),
-                ...(0, index_js_2.create)(ts),
-                (0, volar_service_typescript_twoslash_queries_1.create)(ts),
-                (0, index_js_1.create)(),
-                (0, astro_js_1.create)(ts),
-                getPrettierService(),
-            ];
-        },
-        getLanguagePlugins(serviceEnv, projectContext) {
-            const languagePlugins = [
-                (0, vue_js_1.getVueLanguageModule)(),
-                (0, svelte_js_1.getSvelteLanguageModule)(),
-            ];
-            if (projectContext.typescript) {
-                const rootPath = projectContext.typescript.configFileName
-                    ? projectContext.typescript.configFileName.split('/').slice(0, -1).join('/')
-                    : serviceEnv.typescript.uriToFileName(serviceEnv.workspaceFolder);
-                const nearestPackageJson = ts.findConfigFile(rootPath, ts.sys.fileExists, 'package.json');
-                const astroInstall = (0, utils_js_1.getAstroInstall)([rootPath], {
-                    nearestPackageJson: nearestPackageJson,
-                    readDirectory: ts.sys.readDirectory,
-                });
-                if (astroInstall === 'not-found') {
-                    connection.sendNotification(node_1.ShowMessageNotification.type, {
-                        message: `Couldn't find Astro in workspace "${rootPath}". Experience might be degraded. For the best experience, please make sure Astro is installed into your project and restart the language server.`,
-                        type: node_1.MessageType.Warning,
-                    });
-                }
-                languagePlugins.unshift((0, core_1.getLanguageModule)(typeof astroInstall === 'string' ? undefined : astroInstall, ts));
-            }
-            return languagePlugins;
-        },
-    };
+function getLanguagePlugins(connection, ts, serviceEnv, tsconfig) {
+    const languagePlugins = [
+        (0, vue_js_1.getVueLanguageModule)(),
+        (0, svelte_js_1.getSvelteLanguageModule)(),
+    ];
+    const rootPath = tsconfig
+        ? tsconfig.split('/').slice(0, -1).join('/')
+        : serviceEnv.typescript.uriToFileName(serviceEnv.workspaceFolder);
+    const nearestPackageJson = ts.findConfigFile(rootPath, ts.sys.fileExists, 'package.json');
+    const astroInstall = (0, utils_js_1.getAstroInstall)([rootPath], {
+        nearestPackageJson: nearestPackageJson,
+        readDirectory: ts.sys.readDirectory,
+    });
+    if (astroInstall === 'not-found') {
+        connection.sendNotification(node_1.ShowMessageNotification.type, {
+            message: `Couldn't find Astro in workspace "${rootPath}". Experience might be degraded. For the best experience, please make sure Astro is installed into your project and restart the language server.`,
+            type: node_1.MessageType.Warning,
+        });
+    }
+    languagePlugins.unshift((0, core_1.getLanguageModule)(typeof astroInstall === 'string' ? undefined : astroInstall, ts));
+    return languagePlugins;
+}
+exports.getLanguagePlugins = getLanguagePlugins;
+function getLanguageServicePlugins(connection, ts) {
+    return [
+        (0, html_js_1.create)(),
+        (0, volar_service_css_1.create)(),
+        (0, volar_service_emmet_1.create)(),
+        ...(0, index_js_2.create)(ts),
+        (0, volar_service_typescript_twoslash_queries_1.create)(ts),
+        (0, index_js_1.create)(),
+        (0, astro_js_1.create)(ts),
+        getPrettierService(),
+    ];
     function getPrettierService() {
         let prettier;
         let prettierPluginPath;
+        let hasShownNotification = false;
         return (0, volar_service_prettier_1.create)((context) => {
             const workspaceUri = vscode_uri_1.URI.parse(context.env.workspaceFolder);
             if (workspaceUri.scheme === 'file') {
                 prettier = (0, importPackage_js_1.importPrettier)(workspaceUri.fsPath);
                 prettierPluginPath = (0, importPackage_js_1.getPrettierPluginPath)(workspaceUri.fsPath);
-                if (!prettier || !prettierPluginPath) {
+                if ((!prettier || !prettierPluginPath) && !hasShownNotification) {
                     connection.sendNotification(node_1.ShowMessageNotification.type, {
-                        message: "Couldn't load `prettier` or `prettier-plugin-astro`. Formatting will not work. Please make sure those two packages are installed into your project.",
+                        message: "Couldn't load `prettier` or `prettier-plugin-astro`. Formatting will not work. Please make sure those two packages are installed into your project and restart the language server.",
                         type: node_1.MessageType.Warning,
                     });
+                    hasShownNotification = true;
                 }
                 return prettier;
             }
         }, {
             documentSelector: ['astro'],
             getFormattingOptions: async (prettierInstance, document, formatOptions, context) => {
-                const filePath = vscode_uri_1.URI.parse(document.uri).fsPath;
+                const documentUri = context.decodeEmbeddedDocumentUri(document.uri)?.[0] ?? document.uri;
+                const filePath = vscode_uri_1.URI.parse(documentUri).fsPath;
+                if (!filePath) {
+                    return {};
+                }
                 let configOptions = null;
                 try {
                     configOptions = await prettierInstance.resolveConfig(filePath, {
@@ -134,5 +121,5 @@ function createServerOptions(connection, ts) {
         });
     }
 }
-exports.createServerOptions = createServerOptions;
+exports.getLanguageServicePlugins = getLanguageServicePlugins;
 //# sourceMappingURL=languageServerPlugin.js.map

package/dist/nodeServer.js

@@ -11,9 +11,25 @@ connection.onInitialize((params) => {
         throw new Error('The `typescript.tsdk` init option is required. It should point to a directory containing a `typescript.js` or `tsserverlibrary.js` file, such as `node_modules/typescript/lib`.');
     }
     const { typescript, diagnosticMessages } = (0, node_1.loadTsdkByPath)(tsdk, params.locale);
-    return server.initialize(params, (0, node_1.createTypeScriptProjectProviderFactory)(typescript, diagnosticMessages), (0, languageServerPlugin_js_1.createServerOptions)(connection, typescript));
+    return server.initialize(params, (0, languageServerPlugin_js_1.getLanguageServicePlugins)(connection, typescript), (0, node_1.createTypeScriptProjectProvider)(typescript, diagnosticMessages, (env, project) => (0, languageServerPlugin_js_1.getLanguagePlugins)(connection, typescript, env, project.configFileName)));
 });
 connection.onInitialized(() => {
     server.initialized();
+    server.watchFiles([
+        `**/*.{${[
+            'js',
+            'cjs',
+            'mjs',
+            'ts',
+            'cts',
+            'mts',
+            'jsx',
+            'tsx',
+            'json',
+            'astro',
+            'vue',
+            'svelte',
+        ].join(',')}}`,
+    ]);
 });
 //# sourceMappingURL=nodeServer.js.map

package/dist/plugins/astro.d.ts

@@ -1,2 +1,2 @@
-import { ServicePlugin } from '@volar/language-server';
-export declare const create: (ts: typeof import('typescript')) => ServicePlugin;
+import { LanguageServicePlugin } from '@volar/language-server';
+export declare const create: (ts: typeof import('typescript')) => LanguageServicePlugin;

package/dist/plugins/astro.js

@@ -18,11 +18,13 @@ const create = (ts) => {
                     if (token.isCancellationRequested)
                         return null;
                     let items = [];
-                    const [file] = context.documents.getVirtualCodeByUri(document.uri);
-                    if (!(file instanceof index_js_1.AstroVirtualCode))
+                    const decoded = context.decodeEmbeddedDocumentUri(document.uri);
+                    const sourceScript = decoded && context.language.scripts.get(decoded[0]);
+                    const virtualCode = decoded && sourceScript?.generated?.embeddedCodes.get(decoded[1]);
+                    if (!(virtualCode instanceof index_js_1.AstroVirtualCode))
                         return;
                     if (completionContext.triggerCharacter === '-') {
-                        const frontmatterCompletion = getFrontmatterCompletion(file, document, position);
+                        const frontmatterCompletion = getFrontmatterCompletion(virtualCode, document, position);
                         if (frontmatterCompletion)
                             items.push(frontmatterCompletion);
                     }
@@ -34,10 +36,12 @@ const create = (ts) => {
                 provideSemanticDiagnostics(document, token) {
                     if (token.isCancellationRequested)
                         return [];
-                    const [file] = context.documents.getVirtualCodeByUri(document.uri);
-                    if (!(file instanceof index_js_1.AstroVirtualCode))
+                    const decoded = context.decodeEmbeddedDocumentUri(document.uri);
+                    const sourceScript = decoded && context.language.scripts.get(decoded[0]);
+                    const virtualCode = decoded && sourceScript?.generated?.embeddedCodes.get(decoded[1]);
+                    if (!(virtualCode instanceof index_js_1.AstroVirtualCode))
                         return;
-                    return file.compilerDiagnostics.map(compilerMessageToDiagnostic);
+                    return virtualCode.compilerDiagnostics.map(compilerMessageToDiagnostic);
                     function compilerMessageToDiagnostic(message) {
                         const start = language_server_1.Position.create(message.location.line - 1, message.location.column - 1);
                         const end = document.positionAt(document.offsetAt(start) + message.location.length);

package/dist/plugins/html.d.ts

@@ -1,2 +1,2 @@
-import { ServicePlugin } from '@volar/language-server';
-export declare const create: () => ServicePlugin;
+import { LanguageServicePlugin } from '@volar/language-server';
+export declare const create: () => LanguageServicePlugin;

package/dist/plugins/html.js

@@ -1,33 +1,73 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = void 0;
 const language_server_1 = require("@volar/language-server");
 const volar_service_html_1 = require("volar-service-html");
+const html = __importStar(require("vscode-html-languageservice"));
+const vscode_uri_1 = require("vscode-uri");
 const index_js_1 = require("../core/index.js");
 const html_data_js_1 = require("./html-data.js");
 const utils_js_1 = require("./utils.js");
 const create = () => {
-    const htmlServicePlugin = (0, volar_service_html_1.create)();
+    const htmlServicePlugin = (0, volar_service_html_1.create)({
+        getCustomData: async (context) => {
+            const customData = (await context.env.getConfiguration?.('html.customData')) ?? [];
+            const newData = [];
+            for (const customDataPath of customData) {
+                const uri = vscode_uri_1.Utils.resolvePath(vscode_uri_1.URI.parse(context.env.workspaceFolder), customDataPath);
+                const json = await context.env.fs?.readFile?.(uri.toString());
+                if (json) {
+                    try {
+                        const data = JSON.parse(json);
+                        newData.push(html.newHTMLDataProvider(customDataPath, data));
+                    }
+                    catch (error) {
+                        console.error(error);
+                    }
+                }
+            }
+            return [...newData, html_data_js_1.astroAttributes, html_data_js_1.astroElements, html_data_js_1.classListAttribute];
+        },
+    });
     return {
         ...htmlServicePlugin,
         create(context) {
             const htmlPlugin = htmlServicePlugin.create(context);
-            htmlPlugin.provide['html/updateCustomData']?.([
-                html_data_js_1.astroAttributes,
-                html_data_js_1.astroElements,
-                html_data_js_1.classListAttribute,
-            ]);
             return {
                 ...htmlPlugin,
                 async provideCompletionItems(document, position, completionContext, token) {
                     if (document.languageId !== 'html')
                         return;
-                    const [_, source] = context.documents.getVirtualCodeByUri(document.uri);
-                    const code = source?.generated?.code;
-                    if (!(code instanceof index_js_1.AstroVirtualCode))
+                    const decoded = context.decodeEmbeddedDocumentUri(document.uri);
+                    const sourceScript = decoded && context.language.scripts.get(decoded[0]);
+                    const root = sourceScript?.generated?.root;
+                    if (!(root instanceof index_js_1.AstroVirtualCode))
                         return;
                     // Don't return completions if the current node is a component
-                    if ((0, utils_js_1.isInComponentStartTag)(code.htmlDocument, document.offsetAt(position))) {
+                    if ((0, utils_js_1.isInComponentStartTag)(root.htmlDocument, document.offsetAt(position))) {
                         return null;
                     }
                     const completions = await htmlPlugin.provideCompletionItems(document, position, completionContext, token);

package/dist/plugins/typescript/codeActions.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.enhancedResolveCodeAction = exports.enhancedProvideCodeActions = void 0;
 const language_server_1 = require("@volar/language-server");
 const index_js_1 = require("../../core/index.js");
-const utils_js_1 = require("../utils.js");
+const utils_js_1 = require("./utils.js");
 function enhancedProvideCodeActions(codeActions, context) {
     return codeActions.map((codeAction) => mapCodeAction(codeAction, context));
 }
@@ -22,17 +22,13 @@ function mapCodeAction(codeAction, context) {
         return codeAction;
     codeAction.edit.documentChanges = codeAction.edit.documentChanges.map((change) => {
         if (language_server_1.TextDocumentEdit.is(change)) {
-            const [virtualFile, source] = context.documents.getVirtualCodeByUri(change.textDocument.uri);
-            const code = source?.generated?.code;
-            if (!virtualFile || !(code instanceof index_js_1.AstroVirtualCode))
+            const decoded = context.decodeEmbeddedDocumentUri(change.textDocument.uri);
+            const sourceScript = decoded && context.language.scripts.get(decoded[0]);
+            const virtualCode = decoded && sourceScript?.generated?.embeddedCodes.get(decoded[1]);
+            const root = sourceScript?.generated?.root;
+            if (!virtualCode || !(root instanceof index_js_1.AstroVirtualCode))
                 return change;
-            change.edits = change.edits.map((edit) => {
-                const shouldModifyEdit = (0, utils_js_1.editShouldBeInFrontmatter)(edit.range, code.astroMeta);
-                if (shouldModifyEdit.itShould) {
-                    edit = (0, utils_js_1.ensureProperEditForFrontmatter)(edit, code.astroMeta, '\n');
-                }
-                return edit;
-            });
+            change.edits = change.edits.map((edit) => (0, utils_js_1.mapEdit)(edit, root, virtualCode.languageId));
         }
         return change;
     });

package/dist/plugins/typescript/completions.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.enhancedResolveCompletionItem = exports.enhancedProvideCompletionItems = void 0;
 const language_server_1 = require("@volar/language-server");
 const index_js_1 = require("../../core/index.js");
-const utils_js_1 = require("../utils.js");
+const utils_js_1 = require("./utils.js");
 function enhancedProvideCompletionItems(completions) {
     completions.items = completions.items.filter(isValidCompletion).map((completion) => {
         const source = completion?.data?.originalItem?.source;
@@ -31,16 +31,13 @@ function enhancedResolveCompletionItem(resolvedCompletion, context) {
         resolvedCompletion.detail = getDetailForFileCompletion(resolvedCompletion.detail ?? '', resolvedCompletion.data.originalItem.source);
     }
     if (resolvedCompletion.additionalTextEdits) {
-        const [virtualFile, source] = context.documents.getVirtualCodeByUri(resolvedCompletion.data.uri);
-        const code = source?.generated?.code;
-        if (!virtualFile || !(code instanceof index_js_1.AstroVirtualCode))
+        const decoded = context.decodeEmbeddedDocumentUri(resolvedCompletion.data.uri);
+        const sourceScript = decoded && context.language.scripts.get(decoded[0]);
+        const virtualCode = decoded && sourceScript?.generated?.embeddedCodes.get(decoded[1]);
+        const root = sourceScript?.generated?.root;
+        if (!virtualCode || !(root instanceof index_js_1.AstroVirtualCode))
             return resolvedCompletion;
-        resolvedCompletion.additionalTextEdits = resolvedCompletion.additionalTextEdits.map((edit) => {
-            if ((0, utils_js_1.editShouldBeInFrontmatter)(edit.range, code.astroMeta).itShould) {
-                edit = (0, utils_js_1.ensureProperEditForFrontmatter)(edit, code.astroMeta, '\n');
-            }
-            return edit;
-        });
+        resolvedCompletion.additionalTextEdits = resolvedCompletion.additionalTextEdits.map((edit) => (0, utils_js_1.mapEdit)(edit, root, virtualCode.languageId));
     }
     return resolvedCompletion;
 }

package/dist/plugins/typescript/index.d.ts

@@ -1,2 +1,2 @@
-import type { ServicePlugin } from '@volar/language-server';
-export declare const create: (ts: typeof import('typescript')) => ServicePlugin[];
+import type { LanguageServicePlugin } from '@volar/language-server';
+export declare const create: (ts: typeof import('typescript')) => LanguageServicePlugin[];

package/dist/plugins/typescript/index.js

@@ -41,15 +41,16 @@ const create = (ts) => {
                             return (0, codeActions_js_1.enhancedResolveCodeAction)(resolvedCodeAction, context);
                         },
                         async provideSemanticDiagnostics(document, token) {
-                            const [_, source] = context.documents.getVirtualCodeByUri(document.uri);
-                            const code = source?.generated?.code;
+                            const decoded = context.decodeEmbeddedDocumentUri(document.uri);
+                            const sourceScript = decoded && context.language.scripts.get(decoded[0]);
+                            const root = sourceScript?.generated?.root;
                             let tsxLineCount = undefined;
-                            if (code instanceof index_js_1.AstroVirtualCode) {
+                            if (root instanceof index_js_1.AstroVirtualCode) {
                                 // If we have compiler errors, our TSX isn't valid so don't bother showing TS errors
-                                if (code.hasCompilationErrors)
+                                if (root.hasCompilationErrors)
                                     return null;
                                 // We'll use this to filter out diagnostics that are outside the mapped range of the TSX
-                                tsxLineCount = code.astroMeta.tsxRanges.body.end.line;
+                                tsxLineCount = root.astroMeta.tsxRanges.body.end.line;
                             }
                             const diagnostics = await typeScriptPlugin.provideSemanticDiagnostics(document, token);
                             if (!diagnostics)

package/dist/plugins/typescript/utils.d.ts

@@ -0,0 +1,3 @@
+import type { TextEdit } from 'vscode-html-languageservice';
+import type { AstroVirtualCode } from '../../core/index.js';
+export declare function mapEdit(edit: TextEdit, code: AstroVirtualCode, languageId: string): TextEdit;

package/dist/plugins/typescript/utils.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mapEdit = void 0;
+const utils_js_1 = require("../utils.js");
+function mapEdit(edit, code, languageId) {
+    // Don't attempt to move the edit to the frontmatter if the file isn't the root TSX file, it means it's a script tag
+    if (languageId === 'typescriptreact') {
+        if ((0, utils_js_1.editShouldBeInFrontmatter)(edit.range, code.astroMeta).itShould) {
+            edit = (0, utils_js_1.ensureProperEditForFrontmatter)(edit, code.astroMeta, '\n');
+        }
+    }
+    else {
+        // If the edit is at the start of the file, add a newline before it, otherwise we'll get `<script>text`
+        if (edit.range.start.line === 0 && edit.range.start.character === 0) {
+            edit.newText = '\n' + edit.newText;
+        }
+    }
+    return edit;
+}
+exports.mapEdit = mapEdit;
+//# sourceMappingURL=utils.js.map

package/dist/plugins/typescript-addons/index.d.ts

@@ -1,2 +1,2 @@
-import type { ServicePlugin } from '@volar/language-server';
-export declare const create: () => ServicePlugin;
+import type { LanguageServicePlugin } from '@volar/language-server';
+export declare const create: () => LanguageServicePlugin;

package/dist/plugins/typescript-addons/index.js

@@ -21,17 +21,18 @@ const create = () => {
                         token.isCancellationRequested ||
                         completionContext.triggerKind === 2)
                         return null;
-                    const [_, source] = context.documents.getVirtualCodeByUri(document.uri);
-                    const code = source?.generated?.code;
-                    if (!(code instanceof index_js_1.AstroVirtualCode))
+                    const decoded = context.decodeEmbeddedDocumentUri(document.uri);
+                    const sourceScript = decoded && context.language.scripts.get(decoded[0]);
+                    const root = sourceScript?.generated?.root;
+                    if (!(root instanceof index_js_1.AstroVirtualCode))
                         return undefined;
-                    if (!(0, utils_js_1.isInsideFrontmatter)(document.offsetAt(position), code.astroMeta.frontmatter))
+                    if (!(0, utils_js_1.isInsideFrontmatter)(document.offsetAt(position), root.astroMeta.frontmatter))
                         return null;
                     const completionList = {
                         items: [],
                         isIncomplete: false,
                     };
-                    completionList.items.push(...(0, snippets_js_1.getSnippetCompletions)(code.astroMeta.frontmatter));
+                    completionList.items.push(...(0, snippets_js_1.getSnippetCompletions)(root.astroMeta.frontmatter));
                     return completionList;
                 },
                 resolveCompletionItem(item) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "2.8.3",
+  "version": "2.9.0",
   "author": "withastro",
   "license": "MIT",
   "repository": {
@@ -22,19 +22,19 @@
   "dependencies": {
     "@astrojs/compiler": "^2.7.0",
     "@jridgewell/sourcemap-codec": "^1.4.15",
-    "@volar/kit": "~2.1.2",
-    "@volar/language-core": "~2.1.2",
-    "@volar/language-server": "~2.1.2",
-    "@volar/language-service": "~2.1.2",
-    "@volar/typescript": "~2.1.2",
+    "@volar/kit": "~2.2.1",
+    "@volar/language-core": "~2.2.1",
+    "@volar/language-server": "~2.2.1",
+    "@volar/language-service": "~2.2.1",
+    "@volar/typescript": "~2.2.1",
     "fast-glob": "^3.2.12",
-    "volar-service-css": "0.0.34",
-    "volar-service-emmet": "0.0.34",
-    "volar-service-html": "0.0.34",
-    "volar-service-prettier": "0.0.34",
-    "volar-service-typescript": "0.0.34",
-    "volar-service-typescript-twoslash-queries": "0.0.34",
-    "vscode-html-languageservice": "^5.1.2",
+    "volar-service-css": "0.0.43",
+    "volar-service-emmet": "0.0.43",
+    "volar-service-html": "0.0.43",
+    "volar-service-prettier": "0.0.43",
+    "volar-service-typescript": "0.0.43",
+    "volar-service-typescript-twoslash-queries": "0.0.43",
+    "vscode-html-languageservice": "^5.2.0",
     "vscode-uri": "^3.0.8"
   },
   "devDependencies": {
@@ -44,7 +44,7 @@
     "@types/chai": "^4.3.5",
     "@types/mocha": "^10.0.1",
     "@types/node": "^18.17.8",
-    "@volar/test-utils": "~2.1.2",
+    "@volar/test-utils": "~2.2.1",
     "astro": "^4.3.5",
     "chai": "^4.3.7",
     "mocha": "^10.2.0",