Merge branch 'main' into aeisenberg/fix-log-path

Author: aeisenberg

extensions/ql-vscode/CHANGELOG.md

@@ -5,6 +5,7 @@
 - Sorted result set filenames now include a hash of the result set name instead of the full name. [#2955](https://github.com/github/vscode-codeql/pull/2955)
 - The "Install Pack Dependencies" will now only list CodeQL packs located in the workspace. [#2960](https://github.com/github/vscode-codeql/pull/2960)
 - Fix a bug where the "View Query Log" action for a query history item was not working. [#2984](https://github.com/github/vscode-codeql/pull/2984)
+- Add a command to sort items in the databases view by language. [#2993](https://github.com/github/vscode-codeql/pull/2993)
 
 ## 1.9.2 - 12 October 2023
 

extensions/ql-vscode/package-lock.json

@@ -772,6 +772,10 @@
         "command": "codeQLDatabases.sortByName",
         "title": "Sort by Name"
       },
+      {
+        "command": "codeQLDatabases.sortByLanguage",
+        "title": "Sort by Language"
+      },
       {
         "command": "codeQLDatabases.sortByDateAdded",
         "title": "Sort by Date Added"
@@ -998,10 +1002,15 @@
           "group": "1_databases@0"
         },
         {
-          "command": "codeQLDatabases.sortByDateAdded",
+          "command": "codeQLDatabases.sortByLanguage",
           "when": "view == codeQLDatabases",
           "group": "1_databases@1"
         },
+        {
+          "command": "codeQLDatabases.sortByDateAdded",
+          "when": "view == codeQLDatabases",
+          "group": "1_databases@2"
+        },
         {
           "command": "codeQLQueries.createQuery",
           "when": "view == codeQLQueries",
@@ -1499,6 +1508,10 @@
           "command": "codeQLDatabases.sortByName",
           "when": "false"
         },
+        {
+          "command": "codeQLDatabases.sortByLanguage",
+          "when": "false"
+        },
         {
           "command": "codeQLDatabases.sortByDateAdded",
           "when": "false"