fix ${relativeFileDirname} in findInFilesCommand when using remote (#…

…180554) fix ${relativeFileDirname} resolving in findInFilesCommand when using remote #180553
microsoft · May 9, 2023 · 1b5e85f · 1b5e85f
1 parent 8023c83
commit 1b5e85f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/vs/workbench/contrib/search/browser/searchActionsFind.ts b/src/vs/workbench/contrib/search/browser/searchActionsFind.ts
@@ -363,8 +363,9 @@ export async function findInFilesCommand(accessor: ServicesAccessor, _args: IFin
 		const configurationResolverService = accessor.get(IConfigurationResolverService);
 		const historyService = accessor.get(IHistoryService);
 		const workspaceContextService = accessor.get(IWorkspaceContextService);
-		const activeWorkspaceRootUri = historyService.getLastActiveWorkspaceRoot(Schemas.file);
-		const lastActiveWorkspaceRoot = activeWorkspaceRootUri ? withNullAsUndefined(workspaceContextService.getWorkspaceFolder(activeWorkspaceRootUri)) : undefined;
+		const activeWorkspaceRootUri = historyService.getLastActiveWorkspaceRoot();
+		const filteredActiveWorkspaceRootUri = activeWorkspaceRootUri?.scheme === Schemas.file || activeWorkspaceRootUri?.scheme === Schemas.vscodeRemote ? activeWorkspaceRootUri : undefined;
+		const lastActiveWorkspaceRoot = filteredActiveWorkspaceRootUri ? withNullAsUndefined(workspaceContextService.getWorkspaceFolder(filteredActiveWorkspaceRootUri)) : undefined;
 
 		for (const entry of Object.entries(_args)) {
 			const name = entry[0];