allow strategies to control whole range deco, let live not render it (microsoft#201224)

Author: jrieken

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

@@ -5,7 +5,6 @@
 
 import { renderMarkdownAsPlaintext } from 'vs/base/browser/markdownRenderer';
 import * as aria from 'vs/base/browser/ui/aria/aria';
-import { coalesceInPlace } from 'vs/base/common/arrays';
 import { Barrier, Queue, raceCancellation, raceCancellationError } from 'vs/base/common/async';
 import { CancellationTokenSource } from 'vs/base/common/cancellation';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
@@ -25,7 +24,6 @@ import { IRange, Range } from 'vs/editor/common/core/range';
 import { ISelection, Selection } from 'vs/editor/common/core/selection';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
 import { TextEdit } from 'vs/editor/common/languages';
-import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
 import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
 import { InlineCompletionsController } from 'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController';
 import { localize } from 'vs/nls';
@@ -98,13 +96,6 @@ export class InlineChatController implements IEditorContribution {
 		return editor.getContribution<InlineChatController>(INLINE_CHAT_ID);
 	}
 
-	private static _decoBlock = ModelDecorationOptions.register({
-		description: 'inline-chat',
-		showIfCollapsed: false,
-		isWholeLine: true,
-		className: 'inline-chat-block-selection',
-	});
-
 	private static _storageKey = 'inline-chat-history';
 	private static _promptHistory: string[] = [];
 	private _historyOffset: number = -1;
@@ -386,10 +377,7 @@ export class InlineChatController implements IEditorContribution {
 
 		const wholeRangeDecoration = this._editor.createDecorationsCollection();
 		const updateWholeRangeDecoration = () => {
-
-			const ranges = [this._activeSession!.wholeRange.value];//this._activeSession!.wholeRange.values;
-			const newDecorations = ranges.map(range => range.isEmpty() ? undefined : ({ range, options: InlineChatController._decoBlock }));
-			coalesceInPlace(newDecorations);
+			const newDecorations = this._strategy?.getWholeRangeDecoration() ?? [];
 			wholeRangeDecoration.set(newDecorations);
 		};
 		this._sessionStore.add(toDisposable(() => wholeRangeDecoration.clear()));

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

@@ -6,7 +6,7 @@
 import { disposableWindowInterval } from 'vs/base/browser/dom';
 import { $window } from 'vs/base/browser/window';
 import { IAction, toAction } from 'vs/base/common/actions';
-import { equals, tail } from 'vs/base/common/arrays';
+import { coalesceInPlace, equals, tail } from 'vs/base/common/arrays';
 import { AsyncIterableObject, AsyncIterableSource } from 'vs/base/common/async';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { Codicon } from 'vs/base/common/codicons';
@@ -45,6 +45,14 @@ import { CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, CTX
 
 export abstract class EditModeStrategy {
 
+	protected static _decoBlock = ModelDecorationOptions.register({
+		description: 'inline-chat',
+		showIfCollapsed: false,
+		isWholeLine: true,
+		className: 'inline-chat-block-selection',
+	});
+
+
 	protected readonly _onDidAccept = new Emitter<void>();
 	protected readonly _onDidDiscard = new Emitter<void>();
 
@@ -53,7 +61,10 @@ export abstract class EditModeStrategy {
 
 	toggleDiff?: () => any;
 
-	constructor(protected readonly _zone: InlineChatZoneWidget) { }
+	constructor(
+		protected readonly _session: Session,
+		protected readonly _zone: InlineChatZoneWidget,
+	) { }
 
 	dispose(): void {
 		this._onDidAccept.dispose();
@@ -75,6 +86,13 @@ export abstract class EditModeStrategy {
 	abstract renderChanges(response: ReplyResponse): Promise<Position | undefined>;
 
 	abstract hasFocus(): boolean;
+
+	getWholeRangeDecoration(): IModelDeltaDecoration[] {
+		const ranges = [this._session.wholeRange.value];
+		const newDecorations = ranges.map(range => range.isEmpty() ? undefined : ({ range, options: EditModeStrategy._decoBlock }));
+		coalesceInPlace(newDecorations);
+		return newDecorations;
+	}
 }
 
 export class PreviewStrategy extends EditModeStrategy {
@@ -83,16 +101,16 @@ export class PreviewStrategy extends EditModeStrategy {
 	private readonly _listener: IDisposable;
 
 	constructor(
-		private readonly _session: Session,
+		session: Session,
 		zone: InlineChatZoneWidget,
 		@IContextKeyService contextKeyService: IContextKeyService,
 	) {
-		super(zone);
+		super(session, zone);
 
 		this._ctxDocumentChanged = CTX_INLINE_CHAT_DOCUMENT_CHANGED.bindTo(contextKeyService);
-		this._listener = Event.debounce(_session.textModelN.onDidChangeContent.bind(_session.textModelN), () => { }, 350)(_ => {
-			if (!_session.textModelN.isDisposed() && !_session.textModel0.isDisposed()) {
-				this._ctxDocumentChanged.set(_session.hasChangedText);
+		this._listener = Event.debounce(session.textModelN.onDidChangeContent.bind(session.textModelN), () => { }, 350)(_ => {
+			if (!session.textModelN.isDisposed() && !session.textModel0.isDisposed()) {
+				this._ctxDocumentChanged.set(session.hasChangedText);
 			}
 		});
 	}
@@ -179,15 +197,15 @@ export class LivePreviewStrategy extends EditModeStrategy {
 	private _editCount: number = 0;
 
 	constructor(
-		private readonly _session: Session,
+		session: Session,
 		private readonly _editor: ICodeEditor,
 		zone: InlineChatZoneWidget,
 		@IStorageService storageService: IStorageService,
 		@IBulkEditService bulkEditService: IBulkEditService,
 		@IEditorWorkerService private readonly _editorWorkerService: IEditorWorkerService,
 		@IInstantiationService private readonly _instaService: IInstantiationService,
 	) {
-		super(zone);
+		super(session, zone);
 
 		this._previewZone = new Lazy(() => _instaService.createInstance(InlineChatFileCreatePreviewWidget, _editor));
 	}
@@ -500,16 +518,14 @@ export class LiveStrategy extends EditModeStrategy {
 	private _editCount: number = 0;
 
 	constructor(
-		protected readonly _session: Session,
+		session: Session,
 		protected readonly _editor: ICodeEditor,
 		zone: InlineChatZoneWidget,
 		@IContextKeyService contextKeyService: IContextKeyService,
-		@IStorageService protected _storageService: IStorageService,
-		@IBulkEditService protected readonly _bulkEditService: IBulkEditService,
 		@IEditorWorkerService protected readonly _editorWorkerService: IEditorWorkerService,
 		@IInstantiationService protected readonly _instaService: IInstantiationService,
 	) {
-		super(zone);
+		super(session, zone);
 		this._ctxCurrentChangeHasDiff = CTX_INLINE_CHAT_CHANGE_HAS_DIFF.bindTo(contextKeyService);
 		this._ctxCurrentChangeShowsDiff = CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF.bindTo(contextKeyService);
 
@@ -893,6 +909,11 @@ export class LiveStrategy extends EditModeStrategy {
 	hasFocus(): boolean {
 		return this._zone.widget.hasFocus();
 	}
+
+	override getWholeRangeDecoration(): IModelDeltaDecoration[] {
+		// don't render the blue in live mode
+		return [];
+	}
 }