From e5161f6bea4ce484b37ea56e0261ade947934e64 Mon Sep 17 00:00:00 2001 From: eronnen Date: Fri, 21 Apr 2023 20:24:06 +0300 Subject: [PATCH] fix file variables resolving in findInFilesCommand when using vscode-remote #180553 --- src/vs/workbench/contrib/search/browser/searchActionsFind.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/contrib/search/browser/searchActionsFind.ts b/src/vs/workbench/contrib/search/browser/searchActionsFind.ts index 418109b7bd699..0042bfaf818ff 100644 --- 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];