mrva/vscode-codeql
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Sort databases by name if their languages are the same (#3055)

Browse Source
This commit is contained in:
Shati Patel
2023-11-06 16:03:33 +00:00
committed by GitHub
parent 1c19d7a2e1
commit 429f9a17d4
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/ql-vscode/CHANGELOG.md
View File

@@ -2,6 +2,8 @@
## [UNRELEASED] ## [UNRELEASED]
- The "Sort by Language" action in the databases view now sorts by name within each language. [#3055](https://github.com/github/vscode-codeql/pull/3055)
## 1.9.4 - 6 November 2023 ## 1.9.4 - 6 November 2023
No user facing changes. No user facing changes.

12
extensions/ql-vscode/src/databases/local-databases-ui.ts
View File

@@ -158,9 +158,17 @@ class DatabaseTreeDataProvider
case SortOrder.NameDesc: case SortOrder.NameDesc:
return db2.name.localeCompare(db1.name, env.language); return db2.name.localeCompare(db1.name, env.language);
case SortOrder.LanguageAsc: case SortOrder.LanguageAsc:
return db1.language.localeCompare(db2.language, env.language); return (
db1.language.localeCompare(db2.language, env.language) ||
// If the languages are the same, sort by name
db1.name.localeCompare(db2.name, env.language)
);
case SortOrder.LanguageDesc: case SortOrder.LanguageDesc:
return db2.language.localeCompare(db1.language, env.language); return (
db2.language.localeCompare(db1.language, env.language) ||
// If the languages are the same, sort by name
db2.name.localeCompare(db1.name, env.language)
);
case SortOrder.DateAddedAsc: case SortOrder.DateAddedAsc:
return (db1.dateAdded || 0) - (db2.dateAdded || 0); return (db1.dateAdded || 0) - (db2.dateAdded || 0);
case SortOrder.DateAddedDesc: case SortOrder.DateAddedDesc: