Merge editor: show base at top x2?

[bpasero]

This looks and reads a bit weird to me:

This does not really do anything when I am in Column Layout which I think is even the default.

[hediet]

Can context menu entries be hidden when a context key condition fails?

[bpasero]

I think precondition or the when clause of the command, I always forget:

vscode/src/vs/platform/action/common/action.ts

Line 41 in 0445715

precondition?: ContextKeyExpression;

@jrieken knows for sure

[hediet]

precondition just disables that entry, it doesn't hide it

[bpasero]

@hediet try with:

vscode/src/vs/platform/actions/common/actions.ts

Line 22 in 0445715

when?: ContextKeyExpression;

[jrieken]

It is the when clause that defines if an item appears in the menu

[jrieken]

In addition to hiding this when it doesn't apply: can we find a better solution for when it applies. Can we have

for column mode

✔️ Show Base

for mixed mode (radio-logic for these two)

✔️ Show Base At Top
🔲 Show Base In Middle

[hediet]

Fixed

[bpasero]

I still find this weird:

Throwing in some ideas:

Column Layout
I would think just a toggle for the base is fine so that it becomes a single entry.

Mixed Layout
A radio group of 3 entries: "Hide Base", "Show Base Top", "Show Base Center". Alternatively if we worry about too many entries, we could also do a submenu for "Base" specifically with these options.

[bpasero]

Jo's suggestion in #162111 (comment) is also fine, but I think we need that third entry to allow for hiding when in mixed layout.

[hediet]

Verification steps:

Open a merge conflict and verify these menu entries: