From c85fdd4238f9584e37297563f842adeeb1271157 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Tue, 8 Apr 2025 17:41:57 +0200
Subject: [PATCH] adding the boolean editContextSupported to the
 IEnvironmentalOptions

---
 src/vs/editor/browser/config/editorConfiguration.ts          | 5 ++++-
 src/vs/editor/common/config/editorOptions.ts                 | 4 ++--
 .../editor/test/browser/config/editorConfiguration.test.ts   | 3 ++-
 src/vs/editor/test/browser/config/testConfiguration.ts       | 3 ++-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/vs/editor/browser/config/editorConfiguration.ts b/src/vs/editor/browser/config/editorConfiguration.ts
index 701c940c7367c..1bf70f155d76e 100644
--- a/src/vs/editor/browser/config/editorConfiguration.ts
+++ b/src/vs/editor/browser/config/editorConfiguration.ts
@@ -130,7 +130,8 @@ export class EditorConfiguration extends Disposable implements IEditorConfigurat
 			tabFocusMode: TabFocus.getTabFocusMode(),
 			inputMode: InputMode.getInputMode(),
 			accessibilitySupport: partialEnv.accessibilitySupport,
-			glyphMarginDecorationLaneCount: this._glyphMarginDecorationLaneCount
+			glyphMarginDecorationLaneCount: this._glyphMarginDecorationLaneCount,
+			editContextSupported: partialEnv.editContextSupported
 		};
 		return EditorOptionsUtil.computeOptions(this._validatedOptions, env);
 	}
@@ -142,6 +143,7 @@ export class EditorConfiguration extends Disposable implements IEditorConfigurat
 			outerHeight: this._containerObserver.getHeight(),
 			emptySelectionClipboard: browser.isWebKit || browser.isFirefox,
 			pixelRatio: PixelRatio.getInstance(getWindowById(this._targetWindowId, true).window).value,
+			editContextSupported: typeof (globalThis as any).EditContext === 'function',
 			accessibilitySupport: (
 				this._accessibilityService.isScreenReaderOptimized()
 					? AccessibilitySupport.Enabled
@@ -249,6 +251,7 @@ export interface IEnvConfiguration {
 	emptySelectionClipboard: boolean;
 	pixelRatio: number;
 	accessibilitySupport: AccessibilitySupport;
+	editContextSupported: boolean;
 }
 
 class ValidatedEditorOptions implements IValidatedEditorOptions {
diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
index d418872f4bf48..bb4eee8903093 100644
--- a/src/vs/editor/common/config/editorOptions.ts
+++ b/src/vs/editor/common/config/editorOptions.ts
@@ -986,6 +986,7 @@ export interface IEnvironmentalOptions {
 	readonly inputMode: 'insert' | 'overtype';
 	readonly accessibilitySupport: AccessibilitySupport;
 	readonly glyphMarginDecorationLaneCount: number;
+	readonly editContextSupported: boolean;
 }
 
 /**
@@ -1943,8 +1944,7 @@ class EffectiveExperimentalEditContextEnabled extends ComputedEditorOption<Edito
 	}
 
 	public compute(env: IEnvironmentalOptions, options: IComputedEditorOptions): boolean {
-		const editContextSupported = typeof (globalThis as any).EditContext === 'function';
-		return editContextSupported && options.get(EditorOption.experimentalEditContextEnabled);
+		return env.editContextSupported && options.get(EditorOption.experimentalEditContextEnabled);
 	}
 }
 
diff --git a/src/vs/editor/test/browser/config/editorConfiguration.test.ts b/src/vs/editor/test/browser/config/editorConfiguration.test.ts
index 3dcf646314ff1..ce875cd7037f1 100644
--- a/src/vs/editor/test/browser/config/editorConfiguration.test.ts
+++ b/src/vs/editor/test/browser/config/editorConfiguration.test.ts
@@ -66,7 +66,8 @@ suite('Common Editor Config', () => {
 				outerHeight: 100,
 				emptySelectionClipboard: true,
 				pixelRatio: 1,
-				accessibilitySupport: AccessibilitySupport.Unknown
+				accessibilitySupport: AccessibilitySupport.Unknown,
+				editContextSupported: true,
 			};
 		}
 	}
diff --git a/src/vs/editor/test/browser/config/testConfiguration.ts b/src/vs/editor/test/browser/config/testConfiguration.ts
index 3c1862c967dfb..ece0400a78ca6 100644
--- a/src/vs/editor/test/browser/config/testConfiguration.ts
+++ b/src/vs/editor/test/browser/config/testConfiguration.ts
@@ -25,7 +25,8 @@ export class TestConfiguration extends EditorConfiguration {
 			outerHeight: envConfig?.outerHeight ?? 100,
 			emptySelectionClipboard: envConfig?.emptySelectionClipboard ?? true,
 			pixelRatio: envConfig?.pixelRatio ?? 1,
-			accessibilitySupport: envConfig?.accessibilitySupport ?? AccessibilitySupport.Unknown
+			accessibilitySupport: envConfig?.accessibilitySupport ?? AccessibilitySupport.Unknown,
+			editContextSupported: true
 		};
 	}