fix(vscode): find file references not working when hybrid mode disabled

close #4221
vuejs · Apr 7, 2024 · 52a74b4 · 52a74b4
1 parent 7e160b1
commit 52a74b4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/extensions/vscode/package.json b/extensions/vscode/package.json
@@ -415,37 +415,47 @@
 				"title": "Split <script>, <template>, <style> Editors",
 				"category": "Vue",
 				"icon": "images/split-editors.png"
+			},
+			{
+				"command": "vue.findAllFileReferences",
+				"title": "Find File References via Vue Langauge Server",
+				"category": "Vue"
 			}
 		],
 		"menus": {
 			"editor/context": [
 				{
 					"command": "typescript.goToSourceDefinition",
-					"when": "tsSupportsSourceDefinition && resourceLangId == vue",
+					"when": "vueHybridMode && tsSupportsSourceDefinition && resourceLangId == vue",
 					"group": "navigation@9"
 				}
 			],
 			"explorer/context": [
 				{
 					"command": "typescript.findAllFileReferences",
-					"when": "tsSupportsFileReferences && resourceLangId == vue",
+					"when": "vueHybridMode && tsSupportsFileReferences && resourceLangId == vue",
+					"group": "4_search"
+				},
+				{
+					"command": "vue.findAllFileReferences",
+					"when": "!vueHybridMode && resourceLangId == vue",
 					"group": "4_search"
 				}
 			],
 			"editor/title/context": [
 				{
 					"command": "typescript.findAllFileReferences",
-					"when": "tsSupportsFileReferences && resourceLangId == vue"
+					"when": "vueHybridMode && tsSupportsFileReferences && resourceLangId == vue"
 				}
 			],
 			"commandPalette": [
 				{
 					"command": "typescript.reloadProjects",
-					"when": "editorLangId == vue && typescript.isManagedFile"
+					"when": "vueHybridMode && editorLangId == vue && typescript.isManagedFile"
 				},
 				{
 					"command": "typescript.goToProjectConfig",
-					"when": "editorLangId == vue"
+					"when": "vueHybridMode && editorLangId == vue"
 				},
 				{
 					"command": "vue.action.doctor",

diff --git a/extensions/vscode/src/common.ts b/extensions/vscode/src/common.ts
@@ -39,6 +39,8 @@ export async function activate(context: vscode.ExtensionContext, createLc: Creat
 
 export const currentHybridModeStatus = getCurrentHybridModeStatus();
 
+vscode.commands.executeCommand('setContext', 'vueHybridMode', currentHybridModeStatus);
+
 function getCurrentHybridModeStatus(report = false) {
 	if (config.server.hybridMode === 'auto') {
 		const unknownExtensions: string[] = [];
@@ -197,6 +199,7 @@ async function doActivate(context: vscode.ExtensionContext, createLc: CreateLang
 	if (!currentHybridModeStatus) {
 		lsp.activateTsConfigStatusItem(selectors, 'vue.tsconfig', client);
 		lsp.activateTsVersionStatusItem(selectors, 'vue.tsversion', context, client, text => 'TS ' + text);
+		lsp.activateFindFileReferences('vue.findAllFileReferences', client);
 	}
 
 	const hybridModeStatus = vscode.languages.createLanguageStatusItem('vue-hybrid-mode', selectors);