Merge branch 'main' into aiday/internalIssue4344

Author: aiday-mar

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)
+});

src/vs/editor/browser/widget/diffEditorWidget2/patternBottom.svg

@@ -17,6 +17,7 @@ import { ChatEditorInput } from 'vs/workbench/contrib/chat/browser/chatEditorInp
 import { ChatViewPane } from 'vs/workbench/contrib/chat/browser/chatViewPane';
 import { CONTEXT_PROVIDER_EXISTS } from 'vs/workbench/contrib/chat/common/chatContextKeys';
 import { IChatContributionService } from 'vs/workbench/contrib/chat/common/chatContributionService';
+import { IChatService } from 'vs/workbench/contrib/chat/common/chatService';
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 
@@ -68,6 +69,11 @@ async function moveToSidebar(accessor: ServicesAccessor): Promise<void> {
 		const viewId = chatContribService.getViewIdForProvider(chatEditorInput.providerId);
 		const view = await viewsService.openView(viewId) as ChatViewPane;
 		view.loadSession(chatEditorInput.sessionId);
+	} else {
+		const chatService = accessor.get(IChatService);
+		const providerId = chatService.getProviderInfos()[0].id;
+		const viewId = chatContribService.getViewIdForProvider(providerId);
+		await viewsService.openView(viewId);
 	}
 }
 
@@ -90,9 +96,12 @@ export function registerMoveActions() {
 			const widgetService = accessor.get(IChatWidgetService);
 			const viewService = accessor.get(IViewsService);
 			const editorService = accessor.get(IEditorService);
+			const chatService = accessor.get(IChatService);
 
 			const widget = widgetService.lastFocusedWidget;
 			if (!widget || !('viewId' in widget.viewContext)) {
+				const providerId = chatService.getProviderInfos()[0].id;
+				await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: <IChatEditorOptions>{ target: { providerId }, pinned: true } });
 				return;
 			}
 

src/vs/workbench/contrib/chat/browser/actions/chatMoveActions.ts

@@ -155,6 +155,7 @@ export class ChatService extends Disposable implements IChatService {
 		this.trace('onWillSaveState', `Persisting ${allSessions.length} sessions`);
 
 		const serialized = JSON.stringify(allSessions);
+		this.trace('onWillSaveState', `Persisting ${serialized.length} chars`);
 		this.storageService.store(serializedChatKey, serialized, StorageScope.WORKSPACE, StorageTarget.MACHINE);
 	}