Custom tree view should run command on every click

alexr00 · alexr00 · commit 520423b9c16c · 2019-07-10T14:48:51.000+02:00
Not just on selection change Fixes microsoft#76998
diff --git a/src/vs/workbench/browser/parts/views/customView.ts b/src/vs/workbench/browser/parts/views/customView.ts
@@ -28,7 +28,7 @@ import { URI } from 'vs/base/common/uri';
 import { dirname, basename } from 'vs/base/common/resources';
 import { LIGHT, FileThemeIcon, FolderThemeIcon, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { FileKind } from 'vs/platform/files/common/files';
-import { WorkbenchAsyncDataTree } from 'vs/platform/list/browser/listService';
+import { WorkbenchAsyncDataTree, TreeResourceNavigator2 } from 'vs/platform/list/browser/listService';
 import { ViewletPanel, IViewletPanelOptions } from 'vs/workbench/browser/parts/views/panelViewlet';
 import { localize } from 'vs/nls';
 import { timeout } from 'vs/base/common/async';
@@ -42,7 +42,7 @@ import { IMarkdownRenderResult } from 'vs/editor/contrib/markdown/markdownRender
 import { ILabelService } from 'vs/platform/label/common/label';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IListVirtualDelegate, IIdentityProvider } from 'vs/base/browser/ui/list/list';
-import { ITreeRenderer, ITreeNode, IAsyncDataSource, ITreeContextMenuEvent, ITreeEvent } from 'vs/base/browser/ui/tree/tree';
+import { ITreeRenderer, ITreeNode, IAsyncDataSource, ITreeContextMenuEvent } from 'vs/base/browser/ui/tree/tree';
 import { FuzzyScore, createMatches } from 'vs/base/common/filters';
 import { CollapseAllAction } from 'vs/base/browser/ui/tree/treeDefaults';
 
@@ -389,7 +389,6 @@ export class CustomTreeView extends Disposable implements ITreeView {
 		aligner.tree = this.tree;
 
 		this.tree.contextKeyService.createKey<boolean>(this.id, true);
-		this._register(this.tree.onDidChangeSelection(e => this.onSelection(e)));
 		this._register(this.tree.onContextMenu(e => this.onContextMenu(treeMenus, e)));
 		this._register(this.tree.onDidChangeSelection(e => this._onDidChangeSelection.fire(e.elements)));
 		this._register(this.tree.onDidChangeCollapseState(e => {
@@ -401,6 +400,18 @@ export class CustomTreeView extends Disposable implements ITreeView {
 			}
 		}));
 		this.tree.setInput(this.root).then(() => this.updateContentAreas());
+
+		const customTreeNavigator = new TreeResourceNavigator2(this.tree);
+		this._register(customTreeNavigator);
+		this._register(customTreeNavigator.onDidOpenResource(e => {
+			if (!e.browserEvent) {
+				return;
+			}
+			const selection = this.tree.getSelection();
+			if ((selection.length === 1) && selection[0].command) {
+				this.commandService.executeCommand(selection[0].command.id, ...(selection[0].command.arguments || []));
+			}
+		}));
 	}
 
 	private onContextMenu(treeMenus: TreeMenus, treeEvent: ITreeContextMenuEvent<ITreeItem>): void {
@@ -599,20 +610,6 @@ export class CustomTreeView extends Disposable implements ITreeView {
 			this.domNode.removeAttribute('tabindex');
 		}
 	}
-
-	private onSelection(e: ITreeEvent<ITreeItem>): void {
-		if (!e.browserEvent) {
-			return;
-		}
-		const selection: ITreeItem = this.tree.getSelection()[0];
-		if (selection) {
-			if (selection.command) {
-				if (this.tree.openOnSingleClick) {
-					this.commandService.executeCommand(selection.command.id, ...(selection.command.arguments || []));
-				}
-			}
-		}
-	}
 }
 
 class CustomViewIdentityProvider implements IIdentityProvider<ITreeItem> {
