separate added/removed lines (#260626)

Author: amunger

src/vs/workbench/api/common/extHostTypeConverters.ts

@@ -3336,7 +3336,9 @@ export namespace ChatAgentUserActionEvent {
 					outcome: outcomes.get(event.action.outcome) ?? types.ChatEditingSessionActionOutcome.Rejected,
 					uri: URI.revive(event.action.uri),
 					hasRemainingEdits: event.action.hasRemainingEdits,
-					lineCount: event.action.lineCount
+					lineCount: event.action.lineCount,
+					linesAdded: event.action.linesAdded,
+					linesRemoved: event.action.linesRemoved
 				}, result: ehResult
 			};
 		} else {

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

@@ -103,7 +103,12 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 		}));
 
 		this._register(this._textModelChangeService.onDidAcceptOrRejectLines(action => {
-			this._notifyAction({ kind: 'chatEditingHunkAction', uri: this.modifiedURI, outcome: action.state, lineCount: action.lineCount, hasRemainingEdits: action.hasRemainingEdits });
+			this._notifyAction({
+				kind: 'chatEditingHunkAction',
+				uri: this.modifiedURI,
+				outcome: action.state,
+				...action
+			});
 		}));
 
 		// Create a reference to this model to avoid it being disposed from under our nose

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

@@ -33,7 +33,8 @@ import { IChatResponseModel } from '../../common/chatModel.js';
 import { IDocumentDiff2 } from './chatEditingCodeEditorIntegration.js';
 import { pendingRewriteMinimap } from './chatEditingModifiedFileEntry.js';
 
-type acceptedOrRejectedLines = { state: 'accepted' | 'rejected'; lineCount: number; hasRemainingEdits: boolean };
+type affectedLines = { linesAdded: number; linesRemoved: number; lineCount: number; hasRemainingEdits: boolean };
+type acceptedOrRejectedLines = affectedLines & { state: 'accepted' | 'rejected' };
 
 export class ChatEditingTextModelChangeService extends Disposable {
 
@@ -101,9 +102,9 @@ export class ChatEditingTextModelChangeService extends Disposable {
 	private readonly _didAcceptOrRejectLines = this._register(new Emitter<acceptedOrRejectedLines>());
 	public readonly onDidAcceptOrRejectLines = this._didAcceptOrRejectLines.event;
 
-	private notifyHunkAction(state: 'accepted' | 'rejected', lineCount: number, hasRemainingEdits: boolean) {
-		if (lineCount > 0) {
-			this._didAcceptOrRejectLines.fire({ state, lineCount, hasRemainingEdits });
+	private notifyHunkAction(state: 'accepted' | 'rejected', affectedLines: affectedLines) {
+		if (affectedLines.lineCount > 0) {
+			this._didAcceptOrRejectLines.fire({ state, ...affectedLines });
 		}
 	}
 
@@ -113,6 +114,8 @@ export class ChatEditingTextModelChangeService extends Disposable {
 	private _originalToModifiedEdit: StringEdit = StringEdit.empty;
 
 	private lineChangeCount: number = 0;
+	private linesAdded: number = 0;
+	private linesRemoved: number = 0;
 
 	constructor(
 		private readonly originalModel: ITextModel,
@@ -135,9 +138,15 @@ export class ChatEditingTextModelChangeService extends Disposable {
 
 	private updateLineChangeCount(diff: IDocumentDiff) {
 		this.lineChangeCount = 0;
+		this.linesAdded = 0;
+		this.linesRemoved = 0;
+
 		for (const change of diff.changes) {
 			const modifiedRange = change.modified.endLineNumberExclusive - change.modified.startLineNumber;
+			this.linesAdded += Math.max(0, modifiedRange);
 			const originalRange = change.original.endLineNumberExclusive - change.original.startLineNumber;
+			this.linesRemoved += Math.max(0, originalRange);
+
 			this.lineChangeCount += Math.max(modifiedRange, originalRange);
 		}
 	}
@@ -257,7 +266,7 @@ export class ChatEditingTextModelChangeService extends Disposable {
 	 * Keeps the current modified document as the final contents.
 	 */
 	public keep() {
-		this.notifyHunkAction('accepted', this.lineChangeCount, false);
+		this.notifyHunkAction('accepted', { linesAdded: this.linesAdded, linesRemoved: this.linesRemoved, lineCount: this.lineChangeCount, hasRemainingEdits: false });
 		this.originalModel.setValue(this.modifiedModel.createSnapshot());
 		this._diffInfo.set(nullDocumentDiff, undefined);
 		this._originalToModifiedEdit = StringEdit.empty;
@@ -267,7 +276,7 @@ export class ChatEditingTextModelChangeService extends Disposable {
 	 * Undoes the current modified document as the final contents.
 	 */
 	public undo() {
-		this.notifyHunkAction('rejected', this.lineChangeCount, false);
+		this.notifyHunkAction('rejected', { linesAdded: this.linesAdded, linesRemoved: this.linesRemoved, lineCount: this.lineChangeCount, hasRemainingEdits: false });
 		this.modifiedModel.pushStackElement();
 		this._applyEdits([(EditOperation.replace(this.modifiedModel.getFullModelRange(), this.originalModel.getValue()))], EditSources.chatUndoEdits());
 		this.modifiedModel.pushStackElement();
@@ -379,12 +388,20 @@ export class ChatEditingTextModelChangeService extends Disposable {
 		const myDiffOperationId = ++this._diffOperationIds;
 		await Promise.resolve(this._diffOperation);
 		const previousCount = this.lineChangeCount;
+		const previousAdded = this.linesAdded;
+		const previousRemoved = this.linesRemoved;
 		if (this._diffOperationIds === myDiffOperationId) {
 			const thisDiffOperation = this._updateDiffInfo();
 			this._diffOperation = thisDiffOperation;
 			await thisDiffOperation;
 			if (notifyAction) {
-				this.notifyHunkAction(notifyAction, previousCount - this.lineChangeCount, this.lineChangeCount > 0);
+				const affectedLines = {
+					linesAdded: previousAdded - this.linesAdded,
+					linesRemoved: previousRemoved - this.linesRemoved,
+					lineCount: previousCount - this.lineChangeCount,
+					hasRemainingEdits: this.lineChangeCount > 0
+				};
+				this.notifyHunkAction(notifyAction, affectedLines);
 			}
 		}
 	}

src/vs/workbench/contrib/chat/common/chatService.ts

@@ -525,6 +525,8 @@ export interface IChatEditingHunkAction {
 	kind: 'chatEditingHunkAction';
 	uri: URI;
 	lineCount: number;
+	linesAdded: number;
+	linesRemoved: number;
 	outcome: 'accepted' | 'rejected';
 	hasRemainingEdits: boolean;
 }

src/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts

@@ -553,6 +553,8 @@ declare module 'vscode' {
 		kind: 'chatEditingHunkAction';
 		uri: Uri;
 		lineCount: number;
+		linesAdded: number;
+		linesRemoved: number;
 		outcome: ChatEditingSessionActionOutcome;
 		hasRemainingEdits: boolean;
 	}