Add Sort Order Option setting to address #27759

src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as dom from 'vs/base/browser/dom';
-import { compareFileNames } from 'vs/base/common/comparers';
+import { compareFileNamesNumeric } from 'vs/base/common/comparers';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { Emitter, Event } from 'vs/base/common/event';
 import { createMatches, FuzzyScore } from 'vs/base/common/filters';
@@ -351,7 +351,7 @@ export class FileSorter implements ITreeSorter<IFileStat | IWorkspaceFolder> {
 		}
 		if ((a as IFileStat).isDirectory === (b as IFileStat).isDirectory) {
 			// same type -> compare on names
-			return compareFileNames(a.name, b.name);
+			return compareFileNamesNumeric(a.name, b.name);
 		} else if ((a as IFileStat).isDirectory) {
 			return -1;
 		} else {

src/vs/workbench/contrib/files/browser/files.contribution.ts

@@ -14,7 +14,7 @@ import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/wor
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { IEditorInputFactory, EditorInput, IFileEditorInput, IEditorInputFactoryRegistry, Extensions as EditorInputExtensions } from 'vs/workbench/common/editor';
 import { AutoSaveConfiguration, HotExitConfiguration, FILES_EXCLUDE_CONFIG, FILES_ASSOCIATIONS_CONFIG } from 'vs/platform/files/common/files';
-import { VIEWLET_ID, SortOrder, FILE_EDITOR_INPUT_ID, IExplorerService } from 'vs/workbench/contrib/files/common/files';
+import { VIEWLET_ID, SortOrder, SortOrderOption, FILE_EDITOR_INPUT_ID, IExplorerService } from 'vs/workbench/contrib/files/common/files';
 import { TextFileEditorTracker } from 'vs/workbench/contrib/files/browser/editors/textFileEditorTracker';
 import { TextFileSaveErrorHandler } from 'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler';
 import { FileEditorInput } from 'vs/workbench/contrib/files/common/editors/fileEditorInput';
@@ -398,6 +398,19 @@ configurationRegistry.registerConfiguration({
 			],
 			'description': nls.localize('sortOrder', "Controls sorting order of files and folders in the explorer.")
 		},
+		'explorer.sortOrderOption': {
+			'type': 'string',
+			'enum': [SortOrderOption.Numeric, SortOrderOption.Upper, SortOrderOption.Lower, SortOrderOption.Mixed, SortOrderOption.Unicode],
+			'default': SortOrderOption.Numeric,
+			'enumDescriptions': [
+				nls.localize('sortOrderOption.numeric', 'Mixes uppercase and lowercase names together. Numbers are sorted numerically, not alphabetically.'),
+				nls.localize('sortOrderOption.upper', 'Groups uppercase names before lowercase names. Numbers are sorted alphabetically.'),
+				nls.localize('sortOrderOption.lower', 'Groups lowercase names before uppercase names. Numbers are sorted alphabetically.'),
+				nls.localize('sortOrderOption.mixed', 'Mixes uppercase and lowercase names together. Numbers are sorted alphabetically.'),
+				nls.localize('sortOrderOption.unicode', 'Sorts names in unicode order.')
+			],
+			'description': nls.localize('SortOrderOption', "Further specifies the file and directory sort order.")
+		},
 		'explorer.decorations.colors': {
 			type: 'boolean',
 			description: nls.localize('explorer.decorations.colors', "Controls whether file decorations should use colors."),

src/vs/workbench/contrib/files/browser/views/explorerViewer.ts

@@ -29,7 +29,7 @@ import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { equals, deepClone } from 'vs/base/common/objects';
 import * as path from 'vs/base/common/path';
 import { ExplorerItem, NewExplorerItem } from 'vs/workbench/contrib/files/common/explorerModel';
-import { compareFileExtensions, compareFileNames } from 'vs/base/common/comparers';
+import { compareFileExtensionsNumeric, compareFileNamesUnicode, compareFileExtensionsUnicode, compareFileExtensionsUpper, compareFileExtensionsLower, compareFileExtensionsMixed, compareFileNamesNumeric, compareFileNamesUpper, compareFileNamesLower, compareFileNamesMixed } from 'vs/base/common/comparers';
 import { fillResourceDataTransfers, CodeDataTransfers, extractResources, containsDragType } from 'vs/workbench/browser/dnd';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IDragAndDropData, DataTransfers } from 'vs/base/browser/dnd';
@@ -641,6 +641,33 @@ export class FileSorter implements ITreeSorter<ExplorerItem> {
 		}
 
 		const sortOrder = this.explorerService.sortOrder;
+		const sortOrderOption = this.explorerService.sortOrderOption;
+
+		let compareFileNames;
+		let compareFileExtensions;
+		switch (sortOrderOption) {
+			case 'upper':
+				compareFileNames = compareFileNamesUpper;
+				compareFileExtensions = compareFileExtensionsUpper;
+				break;
+			case 'lower':
+				compareFileNames = compareFileNamesLower;
+				compareFileExtensions = compareFileExtensionsLower;
+				break;
+			case 'mixed':
+				compareFileNames = compareFileNamesMixed;
+				compareFileExtensions = compareFileExtensionsMixed;
+				break;
+			case 'unicode':
+				compareFileNames = compareFileNamesUnicode;
+				compareFileExtensions = compareFileExtensionsUnicode;
+				break;
+			default:
+				// 'numeric'
+				compareFileNames = compareFileNamesNumeric;
+				compareFileExtensions = compareFileExtensionsNumeric;
+
+		}
 
 		// Sort Directories
 		switch (sortOrder) {

src/vs/workbench/contrib/files/common/explorerService.ts

@@ -6,7 +6,7 @@
 import { Event } from 'vs/base/common/event';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { DisposableStore } from 'vs/base/common/lifecycle';
-import { IExplorerService, IFilesConfiguration, SortOrder, IExplorerView } from 'vs/workbench/contrib/files/common/files';
+import { IExplorerService, IFilesConfiguration, SortOrder, SortOrderOption, IExplorerView } from 'vs/workbench/contrib/files/common/files';
 import { ExplorerItem, ExplorerModel } from 'vs/workbench/contrib/files/common/explorerModel';
 import { URI } from 'vs/base/common/uri';
 import { FileOperationEvent, FileOperation, IFileService, FileChangesEvent, FILES_EXCLUDE_CONFIG, FileChangeType, IResolveFileOptions } from 'vs/platform/files/common/files';
@@ -35,6 +35,7 @@ export class ExplorerService implements IExplorerService {
 	private readonly disposables = new DisposableStore();
 	private editable: { stat: ExplorerItem, data: IEditableData } | undefined;
 	private _sortOrder: SortOrder;
+	private _sortOrderOption: SortOrderOption;
 	private cutItems: ExplorerItem[] | undefined;
 	private view: IExplorerView | undefined;
 	private model: ExplorerModel;
@@ -48,6 +49,7 @@ export class ExplorerService implements IExplorerService {
 		@IEditorService private editorService: IEditorService,
 	) {
 		this._sortOrder = this.configurationService.getValue('explorer.sortOrder');
+		this._sortOrderOption = this.configurationService.getValue('explorer.sortOrderOption');
 
 		this.model = new ExplorerModel(this.contextService, this.fileService);
 		this.disposables.add(this.model);
@@ -83,6 +85,10 @@ export class ExplorerService implements IExplorerService {
 		return this._sortOrder;
 	}
 
+	get sortOrderOption(): SortOrderOption {
+		return this._sortOrderOption;
+	}
+
 	registerView(contextProvider: IExplorerView): void {
 		this.view = contextProvider;
 	}
@@ -379,13 +385,22 @@ export class ExplorerService implements IExplorerService {
 	}
 
 	private async onConfigurationUpdated(configuration: IFilesConfiguration, event?: IConfigurationChangeEvent): Promise<void> {
-		const configSortOrder = configuration?.explorer?.sortOrder || 'default';
+		let shouldRefresh = false;
+
+		const configSortOrder = configuration?.explorer?.sortOrder || SortOrder.Default;
 		if (this._sortOrder !== configSortOrder) {
-			const shouldRefresh = this._sortOrder !== undefined;
+			shouldRefresh = this._sortOrder !== undefined;
 			this._sortOrder = configSortOrder;
-			if (shouldRefresh) {
-				await this.refresh();
-			}
+		}
+
+		const configSortOrderOption = configuration?.explorer?.sortOrderOption || SortOrderOption.Numeric;
+		if (this._sortOrderOption !== configSortOrderOption) {
+			shouldRefresh = shouldRefresh || this._sortOrderOption !== undefined;
+			this._sortOrderOption = configSortOrderOption;
+		}
+
+		if (shouldRefresh) {
+			await this.refresh();
 		}
 	}
 

src/vs/workbench/contrib/files/common/files.ts

@@ -37,6 +37,7 @@ export interface IExplorerService {
 	_serviceBrand: undefined;
 	readonly roots: ExplorerItem[];
 	readonly sortOrder: SortOrder;
+	readonly sortOrderOption: SortOrderOption;
 
 	getContext(respectMultiSelection: boolean): ExplorerItem[];
 	setEditable(stat: ExplorerItem, data: IEditableData | null): Promise<void>;
@@ -120,6 +121,7 @@ export interface IFilesConfiguration extends PlatformIFilesConfiguration, IWorkb
 		enableDragAndDrop: boolean;
 		confirmDelete: boolean;
 		sortOrder: SortOrder;
+		sortOrderOption: SortOrderOption;
 		decorations: {
 			colors: boolean;
 			badges: boolean;
@@ -142,6 +144,14 @@ export const enum SortOrder {
 	Modified = 'modified'
 }
 
+export const enum SortOrderOption {
+	Numeric = 'numeric',
+	Upper = 'upper',
+	Lower = 'lower',
+	Mixed = 'mixed',
+	Unicode = 'unicode',
+}
+
 export class TextFileContentProvider extends Disposable implements ITextModelContentProvider {
 	private readonly fileWatcherDisposable = this._register(new MutableDisposable());
 

src/vs/workbench/contrib/scm/browser/repositoryPane.ts

@@ -39,7 +39,7 @@ import { Iterable } from 'vs/base/common/iterator';
 import { ICompressedTreeNode, ICompressedTreeElement } from 'vs/base/browser/ui/tree/compressedObjectTreeModel';
 import { URI } from 'vs/base/common/uri';
 import { FileKind } from 'vs/platform/files/common/files';
-import { compareFileNames } from 'vs/base/common/comparers';
+import { compareFileNamesNumeric } from 'vs/base/common/comparers';
 import { FuzzyScore, createMatches } from 'vs/base/common/filters';
 import { IViewDescriptor, IViewDescriptorService } from 'vs/workbench/common/views';
 import { localize } from 'vs/nls';
@@ -352,7 +352,7 @@ export class SCMTreeSorter implements ITreeSorter<TreeElement> {
 		const oneName = ResourceTree.isResourceNode(one) ? one.name : basename((one as ISCMResource).sourceUri);
 		const otherName = ResourceTree.isResourceNode(other) ? other.name : basename((other as ISCMResource).sourceUri);
 
-		return compareFileNames(oneName, otherName);
+		return compareFileNamesNumeric(oneName, otherName);
 	}
 }
 

src/vs/workbench/contrib/search/common/searchModel.ts

@@ -29,7 +29,7 @@ import { editorMatchesToTextSearchResults, addContextToEditorMatches } from 'vs/
 import { withNullAsUndefined } from 'vs/base/common/types';
 import { memoize } from 'vs/base/common/decorators';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { compareFileNames, compareFileExtensions, comparePaths } from 'vs/base/common/comparers';
+import { compareFileNamesNumeric, compareFileExtensionsNumeric, comparePaths } from 'vs/base/common/comparers';
 import { IFileService, IFileStatWithMetadata } from 'vs/platform/files/common/files';
 
 export class Match {
@@ -666,9 +666,9 @@ export function searchMatchComparer(elementA: RenderableMatch, elementB: Rendera
 			case SearchSortOrder.CountAscending:
 				return elementA.count() - elementB.count();
 			case SearchSortOrder.Type:
-				return compareFileExtensions(elementA.name(), elementB.name());
+				return compareFileExtensionsNumeric(elementA.name(), elementB.name());
 			case SearchSortOrder.FileNames:
-				return compareFileNames(elementA.name(), elementB.name());
+				return compareFileNamesNumeric(elementA.name(), elementB.name());
 			case SearchSortOrder.Modified:
 				const fileStatA = elementA.fileStat;
 				const fileStatB = elementB.fileStat;
@@ -677,7 +677,7 @@ export function searchMatchComparer(elementA: RenderableMatch, elementB: Rendera
 				}
 			// Fall through otherwise
 			default:
-				return comparePaths(elementA.resource.fsPath, elementB.resource.fsPath) || compareFileNames(elementA.name(), elementB.name());
+				return comparePaths(elementA.resource.fsPath, elementB.resource.fsPath) || compareFileNamesNumeric(elementA.name(), elementB.name());
 		}
 	}