@astrojs/language-server 2.9.1 → 2.11.0

package/dist/buildMappings.d.ts

@@ -0,0 +1,3 @@
+import type { Mapping } from '@volar/language-core';
+import type { Segment } from 'muggle-string';
+export declare function buildMappings<T>(chunks: Segment<T>[]): Mapping<T>[];

package/dist/buildMappings.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildMappings = void 0;
+function buildMappings(chunks) {
+    let length = 0;
+    const mappings = [];
+    for (const segment of chunks) {
+        if (typeof segment === 'string') {
+            length += segment.length;
+        }
+        else {
+            mappings.push({
+                sourceOffsets: [segment[2]],
+                generatedOffsets: [length],
+                lengths: [segment[0].length],
+                data: segment[3],
+            });
+            length += segment[0].length;
+        }
+    }
+    return mappings;
+}
+exports.buildMappings = buildMappings;
+//# sourceMappingURL=buildMappings.js.map

package/dist/check.js

@@ -56,9 +56,7 @@ 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.language.typescript.projectHost.getScriptFileNames()).filter((file) => {
+        let files = (fileNames !== undefined ? fileNames : this.linter.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');
@@ -94,7 +92,7 @@ class AstroCheck {
                 if (logErrors !== undefined && errorText) {
                     console.info(errorText);
                 }
-                const fileSnapshot = this.linter.language.typescript.projectHost.getScriptSnapshot(file);
+                const fileSnapshot = this.linter.projectHost.getScriptSnapshot(file);
                 const fileContent = fileSnapshot?.getText(0, fileSnapshot.getLength());
                 result.fileResult.push({
                     errors: fileDiagnostics,
@@ -115,17 +113,17 @@ class AstroCheck {
         this.ts = this.typescriptPath ? require(this.typescriptPath) : require('typescript');
         const tsconfigPath = this.getTsconfig();
         const astroInstall = (0, utils_js_1.getAstroInstall)([this.workspacePath]);
-        const languages = [
-            (0, index_js_1.getLanguageModule)(typeof astroInstall === 'string' ? undefined : astroInstall, this.ts),
-            (0, svelte_js_1.getSvelteLanguageModule)(),
-            (0, vue_js_1.getVueLanguageModule)(),
+        const languagePlugins = [
+            (0, index_js_1.getAstroLanguagePlugin)(typeof astroInstall === 'string' ? undefined : astroInstall, this.ts),
+            (0, svelte_js_1.getSvelteLanguagePlugin)(),
+            (0, vue_js_1.getVueLanguagePlugin)(),
         ];
         const services = [...(0, index_js_2.create)(this.ts), (0, astro_js_1.create)(this.ts)];
         if (tsconfigPath) {
-            this.linter = kit.createTypeScriptChecker(languages, services, tsconfigPath);
+            this.linter = kit.createTypeScriptChecker(languagePlugins, services, tsconfigPath);
         }
         else {
-            this.linter = kit.createTypeScriptInferredChecker(languages, services, () => {
+            this.linter = kit.createTypeScriptInferredChecker(languagePlugins, services, () => {
                 return fast_glob_1.default.sync('**/*.astro', {
                     cwd: this.workspacePath,
                     ignore: ['node_modules'],

package/dist/core/index.d.ts

@@ -2,9 +2,10 @@ import type { DiagnosticMessage } from '@astrojs/compiler/types';
 import { type CodeMapping, type LanguagePlugin, type VirtualCode } from '@volar/language-core';
 import type ts from 'typescript';
 import type { HTMLDocument } from 'vscode-html-languageservice';
+import type { URI } from 'vscode-uri';
 import { type AstroInstall } from '../utils.js';
 import { AstroMetadata } from './parseAstro';
-export declare function getLanguageModule(astroInstall: AstroInstall | undefined, ts: typeof import('typescript')): LanguagePlugin<AstroVirtualCode>;
+export declare function getAstroLanguagePlugin(astroInstall: AstroInstall | undefined, ts: typeof import('typescript')): LanguagePlugin<URI, AstroVirtualCode>;
 export declare class AstroVirtualCode implements VirtualCode {
     fileName: string;
     snapshot: ts.IScriptSnapshot;
@@ -19,6 +20,4 @@ export declare class AstroVirtualCode implements VirtualCode {
     codegenStacks: never[];
     constructor(fileName: string, snapshot: ts.IScriptSnapshot);
     get hasCompilationErrors(): boolean;
-    update(newSnapshot: ts.IScriptSnapshot): void;
-    onSnapshotUpdated(): void;
 }

package/dist/core/index.js

@@ -23,35 +23,28 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AstroVirtualCode = exports.getLanguageModule = void 0;
+exports.AstroVirtualCode = exports.getAstroLanguagePlugin = void 0;
 const path = __importStar(require("node:path"));
 const language_core_1 = require("@volar/language-core");
-const vscode_uri_1 = require("vscode-uri");
 const utils_js_1 = require("../utils.js");
 const astro2tsx_1 = require("./astro2tsx");
 const parseAstro_1 = require("./parseAstro");
 const parseCSS_1 = require("./parseCSS");
 const parseHTML_1 = require("./parseHTML");
 const parseJS_js_1 = require("./parseJS.js");
-function getLanguageModule(astroInstall, ts) {
+function getAstroLanguagePlugin(astroInstall, ts) {
     return {
-        getLanguageId(scriptId) {
-            if (scriptId.endsWith('.astro')) {
+        getLanguageId(uri) {
+            if (uri.path.endsWith('.astro')) {
                 return 'astro';
             }
         },
-        createVirtualCode(scriptId, languageId, snapshot) {
+        createVirtualCode(uri, languageId, snapshot) {
             if (languageId === 'astro') {
-                const fileName = scriptId.includes('://')
-                    ? vscode_uri_1.URI.parse(scriptId).fsPath.replace(/\\/g, '/')
-                    : scriptId;
+                const fileName = uri.fsPath.replace(/\\/g, '/');
                 return new AstroVirtualCode(fileName, snapshot);
             }
         },
-        updateVirtualCode(_scriptId, astroCode, snapshot) {
-            astroCode.update(snapshot);
-            return astroCode;
-        },
         typescript: {
             extraFileExtensions: [{ extension: 'astro', isMixedContent: true, scriptKind: 7 }],
             getServiceScript(astroCode) {
@@ -129,7 +122,7 @@ function getLanguageModule(astroInstall, ts) {
         },
     };
 }
-exports.getLanguageModule = getLanguageModule;
+exports.getAstroLanguagePlugin = getAstroLanguagePlugin;
 class AstroVirtualCode {
     constructor(fileName, snapshot) {
         this.fileName = fileName;
@@ -137,16 +130,6 @@ class AstroVirtualCode {
         this.id = 'root';
         this.languageId = 'astro';
         this.codegenStacks = [];
-        this.onSnapshotUpdated();
-    }
-    get hasCompilationErrors() {
-        return this.compilerDiagnostics.filter((diag) => diag.severity === 1).length > 0;
-    }
-    update(newSnapshot) {
-        this.snapshot = newSnapshot;
-        this.onSnapshotUpdated();
-    }
-    onSnapshotUpdated() {
         this.mappings = [
             {
                 sourceOffsets: [0],
@@ -182,6 +165,9 @@ class AstroVirtualCode {
         this.compilerDiagnostics.push(...tsx.diagnostics);
         this.embeddedCodes.push(tsx.virtualCode);
     }
+    get hasCompilationErrors() {
+        return this.compilerDiagnostics.filter((diag) => diag.severity === 1).length > 0;
+    }
 }
 exports.AstroVirtualCode = AstroVirtualCode;
 //# sourceMappingURL=index.js.map

package/dist/core/parseCSS.d.ts

@@ -1,5 +1,5 @@
 import type { ParseResult } from '@astrojs/compiler/types';
-import { type VirtualCode } from '@volar/language-core';
+import type { VirtualCode } from '@volar/language-core';
 import type ts from 'typescript';
 import type { HTMLDocument } from 'vscode-html-languageservice';
 export declare function extractStylesheets(snapshot: ts.IScriptSnapshot, htmlDocument: HTMLDocument, ast: ParseResult['ast']): VirtualCode[];

package/dist/core/parseCSS.js

@@ -2,7 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.collectClassesAndIdsFromDocument = exports.extractStylesheets = void 0;
 const utils_1 = require("@astrojs/compiler/utils");
-const language_core_1 = require("@volar/language-core");
+const muggle_string_1 = require("muggle-string");
+const buildMappings_js_1 = require("../buildMappings.js");
 function extractStylesheets(snapshot, htmlDocument, ast) {
     const embeddedCSSCodes = findEmbeddedStyles(snapshot, htmlDocument.roots);
     const inlineStyles = findInlineStyles(ast);
@@ -25,8 +26,8 @@ function extractStylesheets(snapshot, htmlDocument, ast) {
             ]);
             codes.push(' }\n');
         }
-        const mappings = (0, language_core_1.buildMappings)(codes);
-        const text = (0, language_core_1.toString)(codes);
+        const mappings = (0, buildMappings_js_1.buildMappings)(codes);
+        const text = (0, muggle_string_1.toString)(codes);
         embeddedCSSCodes.push({
             id: 'inline.css',
             languageId: 'css',

package/dist/core/parseJS.d.ts

@@ -1,5 +1,5 @@
 import type { ParseResult } from '@astrojs/compiler/types';
-import { type VirtualCode } from '@volar/language-core';
+import type { VirtualCode } from '@volar/language-core';
 import type ts from 'typescript';
 import type { HTMLDocument } from 'vscode-html-languageservice';
 export declare function extractScriptTags(snapshot: ts.IScriptSnapshot, htmlDocument: HTMLDocument, ast: ParseResult['ast']): VirtualCode[];

package/dist/core/parseJS.js

@@ -2,7 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractScriptTags = void 0;
 const utils_1 = require("@astrojs/compiler/utils");
-const language_core_1 = require("@volar/language-core");
+const muggle_string_1 = require("muggle-string");
+const buildMappings_1 = require("../buildMappings");
 function extractScriptTags(snapshot, htmlDocument, ast) {
     const embeddedJSCodes = findModuleScripts(snapshot, htmlDocument.roots);
     const javascriptContexts = [
@@ -168,8 +169,8 @@ function mergeJSContexts(javascriptContexts) {
             },
         ]);
     }
-    const mappings = (0, language_core_1.buildMappings)(codes);
-    const text = (0, language_core_1.toString)(codes);
+    const mappings = (0, buildMappings_1.buildMappings)(codes);
+    const text = (0, muggle_string_1.toString)(codes);
     return {
         id: 'inline.mjs',
         languageId: 'javascript',

package/dist/core/svelte.d.ts

@@ -1,6 +1,7 @@
 import { type CodeInformation, type LanguagePlugin, type Mapping, type VirtualCode } from '@volar/language-core';
 import type ts from 'typescript';
-export declare function getSvelteLanguageModule(): LanguagePlugin<SvelteVirtualCode>;
+import type { URI } from 'vscode-uri';
+export declare function getSvelteLanguagePlugin(): LanguagePlugin<URI, SvelteVirtualCode>;
 declare class SvelteVirtualCode implements VirtualCode {
     fileName: string;
     snapshot: ts.IScriptSnapshot;
@@ -10,7 +11,5 @@ declare class SvelteVirtualCode implements VirtualCode {
     embeddedCodes: VirtualCode[];
     codegenStacks: never[];
     constructor(fileName: string, snapshot: ts.IScriptSnapshot);
-    update(newSnapshot: ts.IScriptSnapshot): void;
-    private onSnapshotUpdated;
 }
 export {};

package/dist/core/svelte.js

@@ -1,28 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSvelteLanguageModule = void 0;
+exports.getSvelteLanguagePlugin = void 0;
 const language_core_1 = require("@volar/language-core");
-const vscode_uri_1 = require("vscode-uri");
 const utils_js_1 = require("./utils.js");
-function getSvelteLanguageModule() {
+function getSvelteLanguagePlugin() {
     return {
-        getLanguageId(scriptId) {
-            if (scriptId.endsWith('.svelte')) {
+        getLanguageId(uri) {
+            if (uri.path.endsWith('.svelte')) {
                 return 'svelte';
             }
         },
-        createVirtualCode(scriptId, languageId, snapshot) {
+        createVirtualCode(uri, languageId, snapshot) {
             if (languageId === 'svelte') {
-                const fileName = scriptId.includes('://')
-                    ? vscode_uri_1.URI.parse(scriptId).fsPath.replace(/\\/g, '/')
-                    : scriptId;
+                const fileName = uri.fsPath.replace(/\\/g, '/');
                 return new SvelteVirtualCode(fileName, snapshot);
             }
         },
-        updateVirtualCode(_scriptId, svelteCode, snapshot) {
-            svelteCode.update(snapshot);
-            return svelteCode;
-        },
         typescript: {
             extraFileExtensions: [{ extension: 'svelte', isMixedContent: true, scriptKind: 7 }],
             getServiceScript(svelteCode) {
@@ -39,7 +32,7 @@ function getSvelteLanguageModule() {
         },
     };
 }
-exports.getSvelteLanguageModule = getSvelteLanguageModule;
+exports.getSvelteLanguagePlugin = getSvelteLanguagePlugin;
 class SvelteVirtualCode {
     constructor(fileName, snapshot) {
         this.fileName = fileName;
@@ -47,13 +40,6 @@ class SvelteVirtualCode {
         this.id = 'root';
         this.languageId = 'svelte';
         this.codegenStacks = [];
-        this.onSnapshotUpdated();
-    }
-    update(newSnapshot) {
-        this.snapshot = newSnapshot;
-        this.onSnapshotUpdated();
-    }
-    onSnapshotUpdated() {
         this.mappings = [];
         this.embeddedCodes = [];
         this.embeddedCodes.push((0, utils_js_1.framework2tsx)(this.fileName, this.snapshot.getText(0, this.snapshot.getLength()), 'svelte'));

package/dist/core/vue.d.ts

@@ -1,6 +1,7 @@
 import { type CodeInformation, type LanguagePlugin, type Mapping, type VirtualCode } from '@volar/language-core';
 import type ts from 'typescript';
-export declare function getVueLanguageModule(): LanguagePlugin<VueVirtualCode>;
+import type { URI } from 'vscode-uri';
+export declare function getVueLanguagePlugin(): LanguagePlugin<URI, VueVirtualCode>;
 declare class VueVirtualCode implements VirtualCode {
     fileName: string;
     snapshot: ts.IScriptSnapshot;
@@ -10,7 +11,5 @@ declare class VueVirtualCode implements VirtualCode {
     embeddedCodes: VirtualCode[];
     codegenStacks: never[];
     constructor(fileName: string, snapshot: ts.IScriptSnapshot);
-    update(newSnapshot: ts.IScriptSnapshot): void;
-    private onSnapshotUpdated;
 }
 export {};

package/dist/core/vue.js

@@ -1,28 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVueLanguageModule = void 0;
+exports.getVueLanguagePlugin = void 0;
 const language_core_1 = require("@volar/language-core");
-const vscode_uri_1 = require("vscode-uri");
 const utils_js_1 = require("./utils.js");
-function getVueLanguageModule() {
+function getVueLanguagePlugin() {
     return {
-        getLanguageId(scriptId) {
-            if (scriptId.endsWith('.vue')) {
+        getLanguageId(uri) {
+            if (uri.path.endsWith('.vue')) {
                 return 'vue';
             }
         },
-        createVirtualCode(scriptId, languageId, snapshot) {
+        createVirtualCode(uri, languageId, snapshot) {
             if (languageId === 'vue') {
-                const fileName = scriptId.includes('://')
-                    ? vscode_uri_1.URI.parse(scriptId).fsPath.replace(/\\/g, '/')
-                    : scriptId;
+                const fileName = uri.fsPath.replace(/\\/g, '/');
                 return new VueVirtualCode(fileName, snapshot);
             }
         },
-        updateVirtualCode(_scriptId, vueCode, snapshot) {
-            vueCode.update(snapshot);
-            return vueCode;
-        },
         typescript: {
             extraFileExtensions: [{ extension: 'vue', isMixedContent: true, scriptKind: 7 }],
             getServiceScript(vueCode) {
@@ -39,7 +32,7 @@ function getVueLanguageModule() {
         },
     };
 }
-exports.getVueLanguageModule = getVueLanguageModule;
+exports.getVueLanguagePlugin = getVueLanguagePlugin;
 class VueVirtualCode {
     constructor(fileName, snapshot) {
         this.fileName = fileName;
@@ -47,13 +40,6 @@ class VueVirtualCode {
         this.id = 'root';
         this.languageId = 'vue';
         this.codegenStacks = [];
-        this.onSnapshotUpdated();
-    }
-    update(newSnapshot) {
-        this.snapshot = newSnapshot;
-        this.onSnapshotUpdated();
-    }
-    onSnapshotUpdated() {
         this.mappings = [];
         this.embeddedCodes = [];
         this.embeddedCodes.push((0, utils_js_1.framework2tsx)(this.fileName, this.snapshot.getText(0, this.snapshot.getLength()), 'vue'));

package/dist/languageServerPlugin.d.ts

@@ -1,3 +1,4 @@
-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>[];
+import { Connection, LanguagePlugin, LanguageServiceEnvironment } from '@volar/language-server/node';
+import { URI } from 'vscode-uri';
+export declare function getLanguagePlugins(connection: Connection, ts: typeof import('typescript'), serviceEnv: LanguageServiceEnvironment, tsconfig: string | undefined): LanguagePlugin<URI, import("@volar/language-server/node").VirtualCode>[];
 export declare function getLanguageServicePlugins(connection: Connection, ts: typeof import('typescript')): import("@volar/language-server/node").LanguageServicePlugin<any>[];

package/dist/languageServerPlugin.js

@@ -19,12 +19,12 @@ const index_js_1 = require("./plugins/typescript-addons/index.js");
 const index_js_2 = require("./plugins/typescript/index.js");
 function getLanguagePlugins(connection, ts, serviceEnv, tsconfig) {
     const languagePlugins = [
-        (0, vue_js_1.getVueLanguageModule)(),
-        (0, svelte_js_1.getSvelteLanguageModule)(),
+        (0, vue_js_1.getVueLanguagePlugin)(),
+        (0, svelte_js_1.getSvelteLanguagePlugin)(),
     ];
     const rootPath = tsconfig
         ? tsconfig.split('/').slice(0, -1).join('/')
-        : serviceEnv.typescript.uriToFileName(serviceEnv.workspaceFolder);
+        : serviceEnv.workspaceFolders[0].fsPath;
     const nearestPackageJson = ts.findConfigFile(rootPath, ts.sys.fileExists, 'package.json');
     const astroInstall = (0, utils_js_1.getAstroInstall)([rootPath], {
         nearestPackageJson: nearestPackageJson,
@@ -36,7 +36,7 @@ function getLanguagePlugins(connection, ts, serviceEnv, tsconfig) {
             type: node_1.MessageType.Warning,
         });
     }
-    languagePlugins.unshift((0, core_1.getLanguageModule)(typeof astroInstall === 'string' ? undefined : astroInstall, ts));
+    languagePlugins.unshift((0, core_1.getAstroLanguagePlugin)(typeof astroInstall === 'string' ? undefined : astroInstall, ts));
     return languagePlugins;
 }
 exports.getLanguagePlugins = getLanguagePlugins;
@@ -56,24 +56,26 @@ function getLanguageServicePlugins(connection, ts) {
         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) && !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 and restart the language server.",
-                        type: node_1.MessageType.Warning,
-                    });
-                    hasShownNotification = true;
+            for (const workspaceFolder of context.env.workspaceFolders) {
+                if (workspaceFolder.scheme === 'file') {
+                    prettier = (0, importPackage_js_1.importPrettier)(workspaceFolder.fsPath);
+                    prettierPluginPath = (0, importPackage_js_1.getPrettierPluginPath)(workspaceFolder.fsPath);
+                    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 and restart the language server.",
+                            type: node_1.MessageType.Warning,
+                        });
+                        hasShownNotification = true;
+                    }
+                    return prettier;
                 }
-                return prettier;
             }
         }, {
             documentSelector: ['astro'],
             getFormattingOptions: async (prettierInstance, document, formatOptions, context) => {
-                const documentUri = context.decodeEmbeddedDocumentUri(document.uri)?.[0] ?? document.uri;
-                const filePath = vscode_uri_1.URI.parse(documentUri).fsPath;
+                const uri = vscode_uri_1.URI.parse(document.uri);
+                const documentUri = context.decodeEmbeddedDocumentUri(uri)?.[0] ?? uri;
+                const filePath = documentUri.fsPath;
                 if (!filePath) {
                     return {};
                 }

package/dist/nodeServer.js

@@ -11,7 +11,12 @@ 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, languageServerPlugin_js_1.getLanguageServicePlugins)(connection, typescript), (0, node_1.createTypeScriptProjectProvider)(typescript, diagnosticMessages, (env, project) => (0, languageServerPlugin_js_1.getLanguagePlugins)(connection, typescript, env, project.configFileName)));
+    return server.initialize(params, (0, node_1.createTypeScriptProject)(typescript, diagnosticMessages, ({ env, configFileName }) => {
+        return {
+            languagePlugins: (0, languageServerPlugin_js_1.getLanguagePlugins)(connection, typescript, env, configFileName),
+            setup() { },
+        };
+    }), (0, languageServerPlugin_js_1.getLanguageServicePlugins)(connection, typescript), { pullModelDiagnostics: params.initializationOptions?.pullModelDiagnostics });
 });
 connection.onInitialized(() => {
     server.initialized();

package/dist/plugins/astro.js

@@ -7,18 +7,25 @@ exports.create = void 0;
 const node_path_1 = require("node:path");
 const language_server_1 = require("@volar/language-server");
 const fast_glob_1 = __importDefault(require("fast-glob"));
+const vscode_uri_1 = require("vscode-uri");
 const index_js_1 = require("../core/index.js");
 const utils_js_1 = require("./utils.js");
 const create = (ts) => {
     return {
-        triggerCharacters: ['-'],
+        capabilities: {
+            completionProvider: {
+                triggerCharacters: ['-'],
+            },
+            diagnosticProvider: {},
+            codeLensProvider: {},
+        },
         create(context) {
             return {
                 provideCompletionItems(document, position, completionContext, token) {
                     if (token.isCancellationRequested)
                         return null;
                     let items = [];
-                    const decoded = context.decodeEmbeddedDocumentUri(document.uri);
+                    const decoded = context.decodeEmbeddedDocumentUri(vscode_uri_1.URI.parse(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))
@@ -36,7 +43,7 @@ const create = (ts) => {
                 provideSemanticDiagnostics(document, token) {
                     if (token.isCancellationRequested)
                         return [];
-                    const decoded = context.decodeEmbeddedDocumentUri(document.uri);
+                    const decoded = context.decodeEmbeddedDocumentUri(vscode_uri_1.URI.parse(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))
@@ -59,6 +66,9 @@ const create = (ts) => {
                         return;
                     if (!(0, utils_js_1.isJSDocument)(document.languageId))
                         return;
+                    if (!context.project.typescript)
+                        return;
+                    const { uriConverter } = context.project.typescript;
                     const languageService = context.inject('typescript/languageService');
                     if (!languageService)
                         return;
@@ -72,7 +82,7 @@ const create = (ts) => {
                             if (ts.isCallExpression(node) && node.expression.getText() === 'Astro.glob') {
                                 const globArgument = node.arguments.at(0);
                                 if (globArgument) {
-                                    globcodeLens.push(getGlobResultAsCodeLens(globArgument.getText().slice(1, -1), (0, node_path_1.dirname)(context.env.typescript.uriToFileName(document.uri)), document.positionAt(node.arguments.pos)));
+                                    globcodeLens.push(getGlobResultAsCodeLens(globArgument.getText().slice(1, -1), (0, node_path_1.dirname)(uriConverter.asFileName(vscode_uri_1.URI.parse(document.uri))), document.positionAt(node.arguments.pos)));
                                 }
                             }
                             return ts.forEachChild(node, cb);

package/dist/plugins/html.js

@@ -32,20 +32,23 @@ 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 htmlPlugin = (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);
+                for (const workspaceFolder of context.env.workspaceFolders) {
+                    const uri = vscode_uri_1.Utils.resolvePath(workspaceFolder, customDataPath);
+                    const json = await context.env.fs?.readFile?.(uri);
+                    if (json) {
+                        try {
+                            const data = JSON.parse(json);
+                            newData.push(html.newHTMLDataProvider(customDataPath, data));
+                        }
+                        catch (error) {
+                            console.error(error);
+                        }
+                        break;
                     }
                 }
             }
@@ -53,15 +56,15 @@ const create = () => {
         },
     });
     return {
-        ...htmlServicePlugin,
+        ...htmlPlugin,
         create(context) {
-            const htmlPlugin = htmlServicePlugin.create(context);
+            const htmlPluginInstance = htmlPlugin.create(context);
             return {
-                ...htmlPlugin,
+                ...htmlPluginInstance,
                 async provideCompletionItems(document, position, completionContext, token) {
                     if (document.languageId !== 'html')
                         return;
-                    const decoded = context.decodeEmbeddedDocumentUri(document.uri);
+                    const decoded = context.decodeEmbeddedDocumentUri(vscode_uri_1.URI.parse(document.uri));
                     const sourceScript = decoded && context.language.scripts.get(decoded[0]);
                     const root = sourceScript?.generated?.root;
                     if (!(root instanceof index_js_1.AstroVirtualCode))
@@ -70,7 +73,7 @@ const create = () => {
                     if ((0, utils_js_1.isInComponentStartTag)(root.htmlDocument, document.offsetAt(position))) {
                         return null;
                     }
-                    const completions = await htmlPlugin.provideCompletionItems(document, position, completionContext, token);
+                    const completions = await htmlPluginInstance.provideCompletionItems(document, position, completionContext, token);
                     if (!completions) {
                         return null;
                     }

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

@@ -1,3 +1,3 @@
-import type { CodeAction, ServiceContext } from '@volar/language-service';
-export declare function enhancedProvideCodeActions(codeActions: CodeAction[], context: ServiceContext): CodeAction[];
-export declare function enhancedResolveCodeAction(codeAction: CodeAction, context: ServiceContext): CodeAction;
+import type { CodeAction, LanguageServiceContext } from '@volar/language-service';
+export declare function enhancedProvideCodeActions(codeActions: CodeAction[], context: LanguageServiceContext): CodeAction[];
+export declare function enhancedResolveCodeAction(codeAction: CodeAction, context: LanguageServiceContext): CodeAction;

package/dist/plugins/typescript/codeActions.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.enhancedResolveCodeAction = exports.enhancedProvideCodeActions = void 0;
 const language_server_1 = require("@volar/language-server");
+const vscode_uri_1 = require("vscode-uri");
 const index_js_1 = require("../../core/index.js");
 const utils_js_1 = require("./utils.js");
 function enhancedProvideCodeActions(codeActions, context) {
@@ -22,7 +23,7 @@ function mapCodeAction(codeAction, context) {
         return codeAction;
     codeAction.edit.documentChanges = codeAction.edit.documentChanges.map((change) => {
         if (language_server_1.TextDocumentEdit.is(change)) {
-            const decoded = context.decodeEmbeddedDocumentUri(change.textDocument.uri);
+            const decoded = context.decodeEmbeddedDocumentUri(vscode_uri_1.URI.parse(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;

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

@@ -1,3 +1,3 @@
-import { CompletionItem, CompletionList, ServiceContext } from '@volar/language-server';
+import { CompletionItem, CompletionList, LanguageServiceContext } from '@volar/language-server';
 export declare function enhancedProvideCompletionItems(completions: CompletionList): CompletionList;
-export declare function enhancedResolveCompletionItem(resolvedCompletion: CompletionItem, context: ServiceContext): CompletionItem;
+export declare function enhancedResolveCompletionItem(resolvedCompletion: CompletionItem, context: LanguageServiceContext): CompletionItem;

package/dist/plugins/typescript/completions.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.enhancedResolveCompletionItem = exports.enhancedProvideCompletionItems = void 0;
 const language_server_1 = require("@volar/language-server");
+const vscode_uri_1 = require("vscode-uri");
 const index_js_1 = require("../../core/index.js");
 const utils_js_1 = require("./utils.js");
 function enhancedProvideCompletionItems(completions) {
@@ -31,7 +32,7 @@ function enhancedResolveCompletionItem(resolvedCompletion, context) {
         resolvedCompletion.detail = getDetailForFileCompletion(resolvedCompletion.detail ?? '', resolvedCompletion.data.originalItem.source);
     }
     if (resolvedCompletion.additionalTextEdits) {
-        const decoded = context.decodeEmbeddedDocumentUri(resolvedCompletion.data.uri);
+        const decoded = context.decodeEmbeddedDocumentUri(vscode_uri_1.URI.parse(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;

package/dist/plugins/typescript/index.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = void 0;
 const volar_service_typescript_1 = require("volar-service-typescript");
+const vscode_uri_1 = require("vscode-uri");
 const index_js_1 = require("../../core/index.js");
 const codeActions_js_1 = require("./codeActions.js");
 const completions_js_1 = require("./completions.js");
@@ -41,7 +42,7 @@ const create = (ts) => {
                             return (0, codeActions_js_1.enhancedResolveCodeAction)(resolvedCodeAction, context);
                         },
                         async provideSemanticDiagnostics(document, token) {
-                            const decoded = context.decodeEmbeddedDocumentUri(document.uri);
+                            const decoded = context.decodeEmbeddedDocumentUri(vscode_uri_1.URI.parse(document.uri));
                             const sourceScript = decoded && context.language.scripts.get(decoded[0]);
                             const root = sourceScript?.generated?.root;
                             let tsxLineCount = undefined;

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

@@ -1,11 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = void 0;
+const vscode_uri_1 = require("vscode-uri");
 const index_js_1 = require("../../core/index.js");
 const utils_js_1 = require("../utils.js");
 const snippets_js_1 = require("./snippets.js");
 const create = () => {
     return {
+        capabilities: {
+            completionProvider: {
+                resolveProvider: true,
+            },
+        },
         create(context) {
             return {
                 isAdditionalCompletion: true,
@@ -21,7 +27,7 @@ const create = () => {
                         token.isCancellationRequested ||
                         completionContext.triggerKind === 2)
                         return null;
-                    const decoded = context.decodeEmbeddedDocumentUri(document.uri);
+                    const decoded = context.decodeEmbeddedDocumentUri(vscode_uri_1.URI.parse(document.uri));
                     const sourceScript = decoded && context.language.scripts.get(decoded[0]);
                     const root = sourceScript?.generated?.root;
                     if (!(root instanceof index_js_1.AstroVirtualCode))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "2.9.1",
+  "version": "2.11.0",
   "author": "withastro",
   "license": "MIT",
   "repository": {
@@ -22,32 +22,33 @@
   "dependencies": {
     "@astrojs/compiler": "^2.7.0",
     "@jridgewell/sourcemap-codec": "^1.4.15",
-    "@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",
+    "@volar/kit": "~2.4.0-alpha.15",
+    "@volar/language-core": "~2.4.0-alpha.15",
+    "@volar/language-server": "~2.4.0-alpha.15",
+    "@volar/language-service": "~2.4.0-alpha.15",
+    "@volar/typescript": "~2.4.0-alpha.15",
     "fast-glob": "^3.2.12",
-    "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",
+    "muggle-string": "^0.4.1",
+    "volar-service-css": "volar-2.4",
+    "volar-service-emmet": "volar-2.4",
+    "volar-service-html": "volar-2.4",
+    "volar-service-prettier": "volar-2.4",
+    "volar-service-typescript": "volar-2.4",
+    "volar-service-typescript-twoslash-queries": "volar-2.4",
     "vscode-html-languageservice": "^5.2.0",
     "vscode-uri": "^3.0.8"
   },
   "devDependencies": {
-    "svelte": "^4.2.10",
     "@astrojs/svelte": "^5.0.3",
     "@astrojs/vue": "^4.0.8",
     "@types/chai": "^4.3.5",
     "@types/mocha": "^10.0.1",
     "@types/node": "^18.17.8",
-    "@volar/test-utils": "~2.2.1",
+    "@volar/test-utils": "~2.4.0-alpha.15",
     "astro": "^4.3.5",
     "chai": "^4.3.7",
     "mocha": "^10.2.0",
+    "svelte": "^4.2.10",
     "tsx": "^3.12.7",
     "typescript": "^5.2.2",
     "vscode-languageserver-protocol": "^3.17.5",