From 245358ab239977e275a2c076e0376d86781e7d0e Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Fri, 14 Feb 2020 10:30:12 +0100
Subject: [PATCH] sort categories with uncheck items atop,
 https://github.com/microsoft/vscode/issues/90664

---
 .../contrib/bulkEdit/browser/bulkEditPane.ts  |  3 +-
 .../bulkEdit/browser/bulkEditPreview.ts       | 11 +++++-
 .../contrib/bulkEdit/browser/bulkEditTree.ts  | 36 ++++++++++++++++++-
 3 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/contrib/bulkEdit/browser/bulkEditPane.ts b/src/vs/workbench/contrib/bulkEdit/browser/bulkEditPane.ts
index 2d0de4bbb3d37..0970caecdbb0b 100644
--- a/src/vs/workbench/contrib/bulkEdit/browser/bulkEditPane.ts
+++ b/src/vs/workbench/contrib/bulkEdit/browser/bulkEditPane.ts
@@ -6,7 +6,7 @@
 import 'vs/css!./bulkEdit';
 import { WorkbenchAsyncDataTree, TreeResourceNavigator, IOpenEvent } from 'vs/platform/list/browser/listService';
 import { WorkspaceEdit } from 'vs/editor/common/modes';
-import { BulkEditElement, BulkEditDelegate, TextEditElementRenderer, FileElementRenderer, BulkEditDataSource, BulkEditIdentityProvider, FileElement, TextEditElement, BulkEditAccessibilityProvider, BulkEditAriaProvider, CategoryElementRenderer, BulkEditNaviLabelProvider, CategoryElement } from 'vs/workbench/contrib/bulkEdit/browser/bulkEditTree';
+import { BulkEditElement, BulkEditDelegate, TextEditElementRenderer, FileElementRenderer, BulkEditDataSource, BulkEditIdentityProvider, FileElement, TextEditElement, BulkEditAccessibilityProvider, BulkEditAriaProvider, CategoryElementRenderer, BulkEditNaviLabelProvider, CategoryElement, BulkEditSorter } from 'vs/workbench/contrib/bulkEdit/browser/bulkEditTree';
 import { FuzzyScore } from 'vs/base/common/filters';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { registerThemingParticipant, ITheme, ICssStyleCollector, IThemeService } from 'vs/platform/theme/common/themeService';
@@ -135,6 +135,7 @@ export class BulkEditPane extends ViewPane {
 				expandOnlyOnTwistieClick: true,
 				multipleSelectionSupport: false,
 				keyboardNavigationLabelProvider: new BulkEditNaviLabelProvider(),
+				sorter: new BulkEditSorter()
 			}
 		);
 
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/bulkEditPreview.ts b/src/vs/workbench/contrib/bulkEdit/browser/bulkEditPreview.ts
index 8d7ec503497dd..06bdb85376ac0 100644
--- a/src/vs/workbench/contrib/bulkEdit/browser/bulkEditPreview.ts
+++ b/src/vs/workbench/contrib/bulkEdit/browser/bulkEditPreview.ts
@@ -99,6 +99,15 @@ export class BulkFileOperation {
 			this.newUri = edit.newUri;
 		}
 	}
+
+	needsConfirmation(): boolean {
+		for (let [, edit] of this.originalEdits) {
+			if (!this.parent.checked.isChecked(edit)) {
+				return true;
+			}
+		}
+		return false;
+	}
 }
 
 export class BulkCategory {
@@ -230,7 +239,7 @@ export class BulkFileOperations {
 		}
 
 		operationByResource.forEach(value => this.fileOperations.push(value));
-		operationByCategory.forEach(value => value.metadata.needsConfirmation ? this.categories.unshift(value) : this.categories.push(value));
+		operationByCategory.forEach(value => this.categories.push(value));
 
 		// "correct" invalid parent-check child states that is
 		// unchecked file edits (rename, create, delete) uncheck
diff --git a/src/vs/workbench/contrib/bulkEdit/browser/bulkEditTree.ts b/src/vs/workbench/contrib/bulkEdit/browser/bulkEditTree.ts
index 4a50a0b6b890a..544fa1027d4d4 100644
--- a/src/vs/workbench/contrib/bulkEdit/browser/bulkEditTree.ts
+++ b/src/vs/workbench/contrib/bulkEdit/browser/bulkEditTree.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IAsyncDataSource, ITreeRenderer, ITreeNode } from 'vs/base/browser/ui/tree/tree';
+import { IAsyncDataSource, ITreeRenderer, ITreeNode, ITreeSorter } from 'vs/base/browser/ui/tree/tree';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { FuzzyScore, createMatches } from 'vs/base/common/filters';
 import { IResourceLabel, ResourceLabels } from 'vs/workbench/browser/labels';
@@ -24,6 +24,7 @@ import { IconLabel } from 'vs/base/browser/ui/iconLabel/iconLabel';
 import { basename } from 'vs/base/common/resources';
 import { ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { WorkspaceFileEdit } from 'vs/editor/common/modes';
+import { compare } from 'vs/base/common/strings';
 
 // --- VIEW MODEL
 
@@ -248,6 +249,39 @@ export class BulkEditDataSource implements IAsyncDataSource<BulkFileOperations,
 	}
 }
 
+
+export class BulkEditSorter implements ITreeSorter<BulkEditElement> {
+
+	compare(a: BulkEditElement, b: BulkEditElement): number {
+		if (a instanceof CategoryElement && b instanceof CategoryElement) {
+			//
+			const aConfirm = BulkEditSorter._needsConfirmation(a.category);
+			const bConfirm = BulkEditSorter._needsConfirmation(b.category);
+			if (aConfirm === bConfirm) {
+				return a.category.metadata.label.localeCompare(b.category.metadata.label);
+			} else if (aConfirm) {
+				return -1;
+			} else {
+				return 1;
+			}
+		}
+
+		if (a instanceof FileElement && b instanceof FileElement) {
+			return compare(a.edit.uri.toString(), b.edit.uri.toString());
+		}
+
+		if (a instanceof TextEditElement && b instanceof TextEditElement) {
+			return Range.compareRangesUsingStarts(a.edit.textEdit.edit.range, b.edit.textEdit.edit.range);
+		}
+
+		return 0;
+	}
+
+	private static _needsConfirmation(a: BulkCategory): boolean {
+		return a.fileOperations.some(ops => ops.needsConfirmation());
+	}
+}
+
 // --- ACCESSI
 
 export class BulkEditAccessibilityProvider implements IAccessibilityProvider<BulkEditElement> {