initial commit

Author: aiday-mar

src/vs/editor/contrib/zoneWidget/browser/zoneWidget.ts

@@ -31,6 +31,7 @@ export interface IOptions {
 	allowUnlimitedHeight?: boolean;
 	ordinal?: number;
 	showInHiddenAreas?: boolean;
+	allowBehindVerticalScrollbar?: boolean;
 }
 
 export interface IStyles {
@@ -271,7 +272,7 @@ export abstract class ZoneWidget implements IHorizontalSashLayoutProvider {
 	}
 
 	protected _getWidth(info: EditorLayoutInfo): number {
-		return info.width - info.minimap.minimapWidth - info.verticalScrollbarWidth;
+		return info.width - info.minimap.minimapWidth - (this.options.allowBehindVerticalScrollbar ? 0 : info.verticalScrollbarWidth);
 	}
 
 	private _getLeft(info: EditorLayoutInfo): number {

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

@@ -38,6 +38,7 @@ 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',
@@ -100,6 +101,7 @@ export class InlineChatController implements IEditorContribution {
 	private _activeSession?: Session;
 	private _strategy?: EditModeStrategy;
 	private _ignoreModelContentChanged = false;
+	private _selection: Selection | undefined;
 
 	constructor(
 		private readonly _editor: ICodeEditor,
@@ -199,16 +201,32 @@ 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());
 		} 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)`;
+			}
+			console.log('widgetPosition : ', widgetPosition);
+			console.log('selection : ', this._editor.getSelection());
+			console.log('this._activeSession.wholeRange : ', this._activeSession.wholeRange);
 		}
 		this._zone.value.show(widgetPosition);
 	}
@@ -283,6 +301,7 @@ 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/inlineChatWidget.ts

@@ -701,7 +701,7 @@ export class InlineChatZoneWidget extends ZoneWidget {
 		@IInstantiationService private readonly _instaService: IInstantiationService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 	) {
-		super(editor, { showFrame: false, showArrow: false, isAccessible: true, className: 'inline-chat-widget', keepEditorSelection: true, showInHiddenAreas: true, ordinal: 10000 + 3 });
+		super(editor, { showFrame: false, showArrow: false, isAccessible: true, className: 'inline-chat-widget', keepEditorSelection: true, showInHiddenAreas: true, ordinal: 10000 + 3, allowBehindVerticalScrollbar: true });
 
 		this._ctxVisible = CTX_INLINE_CHAT_VISIBLE.bindTo(contextKeyService);
 		this._ctxCursorPosition = CTX_INLINE_CHAT_OUTER_CURSOR_POSITION.bindTo(contextKeyService);
@@ -740,7 +740,7 @@ 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());
 		this._dimension = new Dimension(width, heightInPixel);
@@ -801,12 +801,10 @@ export class InlineChatZoneWidget extends ZoneWidget {
 		}
 		this._indentationWidth = indentationWidth;
 		const info = this.editor.getLayoutInfo();
-		const marginWithoutIndentation = info.glyphMarginWidth + info.decorationsWidth + info.lineNumbersWidth;
-		const marginWithIndentation = marginWithoutIndentation + this._indentationWidth;
 		const isEnoughAvailableSpaceWithIndentation = this._availableSpaceGivenIndentation() > 400;
 		this._indentationWidth = isEnoughAvailableSpaceWithIndentation ? this._indentationWidth : 0;
-		const spaceLeft = isEnoughAvailableSpaceWithIndentation ? marginWithIndentation : marginWithoutIndentation;
-		const spaceRight = info.minimap.minimapWidth + info.verticalScrollbarWidth;
+		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`;
 	}