Reworks some menus

package.json

@@ -6543,7 +6543,7 @@
 			],
 			"editor/context": [
 				{
-					"submenu": "gitlens/editor/context/openChanges",
+					"submenu": "gitlens/editor/context/changes",
 					"when": "editorTextFocus && config.gitlens.menus.editor.compare",
 					"group": "2_gitlens@1"
 				},
@@ -6568,17 +6568,17 @@
 				{
 					"command": "gitlens.openFileHistory",
 					"when": "gitlens:activeFileStatus =~ /tracked/ && config.gitlens.menus.editor.history",
-					"group": "2_gitlens@5"
+					"group": "2_gitlens_1@1"
 				},
 				{
 					"command": "gitlens.quickOpenFileHistory",
 					"when": "gitlens:activeFileStatus =~ /tracked/ && config.gitlens.menus.editor.history",
-					"group": "2_gitlens@6"
+					"group": "2_gitlens_1@2"
 				},
 				{
 					"submenu": "gitlens/editor/annotations",
 					"when": "editorTextFocus && gitlens:activeFileStatus =~ /blameable/ && config.gitlens.menus.editor.blame",
-					"group": "2_gitlens_1@5"
+					"group": "2_gitlens_2@1"
 				}
 			],
 			"editor/context/copy": [
@@ -6743,7 +6743,7 @@
 					"group": "1_cutcopypaste@100"
 				},
 				{
-					"submenu": "gitlens/editor/openChanges",
+					"submenu": "gitlens/editor/changes",
 					"when": "gitlens:enabled && config.gitlens.menus.editorTab.compare",
 					"group": "2_gitlens@0"
 				},
@@ -6767,17 +6767,17 @@
 				{
 					"command": "gitlens.openFileHistory",
 					"when": "gitlens:enabled && config.gitlens.menus.editorTab.history",
-					"group": "2_gitlens@4"
+					"group": "2_gitlens_1@1"
 				},
 				{
 					"command": "gitlens.quickOpenFileHistory",
 					"when": "gitlens:enabled && config.gitlens.menus.editorTab.history",
-					"group": "2_gitlens@5"
+					"group": "2_gitlens_1@2"
 				}
 			],
 			"explorer/context": [
 				{
-					"submenu": "gitlens/explorer/openChanges",
+					"submenu": "gitlens/explorer/changes",
 					"when": "!explorerResourceIsRoot && !explorerResourceIsFolder && gitlens:enabled && config.gitlens.menus.explorer.compare",
 					"group": "4_gitlens@0"
 				},
@@ -6857,9 +6857,9 @@
 					"group": "1_modification@100"
 				},
 				{
-					"submenu": "gitlens/scm/resourceGroup/openChanges",
+					"submenu": "gitlens/scm/resourceGroup/changes",
 					"when": "gitlens:enabled && scmProvider == git && scmResourceGroup =~ /^(workingTree|index)$/ && config.gitlens.menus.scmGroup.compare",
-					"group": "2_gitlens@3"
+					"group": "2_gitlens@1"
 				},
 				{
 					"command": "gitlens.openChangedFiles",
@@ -6874,7 +6874,7 @@
 			],
 			"scm/resourceState/context": [
 				{
-					"submenu": "gitlens/scm/resourceState/openChanges",
+					"submenu": "gitlens/scm/resourceState/changes",
 					"when": "gitlens:enabled && scmProvider == git && scmResourceGroup =~ /^(workingTree|index|merge)$/ && config.gitlens.menus.scmItem.compare",
 					"group": "navigation"
 				},
@@ -7725,7 +7725,7 @@
 				{
 					"command": "gitlens.views.openDirectoryDiffWithWorking",
 					"when": "viewItem =~ /gitlens:(branch|tag)\\b/",
-					"group": "3_gitlens_explore@2"
+					"group": "3_gitlens_explore@11"
 				},
 				{
 					"command": "gitlens.views.compareWithUpstream",
@@ -7880,7 +7880,7 @@
 					"group": "1_gitlens_actions_1@2"
 				},
 				{
-					"submenu": "gitlens/commit/openChanges",
+					"submenu": "gitlens/commit/changes",
 					"when": "viewItem =~ /gitlens:(commit|stash|results:files)\\b/",
 					"group": "2_gitlens_quickopen@1"
 				},
@@ -7893,12 +7893,12 @@
 				{
 					"command": "gitlens.revealCommitInView",
 					"when": "view =~ /gitlens\\.views\\.(?!commits|branches\\b)/ && viewItem =~ /gitlens:commit\\b/",
-					"group": "3_gitlens_explore@2"
+					"group": "3_gitlens_explore@1"
 				},
 				{
 					"command": "gitlens.showCommitInView",
 					"when": "viewItem =~ /gitlens:commit\\b/",
-					"group": "3_gitlens_explore@3"
+					"group": "3_gitlens_explore@2"
 				},
 				{
 					"submenu": "gitlens/commit/copy",
@@ -7975,11 +7975,6 @@
 					"alt": "gitlens.copyRemoteFileUrlWithoutRange"
 				},
 				{
-					"submenu": "gitlens/commit/file/commit",
-					"when": "!gitlens:readonly && view =~ /^gitlens\\.views\\.(fileHistory|lineHistory)/ && viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/",
-					"group": "1_gitlens_actions@0"
-				},
-				{
 					"command": "gitlens.views.stageFile",
 					"when": "!gitlens:readonly && viewItem =~ /gitlens:file\\b(?=.*?\\b\\+unstaged\\b)/",
 					"group": "1_gitlens_actions@1"
@@ -8000,7 +7995,7 @@
 					"group": "2_gitlens_quickopen@1"
 				},
 				{
-					"submenu": "gitlens/commit/file/openChanges",
+					"submenu": "gitlens/commit/file/changes",
 					"when": "viewItem =~ /gitlens:file\\b/",
 					"group": "2_gitlens_quickopen@2"
 				},
@@ -8032,14 +8027,9 @@
 					"alt": "gitlens.copyRemoteCommitUrl"
 				},
 				{
-					"command": "gitlens.revealCommitInView",
-					"when": "view =~ /gitlens\\.views\\.(fileHistory|lineHistory\\b)/ && viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/",
-					"group": "3_gitlens_explore@2"
-				},
-				{
-					"command": "gitlens.showCommitInView",
-					"when": "view =~ /gitlens\\.views\\.(fileHistory|lineHistory\\b)/ && viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/",
-					"group": "3_gitlens_explore@3"
+					"submenu": "gitlens/commit/file/commit",
+					"when": "!gitlens:readonly && view =~ /^gitlens\\.views\\.(fileHistory|lineHistory)/ && viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/",
+					"group": "3_gitlens_explore@1"
 				},
 				{
 					"command": "gitlens.views.applyChanges",
@@ -8169,7 +8159,7 @@
 				{
 					"submenu": "gitlens/commit/browse",
 					"when": "viewItem =~ /gitlens:(branch|commit|file\\b(?=.*?\\b\\+committed\\b)|stash|tag)\\b/",
-					"group": "3_gitlens_explore@1"
+					"group": "3_gitlens_explore@10"
 				},
 				{
 					"command": "gitlens.views.push",
@@ -8714,7 +8704,7 @@
 					"group": "2_gitlens@2"
 				}
 			],
