Merge branch 'main' into aiday/incorrectIndentation

aiday-mar · web-flow · commit e399de0069c8 · 2023-06-23T14:43:23.000+02:00
diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.ts
@@ -435,6 +435,13 @@ export class LivePreviewStrategy extends LiveStrategy {
 	override hasFocus(): boolean {
 		return super.hasFocus() || this._diffZone.value.hasFocus() || this._previewZone.value.hasFocus();
 	}
+
+	override getWidgetPosition(): Position | undefined {
+		if (this._session.lastTextModelChanges.length) {
+			return this._session.wholeRange.value.getEndPosition();
+		}
+		return;
+	}
 }
 
 function showSingleCreateFile(accessor: ServicesAccessor, edit: EditResponse) {

Original file line number	Diff line number	Diff line change
`@@ -435,6 +435,13 @@ export class LivePreviewStrategy extends LiveStrategy {`
`435`	`435`	`override hasFocus(): boolean {`
`436`	`436`	`return super.hasFocus() \|\| this._diffZone.value.hasFocus() \|\| this._previewZone.value.hasFocus();`
`437`	`437`	`}`
	`438`	`+`
	`439`	`+ override getWidgetPosition(): Position \| undefined {`
	`440`	`+ if (this._session.lastTextModelChanges.length) {`
	`441`	`+ return this._session.wholeRange.value.getEndPosition();`
	`442`	`+ }`
	`443`	`+ return;`
	`444`	`+ }`
`438`	`445`	`}`
`439`	`446`
`440`	`447`	`function showSingleCreateFile(accessor: ServicesAccessor, edit: EditResponse) {`