Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion extensions/vscode/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,15 @@ export = defineExtension(() => {
});
}

const tsdk = resolveTsdkPath();
if (tsdk === undefined) {
vscode.window.showErrorMessage('Cannot find TypeScript SDK.');
return;
}

client = launch(
serverPath ?? vscode.Uri.joinPath(context.extensionUri, 'dist', 'language-server.js').fsPath,
vscode.env.appRoot.replace(/\\/g, '/') + '/extensions/node_modules/typescript/lib',
tsdk.replace(/\\/g, '/'),
);

volarLabs.addLanguageClient(client);
Expand Down Expand Up @@ -196,6 +202,23 @@ function launch(serverPath: string, tsdk: string) {
return client;
}

function resolveTsdkPath() {
const vscodeTsdk = path.join(vscode.env.appRoot, 'extensions', 'node_modules', 'typescript', 'lib');
if (fs.existsSync(vscodeTsdk)) {
return vscodeTsdk;
}

const tsExt = vscode.extensions.getExtension('vscode.typescript-language-features');
if (tsExt) {
// Eclipse Theia
// see: https://github.com/eclipse-theia/vscode-builtin-extensions/blob/65c70ec636bd879ef9529d0a2da36f4b99139c40/src/package-vsix.js#L71
const theiaTsdk = path.join(tsExt.extensionPath, 'deps', 'typescript', 'lib');
if (fs.existsSync(theiaTsdk)) {
return theiaTsdk;
}
}
}

function resolveServerPath() {
const tsPluginPackPath = path.join(__dirname, '..', 'node_modules', 'vue-typescript-plugin-pack', 'index.js');

Expand Down