Skip to content
Merged
Show file tree
Hide file tree
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
11 changes: 11 additions & 0 deletions extensions/vscode/rolldown.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,17 @@ const config: RolldownOptions = {
},
},
},
{
name: 'typescript',
resolveId: {
filter: {
id: /^typescript$/,
},
handler() {
return { id: './typescript.js', external: true };
},
},
},
],
};

Expand Down
23 changes: 12 additions & 11 deletions extensions/vscode/src/languageClient.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import * as lsp from '@volar/vscode';
import type { VueInitializationOptions } from '@vue/language-server';
import * as fs from 'node:fs';
import * as path from 'node:path';
import {
executeCommand,
nextTick,
Expand Down Expand Up @@ -61,11 +63,20 @@ async function activateLc(
const outputChannel = useOutputChannel('Vue Language Server');
const selectors = config.server.includeLanguages;

// Setup typescript.js in production mode
if (fs.existsSync(path.join(__dirname, 'server.js'))) {
fs.writeFileSync(path.join(__dirname, 'typescript.js'), `module.exports = require("${vscode.env.appRoot.replace(/\\/g, '/')}/extensions/node_modules/typescript/lib/typescript.js");`);
}

client = createLc(
'vue',
'Vue',
selectors,
await getInitializationOptions(context),
{
typescript: {
tsserverRequestCommand: 'typescript.tsserverRequest',
},
} satisfies VueInitializationOptions,
6009,
outputChannel
);
Expand All @@ -82,7 +93,6 @@ async function activateLc(
}
await client.stop();
outputChannel.clear();
client.clientOptions.initializationOptions = await getInitializationOptions(context);
await client.start();
});

Expand All @@ -101,12 +111,3 @@ async function activateLc(
}
}
}

async function getInitializationOptions(context: vscode.ExtensionContext): Promise<VueInitializationOptions> {
return {
typescript: {
tsdk: (await lsp.getTsdk(context))!.tsdk,
tsserverRequestCommand: 'typescript.tsserverRequest',
},
};
}
1 change: 0 additions & 1 deletion packages/language-server/lib/types.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
export type VueInitializationOptions = {
typescript: {
tsdk: string;
tsserverRequestCommand?: string | [request: string, response: string];
};
};
Expand Down
9 changes: 2 additions & 7 deletions packages/language-server/node.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import type { LanguageServer } from '@volar/language-server';
import { createLanguageServiceEnvironment } from '@volar/language-server/lib/project/simpleProject';
import { createConnection, createServer, loadTsdkByPath } from '@volar/language-server/node';
import { createConnection, createServer } from '@volar/language-server/node';
import { createLanguage, createParsedCommandLine, createVueLanguagePlugin, getDefaultCompilerOptions } from '@vue/language-core';
import { createLanguageService, createUriMap, getHybridModeLanguageServicePlugins, type LanguageService } from '@vue/language-service';
import type * as ts from 'typescript';
import * as ts from 'typescript';
import { URI } from 'vscode-uri';
import type { VueInitializationOptions } from './lib/types';

Expand All @@ -15,14 +15,10 @@ connection.listen();
connection.onInitialize(params => {
const options: VueInitializationOptions = params.initializationOptions;

if (!options.typescript?.tsdk) {
throw new Error('typescript.tsdk is required');
}
if (!options.typescript?.tsserverRequestCommand) {
connection.console.warn('typescript.tsserverRequestCommand is required since >= 3.0 for complete TS features');
}

const { typescript: ts } = loadTsdkByPath(options.typescript.tsdk, params.locale);
const tsconfigProjects = createUriMap<LanguageService>();
const file2ProjectInfo = new Map<string, Promise<ts.server.protocol.ProjectInfo | null>>();

Expand Down Expand Up @@ -204,4 +200,3 @@ connection.onInitialize(params => {
connection.onInitialized(server.initialized);

connection.onShutdown(server.shutdown);

3 changes: 3 additions & 0 deletions packages/language-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
"vscode-languageserver-protocol": "^3.17.5",
"vscode-uri": "^3.0.8"
},
"peerDependencies": {
"typescript": "*"
},
"devDependencies": {
"@typescript/server-harness": "latest"
}
Expand Down
1 change: 0 additions & 1 deletion packages/language-server/tests/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ export async function getLanguageServer(): Promise<{
URI.file(testWorkspacePath).toString(),
{
typescript: {
tsdk: path.dirname(require.resolve('typescript/lib/typescript.js')),
tsserverRequestCommand: 'tsserverRequest',
},
} satisfies VueInitializationOptions,
Expand Down
3 changes: 3 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.