Resetting the EditContext on the dom node on rendering - workaround fix for...

Resetting the EditContext on the dom node on rendering - workaround fix for EditContext not working in aux window (#230318) * wip * setting the edit context only when the target window has changed --------- Co-authored-by: Benjamin Pasero <benjamin.pasero@microsoft.com>

Resetting the EditContext on the dom node on rendering - workaround fix for...
Resetting the EditContext on the dom node on rendering - workaround fix for EditContext not working in aux window (#230318) * wip * setting the edit context only when the target window has changed --------- Co-authored-by: Benjamin Pasero <benjamin.pasero@microsoft.com>
98663479 · Aiday Marlen Kyzy · GitHub · d0858160 · 98663479 · 98663479
--- a/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
+++ b/src/vs/editor/browser/controller/editContext/native/nativeEditContext.ts
@@ -76,7 +76,7 @@ export class NativeEditContext extends AbstractEditContext {
 		}));

 		this._editContext = new EditContext();
-		this.domNode.domNode.editContext = this._editContext;
+		this.setEditContextOnDomNode();

 		this._screenReaderSupport = instantiationService.createInstance(ScreenReaderSupport, this.domNode, context);

@@ -176,6 +176,12 @@ export class NativeEditContext extends AbstractEditContext {

 	public refreshFocusState(): void { }

+	// TODO: added as a workaround fix for https://github.com/microsoft/vscode/issues/229825
+	// When this issue will be fixed the following should be removed.
+	public setEditContextOnDomNode(): void {
+		this.domNode.domNode.editContext = this._editContext;
+	}
+
 	// --- Private methods ---

 	private _updateDomAttributes(): void {

--- a/src/vs/editor/browser/view.ts
+++ b/src/vs/editor/browser/view.ts
@@ -111,6 +111,8 @@ export class View extends ViewEventHandler {
 	private _shouldRecomputeGlyphMarginLanes: boolean = false;
 	private _renderAnimationFrame: IDisposable | null;

+	private _targetWindow: CodeWindow | undefined;
+
 	constructor(
 		commandDelegate: ICommandDelegate,
 		configuration: IEditorConfiguration,
@@ -456,9 +458,14 @@ export class View extends ViewEventHandler {
 			throw new BugIndicatingError();
 		}
 		if (this._renderAnimationFrame === null) {
+			const targetWindow = dom.getWindow(this.domNode?.domNode);
+			if (targetWindow !== this._targetWindow && this._editContext instanceof NativeEditContext) {
+				this._editContext.setEditContextOnDomNode();
+				this._targetWindow = targetWindow;
+			}
 			const rendering = this._createCoordinatedRendering();
 			this._renderAnimationFrame = EditorRenderingCoordinator.INSTANCE.scheduleCoordinatedRendering({
-				window: dom.getWindow(this.domNode?.domNode),
+				window: targetWindow,
 				prepareRenderText: () => {
 					if (this._store.isDisposed) {
 						throw new BugIndicatingError();