From 6642c09fbf49200e7feed677eaab4ee5442aeaef Mon Sep 17 00:00:00 2001
From: Joao Moreno <joao.moreno@microsoft.com>
Date: Fri, 15 Nov 2019 17:10:37 +0100
Subject: [PATCH] explorer: improve context during multi select

---
 .../files/browser/views/explorerView.ts       | 31 +++++++++++++------
 .../files/browser/views/explorerViewer.ts     |  3 +-
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/vs/workbench/contrib/files/browser/views/explorerView.ts b/src/vs/workbench/contrib/files/browser/views/explorerView.ts
index 542546d7f66..fbbdb59ca85 100644
--- a/src/vs/workbench/contrib/files/browser/views/explorerView.ts
+++ b/src/vs/workbench/contrib/files/browser/views/explorerView.ts
@@ -49,7 +49,7 @@ import { values } from 'vs/base/common/map';
 import { first } from 'vs/base/common/arrays';
 import { withNullAsUndefined } from 'vs/base/common/types';
 import { IFileService, FileSystemProviderCapabilities } from 'vs/platform/files/common/files';
-import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
+import { DisposableStore } from 'vs/base/common/lifecycle';
 import { Event } from 'vs/base/common/event';
 import { attachStyler, IColorMapping } from 'vs/platform/theme/common/styler';
 import { ColorValue, listDropBackground } from 'vs/platform/theme/common/colorRegistry';
@@ -283,23 +283,36 @@ export class ExplorerView extends ViewletPanel {
 	}
 
 	getContext(respectMultiSelection: boolean): ExplorerItem[] {
-		let stat: ExplorerItem | undefined;
+		let focusedStat: ExplorerItem | undefined;
+
 		if (this.compressedNavigationController) {
-			stat = this.compressedNavigationController.current;
+			focusedStat = this.compressedNavigationController.current;
 		} else {
 			const focus = this.tree.getFocus();
-			stat = focus.length ? focus[0] : undefined;
+			focusedStat = focus.length ? focus[0] : undefined;
 		}
-		if (!stat) {
+
+		if (!focusedStat) {
 			return [];
 		}
 
-		const selection = this.tree.getSelection();
-		if (respectMultiSelection && selection.indexOf(stat) >= 0) {
-			return selection;
+		const selectedStats: ExplorerItem[] = [];
+
+		for (const stat of this.tree.getSelection()) {
+			const controller = this.renderer.getCompressedNavigationController(stat);
+
+			if (controller) {
+				selectedStats.push(...controller.items);
+			} else {
+				selectedStats.push(stat);
+			}
 		}
 
-		return [stat];
+		if (respectMultiSelection && selectedStats.indexOf(focusedStat) >= 0) {
+			return selectedStats;
+		}
+
+		return [focusedStat];
 	}
 
 	private selectActiveFile(deselect?: boolean, reveal = this.autoReveal): void {
diff --git a/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts b/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
index 5ffc83706ee..68bfe373f5f 100644
--- a/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
+++ b/src/vs/workbench/contrib/files/browser/views/explorerViewer.ts
@@ -118,6 +118,7 @@ export class ExplorerDataSource implements IAsyncDataSource<ExplorerItem | Explo
 
 export interface ICompressedNavigationController {
 	readonly current: ExplorerItem;
+	readonly items: ExplorerItem[];
 	readonly index: number;
 	readonly count: number;
 	previous(): void;
@@ -136,7 +137,7 @@ export class CompressedNavigationController implements ICompressedNavigationCont
 	get count(): number { return this.items.length; }
 	get current(): ExplorerItem { return this.items[this._index]!; }
 
-	constructor(private items: ExplorerItem[], templateData: IFileTemplateData) {
+	constructor(readonly items: ExplorerItem[], templateData: IFileTemplateData) {
 		this._index = items.length - 1;
 		this.labels = Array.from(templateData.container.querySelectorAll('.label-name')) as HTMLElement[];
 		DOM.addClass(this.labels[this._index], 'active');