Joh/weird-mink (microsoft#199049)

* fix up wholerange with diff information once all edits are there

* update summary when having changes across ranges

Author: jrieken

src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts

@@ -745,6 +745,10 @@ export class InlineChatController implements IEditorContribution {
 			this._chatAccessibilityService.acceptResponse(a11yResponse, requestId);
 		}
 
+		// todo@jrieken we can likely remove 'trackEdit'
+		const diff = await this._editorWorkerService.computeDiff(this._activeSession.textModel0.uri, this._activeSession.textModelN.uri, { computeMoves: false, maxComputationTimeMs: Number.MAX_SAFE_INTEGER, ignoreTrimWhitespace: false }, 'advanced');
+		this._activeSession.wholeRange.fixup(diff?.changes ?? []);
+
 		progressiveEditsCts.dispose(true);
 		requestCts.dispose();
 		msgListener.dispose();

src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.ts

@@ -7,7 +7,7 @@ import { URI } from 'vs/base/common/uri';
 import { Emitter, Event } from 'vs/base/common/event';
 import { ResourceEdit, ResourceFileEdit, ResourceTextEdit } from 'vs/editor/browser/services/bulkEditService';
 import { IWorkspaceTextEdit, TextEdit, WorkspaceEdit } from 'vs/editor/common/languages';
-import { IModelDeltaDecoration, ITextModel } from 'vs/editor/common/model';
+import { IModelDecorationOptions, IModelDeltaDecoration, ITextModel } from 'vs/editor/common/model';
 import { EditMode, IInlineChatSessionProvider, IInlineChatSession, IInlineChatBulkEditResponse, IInlineChatEditResponse, IInlineChatMessageResponse, IInlineChatResponse, IInlineChatService, InlineChatResponseType, InlineChateResponseTypes } from 'vs/workbench/contrib/inlineChat/common/inlineChat';
 import { IRange, Range } from 'vs/editor/common/core/range';
 import { IActiveCodeEditor, ICodeEditor } from 'vs/editor/browser/editorBrowser';
@@ -16,15 +16,15 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IModelService } from 'vs/editor/common/services/model';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { createTextBufferFactoryFromSnapshot } from 'vs/editor/common/model/textModel';
+import { ModelDecorationOptions, createTextBufferFactoryFromSnapshot } from 'vs/editor/common/model/textModel';
 import { ILogService } from 'vs/platform/log/common/log';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { Iterable } from 'vs/base/common/iterator';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
 import { isCancellationError } from 'vs/base/common/errors';
 import { EditOperation, ISingleEditOperation } from 'vs/editor/common/core/editOperation';
 import { raceCancellation } from 'vs/base/common/async';
-import { LineRangeMapping } from 'vs/editor/common/diff/rangeMapping';
+import { DetailedLineRangeMapping, LineRangeMapping } from 'vs/editor/common/diff/rangeMapping';
 import { IMarkdownString } from 'vs/base/common/htmlContent';
 import { IUntitledTextEditorModel } from 'vs/workbench/services/untitled/common/untitledTextEditorModel';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
