From 68f66cc8442761e56d01d2444b119cabb26a92ae Mon Sep 17 00:00:00 2001 From: Dmitry Zabello Date: Thu, 13 Jul 2017 12:58:32 +0400 Subject: [PATCH] Sort by type doesn't affect folders (#30572) --- .../parts/files/browser/views/explorerViewer.ts | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/parts/files/browser/views/explorerViewer.ts b/src/vs/workbench/parts/files/browser/views/explorerViewer.ts index 3eef9e6afc9..879eb83ef14 100644 --- a/src/vs/workbench/parts/files/browser/views/explorerViewer.ts +++ b/src/vs/workbench/parts/files/browser/views/explorerViewer.ts @@ -560,7 +560,6 @@ export class FileSorter implements ISorter { // Sort Directories switch (this.sortOrder) { case 'default': - case 'type': case 'modified': if (statA.isDirectory && !statB.isDirectory) { return -1; @@ -572,6 +571,21 @@ export class FileSorter implements ISorter { break; + case 'type': + if (statA.isDirectory && !statB.isDirectory) { + return -1; + } + + if (statB.isDirectory && !statA.isDirectory) { + return 1; + } + + if (statA.isDirectory && statB.isDirectory) { + return comparers.compareFileNames(statA.name, statB.name); + } + + break; + case 'filesFirst': if (statA.isDirectory && !statB.isDirectory) { return 1; -- GitLab