Improves diff editor menu items.

Author: hediet

src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.contribution.ts

@@ -34,9 +34,10 @@ registerAction2(ToggleCollapseUnchangedRegions);
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
 	command: {
 		id: new ToggleCollapseUnchangedRegions().desc.id,
-		title: localize('collapseUnchangedRegions', "Collapse Unchanged Regions"),
+		title: localize('collapseUnchangedRegions', "Show Unchanged Regions"),
 		icon: Codicon.map
 	},
+	order: 22,
 	group: 'navigation',
 	when: ContextKeyExpr.and(
 		ContextKeyExpr.has('config.diffEditor.experimental.collapseUnchangedRegions'),
@@ -47,12 +48,43 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
 	command: {
 		id: new ToggleCollapseUnchangedRegions().desc.id,
-		title: localize('showUnchangedRegions', "Show Unchanged Regions"),
+		title: localize('showUnchangedRegions', "Collapse Unchanged Regions"),
 		icon: ThemeIcon.modify(Codicon.map, 'disabled'),
 	},
+	order: 22,
 	group: 'navigation',
 	when: ContextKeyExpr.and(
 		ContextKeyExpr.has('config.diffEditor.experimental.collapseUnchangedRegions').negate(),
 		ContextKeyEqualsExpr.create('diffEditorVersion', 2)
 	)
 });
+
+export class ToggleShowMovedCodeBlocks extends Action2 {
+	constructor() {
+		super({
+			id: 'diffEditor.toggleShowMovedCodeBlocks',
+			title: { value: localize('toggleShowMovedCodeBlocks', "Toggle Show Moved Code Blocks"), original: 'Toggle Show Moved Code Blocks' },
+			precondition: ContextKeyEqualsExpr.create('diffEditorVersion', 2),
+		});
+	}
+
+	run(accessor: ServicesAccessor, ...args: unknown[]): void {
+		const configurationService = accessor.get(IConfigurationService);
+		const newValue = !configurationService.getValue<boolean>('diffEditor.experimental.showMoves');
+		configurationService.updateValue('diffEditor.experimental.showMoves', newValue);
+	}
+}
+
+registerAction2(ToggleShowMovedCodeBlocks);
+
+MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
+	command: {
+		id: new ToggleShowMovedCodeBlocks().desc.id,
+		title: localize('showMoves', "Show Moves"),
+		icon: Codicon.move,
+		toggled: ContextKeyEqualsExpr.create('config.diffEditor.experimental.showMoves', true),
+	},
+	order: 10,
+	group: '1_diff',
+	when: ContextKeyEqualsExpr.create('diffEditorVersion', 2)
+});