Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/vs/editor/browser/config/editorConfiguration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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
Expand Down Expand Up @@ -249,6 +251,7 @@ export interface IEnvConfiguration {
emptySelectionClipboard: boolean;
pixelRatio: number;
accessibilitySupport: AccessibilitySupport;
editContextSupported: boolean;
}

class ValidatedEditorOptions implements IValidatedEditorOptions {
Expand Down
4 changes: 2 additions & 2 deletions src/vs/editor/common/config/editorOptions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -986,6 +986,7 @@ export interface IEnvironmentalOptions {
readonly inputMode: 'insert' | 'overtype';
readonly accessibilitySupport: AccessibilitySupport;
readonly glyphMarginDecorationLaneCount: number;
readonly editContextSupported: boolean;
}

/**
Expand Down Expand Up @@ -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);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ suite('Common Editor Config', () => {
outerHeight: 100,
emptySelectionClipboard: true,
pixelRatio: 1,
accessibilitySupport: AccessibilitySupport.Unknown
accessibilitySupport: AccessibilitySupport.Unknown,
editContextSupported: true,
};
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/vs/editor/test/browser/config/testConfiguration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
};
}

Expand Down
Loading