@@ -71,12 +71,12 @@ export enum ExpansionState {
 
 class SessionWholeRange {
 
-	private static readonly _options = { description: 'inlineChat/session/wholeRange' };
+	private static readonly _options: IModelDecorationOptions = ModelDecorationOptions.register({ description: 'inlineChat/session/wholeRange' });
 
 	private readonly _onDidChange = new Emitter<this>();
 	readonly onDidChange: Event<this> = this._onDidChange.event;
 
-	private readonly _decorationIds: string[] = [];
+	private _decorationIds: string[] = [];
 
 	constructor(private readonly _textModel: ITextModel, wholeRange: IRange) {
 		this._decorationIds = _textModel.deltaDecorations([], [{ range: wholeRange, options: SessionWholeRange._options }]);
@@ -98,6 +98,22 @@ class SessionWholeRange {
 		this._onDidChange.fire(this);
 	}
 
+	fixup(changes: readonly DetailedLineRangeMapping[]): void {
+
+		const newDeco: IModelDeltaDecoration[] = [];
+		for (const { modified } of changes) {
+			const modifiedRange = modified.isEmpty
+				? new Range(modified.startLineNumber, 1, modified.startLineNumber, this._textModel.getLineLength(modified.startLineNumber))
+				: new Range(modified.startLineNumber, 1, modified.endLineNumberExclusive - 1, this._textModel.getLineLength(modified.endLineNumberExclusive - 1));
+
+			newDeco.push({ range: modifiedRange, options: SessionWholeRange._options });
+		}
+		const [first, ...rest] = this._decorationIds; // first is the original whole range
+		const newIds = this._textModel.deltaDecorations(rest, newDeco);
+		this._decorationIds = [first].concat(newIds);
+		this._onDidChange.fire(this);
+	}
+
 	get value(): Range {
 		let result: Range | undefined;
 		for (const id of this._decorationIds) {

src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.ts

@@ -711,7 +711,7 @@ export class LiveStrategy3 extends EditModeStrategy {
 	}
 
 	private async _computeDiff(): Promise<IDocumentDiff> {
-		const diff = await this._editorWorkerService.computeDiff(this._session.textModel0.uri, this._session.textModelN.uri, { ignoreTrimWhitespace: false, maxComputationTimeMs: 5000, computeMoves: false }, 'advanced');
+		const diff = await this._editorWorkerService.computeDiff(this._session.textModel0.uri, this._session.textModelN.uri, { ignoreTrimWhitespace: false, maxComputationTimeMs: Number.MAX_SAFE_INTEGER, computeMoves: false }, 'advanced');
 
 		if (!diff || diff.changes.length === 0) {
 			return { identical: false, quitEarly: false, changes: [], moves: [] };
@@ -750,8 +750,6 @@ export class LiveStrategy3 extends EditModeStrategy {
 
 		this._sessionStore.clear();
 
-		this._updateSummaryMessage(diff.changes);
-
 		if (diff.identical || diff.changes.length === 0) {
 
 			if (isAfterManualInteraction) {
@@ -767,10 +765,10 @@ export class LiveStrategy3 extends EditModeStrategy {
 		const mightContainRTL = this._session.textModel0.mightContainRTL() ?? false;
 		const renderOptions = RenderOptions.fromEditor(this._editor);
 
-		let widgetData: { distance: number; position: Position; actions: IAction[] } | undefined;
-
-		for (const { original, modified, innerChanges } of diff.changes) {
+		let widgetData: { distance: number; position: Position; actions: IAction[]; mapping: LineRangeMapping } | undefined;
 
+		for (const mapping of diff.changes) {
+			const { original, modified, innerChanges } = mapping;
 			const modifiedRange: Range = modified.isEmpty
 				? new Range(modified.startLineNumber, 1, modified.startLineNumber, this._session.textModelN.getLineLength(modified.startLineNumber))
 				: new Range(modified.startLineNumber, 1, modified.endLineNumberExclusive - 1, this._session.textModelN.getLineLength(modified.endLineNumberExclusive - 1));
@@ -895,7 +893,7 @@ export class LiveStrategy3 extends EditModeStrategy {
 					: zoneLineNumber - modifiedRange.endLineNumber;
 
 				if (!widgetData || widgetData.distance > myDistance) {
-					widgetData = { distance: myDistance, position: modifiedRange.getStartPosition().delta(-1), actions };
+					widgetData = { distance: myDistance, position: modifiedRange.getStartPosition().delta(-1), mapping, actions };
 				}
 			}
 		}
@@ -904,6 +902,9 @@ export class LiveStrategy3 extends EditModeStrategy {
 			this._zone.widget.setExtraButtons(widgetData.actions);
 			this._zone.updatePositionAndHeight(widgetData.position);
 			this._editor.revealPositionInCenterIfOutsideViewport(widgetData.position);
+
+			this._updateSummaryMessage(widgetData.mapping, diff.changes);
+
 		}
 
 		const decorations = this._editor.createDecorationsCollection(newDecorations);
@@ -940,18 +941,20 @@ export class LiveStrategy3 extends EditModeStrategy {
 		}
 	}
 
-	protected _updateSummaryMessage(mappings: readonly LineRangeMapping[]) {
-		let linesChanged = 0;
-		for (const change of mappings) {
-			linesChanged += change.changedLineCount;
-		}
+	protected _updateSummaryMessage(current: LineRangeMapping, mappings: readonly LineRangeMapping[]) {
+		const thisLinesChange = current.changedLineCount;
+		const allLinesChanges = mappings.reduce((total, change) => total + change.changedLineCount, 0);
 		let message: string;
-		if (linesChanged === 0) {
+		if (allLinesChanges === 0) {
 			message = localize('lines.0', "Nothing changed");
-		} else if (linesChanged === 1) {
+		} else if (allLinesChanges === 1) {
 			message = localize('lines.1', "Changed 1 line");
 		} else {
-			message = localize('lines.N', "Changed {0} lines", linesChanged);
+			if (mappings.length === 1) {
+				message = localize('lines.N', "Changed {0} lines", allLinesChanges);
+			} else {
+				message = localize('lines.NM', "{0} of {1} changed lines", thisLinesChange, allLinesChanges);
+			}
 		}
 		this._zone.widget.updateStatus(message);
 	}

src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts

@@ -296,7 +296,7 @@ suite('InteractiveChatController', function () {
 
 		await ctrl.waitFor([State.MAKE_REQUEST, State.APPLY_RESPONSE, State.SHOW_RESPONSE, State.WAIT_FOR_INPUT]);
 
-		assert.deepStrictEqual(session.wholeRange.value, new Range(1, 1, 4, 12));
+		assert.deepStrictEqual(session.wholeRange.value, new Range(4, 1, 4, 12));
 
 		await ctrl.cancelSession();
 		await r;