cleaning the code

Author: aiday-mar

src/vs/workbench/contrib/inlineChat/browser/inlineChat.css

@@ -7,6 +7,10 @@
 	z-index: 3;
 }
 
+.monaco-editor .zone-widget-container.inside-selection {
+	background-color: var(--vscode-inlineChat-regionHighlight);
+}
+
 .monaco-editor .inline-chat {
 	color: inherit;
 	padding: 6px;

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

@@ -38,7 +38,6 @@ import { INotebookEditorService } from 'vs/workbench/contrib/notebook/browser/se
 import { CellUri } from 'vs/workbench/contrib/notebook/common/notebookCommon';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { Lazy } from 'vs/base/common/lazy';
-import { Selection } from 'vs/editor/common/core/selection';
 
 export const enum State {
 	CREATE_SESSION = 'CREATE_SESSION',
@@ -101,7 +100,6 @@ export class InlineChatController implements IEditorContribution {
 	private _activeSession?: Session;
 	private _strategy?: EditModeStrategy;
 	private _ignoreModelContentChanged = false;
-	private _selection: Selection | undefined;
 
 	constructor(
 		private readonly _editor: ICodeEditor,
@@ -201,34 +199,20 @@ export class InlineChatController implements IEditorContribution {
 		assertType(this._strategy);
 		assertType(this._editor.hasModel());
 
-		const info = this._editor.getLayoutInfo();
-		const marginWithoutIndentation = info.glyphMarginWidth + info.decorationsWidth + info.lineNumbersWidth;
-		this._zone.value.container!.style.marginLeft = `${marginWithoutIndentation}px`;
-
 		let widgetPosition: Position | undefined;
 		if (initialRender) {
-			this._selection = this._editor.getSelection();
 			widgetPosition = this._editor.getSelection().getEndPosition();
-			this._zone.value.setMargins(widgetPosition);
-			console.log('widgetPosition : ', widgetPosition);
-			console.log('selection : ', this._editor.getSelection());
+			this._zone.value.setContainerMargins();
+			this._zone.value.setWidgetMargins(widgetPosition);
 		} else {
 			widgetPosition = this._strategy.getWidgetPosition() ?? this._zone.value.position ?? this._activeSession.wholeRange.value.getEndPosition();
 			const needsMargin = this._strategy.needsMargin();
 			if (!needsMargin) {
-				this._zone.value.setMargins(widgetPosition, 0);
-			}
-			// TODO: clean up
-			const widgetLineNumber = widgetPosition.lineNumber;
-			if (this._selection && widgetLineNumber >= this._selection.startLineNumber && widgetLineNumber < this._selection.endLineNumber) {
-				console.log('this._zone.value.container : ', this._zone.value.container);
-				this._zone.value.container!.style.backgroundColor = `var(--vscode-inlineChat-regionHighlight)`;
+				this._zone.value.setWidgetMargins(widgetPosition, 0);
 			}
-			console.log('widgetPosition : ', widgetPosition);
-			console.log('selection : ', this._editor.getSelection());
-			console.log('this._activeSession.wholeRange : ', this._activeSession.wholeRange);
 		}
 		this._zone.value.show(widgetPosition);
+		this._zone.value.updateBackgroundColor(widgetPosition, this._activeSession.selection);
 	}
 
 	protected async _nextState(state: State, options: InlineChatRunOptions | undefined): Promise<void> {
@@ -301,7 +285,6 @@ export class InlineChatController implements IEditorContribution {
 			range: this._activeSession.wholeRange.value,
 			options: InlineChatController._decoBlock
 		}]);
-		console.log('wholeRangeDecoration', wholeRangeDecoration);
 		this._sessionStore.add(toDisposable(() => wholeRangeDecoration.clear()));
 
 		this._zone.value.widget.updateSlashCommands(this._activeSession.session.slashCommands ?? []);

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

@@ -126,7 +126,8 @@ export class Session {
 		readonly textModelN: ITextModel,
 		readonly provider: IInlineChatSessionProvider,
 		readonly session: IInlineChatSession,
-		readonly wholeRange: SessionWholeRange
+		readonly wholeRange: SessionWholeRange,
+		readonly selection: IRange
 	) {
 		this.textModelNAltVersion = textModelN.getAlternativeVersionId();
 		this._teldata = {
@@ -443,7 +444,7 @@ export class InlineChatSessionService implements IInlineChatSessionService {
 		const wholeRangeMgr = new SessionWholeRange(textModel, wholeRange);
 		store.add(wholeRangeMgr);
 
-		const session = new Session(options.editMode, editor, textModel0, textModel, provider, raw, wholeRangeMgr);
+		const session = new Session(options.editMode, editor, textModel0, textModel, provider, raw, wholeRangeMgr, editor.getSelection());
 
 		// store: key -> session
 		const key = this._key(editor, textModel.uri);

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

@@ -7,7 +7,7 @@ import 'vs/css!./inlineChat';
 import { DisposableStore, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { IActiveCodeEditor, ICodeEditor, IDiffEditorConstructionOptions } from 'vs/editor/browser/editorBrowser';
 import { EditorOption } from 'vs/editor/common/config/editorOptions';
-import { Range } from 'vs/editor/common/core/range';
+import { IRange, Range } from 'vs/editor/common/core/range';
 import { localize } from 'vs/nls';
 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -47,8 +47,8 @@ import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibil
 import { renderLabelWithIcons } from 'vs/base/browser/ui/iconLabel/iconLabels';
 import { ExpansionState } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSession';
 import { IdleValue } from 'vs/base/common/async';
-import * as aria from 'vs/base/browser/ui/aria/aria';
 import { IMenuWorkbenchButtonBarOptions, MenuWorkbenchButtonBar } from 'vs/platform/actions/browser/buttonbar';
+import * as aria from 'vs/base/browser/ui/aria/aria';
 
 const defaultAriaLabel = localize('aria-label', "Inline Chat Input");
 
@@ -740,17 +740,17 @@ export class InlineChatZoneWidget extends ZoneWidget {
 
 
 	protected override _doLayout(heightInPixel: number): void {
-		console.log('inside of _doLayout');
+
 		const maxWidth = !this.widget.showsAnyPreview() ? 640 : Number.MAX_SAFE_INTEGER;
-		const width = Math.min(maxWidth, this._availableSpaceGivenIndentation());
+		const width = Math.min(maxWidth, this._availableSpaceGivenIndentation(this._indentationWidth));
 		this._dimension = new Dimension(width, heightInPixel);
 		this.widget.domNode.style.width = `${width}px`;
 		this.widget.layout(this._dimension);
 	}
 
-	private _availableSpaceGivenIndentation(): number {
+	private _availableSpaceGivenIndentation(indentationWidth: number | undefined): number {
 		const info = this.editor.getLayoutInfo();
-		return info.contentWidth - (info.glyphMarginWidth + info.decorationsWidth + (this._indentationWidth ?? 0));
+		return info.contentWidth - (info.glyphMarginWidth + info.decorationsWidth + (indentationWidth ?? 0));
 	}
 
 	private _computeHeightInLines(): number {
@@ -771,6 +771,14 @@ export class InlineChatZoneWidget extends ZoneWidget {
 		this._ctxVisible.set(true);
 	}
 
+	public updateBackgroundColor(position: Position, selection: IRange) {
+		if (!this.container) {
+			return;
+		}
+		const widgetLineNumber = position.lineNumber;
+		this.container.classList.toggle('inside-selection', widgetLineNumber >= selection.startLineNumber && widgetLineNumber < selection.endLineNumber);
+	}
+
 	private _calculateIndentationWidth(position: Position): number {
 		const viewModel = this.editor._getViewModel();
 		if (!viewModel) {
@@ -792,21 +800,25 @@ export class InlineChatZoneWidget extends ZoneWidget {
 		return this.editor.getOffsetForColumn(indentationLineNumber ?? positionLine, indentationLevel ?? viewModel.getLineFirstNonWhitespaceColumn(positionLine));
 	}
 
-	setMargins(position: Position, indentationWidth?: number): void {
+	setContainerMargins(): void {
+		if (!this.container) {
+			return;
+		}
+		const info = this.editor.getLayoutInfo();
+		const marginWithoutIndentation = info.glyphMarginWidth + info.decorationsWidth + info.lineNumbersWidth;
+		this.container.style.marginLeft = `${marginWithoutIndentation}px`;
+	}
+
+	setWidgetMargins(position: Position, indentationWidth?: number): void {
 		if (indentationWidth === undefined) {
 			indentationWidth = this._calculateIndentationWidth(position);
 		}
 		if (this._indentationWidth === indentationWidth) {
 			return;
 		}
-		this._indentationWidth = indentationWidth;
-		const info = this.editor.getLayoutInfo();
-		const isEnoughAvailableSpaceWithIndentation = this._availableSpaceGivenIndentation() > 400;
-		this._indentationWidth = isEnoughAvailableSpaceWithIndentation ? this._indentationWidth : 0;
-		const spaceLeft = isEnoughAvailableSpaceWithIndentation ? this._indentationWidth : 0;
-		const spaceRight = info.minimap.minimapWidth;
-		this.widget.domNode.style.marginLeft = `${spaceLeft}px`;
-		this.widget.domNode.style.marginRight = `${spaceRight}px`;
+		this._indentationWidth = this._availableSpaceGivenIndentation(indentationWidth) > 400 ? indentationWidth : 0;
+		this.widget.domNode.style.marginLeft = `${this._indentationWidth}px`;
+		this.widget.domNode.style.marginRight = `${this.editor.getLayoutInfo().minimap.minimapWidth}px`;
 	}
 
 	override hide(): void {