Merge pull request microsoft#162150 from microsoft/hediet/additional-shark

hediet · web-flow · commit dfca1cc00264 · 2022-09-28T15:10:01.000+02:00
Fixes microsoft#162111
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/commands/commands.ts b/src/vs/workbench/contrib/mergeEditor/browser/commands/commands.ts
@@ -294,7 +294,7 @@ export class ShowHideAtTopBase extends Action2 {
 					order: 10,
 				},
 			],
-			precondition: ContextKeyExpr.and(ctxIsMergeEditor, ctxMergeEditorShowBase),
+			precondition: ContextKeyExpr.and(ctxIsMergeEditor, ctxMergeEditorShowBase, ctxMergeEditorLayout.isEqualTo('mixed')),
 		});
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ export class ShowHideAtTopBase extends Action2 {`
`294`	`294`	`order: 10,`
`295`	`295`	`},`
`296`	`296`	`],`
`297`		`- precondition: ContextKeyExpr.and(ctxIsMergeEditor, ctxMergeEditorShowBase),`
	`297`	`+ precondition: ContextKeyExpr.and(ctxIsMergeEditor, ctxMergeEditorShowBase, ctxMergeEditorLayout.isEqualTo('mixed')),`
`298`	`298`	`});`
`299`	`299`	`}`
`300`	`300`