Fixes folder history from showing on file

eamodio · eamodio · commit 1421127bc36f · 2025-01-16T16:25:52.000-05:00
diff --git a/contributions.json b/contributions.json
@@ -3065,7 +3065,6 @@
 				],
 				"gitlens/explorer/file/history": [
 					{
-						"when": "!explorerResourceIsRoot && !explorerResourceIsFolder && gitlens:enabled",
 						"group": "1_gitlens",
 						"order": 1
 					}
@@ -3519,7 +3518,6 @@
 				],
 				"gitlens/explorer/file/history": [
 					{
-						"when": "!explorerResourceIsRoot && !explorerResourceIsFolder && gitlens:enabled",
 						"group": "1_gitlens_quick",
 						"order": 1
 					}
@@ -3704,7 +3702,6 @@
 				],
 				"gitlens/explorer/file/history": [
 					{
-						"when": "!explorerResourceIsRoot && !explorerResourceIsFolder && gitlens:enabled",
 						"group": "1_gitlens",
 						"order": 2
 					}
@@ -12025,7 +12022,7 @@
 			"menus": {
 				"explorer/context": [
 					{
-						"when": "gitlens:enabled && config.gitlens.menus.explorer.history",
+						"when": "!explorerResourceIsRoot && !explorerResourceIsFolder && gitlens:enabled && config.gitlens.menus.explorer.history",
 						"group": "4_timeline",
 						"order": 0
 					}
@@ -12037,7 +12034,7 @@
 			"menus": {
 				"explorer/context": [
 					{
-						"when": "gitlens:enabled && config.gitlens.menus.explorer.history",
+						"when": "(explorerResourceIsRoot || explorerResourceIsFolder) && gitlens:enabled && config.gitlens.menus.explorer.history",
 						"group": "4_timeline",
 						"order": 0
 					}
diff --git a/package.json b/package.json
@@ -13189,12 +13189,12 @@
 				},
 				{
 					"submenu": "gitlens/explorer/file/history",
-					"when": "gitlens:enabled && config.gitlens.menus.explorer.history",
+					"when": "!explorerResourceIsRoot && !explorerResourceIsFolder && gitlens:enabled && config.gitlens.menus.explorer.history",
 					"group": "4_timeline@0"
 				},
 				{
 					"submenu": "gitlens/explorer/folder/history",
-					"when": "gitlens:enabled && config.gitlens.menus.explorer.history",
+					"when": "(explorerResourceIsRoot || explorerResourceIsFolder) && gitlens:enabled && config.gitlens.menus.explorer.history",
 					"group": "4_timeline@0"
 				},
 				{
@@ -13760,17 +13760,14 @@
 			"gitlens/explorer/file/history": [
 				{
 					"command": "gitlens.openFileHistory",
-					"when": "!explorerResourceIsRoot && !explorerResourceIsFolder && gitlens:enabled",
 					"group": "1_gitlens@1"
 				},
 				{
 					"command": "gitlens.showFileInTimeline",
-					"when": "!explorerResourceIsRoot && !explorerResourceIsFolder && gitlens:enabled",
 					"group": "1_gitlens@2"
 				},
 				{
 					"command": "gitlens.quickOpenFileHistory",
-					"when": "!explorerResourceIsRoot && !explorerResourceIsFolder && gitlens:enabled",
 					"group": "1_gitlens_quick@1"
 				}
 			],

Original file line number	Diff line number	Diff line change
`@@ -3065,7 +3065,6 @@`
`3065`	`3065`	`],`
`3066`	`3066`	`"gitlens/explorer/file/history": [`
`3067`	`3067`	`{`
`3068`		`- "when": "!explorerResourceIsRoot && !explorerResourceIsFolder && gitlens:enabled",`
`3069`	`3068`	`"group": "1_gitlens",`
`3070`	`3069`	`"order": 1`
`3071`	`3070`	`}`
`@@ -3519,7 +3518,6 @@`
`3519`	`3518`	`],`
`3520`	`3519`	`"gitlens/explorer/file/history": [`
`3521`	`3520`	`{`
`3522`		`- "when": "!explorerResourceIsRoot && !explorerResourceIsFolder && gitlens:enabled",`
`3523`	`3521`	`"group": "1_gitlens_quick",`
`3524`	`3522`	`"order": 1`
`3525`	`3523`	`}`
`@@ -3704,7 +3702,6 @@`
`3704`	`3702`	`],`
`3705`	`3703`	`"gitlens/explorer/file/history": [`
`3706`	`3704`	`{`
`3707`		`- "when": "!explorerResourceIsRoot && !explorerResourceIsFolder && gitlens:enabled",`
`3708`	`3705`	`"group": "1_gitlens",`
`3709`	`3706`	`"order": 2`
`3710`	`3707`	`}`
`@@ -12025,7 +12022,7 @@`
`12025`	`12022`	`"menus": {`
`12026`	`12023`	`"explorer/context": [`
`12027`	`12024`	`{`
`12028`		`- "when": "gitlens:enabled && config.gitlens.menus.explorer.history",`
	`12025`	`+ "when": "!explorerResourceIsRoot && !explorerResourceIsFolder && gitlens:enabled && config.gitlens.menus.explorer.history",`
`12029`	`12026`	`"group": "4_timeline",`
`12030`	`12027`	`"order": 0`
`12031`	`12028`	`}`
`@@ -12037,7 +12034,7 @@`
`12037`	`12034`	`"menus": {`
`12038`	`12035`	`"explorer/context": [`
`12039`	`12036`	`{`
`12040`		`- "when": "gitlens:enabled && config.gitlens.menus.explorer.history",`
	`12037`	`+ "when": "(explorerResourceIsRoot \|\| explorerResourceIsFolder) && gitlens:enabled && config.gitlens.menus.explorer.history",`
`12041`	`12038`	`"group": "4_timeline",`
`12042`	`12039`	`"order": 0`
`12043`	`12040`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13189,12 +13189,12 @@`
`13189`	`13189`	`},`
`13190`	`13190`	`{`
`13191`	`13191`	`"submenu": "gitlens/explorer/file/history",`
`13192`		`- "when": "gitlens:enabled && config.gitlens.menus.explorer.history",`
	`13192`	`+ "when": "!explorerResourceIsRoot && !explorerResourceIsFolder && gitlens:enabled && config.gitlens.menus.explorer.history",`
`13193`	`13193`	`"group": "4_timeline@0"`
`13194`	`13194`	`},`
`13195`	`13195`	`{`
`13196`	`13196`	`"submenu": "gitlens/explorer/folder/history",`
`13197`		`- "when": "gitlens:enabled && config.gitlens.menus.explorer.history",`
	`13197`	`+ "when": "(explorerResourceIsRoot \|\| explorerResourceIsFolder) && gitlens:enabled && config.gitlens.menus.explorer.history",`
`13198`	`13198`	`"group": "4_timeline@0"`
`13199`	`13199`	`},`
`13200`	`13200`	`{`
`@@ -13760,17 +13760,14 @@`
`13760`	`13760`	`"gitlens/explorer/file/history": [`
`13761`	`13761`	`{`
`13762`	`13762`	`"command": "gitlens.openFileHistory",`
`13763`		`- "when": "!explorerResourceIsRoot && !explorerResourceIsFolder && gitlens:enabled",`
`13764`	`13763`	`"group": "1_gitlens@1"`
`13765`	`13764`	`},`
`13766`	`13765`	`{`
`13767`	`13766`	`"command": "gitlens.showFileInTimeline",`
`13768`		`- "when": "!explorerResourceIsRoot && !explorerResourceIsFolder && gitlens:enabled",`
`13769`	`13767`	`"group": "1_gitlens@2"`
`13770`	`13768`	`},`
`13771`	`13769`	`{`
`13772`	`13770`	`"command": "gitlens.quickOpenFileHistory",`
`13773`		`- "when": "!explorerResourceIsRoot && !explorerResourceIsFolder && gitlens:enabled",`
`13774`	`13771`	`"group": "1_gitlens_quick@1"`
`13775`	`13772`	`}`
`13776`	`13773`	`],`