Skip to content

Commit 1b5e85f

Browse files
authored
fix ${relativeFileDirname} in findInFilesCommand when using remote (microsoft#180554)
fix ${relativeFileDirname} resolving in findInFilesCommand when using remote microsoft#180553
1 parent 8023c83 commit 1b5e85f

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/vs/workbench/contrib/search/browser/searchActionsFind.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,8 +363,9 @@ export async function findInFilesCommand(accessor: ServicesAccessor, _args: IFin
363363
const configurationResolverService = accessor.get(IConfigurationResolverService);
364364
const historyService = accessor.get(IHistoryService);
365365
const workspaceContextService = accessor.get(IWorkspaceContextService);
366-
const activeWorkspaceRootUri = historyService.getLastActiveWorkspaceRoot(Schemas.file);
367-
const lastActiveWorkspaceRoot = activeWorkspaceRootUri ? withNullAsUndefined(workspaceContextService.getWorkspaceFolder(activeWorkspaceRootUri)) : undefined;
366+
const activeWorkspaceRootUri = historyService.getLastActiveWorkspaceRoot();
367+
const filteredActiveWorkspaceRootUri = activeWorkspaceRootUri?.scheme === Schemas.file || activeWorkspaceRootUri?.scheme === Schemas.vscodeRemote ? activeWorkspaceRootUri : undefined;
368+
const lastActiveWorkspaceRoot = filteredActiveWorkspaceRootUri ? withNullAsUndefined(workspaceContextService.getWorkspaceFolder(filteredActiveWorkspaceRootUri)) : undefined;
368369

369370
for (const entry of Object.entries(_args)) {
370371
const name = entry[0];

0 commit comments

Comments
 (0)