Merge branch 'master' into handle-unsaved-files

volarjs · Aug 25, 2024 · e747717 · e747717
2 parents 87ad0b2 + 0797a0d
commit e747717
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 6 deletions.
diff --git a/packages/language-service/lib/features/resolveCodeAction.ts b/packages/language-service/lib/features/resolveCodeAction.ts
@@ -9,6 +9,7 @@ export function register(context: LanguageServiceContext) {
 	return async (item: vscode.CodeAction, token = NoneCancellationToken) => {
 
 		const data: ServiceCodeActionData | undefined = item.data;
+		delete item.data;
 
 		if (data) {
 

diff --git a/packages/language-service/lib/features/resolveCodeLens.ts b/packages/language-service/lib/features/resolveCodeLens.ts
@@ -12,6 +12,7 @@ export function register(context: LanguageServiceContext) {
 	return async (item: vscode.CodeLens, token = NoneCancellationToken) => {
 
 		const data: ServiceCodeLensData | ServiceReferencesCodeLensData | undefined = item.data;
+		delete item.data;
 
 		if (data?.kind === 'normal') {
 

diff --git a/packages/language-service/lib/features/resolveCompletionItem.ts b/packages/language-service/lib/features/resolveCompletionItem.ts
@@ -11,6 +11,7 @@ export function register(context: LanguageServiceContext) {
 	return async (item: vscode.CompletionItem, token = NoneCancellationToken) => {
 
 		const data: ServiceCompletionData | undefined = item.data;
+		delete item.data;
 
 		if (data) {
 

diff --git a/packages/language-service/lib/features/resolveDocumentLink.ts b/packages/language-service/lib/features/resolveDocumentLink.ts
@@ -9,6 +9,8 @@ export function register(context: LanguageServiceContext) {
 	return async (item: vscode.DocumentLink, token = NoneCancellationToken) => {
 
 		const data: DocumentLinkData | undefined = item.data;
+		delete item.data;
+
 		if (data) {
 			const plugin = context.plugins[data.pluginIndex];
 			if (!plugin[1].resolveDocumentLink) {

diff --git a/packages/language-service/lib/features/resolveInlayHint.ts b/packages/language-service/lib/features/resolveInlayHint.ts
@@ -8,6 +8,8 @@ export function register(context: LanguageServiceContext) {
 	return async (item: vscode.InlayHint, token = NoneCancellationToken) => {
 
 		const data: InlayHintData | undefined = item.data;
+		delete item.data;
+
 		if (data) {
 			const plugin = context.plugins[data.pluginIndex];
 			if (!plugin[1].resolveInlayHint) {

diff --git a/packages/language-service/lib/features/resolveWorkspaceSymbol.ts b/packages/language-service/lib/features/resolveWorkspaceSymbol.ts
@@ -5,19 +5,21 @@ import { NoneCancellationToken } from '../utils/cancellation';
 
 export function register(context: LanguageServiceContext) {
 
-	return async (symbol: vscode.WorkspaceSymbol, token = NoneCancellationToken) => {
+	return async (item: vscode.WorkspaceSymbol, token = NoneCancellationToken) => {
+
+		const data: WorkspaceSymbolData | undefined = item.data;
+		delete item.data;
 
-		const data: WorkspaceSymbolData | undefined = symbol.data;
 		if (data) {
 			const plugin = context.plugins[data.pluginIndex];
 			if (!plugin[1].resolveWorkspaceSymbol) {
-				return symbol;
+				return item;
 			}
 
-			Object.assign(symbol, data.original);
-			symbol = await plugin[1].resolveWorkspaceSymbol(symbol, token);
+			Object.assign(item, data.original);
+			item = await plugin[1].resolveWorkspaceSymbol(item, token);
 		}
 
-		return symbol;
+		return item;
 	};
 }