-			"gitlens/commit/openChanges": [
+			"gitlens/commit/changes": [
 				{
 					"command": "gitlens.views.openChangedFileDiffs",
 					"when": "viewItem =~ /gitlens:(commit|stash|results:files)\\b/",
@@ -8738,6 +8728,16 @@
 			],
 			"gitlens/commit/file/commit": [
 				{
+					"command": "gitlens.revealCommitInView",
+					"when": "view =~ /gitlens\\.views\\.(fileHistory|lineHistory\\b)/ && viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/",
+					"group": "navigation@1"
+				},
+				{
+					"command": "gitlens.showCommitInView",
+					"when": "view =~ /gitlens\\.views\\.(fileHistory|lineHistory\\b)/ && viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/",
+					"group": "navigation@2"
+				},
+				{
 					"command": "gitlens.views.push",
 					"when": "gitlens:hasRemotes && !gitlens:readonly && viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)(?=.*?\\b\\+current\\b)(?=.*?\\b\\+unpublished\\b)(?=.*?\\b\\+HEAD\\b)/",
 					"group": "1_gitlens_actions@0"
@@ -8775,15 +8775,15 @@
 				{
 					"command": "gitlens.views.createBranch",
 					"when": "!gitlens:readonly && viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/",
-					"group": "1_gitlens_actions_1@1"
+					"group": "1_gitlens_secondary_actions@1"
 				},
 				{
 					"command": "gitlens.views.createTag",
 					"when": "!gitlens:readonly && viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/",
-					"group": "1_gitlens_actions_1@2"
+					"group": "1_gitlens_secondary_actions@2"
 				}
 			],
-			"gitlens/commit/file/openChanges": [
+			"gitlens/commit/file/changes": [
 				{
 					"command": "gitlens.externalDiff",
 					"when": "viewItem =~ /gitlens:file\\b(?!.*?\\b\\+conflicted\\b)/",
@@ -8855,7 +8855,7 @@
 					"group": "2_gitlens@3"
 				}
 			],
-			"gitlens/editor/context/openChanges": [
+			"gitlens/editor/context/changes": [
 				{
 					"command": "gitlens.diffWithPrevious",
 					"group": "1_gitlens@1"
@@ -8903,7 +8903,7 @@
 					"group": "3_gitlens@2"
 				}
 			],
-			"gitlens/editor/openChanges": [
+			"gitlens/editor/changes": [
 				{
 					"command": "gitlens.diffWithPrevious",
 					"group": "1_gitlens@1"
@@ -8922,7 +8922,7 @@
 					"group": "2_gitlens@2"
 				}
 			],
-			"gitlens/explorer/openChanges": [
+			"gitlens/explorer/changes": [
 				{
 					"command": "gitlens.diffWithPrevious",
 					"group": "1_gitlens@1"
@@ -8936,7 +8936,7 @@
 					"group": "2_gitlens@2"
 				}
 			],
-			"gitlens/scm/resourceGroup/openChanges": [
+			"gitlens/scm/resourceGroup/changes": [
 				{
 					"command": "gitlens.externalDiffAll",
 					"group": "1_gitlens@1"
@@ -8950,7 +8950,7 @@
 					"group": "1_gitlens@3"
 				}
 			],
-			"gitlens/scm/resourceState/openChanges": [
+			"gitlens/scm/resourceState/changes": [
 				{
 					"command": "gitlens.externalDiff",
 					"when": "gitlens:enabled && scmProvider == git && scmResourceGroup =~ /^(workingTree|index|merge)$/ && config.gitlens.menus.scmItem.compare",
@@ -9072,7 +9072,7 @@
 				"label": "Copy As"
 			},
 			{
-				"id": "gitlens/commit/openChanges",
+				"id": "gitlens/commit/changes",
 				"label": "Open Changes"
 			},
 			{
@@ -9084,7 +9084,7 @@
 				"label": "Commit"
 			},
 			{
-				"id": "gitlens/commit/file/openChanges",
+				"id": "gitlens/commit/file/changes",
 				"label": "Open Changes"
 			},
 			{
@@ -9096,23 +9096,23 @@
 				}
 			},
 			{
-				"id": "gitlens/editor/context/openChanges",
-				"label": "Open Changes"
+				"id": "gitlens/editor/context/changes",
+				"label": "Commit Changes"
 			},
 			{
-				"id": "gitlens/editor/openChanges",
-				"label": "Open Changes"
+				"id": "gitlens/editor/changes",
+				"label": "Commit Changes"
 			},
 			{
-				"id": "gitlens/explorer/openChanges",
-				"label": "Open Changes"
+				"id": "gitlens/explorer/changes",
+				"label": "Commit Changes"
 			},
 			{
-				"id": "gitlens/scm/resourceGroup/openChanges",
+				"id": "gitlens/scm/resourceGroup/changes",
 				"label": "Open Changes"
 			},
 			{
-				"id": "gitlens/scm/resourceState/openChanges",
+				"id": "gitlens/scm/resourceState/changes",
 				"label": "Open Changes"
 			},
 			{

src/webviews/apps/settings/partials/menus.html

@@ -38,7 +38,7 @@
 								data-setting-type="object"
 								disabled
 							/>
-							<label for="menus.editor.compare">Add <i>Open Changes</i> submenu</label>
+							<label for="menus.editor.compare">Add <i>Commit Changes</i> submenu</label>
 						</div>
 					</div>
 
@@ -142,7 +142,7 @@
 								data-setting-type="object"
 								disabled
 							/>
-							<label for="menus.editorTab.compare">Add <i>Open Changes</i> submenu</label>
+							<label for="menus.editorTab.compare">Add <i>Commit Changes</i> submenu</label>
 						</div>
 					</div>
 
@@ -204,9 +204,7 @@
 								data-setting-type="object"
 								disabled
 							/>
-							<label for="menus.editorGroup.compare"
-								>Add <i>Open Changes with *</i> and <i>Show Revision Commit</i> commands</label
-							>
+							<label for="menus.editorGroup.compare">Add revision history navigation commands</label>
 						</div>
 					</div>
 
@@ -266,7 +264,7 @@
 								data-setting-type="object"
 								disabled
 							/>
-							<label for="menus.explorer.compare">Add <i>Open Changes</i> submenu</label>
+							<label for="menus.explorer.compare">Add <i>Commit Changes</i> submenu</label>
 						</div>
 					</div>