development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-13 21:55:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix "reveal in sidebar" search command with no context

Browse source 
Fix #94827
This commit is contained in:
Rob Lourens 2020-04-10 16:54:15 -05:00
parent c677d9eb49
commit b02e2efb9d
1 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/vs/workbench/contrib/search/browser/search.contribution.ts
View file

@ -332,21 +332,37 @@ CommandsRegistry.registerCommand({
CommandsRegistry.registerCommand({
id: Constants.RevealInSideBarForSearchResults,
handler: (accessor, fileMatch: FileMatch) => {
handler: (accessor, args: any) => {
const viewletService = accessor.get(IViewletService);
const explorerService = accessor.get(IExplorerService);
const contextService = accessor.get(IWorkspaceContextService);
const uri = fileMatch.resource;
const searchView = getSearchView(accessor.get(IViewsService));
if (!searchView) {
return;
}
let fileMatch: FileMatch;
if (!(args instanceof FileMatch)) {
args = searchView.getControl().getFocus()[0];
}
if (args instanceof FileMatch) {
fileMatch = args;
} else {
return;
}
viewletService.openViewlet(VIEWLET_ID_FILES, false).then((viewlet) => {
const explorerViewContainer = viewlet?.getViewPaneContainer() as ExplorerViewPaneContainer;
if (!viewlet) {
return;
}
const explorerViewContainer = viewlet.getViewPaneContainer() as ExplorerViewPaneContainer;
const uri = fileMatch.resource;
if (uri && contextService.isInsideWorkspace(uri)) {
const explorerView = explorerViewContainer?.getExplorerView();
if (explorerView) {
explorerView.setExpanded(true);
explorerService.select(uri, true).then(() => explorerView.focus(), onUnexpectedError);
}
const explorerView = explorerViewContainer.getExplorerView();
explorerView.setExpanded(true);
explorerService.select(uri, true).then(() => explorerView.focus(), onUnexpectedError);
}
});
}