Merge pull request #1991 from github/nora/order-context-menu-actions

norascheuch · web-flow · commit 708e55244ed0 · 2023-01-20T13:42:54.000+01:00
Sort and group context menu actions
diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json
@@ -798,19 +798,23 @@
       "view/item/context": [
         {
           "command": "codeQLVariantAnalysisRepositories.removeItemContextMenu",
-          "when": "view == codeQLVariantAnalysisRepositories && viewItem =~ /canBeRemoved/"
+          "when": "view == codeQLVariantAnalysisRepositories && viewItem =~ /canBeRemoved/",
+          "group": "2_qlContextMenu@3"
         },
         {
           "command": "codeQLVariantAnalysisRepositories.setSelectedItemContextMenu",
-          "when": "view == codeQLVariantAnalysisRepositories && viewItem =~ /canBeSelected/"
+          "when": "view == codeQLVariantAnalysisRepositories && viewItem =~ /canBeSelected/",
+          "group": "1_qlContextMenu@1"
         },
         {
           "command": "codeQLVariantAnalysisRepositories.renameItemContextMenu",
-          "when": "view == codeQLVariantAnalysisRepositories && viewItem =~ /canBeRenamed/"
+          "when": "view == codeQLVariantAnalysisRepositories && viewItem =~ /canBeRenamed/",
+          "group": "2_qlContextMenu@2"
         },
         {
           "command": "codeQLVariantAnalysisRepositories.openOnGitHubContextMenu",
-          "when": "view == codeQLVariantAnalysisRepositories && viewItem =~ /canBeOpenedOnGitHub/"
+          "when": "view == codeQLVariantAnalysisRepositories && viewItem =~ /canBeOpenedOnGitHub/",
+          "group": "2_qlContextMenu@1"
         },
         {
           "command": "codeQLDatabases.setCurrentDatabase",

Original file line number	Diff line number	Diff line change
`@@ -798,19 +798,23 @@`
`798`	`798`	`"view/item/context": [`
`799`	`799`	`{`
`800`	`800`	`"command": "codeQLVariantAnalysisRepositories.removeItemContextMenu",`
`801`		`- "when": "view == codeQLVariantAnalysisRepositories && viewItem =~ /canBeRemoved/"`
	`801`	`+ "when": "view == codeQLVariantAnalysisRepositories && viewItem =~ /canBeRemoved/",`
	`802`	`+ "group": "2_qlContextMenu@3"`
`802`	`803`	`},`
`803`	`804`	`{`
`804`	`805`	`"command": "codeQLVariantAnalysisRepositories.setSelectedItemContextMenu",`
`805`		`- "when": "view == codeQLVariantAnalysisRepositories && viewItem =~ /canBeSelected/"`
	`806`	`+ "when": "view == codeQLVariantAnalysisRepositories && viewItem =~ /canBeSelected/",`
	`807`	`+ "group": "1_qlContextMenu@1"`
`806`	`808`	`},`
`807`	`809`	`{`
`808`	`810`	`"command": "codeQLVariantAnalysisRepositories.renameItemContextMenu",`
`809`		`- "when": "view == codeQLVariantAnalysisRepositories && viewItem =~ /canBeRenamed/"`
	`811`	`+ "when": "view == codeQLVariantAnalysisRepositories && viewItem =~ /canBeRenamed/",`
	`812`	`+ "group": "2_qlContextMenu@2"`
`810`	`813`	`},`
`811`	`814`	`{`
`812`	`815`	`"command": "codeQLVariantAnalysisRepositories.openOnGitHubContextMenu",`
`813`		`- "when": "view == codeQLVariantAnalysisRepositories && viewItem =~ /canBeOpenedOnGitHub/"`
	`816`	`+ "when": "view == codeQLVariantAnalysisRepositories && viewItem =~ /canBeOpenedOnGitHub/",`
	`817`	`+ "group": "2_qlContextMenu@1"`
`814`	`818`	`},`
`815`	`819`	`{`
`816`	`820`	`"command": "codeQLDatabases.setCurrentDatabase",`