Merge pull request #2007 from github/nora/query-history-sort-button

Query History: sorting

Author: norascheuch

extensions/ql-vscode/media/dark/edit.svg

@@ -523,51 +523,30 @@
       },
       {
         "command": "codeQLQueryHistory.openQuery",
-        "title": "Open the Query that Produced these Results",
-        "icon": {
-          "light": "media/light/edit.svg",
-          "dark": "media/dark/edit.svg"
-        }
+        "title": "Open Query",
+        "icon": "$(edit)"
       },
       {
         "command": "codeQLQueryHistory.itemClicked",
         "title": "Open Query Results",
-        "icon": {
-          "light": "media/light/preview.svg",
-          "dark": "media/dark/preview.svg"
-        }
+        "icon": "$(preview)"
       },
       {
         "command": "codeQLQueryHistory.removeHistoryItem",
-        "title": "Remove History Item(s)",
-        "icon": {
-          "light": "media/light/trash.svg",
-          "dark": "media/dark/trash.svg"
-        }
+        "title": "Remove from History",
+        "icon": "$(trash)"
       },
       {
         "command": "codeQLQueryHistory.sortByName",
-        "title": "Sort by Name",
-        "icon": {
-          "light": "media/light/sort-alpha.svg",
-          "dark": "media/dark/sort-alpha.svg"
-        }
+        "title": "Sort by Name"
       },
       {
         "command": "codeQLQueryHistory.sortByDate",
-        "title": "Sort by Query Date",
-        "icon": {
-          "light": "media/light/sort-date.svg",
-          "dark": "media/dark/sort-date.svg"
-        }
+        "title": "Sort by Date"
       },
       {
         "command": "codeQLQueryHistory.sortByCount",
-        "title": "Sort by Results Count",
-        "icon": {
-          "light": "media/light/sort-num.svg",
-          "dark": "media/dark/sort-num.svg"
-        }
+        "title": "Sort by Results Count"
       },
       {
         "command": "codeQLQueryHistory.showQueryLog",
@@ -757,17 +736,17 @@
         {
           "command": "codeQLQueryHistory.sortByName",
           "when": "view == codeQLQueryHistory",
-          "group": "navigation"
+          "group": "1_queryHistory@0"
         },
         {
           "command": "codeQLQueryHistory.sortByDate",
           "when": "view == codeQLQueryHistory",
-          "group": "navigation"
+          "group": "1_queryHistory@1"
         },
         {
           "command": "codeQLQueryHistory.sortByCount",
           "when": "view == codeQLQueryHistory",
-          "group": "navigation"
+          "group": "1_queryHistory@2"
         },
         {
           "command": "codeQLAstViewer.clear",