Fix #46733 - context menu opens search menu

This commit is contained in:
Rob Lourens
2018-04-23 13:54:49 -07:00
parent 6d6585a213
commit 9ce5816cc3
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -480,7 +480,7 @@ export class TreeResourceNavigator extends Disposable {
const isMouseEvent = payload && payload.origin === 'mouse';
const isDoubleClick = isMouseEvent && originalEvent && originalEvent.detail === 2;
if (!isMouseEvent || this.tree.openOnSingleClick || isDoubleClick) {
if (!payload.preventOpenOnFocus && (!isMouseEvent || this.tree.openOnSingleClick || isDoubleClick)) {
this._openResource.fire({
editorOptions: {
preserveFocus: true,
@@ -378,7 +378,7 @@ export class SearchTreeController extends WorkbenchTreeController {
this.contextMenu = this.menuService.createMenu(MenuId.SearchContext, tree.contextKeyService);
}
tree.setFocus(element);
tree.setFocus(element, { preventOpenOnFocus: true });
const anchor = { x: event.posx, y: event.posy };
this.contextMenuService.showContextMenu({