Skip to content

Commit 2264b6b

Browse files
norascheuchnorascheuch
authored
Merge pull request #2016 from github/nora/query-history-context-menu
Query History: context menu copy and groups
2 parents 07f5d2b + 6ebb4af commit 2264b6b

File tree

2 files changed

+29
-29
lines changed

2 files changed

+29
-29
lines changed

‎extensions/ql-vscode/package.json‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@
523523
},
524524
{
525525
"command": "codeQLQueryHistory.openQuery",
526-
"title": "Open Query",
526+
"title": "View Query",
527527
"icon": "$(edit)"
528528
},
529529
{
@@ -533,7 +533,7 @@
533533
},
534534
{
535535
"command": "codeQLQueryHistory.removeHistoryItem",
536-
"title": "Remove from History",
536+
"title": "Delete",
537537
"icon": "$(trash)"
538538
},
539539
{
@@ -550,11 +550,11 @@
550550
},
551551
{
552552
"command": "codeQLQueryHistory.showQueryLog",
553-
"title": "Show Query Log"
553+
"title": "View Query Log"
554554
},
555555
{
556556
"command": "codeQLQueryHistory.openQueryDirectory",
557-
"title": "Open Query Directory"
557+
"title": "Open Results Directory"
558558
},
559559
{
560560
"command": "codeQLQueryHistory.showEvalLog",
@@ -574,7 +574,7 @@
574574
},
575575
{
576576
"command": "codeQLQueryHistory.showQueryText",
577-
"title": "Show Query Text"
577+
"title": "View Query Text"
578578
},
579579
{
580580
"command": "codeQLQueryHistory.exportResults",
@@ -597,16 +597,16 @@
597597
"title": "View DIL"
598598
},
599599
{
600-
"command": "codeQLQueryHistory.setLabel",
601-
"title": "Set Label"
600+
"command": "codeQLQueryHistory.renameItem",
601+
"title": "Rename"
602602
},
603603
{
604604
"command": "codeQLQueryHistory.compareWith",
605605
"title": "Compare Results"
606606
},
607607
{
608608
"command": "codeQLQueryHistory.openOnGithub",
609-
"title": "Open Variant Analysis on GitHub"
609+
"title": "View Logs"
610610
},
611611
{
612612
"command": "codeQLQueryHistory.copyRepoList",
@@ -827,57 +827,57 @@
827827
},
828828
{
829829
"command": "codeQLQueryHistory.openQuery",
830-
"group": "9_qlCommands",
830+
"group": "2_queryHistory@0",
831831
"when": "view == codeQLQueryHistory"
832832
},
833833
{
834834
"command": "codeQLQueryHistory.removeHistoryItem",
835-
"group": "9_qlCommands",
835+
"group": "7_queryHistory@0",
836836
"when": "viewItem == interpretedResultsItem || viewItem == rawResultsItem || viewItem == remoteResultsItem || viewItem == cancelledResultsItem || viewItem == cancelledRemoteResultsItem"
837837
},
838838
{
839-
"command": "codeQLQueryHistory.setLabel",
840-
"group": "9_qlCommands",
839+
"command": "codeQLQueryHistory.renameItem",
840+
"group": "6_queryHistory@0",
841841
"when": "view == codeQLQueryHistory"
842842
},
843843
{
844844
"command": "codeQLQueryHistory.compareWith",
845-
"group": "9_qlCommands",
845+
"group": "3_queryHistory@0",
846846
"when": "viewItem == rawResultsItem || viewItem == interpretedResultsItem"
847847
},
848848
{
849849
"command": "codeQLQueryHistory.showQueryLog",
850-
"group": "9_qlCommands",
850+
"group": "4_queryHistory@4",
851851
"when": "viewItem == rawResultsItem || viewItem == interpretedResultsItem"
852852
},
853853
{
854854
"command": "codeQLQueryHistory.openQueryDirectory",
855-
"group": "9_qlCommands",
855+
"group": "2_queryHistory@4",
856856
"when": "view == codeQLQueryHistory && !hasRemoteServer"
857857
},
858858
{
859859
"command": "codeQLQueryHistory.showEvalLog",
860-
"group": "9_qlCommands",
860+
"group": "4_queryHistory@1",
861861
"when": "codeql.supportsEvalLog && viewItem == rawResultsItem || codeql.supportsEvalLog && viewItem == interpretedResultsItem || codeql.supportsEvalLog && viewItem == cancelledResultsItem"
862862
},
863863
{
864864
"command": "codeQLQueryHistory.showEvalLogSummary",
865-
"group": "9_qlCommands",
865+
"group": "4_queryHistory@2",
866866
"when": "codeql.supportsEvalLog && viewItem == rawResultsItem || codeql.supportsEvalLog && viewItem == interpretedResultsItem || codeql.supportsEvalLog && viewItem == cancelledResultsItem"
867867
},
868868
{
869869
"command": "codeQLQueryHistory.showEvalLogViewer",
870-
"group": "9_qlCommands",
870+
"group": "4_queryHistory@3",
871871
"when": "config.codeQL.canary && codeql.supportsEvalLog && viewItem == rawResultsItem || config.codeQL.canary && codeql.supportsEvalLog && viewItem == interpretedResultsItem || config.codeQL.canary && codeql.supportsEvalLog && viewItem == cancelledResultsItem"
872872
},
873873
{
874874
"command": "codeQLQueryHistory.showQueryText",
875-
"group": "9_qlCommands",
875+
"group": "2_queryHistory@2",
876876
"when": "view == codeQLQueryHistory"
877877
},
878878
{
879879
"command": "codeQLQueryHistory.exportResults",
880-
"group": "9_qlCommands",
880+
"group": "1_queryHistory@0",
881881
"when": "view == codeQLQueryHistory && viewItem == remoteResultsItem"
882882
},
883883
{
@@ -887,17 +887,17 @@
887887
},
888888
{
889889
"command": "codeQLQueryHistory.viewCsvAlerts",
890-
"group": "9_qlCommands",
890+
"group": "5_queryHistory@0",
891891
"when": "viewItem == interpretedResultsItem"
892892
},
893893
{
894894
"command": "codeQLQueryHistory.viewSarifAlerts",
895-
"group": "9_qlCommands",
895+
"group": "5_queryHistory@1",
896896
"when": "viewItem == interpretedResultsItem"
897897
},
898898
{
899899
"command": "codeQLQueryHistory.viewDil",
900-
"group": "9_qlCommands",
900+
"group": "5_queryHistory@2",
901901
"when": "viewItem == rawResultsItem || viewItem == interpretedResultsItem"
902902
},
903903
{
@@ -907,12 +907,12 @@
907907
},
908908
{
909909
"command": "codeQLQueryHistory.openOnGithub",
910-
"group": "9_qlCommands",
910+
"group": "2_queryHistory@3",
911911
"when": "viewItem == remoteResultsItem || viewItem == inProgressRemoteResultsItem || viewItem == cancelledRemoteResultsItem"
912912
},
913913
{
914914
"command": "codeQLQueryHistory.copyRepoList",
915-
"group": "9_qlCommands",
915+
"group": "1_queryHistory@1",
916916
"when": "viewItem == remoteResultsItem"
917917
},
918918
{
@@ -1160,7 +1160,7 @@
11601160
"when": "false"
11611161
},
11621162
{
1163-
"command": "codeQLQueryHistory.setLabel",
1163+
"command": "codeQLQueryHistory.renameItem",
11641164
"when": "false"
11651165
},
11661166
{

‎extensions/ql-vscode/src/query-history/query-history-manager.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,8 @@ export class QueryHistoryManager extends DisposableObject {
236236
);
237237
this.push(
238238
commandRunner(
239-
"codeQLQueryHistory.setLabel",
240-
this.handleSetLabel.bind(this),
239+
"codeQLQueryHistory.renameItem",
240+
this.handleRenameItem.bind(this),
241241
),
242242
);
243243
this.push(
@@ -749,7 +749,7 @@ export class QueryHistoryManager extends DisposableObject {
749749
}
750750
}
751751

752-
async handleSetLabel(
752+
async handleRenameItem(
753753
singleItem: QueryHistoryInfo,
754754
multiSelect: QueryHistoryInfo[],
755755
): Promise<void> {

0 commit comments

Comments
 (0)