fix: assign keybinding for edits view (microsoft#232214) (microsoft#232215)

* fix: assign keybinding for edits view (microsoft#232214)

* fix: don't unnecessarily prompt when clearing existing editing session

* fix: only reveal chat edited files after they exist on disk

* fix: sync all attachments to working set when submitting request

Author: joyceerhl

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

@@ -166,15 +166,6 @@ export function registerNewChatActions() {
 					});
 
 					return Boolean(result);
-				} else {
-					const result = await dialogService.confirm({
-						title: localize('chat.startEditing.confirmation.title', "Start new editing session?"),
-						message: localize('chat.startEditing.confirmation.message', "Starting a new editing session will end your current editing session and discard edits to {0} files. Do you wish to proceed?", currentEditCount),
-						type: 'info',
-						primaryButton: localize('chat.startEditing.confirmation.primaryButton', "Yes")
-					});
-
-					return result.confirmed;
 				}
 			}
 
@@ -328,7 +319,7 @@ export function registerNewChatActions() {
 		constructor() {
 			super({
 				id: 'workbench.action.chat.openEditSession',
-				title: localize2('chat.openEdits.label', "Open Edit Session"),
+				title: localize2('chat.openEdits.label', "Open {0}", 'Copilot Edits'),
 				category: CHAT_CATEGORY,
 				icon: Codicon.goToEditingSession,
 				precondition: ContextKeyExpr.and(CONTEXT_CHAT_ENABLED, CONTEXT_CHAT_EDITING_PARTICIPANT_REGISTERED),
@@ -343,7 +334,12 @@ export function registerNewChatActions() {
 					when: CONTEXT_CHAT_EDITING_PARTICIPANT_REGISTERED,
 					group: 'a_chatEdit',
 					order: 1
-				}]
+				}],
+				keybinding: {
+					weight: KeybindingWeight.WorkbenchContrib,
+					primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyI,
+					when: ContextKeyExpr.and(ContextKeyExpr.notEquals('view', EDITS_VIEW_ID), CONTEXT_CHAT_EDITING_PARTICIPANT_REGISTERED)
+				}
 			});
 		}
 

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

@@ -216,7 +216,9 @@ class SendToChatEditingAction extends Action2 {
 		if (currentEditCount) {
 			const result = await dialogService.confirm({
 				title: localize('chat.startEditing.confirmation.title', "Start new editing session?"),
-				message: localize('chat.startEditing.confirmation.message', "Starting a new editing session will end your current editing session and discard edits to {0} files. Do you wish to proceed?", currentEditCount),
+				message: currentEditCount === 1
+					? localize('chat.startEditing.confirmation.message.one', "Starting a new editing session will end your current editing session containing {0} file. Do you wish to proceed?", currentEditCount)
+					: localize('chat.startEditing.confirmation.message.many', "Starting a new editing session will end your current editing session containing {0} files. Do you wish to proceed?", currentEditCount),
 				type: 'info',
 				primaryButton: localize('chat.startEditing.confirmation.primaryButton', "Yes")
 			});

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

@@ -109,10 +109,7 @@ class QuickChatGlobalAction extends Action2 {
 			category: CHAT_CATEGORY,
 			keybinding: {
 				weight: KeybindingWeight.WorkbenchContrib,
-				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyI,
-				linux: {
-					primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyMod.Alt | KeyCode.KeyI
-				}
+				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyMod.Alt | KeyCode.KeyI,
 			},
 			menu: {
 				id: MenuId.ChatCommandCenter,

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

@@ -474,7 +474,9 @@ export function registerChatTitleActions() {
 					} else {
 						const result = await dialogService.confirm({
 							title: localize('chat.startEditing.confirmation.title', "Start new editing session?"),
-							message: localize('chat.startEditing.confirmation.message', "Starting a new editing session will end your current editing session and discard edits to {0} files. Do you wish to proceed?", currentEditCount),
+							message: currentEditCount
+								? localize('chat.startEditing.confirmation.message.one', "Starting a new editing session will end your current editing session containing {0} file. Do you wish to proceed?", currentEditCount)
+								: localize('chat.startEditing.confirmation.message.many', "Starting a new editing session will end your current editing session containing {0} files. Do you wish to proceed?", currentEditCount),
 							type: 'info',
 							primaryButton: localize('chat.startEditing.confirmation.primaryButton', "Yes")
 						});

src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingService.ts

@@ -20,6 +20,7 @@ import { ITextModelService } from '../../../../../editor/common/services/resolve
 import { localize, localize2 } from '../../../../../nls.js';
 import { IContextKey, IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
 import { EditorActivation } from '../../../../../platform/editor/common/editor.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { bindContextKey } from '../../../../../platform/observable/common/platformObservableUtils.js';
 import { IProgressService, ProgressLocation } from '../../../../../platform/progress/common/progress.js';
@@ -86,6 +87,7 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 		@ICodeMapperService private readonly _codeMapperService: ICodeMapperService,
 		@IEditorService private readonly _editorService: IEditorService,
 		@IDecorationsService decorationsService: IDecorationsService,
+		@IFileService private readonly _fileService: IFileService,
 		@IWorkbenchAssignmentService private readonly _workbenchAssignmentService: IWorkbenchAssignmentService
 	) {
 		super();
@@ -243,6 +245,7 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 
 		let editsSource: AsyncIterableSource<IChatTextEditGroup> | undefined;
 		const editsSeen = new ResourceMap<{ seen: number }>();
+		const editedFilesExist = new ResourceMap<Promise<boolean>>();
 
 		const onResponseComplete = (responseModel: IChatResponseModel) => {
 			if (responseModel.result?.errorDetails) {
@@ -256,14 +259,22 @@ export class ChatEditingService extends Disposable implements IChatEditingServic
 			editsSource?.resolve();
 			editsSource = undefined;
 			editsSeen.clear();
+			editedFilesExist.clear();
 		};
 
 
 		const handleResponseParts = (responseModel: IChatResponseModel) => {
 			for (const part of responseModel.response.value) {
 				if (part.kind === 'codeblockUri' || part.kind === 'textEditGroup') {
 					// ensure editor is open asap
-					this._editorService.openEditor({ resource: part.uri, options: { inactive: true, preserveFocus: true, pinned: true } });
+					if (!editedFilesExist.get(part.uri)) {
+						editedFilesExist.set(part.uri, this._fileService.exists(part.uri).then((e) => {
+							if (e) {
+								this._editorService.openEditor({ resource: part.uri, options: { inactive: true, preserveFocus: true, pinned: true } });
+							}
+							return e;
+						}));
+					}
 
 					// get new edits and start editing session
 					const first = editsSeen.size === 0;

src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts

@@ -593,6 +593,7 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 			}
 			// this file does not exist yet, create it and try again
 			await this._bulkEditService.apply({ edits: [{ newResource: resource }] });
+			this._editorService.openEditor({ resource, options: { inactive: true, preserveFocus: true, pinned: true } });
 			return this._createModifiedFileEntry(resource, responseModel, true);
 		}
 	}

src/vs/workbench/contrib/chat/browser/chatWidget.ts

@@ -1012,6 +1012,11 @@ export class ChatWidget extends Disposable implements IChatWidget {
 					}
 				}
 				workingSet = [...uniqueWorkingSetEntries.values()];
+				const currentEditingSession = this.chatEditingService.currentEditingSessionObs.get();
+				for (const file of workingSet) {
+					// Make sure that any files that we sent are part of the working set
+					currentEditingSession?.addFileToWorkingSet(file);
+				}
 				attachedContext = editingSessionAttachedContext;
 			}