Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-03 07:44:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Search Tree - file order changes when switching from list to tree (#162270)

Browse Source 
Fixes #162155
This commit is contained in:
Andrea Mah
2022-09-28 17:34:22 -07:00
committed by GitHub
parent a1a877b80b
commit 96dda01daf
1 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/search/common/searchModel.ts
+31 -6
View File
@@ -928,12 +928,38 @@ export class FolderMatchNoRoot extends FolderMatch {
* and their sort order is undefined.
*/
export function searchMatchComparer(elementA: RenderableMatch, elementB: RenderableMatch, sortOrder: SearchSortOrder = SearchSortOrder.Default): number {
if (elementA instanceof FileMatch && elementB instanceof FolderMatch) {
return 1;
}
if (elementB instanceof FileMatch && elementA instanceof FolderMatch) {
return -1;
}
if (elementA instanceof FolderMatch && elementB instanceof FolderMatch) {
const elemAIndex = elementA.index();
const elemBIndex = elementB.index();
if (elemAIndex !== null && elemBIndex !== null) {
return elemAIndex - elemBIndex;
}
switch (sortOrder) {
case SearchSortOrder.CountDescending:
return elementB.count() - elementA.count();
case SearchSortOrder.CountAscending:
return elementA.count() - elementB.count();
case SearchSortOrder.Type:
return compareFileExtensions(elementA.name(), elementB.name());
case SearchSortOrder.FileNames:
return compareFileNames(elementA.name(), elementB.name());
// Fall through otherwise
default:
if (!elementA.resource || !elementB.resource) {
return 0;
}
return comparePaths(elementA.resource.fsPath, elementB.resource.fsPath) || compareFileNames(elementA.name(), elementB.name());
}
}
if (elementA instanceof FileMatch && elementB instanceof FileMatch) {
@@ -947,12 +973,11 @@ export function searchMatchComparer(elementA: RenderableMatch, elementB: Rendera
case SearchSortOrder.FileNames:
return compareFileNames(elementA.name(), elementB.name());
case SearchSortOrder.Modified: {
if (!(elementA instanceof FolderMatch) || !(elementB instanceof FolderMatch)) {
const fileStatA = elementA.fileStat;
const fileStatB = elementB.fileStat;
if (fileStatA && fileStatB) {
return fileStatB.mtime - fileStatA.mtime;
}
const fileStatA = elementA.fileStat;
const fileStatB = elementB.fileStat;
if (fileStatA && fileStatB) {
return fileStatB.mtime - fileStatA.mtime;
}
}
// Fall through otherwise