fix(typescript): add workspace symbols support for TS plugin

close vuejs/language-tools#4595
volarjs · Jul 22, 2024 · 669ce2e · 669ce2e
1 parent d0c3954
commit 669ce2e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/packages/language-server/lib/server.ts b/packages/language-server/lib/server.ts
@@ -51,10 +51,10 @@ export function createServerBase(
 	const status = {
 		connection,
 		fs: createFsWithCache(fs),
-		initializeParams: undefined as unknown as vscode.InitializeParams,
-		initializeResult: undefined as unknown as VolarInitializeResult,
-		languageServicePlugins: [] as unknown as LanguageServicePlugin[],
-		project: undefined as unknown as LanguageServerProject,
+		initializeParams: undefined! as vscode.InitializeParams,
+		initializeResult: undefined! as VolarInitializeResult,
+		languageServicePlugins: [] as LanguageServicePlugin[],
+		project: undefined! as LanguageServerProject,
 		pullModelDiagnostics: false,
 		documents,
 		workspaceFolders: createUriMap<boolean>(),

diff --git a/packages/typescript/lib/node/proxyLanguageService.ts b/packages/typescript/lib/node/proxyLanguageService.ts
@@ -79,6 +79,7 @@ export function createProxyLanguageService(languageService: ts.LanguageService)
 					case 'getCompletionEntryDetails': return getCompletionEntryDetails(language, target[p]);
 					case 'provideInlayHints': return provideInlayHints(language, target[p]);
 					case 'getFileReferences': return getFileReferences(language, target[p]);
+					case 'getNavigateToItems': return getNavigateToItems(language, target[p]);
 				}
 			};
 		},
@@ -971,6 +972,15 @@ function getFileReferences(language: Language<string>, getFileReferences: ts.Lan
 		return dedupeDocumentSpans(resolved);
 	};
 }
+function getNavigateToItems(language: Language<string>, getNavigateToItems: ts.LanguageService['getNavigateToItems']): ts.LanguageService['getNavigateToItems'] {
+	return (...args) => {
+		const unresolved = getNavigateToItems(...args);
+		const resolved = unresolved
+			.map(s => transformDocumentSpan(language, s, isReferencesEnabled))
+			.filter(s => !!s);
+		return dedupeDocumentSpans(resolved);
+	};
+}
 
 function linkedCodeFeatureWorker<T>(
 	language: Language<string>,