refactor: provide trigger characters in plugins

extensions/vscode-vue-language-features/scripts/build-browser.js

@@ -12,11 +12,6 @@ require('esbuild').build({
     plugins: [{
         name: 'node-deps',
         setup(build) {
-            // build.onResolve({ filter: /^(vscode-.*|estree-walker|jsonc-parser)/ }, args => {
-            //     const pathUmdMay = require.resolve(args.path, { paths: [args.resolveDir] })
-            //     const pathEsm = pathUmdMay.replace('/umd/', '/esm/')
-            //     return { path: pathEsm }
-            // })
             build.onResolve({ filter: /^\@vue\/.*$/ }, args => {
                 const pathUmdMay = require.resolve(args.path, { paths: [args.resolveDir] })
                 const pathEsm = pathUmdMay.replace('.cjs.', '.esm-browser.')
@@ -47,17 +42,9 @@ require('esbuild').build({
     plugins: [{
         name: 'node-deps',
         setup(build) {
-            // build.onResolve({ filter: /^(vscode-.*|estree-walker|jsonc-parser)/ }, args => {
-            //     const pathUmdMay = require.resolve(args.path, { paths: [args.resolveDir] })
-            //     const pathEsm = pathUmdMay.replace('/umd/', '/esm/')
-            //     if (pathUmdMay !== pathEsm)
-            //         console.log(pathUmdMay)
-            //     return { path: pathEsm }
-            // })
             build.onResolve({ filter: /^vscode-.*-languageservice$/ }, args => {
                 const pathUmdMay = require.resolve(args.path, { paths: [args.resolveDir] })
                 const pathEsm = pathUmdMay.replace('/umd/', '/esm/')
-                console.log(pathUmdMay, pathEsm)
                 return { path: pathEsm }
             })
             build.onResolve({ filter: /^\@vue\/.*$/ }, args => {

packages/typescript-language-service/src/index.ts

@@ -1,9 +1,8 @@
 import * as vscode from 'vscode-languageserver-protocol';
-import * as completions from './services/completion';
-import * as completions2 from './services/completion2';
-import * as directiveCommentCompletions from './services/directiveCommentCompletions';
-import * as jsDocCompletions from './services/jsDocCompletions';
-import * as completionResolve from './services/completionResolve';
+import * as completions from './services/completions/basic';
+import * as directiveCommentCompletions from './services/completions/directiveComment';
+import * as jsDocCompletions from './services/completions/jsDoc';
+import * as completionResolve from './services/completions/resolve';
 import * as definitions from './services/definition';
 import * as typeDefinitions from './services/typeDefinition';
 import * as references from './services/references';
@@ -30,7 +29,6 @@ import type * as ts from 'typescript/lib/tsserverlibrary';
 
 export interface LanguageService extends ReturnType<typeof createLanguageService> { }
 export { getSemanticTokenLegend } from './services/semanticTokens';
-export { getTriggerCharacters } from './services/completion';
 import * as path from 'path';
 
 export interface Settings {
@@ -61,7 +59,7 @@ export function createLanguageService(
 		findDocumentHighlights: documentHighlight.register(languageService, getValidTextDocument, ts),
 		findDocumentSymbols: documentSymbol.register(languageService, getValidTextDocument),
 		findWorkspaceSymbols: workspaceSymbols.register(languageService, getTextDocument),
-		doComplete: completions2.register(languageService, getValidTextDocument, settings, ts),
+		doComplete: completions.register(languageService, getValidTextDocument, settings, ts),
 		doCompletionResolve: completionResolve.register(languageService, getValidTextDocument, getTextDocument, settings),
 		doDirectiveCommentComplete: directiveCommentCompletions.register(getValidTextDocument),
 		doJsDocComplete: jsDocCompletions.register(languageService, getValidTextDocument),
@@ -82,7 +80,6 @@ export function createLanguageService(
 			getTextDocument,
 			getValidTextDocument,
 			isValidFile,
-			doCompleteSync: completions.register(languageService, getValidTextDocument, ts),
 		},
 	};
 

packages/typescript-language-service/src/services/completion.ts → packages/typescript-language-service/src/services/completions/basic.ts

@@ -1,10 +1,11 @@
 import type * as ts from 'typescript/lib/tsserverlibrary';
-import * as PConst from '../protocol.const';
+import * as PConst from '../../protocol.const';
 import * as vscode from 'vscode-languageserver-protocol';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
 import * as shared from '@volar/shared';
 import * as semver from 'semver';
-import { parseKindModifier } from '../utils/modifiers';
+import { parseKindModifier } from '../../utils/modifiers';
+import { Settings } from '../..';
 
 export interface Data {
 	uri: string,
@@ -13,40 +14,33 @@ export interface Data {
 	originalItem: ts.CompletionEntry
 }
 
-export function getTriggerCharacters(tsVersion: string) {
-
-	const triggerCharacters = ['.', '"', '\'', '`', '/', '<'];
-
-	// https://github.com/microsoft/vscode/blob/8e65ae28d5fb8b3c931135da1a41edb9c80ae46f/extensions/typescript-language-features/src/languageFeatures/completions.ts#L811-L833
-	if (semver.lt(tsVersion, '3.1.0') || semver.gte(tsVersion, '3.2.0')) {
-		triggerCharacters.push('@');
-	}
-	if (semver.gte(tsVersion, '3.8.1')) {
-		triggerCharacters.push('#');
-	}
-	if (semver.gte(tsVersion, '4.3.0')) {
-		triggerCharacters.push(' ');
-	}
-
-	return triggerCharacters;
-}
-
 export function register(
 	languageService: ts.LanguageService,
 	getTextDocument: (uri: string) => TextDocument | undefined,
+	settings: Settings,
 	ts: typeof import('typescript/lib/tsserverlibrary'),
 ) {
-	return (uri: string, position: vscode.Position, options?: ts.GetCompletionsAtPositionOptions): vscode.CompletionList | undefined => {
+
+	return async (uri: string, position: vscode.Position, options?: ts.GetCompletionsAtPositionOptions): Promise<vscode.CompletionList | undefined> => {
 
 		const document = getTextDocument(uri);
-		if (!document) return;
+		if (!document)
+			return;
 
+		const preferences = await settings.getPreferences?.(document) ?? {};
 		const fileName = shared.uriToFsPath(document.uri);
 		const offset = document.offsetAt(position);
 
 		let completionContext: ReturnType<typeof languageService.getCompletionsAtPosition> | undefined;
-		try { completionContext = languageService.getCompletionsAtPosition(fileName, offset, options); } catch { }
-		if (completionContext === undefined) return;
+		try {
+			completionContext = languageService.getCompletionsAtPosition(fileName, offset, {
+				...preferences,
+				...options,
+			});
+		} catch { }
+
+		if (completionContext === undefined)
+			return;
 
 		const wordRange = completionContext.optionalReplacementSpan ? vscode.Range.create(
 			document.positionAt(completionContext.optionalReplacementSpan.start),

packages/typescript-language-service/src/services/completionResolve.ts → packages/typescript-language-service/src/services/completions/resolve.ts

@@ -1,12 +1,12 @@
 import type * as ts from 'typescript/lib/tsserverlibrary';
 import * as vscode from 'vscode-languageserver-protocol';
 import { TextDocument } from 'vscode-languageserver-textdocument';
-import { entriesToLocations } from '../utils/transforms';
-import { handleKindModifiers } from './completion';
-import type { Data } from './completion';
-import * as previewer from '../utils/previewer';
+import { entriesToLocations } from '../../utils/transforms';
+import { handleKindModifiers } from './basic';
+import type { Data } from './basic';
+import * as previewer from '../../utils/previewer';
 import * as shared from '@volar/shared';
-import type { Settings } from '../';
+import type { Settings } from '../..';
 
 export function register(
 	languageService: ts.LanguageService,
@@ -16,7 +16,11 @@ export function register(
 ) {
 	return async (item: vscode.CompletionItem, newPosition?: vscode.Position): Promise<vscode.CompletionItem> => {
 
-		const data: Data = item.data as any;
+		const data: Data | undefined = item.data as any;
+
+		if (!data)
+			return item;
+
 		const fileName = data.fileName;
 		let offset = data.offset;
 		const document = getTextDocument(data.uri);

packages/vue-language-server/src/common.ts

@@ -91,7 +91,7 @@ export function createLanguageServer(connection: vscode.Connection, runtimeEnv:
 
 			(await import('./features/customFeatures')).register(connection, documents, () => projects);
 			(await import('./features/languageFeatures')).register(ts, connection, documents, () => projects, options.languageFeatures, params);
-			(await import('./registers/registerlanguageFeatures')).register(options.languageFeatures!, vue.getSemanticTokenLegend(), result.capabilities, ts.version);
+			(await import('./registers/registerlanguageFeatures')).register(options.languageFeatures!, vue.getSemanticTokenLegend(), result.capabilities);
 
 			connection.onInitialized(async () => {
 

packages/vue-language-server/src/registers/registerlanguageFeatures.ts

@@ -6,7 +6,6 @@ export function register(
 	features: NonNullable<shared.ServerInitializationOptions['languageFeatures']>,
 	legend: vscode.SemanticTokensLegend,
 	server: vscode.ServerCapabilities,
-	tsVersion: string,
 ) {
 	if (features.references) {
 		server.referencesProvider = true;
@@ -54,9 +53,8 @@ export function register(
 		};
 	}
 	if (features.completion) {
-		const triggerCharacters = vue.getTriggerCharacters(tsVersion);
 		server.completionProvider = {
-			triggerCharacters: Object.values(triggerCharacters).flat(),
+			triggerCharacters: '!@#$%^&*()_+-=`~{}|[]\:";\'<>?,./'.split(''), // all symbols on keyboard
 			resolveProvider: true,
 		};
 		server.executeCommandProvider = {

packages/vue-language-service-types/src/index.ts

@@ -7,9 +7,9 @@ type NullableResult<T> = NotNullableResult<T | undefined | null>;
 export type SemanticToken = [number, number, number, number, number];
 
 export interface ConfigurationHost {
-	getConfiguration: (<T> (section: string, scopeUri?: string) => Promise<T | undefined>),
-	onDidChangeConfiguration: (cb: () => void) => void,
-	rootUris: string[],
+    getConfiguration: (<T> (section: string, scopeUri?: string) => Promise<T | undefined>),
+    onDidChangeConfiguration: (cb: () => void) => void,
+    rootUris: string[],
 }
 
 export interface ExecuteCommandContext {
@@ -26,6 +26,9 @@ export interface ExecuteCommandContext {
 }
 
 export type EmbeddedLanguageServicePlugin = {
+
+    triggerCharacters?: string[],
+
     doValidation?(document: TextDocument, options: {
         semantic?: boolean;
         syntactic?: boolean;

packages/vue-language-service/src/commonPlugins/css.ts

@@ -49,6 +49,9 @@ export default function (host: {
         getStylesheet,
         getCssLs,
 
+        // https://github.com/microsoft/vscode/blob/09850876e652688fb142e2e19fd00fd38c0bc4ba/extensions/css-language-features/server/src/cssServer.ts#L97
+        triggerCharacters: ['/', '-', ':'],
+
         async doValidation(document) {
             return worker(document, async (stylesheet, cssLs) => {
 

packages/vue-language-service/src/commonPlugins/html.ts

@@ -30,6 +30,9 @@ export default function (host: {
         getHtmlDocument,
         getHtmlDataProviders: () => customData,
 
+        // https://github.com/microsoft/vscode/blob/09850876e652688fb142e2e19fd00fd38c0bc4ba/extensions/html-language-features/server/src/htmlServer.ts#L183
+        triggerCharacters: ['.', ':', '<', '"', '=', '/'],
+
         async doComplete(document, position, context) {
             return worker(document, (htmlDocument) => {
 

packages/vue-language-service/src/commonPlugins/json.ts

@@ -13,6 +13,9 @@ export default function (host: {
 
     return {
 
+        // https://github.com/microsoft/vscode/blob/09850876e652688fb142e2e19fd00fd38c0bc4ba/extensions/json-language-features/server/src/jsonServer.ts#L150
+        triggerCharacters: ['"', ':'],
+
         doValidation(document) {
             return worker(document, async (jsonDocument) => {