Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 20:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes diff editor precondition commands.

Browse Source
This commit is contained in:
Henning Dieterichs
2023-09-11 11:10:57 +02:00
committed by Henning Dieterichs
parent 83694b96a6
commit 3dd94c35ed
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vs/editor/browser/widget/diffEditor/diffEditor.contribution.ts
View File

@@ -25,6 +25,7 @@ export class ToggleCollapseUnchangedRegions extends Action2 {
title: { value: localize('toggleCollapseUnchangedRegions', "Toggle Collapse Unchanged Regions"), original: 'Toggle Collapse Unchanged Regions' },
icon: Codicon.map,
toggled: ContextKeyExpr.has('config.diffEditor.hideUnchangedRegions.enabled'),
precondition: ContextKeyExpr.has('isInDiffEditor'),
menu: {
id: MenuId.EditorTitle,
order: 22,
@@ -47,6 +48,7 @@ export class ToggleShowMovedCodeBlocks extends Action2 {
super({
id: 'diffEditor.toggleShowMovedCodeBlocks',
title: { value: localize('toggleShowMovedCodeBlocks', "Toggle Show Moved Code Blocks"), original: 'Toggle Show Moved Code Blocks' },
precondition: ContextKeyExpr.has('isInDiffEditor'),
});
}
@@ -64,6 +66,7 @@ export class ToggleUseInlineViewWhenSpaceIsLimited extends Action2 {
super({
id: 'diffEditor.toggleUseInlineViewWhenSpaceIsLimited',
title: { value: localize('toggleUseInlineViewWhenSpaceIsLimited', "Toggle Use Inline View When Space Is Limited"), original: 'Toggle Use Inline View When Space Is Limited' },
precondition: ContextKeyExpr.has('isInDiffEditor'),
});
}
@@ -84,7 +87,10 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
},
order: 11,
group: '1_diff',
when: EditorContextKeys.diffEditorRenderSideBySideInlineBreakpointReached,
when: ContextKeyExpr.and(
EditorContextKeys.diffEditorRenderSideBySideInlineBreakpointReached,
ContextKeyExpr.has('isInDiffEditor'),
),
});
MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
@@ -96,6 +102,7 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
},
order: 10,
group: '1_diff',
when: ContextKeyExpr.has('isInDiffEditor'),
});
const diffEditorCategory: ILocalizedString = {