mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 10:58:30 -05:00
Merge vscode 1.67 (#20883)
* Fix initial build breaks from 1.67 merge (#2514) * Update yarn lock files * Update build scripts * Fix tsconfig * Build breaks * WIP * Update yarn lock files * Misc breaks * Updates to package.json * Breaks * Update yarn * Fix breaks * Breaks * Build breaks * Breaks * Breaks * Breaks * Breaks * Breaks * Missing file * Breaks * Breaks * Breaks * Breaks * Breaks * Fix several runtime breaks (#2515) * Missing files * Runtime breaks * Fix proxy ordering issue * Remove commented code * Fix breaks with opening query editor * Fix post merge break * Updates related to setup build and other breaks (#2516) * Fix bundle build issues * Update distro * Fix distro merge and update build JS files * Disable pipeline steps * Remove stats call * Update license name * Make new RPM dependencies a warning * Fix extension manager version checks * Update JS file * Fix a few runtime breaks * Fixes * Fix runtime issues * Fix build breaks * Update notebook tests (part 1) * Fix broken tests * Linting errors * Fix hygiene * Disable lint rules * Bump distro * Turn off smoke tests * Disable integration tests * Remove failing "activate" test * Remove failed test assertion * Disable other broken test * Disable query history tests * Disable extension unit tests * Disable failing tasks
This commit is contained in:
Karl Burtram
339
src/vs/editor/browser/config/editorConfiguration.ts
Normal file
339
src/vs/editor/browser/config/editorConfiguration.ts
Normal file
@@ -0,0 +1,339 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
import * as browser from 'vs/base/browser/browser';
|
||||
import * as arrays from 'vs/base/common/arrays';
|
||||
import { Emitter, Event } from 'vs/base/common/event';
|
||||
import { Disposable } from 'vs/base/common/lifecycle';
|
||||
import * as objects from 'vs/base/common/objects';
|
||||
import * as platform from 'vs/base/common/platform';
|
||||
import { ElementSizeObserver } from 'vs/editor/browser/config/elementSizeObserver';
|
||||
import { FontMeasurements } from 'vs/editor/browser/config/fontMeasurements';
|
||||
import { migrateOptions } from 'vs/editor/browser/config/migrateOptions';
|
||||
import { TabFocus } from 'vs/editor/browser/config/tabFocus';
|
||||
import { ComputeOptionsMemory, ConfigurationChangedEvent, EditorOption, editorOptionsRegistry, FindComputedEditorOptionValueById, IComputedEditorOptions, IEditorOptions, IEnvironmentalOptions } from 'vs/editor/common/config/editorOptions';
|
||||
import { EditorZoom } from 'vs/editor/common/config/editorZoom';
|
||||
import { BareFontInfo, FontInfo, IValidatedEditorOptions } from 'vs/editor/common/config/fontInfo';
|
||||
import { IDimension } from 'vs/editor/common/core/dimension';
|
||||
import { IEditorConfiguration } from 'vs/editor/common/config/editorConfiguration';
|
||||
import { AccessibilitySupport, IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
|
||||
|
||||
export interface IEditorConstructionOptions extends IEditorOptions {
|
||||
/**
|
||||
* The initial editor dimension (to avoid measuring the container).
|
||||
*/
|
||||
dimension?: IDimension;
|
||||
/**
|
||||
* Place overflow widgets inside an external DOM node.
|
||||
* Defaults to an internal DOM node.
|
||||
*/
|
||||
overflowWidgetsDomNode?: HTMLElement;
|
||||
/**
|
||||
* Enables dropping into the editor.
|
||||
*
|
||||
* This shows a preview of the drop location and triggers an `onDropIntoEditor` event.
|
||||
*/
|
||||
enableDropIntoEditor?: boolean;
|
||||
}
|
||||
|
||||
export class EditorConfiguration extends Disposable implements IEditorConfiguration {
|
||||
|
||||
private _onDidChange = this._register(new Emitter<ConfigurationChangedEvent>());
|
||||
public readonly onDidChange: Event<ConfigurationChangedEvent> = this._onDidChange.event;
|
||||
|
||||
private _onDidChangeFast = this._register(new Emitter<ConfigurationChangedEvent>());
|
||||
public readonly onDidChangeFast: Event<ConfigurationChangedEvent> = this._onDidChangeFast.event;
|
||||
|
||||
public readonly isSimpleWidget: boolean;
|
||||
private readonly _containerObserver: ElementSizeObserver;
|
||||
|
||||
private _isDominatedByLongLines: boolean = false;
|
||||
private _viewLineCount: number = 1;
|
||||
private _lineNumbersDigitCount: number = 1;
|
||||
private _reservedHeight: number = 0;
|
||||
|
||||
private readonly _computeOptionsMemory: ComputeOptionsMemory = new ComputeOptionsMemory();
|
||||
/**
|
||||
* Raw options as they were passed in and merged with all calls to `updateOptions`.
|
||||
*/
|
||||
private readonly _rawOptions: IEditorOptions;
|
||||
/**
|
||||
* Validated version of `_rawOptions`.
|
||||
*/
|
||||
private _validatedOptions: ValidatedEditorOptions;
|
||||
/**
|
||||
* Complete options which are a combination of passed in options and env values.
|
||||
*/
|
||||
public options: ComputedEditorOptions;
|
||||
|
||||
constructor(
|
||||
isSimpleWidget: boolean,
|
||||
options: Readonly<IEditorConstructionOptions>,
|
||||
container: HTMLElement | null,
|
||||
@IAccessibilityService private readonly _accessibilityService: IAccessibilityService
|
||||
) {
|
||||
super();
|
||||
this.isSimpleWidget = isSimpleWidget;
|
||||
this._containerObserver = this._register(new ElementSizeObserver(container, options.dimension));
|
||||
|
||||
this._rawOptions = deepCloneAndMigrateOptions(options);
|
||||
this._validatedOptions = EditorOptionsUtil.validateOptions(this._rawOptions);
|
||||
this.options = this._computeOptions();
|
||||
|
||||
if (this.options.get(EditorOption.automaticLayout)) {
|
||||
this._containerObserver.startObserving();
|
||||
}
|
||||
|
||||
this._register(EditorZoom.onDidChangeZoomLevel(() => this._recomputeOptions()));
|
||||
this._register(TabFocus.onDidChangeTabFocus(() => this._recomputeOptions()));
|
||||
this._register(this._containerObserver.onDidChange(() => this._recomputeOptions()));
|
||||
this._register(FontMeasurements.onDidChange(() => this._recomputeOptions()));
|
||||
this._register(browser.PixelRatio.onDidChange(() => this._recomputeOptions()));
|
||||
this._register(this._accessibilityService.onDidChangeScreenReaderOptimized(() => this._recomputeOptions()));
|
||||
}
|
||||
|
||||
private _recomputeOptions(): void {
|
||||
const newOptions = this._computeOptions();
|
||||
const changeEvent = EditorOptionsUtil.checkEquals(this.options, newOptions);
|
||||
if (changeEvent === null) {
|
||||
// nothing changed!
|
||||
return;
|
||||
}
|
||||
|
||||
this.options = newOptions;
|
||||
this._onDidChangeFast.fire(changeEvent);
|
||||
this._onDidChange.fire(changeEvent);
|
||||
}
|
||||
|
||||
private _computeOptions(): ComputedEditorOptions {
|
||||
const partialEnv = this._readEnvConfiguration();
|
||||
const bareFontInfo = BareFontInfo.createFromValidatedSettings(this._validatedOptions, partialEnv.pixelRatio, this.isSimpleWidget);
|
||||
const fontInfo = this._readFontInfo(bareFontInfo);
|
||||
const env: IEnvironmentalOptions = {
|
||||
memory: this._computeOptionsMemory,
|
||||
outerWidth: partialEnv.outerWidth,
|
||||
outerHeight: partialEnv.outerHeight - this._reservedHeight,
|
||||
fontInfo: fontInfo,
|
||||
extraEditorClassName: partialEnv.extraEditorClassName,
|
||||
isDominatedByLongLines: this._isDominatedByLongLines,
|
||||
viewLineCount: this._viewLineCount,
|
||||
lineNumbersDigitCount: this._lineNumbersDigitCount,
|
||||
emptySelectionClipboard: partialEnv.emptySelectionClipboard,
|
||||
pixelRatio: partialEnv.pixelRatio,
|
||||
tabFocusMode: TabFocus.getTabFocusMode(),
|
||||
accessibilitySupport: partialEnv.accessibilitySupport
|
||||
};
|
||||
return EditorOptionsUtil.computeOptions(this._validatedOptions, env);
|
||||
}
|
||||
|
||||
protected _readEnvConfiguration(): IEnvConfiguration {
|
||||
return {
|
||||
extraEditorClassName: getExtraEditorClassName(),
|
||||
outerWidth: this._containerObserver.getWidth(),
|
||||
outerHeight: this._containerObserver.getHeight(),
|
||||
emptySelectionClipboard: browser.isWebKit || browser.isFirefox,
|
||||
pixelRatio: browser.PixelRatio.value,
|
||||
accessibilitySupport: (
|
||||
this._accessibilityService.isScreenReaderOptimized()
|
||||
? AccessibilitySupport.Enabled
|
||||
: this._accessibilityService.getAccessibilitySupport()
|
||||
)
|
||||
};
|
||||
}
|
||||
|
||||
protected _readFontInfo(bareFontInfo: BareFontInfo): FontInfo {
|
||||
return FontMeasurements.readFontInfo(bareFontInfo);
|
||||
}
|
||||
|
||||
public getRawOptions(): IEditorOptions {
|
||||
return this._rawOptions;
|
||||
}
|
||||
|
||||
public updateOptions(_newOptions: Readonly<IEditorOptions>): void {
|
||||
const newOptions = deepCloneAndMigrateOptions(_newOptions);
|
||||
|
||||
const didChange = EditorOptionsUtil.applyUpdate(this._rawOptions, newOptions);
|
||||
if (!didChange) {
|
||||
return;
|
||||
}
|
||||
|
||||
this._validatedOptions = EditorOptionsUtil.validateOptions(this._rawOptions);
|
||||
this._recomputeOptions();
|
||||
}
|
||||
|
||||
public observeContainer(dimension?: IDimension): void {
|
||||
this._containerObserver.observe(dimension);
|
||||
}
|
||||
|
||||
public setIsDominatedByLongLines(isDominatedByLongLines: boolean): void {
|
||||
if (this._isDominatedByLongLines === isDominatedByLongLines) {
|
||||
return;
|
||||
}
|
||||
this._isDominatedByLongLines = isDominatedByLongLines;
|
||||
this._recomputeOptions();
|
||||
}
|
||||
|
||||
public setModelLineCount(modelLineCount: number): void {
|
||||
const lineNumbersDigitCount = digitCount(modelLineCount);
|
||||
if (this._lineNumbersDigitCount === lineNumbersDigitCount) {
|
||||
return;
|
||||
}
|
||||
this._lineNumbersDigitCount = lineNumbersDigitCount;
|
||||
this._recomputeOptions();
|
||||
}
|
||||
|
||||
public setViewLineCount(viewLineCount: number): void {
|
||||
if (this._viewLineCount === viewLineCount) {
|
||||
return;
|
||||
}
|
||||
this._viewLineCount = viewLineCount;
|
||||
this._recomputeOptions();
|
||||
}
|
||||
|
||||
public setReservedHeight(reservedHeight: number) {
|
||||
if (this._reservedHeight === reservedHeight) {
|
||||
return;
|
||||
}
|
||||
this._reservedHeight = reservedHeight;
|
||||
this._recomputeOptions();
|
||||
}
|
||||
}
|
||||
|
||||
function digitCount(n: number): number {
|
||||
let r = 0;
|
||||
while (n) {
|
||||
n = Math.floor(n / 10);
|
||||
r++;
|
||||
}
|
||||
return r ? r : 1;
|
||||
}
|
||||
|
||||
function getExtraEditorClassName(): string {
|
||||
let extra = '';
|
||||
if (!browser.isSafari && !browser.isWebkitWebView) {
|
||||
// Use user-select: none in all browsers except Safari and native macOS WebView
|
||||
extra += 'no-user-select ';
|
||||
}
|
||||
if (browser.isSafari) {
|
||||
// See https://github.com/microsoft/vscode/issues/108822
|
||||
extra += 'no-minimap-shadow ';
|
||||
extra += 'enable-user-select ';
|
||||
}
|
||||
if (platform.isMacintosh) {
|
||||
extra += 'mac ';
|
||||
}
|
||||
return extra;
|
||||
}
|
||||
|
||||
export interface IEnvConfiguration {
|
||||
extraEditorClassName: string;
|
||||
outerWidth: number;
|
||||
outerHeight: number;
|
||||
emptySelectionClipboard: boolean;
|
||||
pixelRatio: number;
|
||||
accessibilitySupport: AccessibilitySupport;
|
||||
}
|
||||
|
||||
class ValidatedEditorOptions implements IValidatedEditorOptions {
|
||||
private readonly _values: any[] = [];
|
||||
public _read<T>(option: EditorOption): T {
|
||||
return this._values[option];
|
||||
}
|
||||
public get<T extends EditorOption>(id: T): FindComputedEditorOptionValueById<T> {
|
||||
return this._values[id];
|
||||
}
|
||||
public _write<T>(option: EditorOption, value: T): void {
|
||||
this._values[option] = value;
|
||||
}
|
||||
}
|
||||
|
||||
export class ComputedEditorOptions implements IComputedEditorOptions {
|
||||
private readonly _values: any[] = [];
|
||||
public _read<T>(id: EditorOption): T {
|
||||
if (id >= this._values.length) {
|
||||
throw new Error('Cannot read uninitialized value');
|
||||
}
|
||||
return this._values[id];
|
||||
}
|
||||
public get<T extends EditorOption>(id: T): FindComputedEditorOptionValueById<T> {
|
||||
return this._read(id);
|
||||
}
|
||||
public _write<T>(id: EditorOption, value: T): void {
|
||||
this._values[id] = value;
|
||||
}
|
||||
}
|
||||
|
||||
class EditorOptionsUtil {
|
||||
|
||||
public static validateOptions(options: IEditorOptions): ValidatedEditorOptions {
|
||||
const result = new ValidatedEditorOptions();
|
||||
for (const editorOption of editorOptionsRegistry) {
|
||||
const value = (editorOption.name === '_never_' ? undefined : (options as any)[editorOption.name]);
|
||||
result._write(editorOption.id, editorOption.validate(value));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
public static computeOptions(options: ValidatedEditorOptions, env: IEnvironmentalOptions): ComputedEditorOptions {
|
||||
const result = new ComputedEditorOptions();
|
||||
for (const editorOption of editorOptionsRegistry) {
|
||||
result._write(editorOption.id, editorOption.compute(env, result, options._read(editorOption.id)));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
private static _deepEquals<T>(a: T, b: T): boolean {
|
||||
if (typeof a !== 'object' || typeof b !== 'object' || !a || !b) {
|
||||
return a === b;
|
||||
}
|
||||
if (Array.isArray(a) || Array.isArray(b)) {
|
||||
return (Array.isArray(a) && Array.isArray(b) ? arrays.equals(a, b) : false);
|
||||
}
|
||||
if (Object.keys(a as unknown as object).length !== Object.keys(b as unknown as object).length) {
|
||||
return false;
|
||||
}
|
||||
for (const key in a) {
|
||||
if (!EditorOptionsUtil._deepEquals(a[key], b[key])) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public static checkEquals(a: ComputedEditorOptions, b: ComputedEditorOptions): ConfigurationChangedEvent | null {
|
||||
const result: boolean[] = [];
|
||||
let somethingChanged = false;
|
||||
for (const editorOption of editorOptionsRegistry) {
|
||||
const changed = !EditorOptionsUtil._deepEquals(a._read(editorOption.id), b._read(editorOption.id));
|
||||
result[editorOption.id] = changed;
|
||||
if (changed) {
|
||||
somethingChanged = true;
|
||||
}
|
||||
}
|
||||
return (somethingChanged ? new ConfigurationChangedEvent(result) : null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns true if something changed.
|
||||
* Modifies `options`.
|
||||
*/
|
||||
public static applyUpdate(options: IEditorOptions, update: Readonly<IEditorOptions>): boolean {
|
||||
let changed = false;
|
||||
for (const editorOption of editorOptionsRegistry) {
|
||||
if (update.hasOwnProperty(editorOption.name)) {
|
||||
const result = editorOption.applyUpdate((options as any)[editorOption.name], (update as any)[editorOption.name]);
|
||||
(options as any)[editorOption.name] = result.newValue;
|
||||
changed = changed || result.didChange;
|
||||
}
|
||||
}
|
||||
return changed;
|
||||
}
|
||||
}
|
||||
|
||||
function deepCloneAndMigrateOptions(_options: Readonly<IEditorOptions>): IEditorOptions {
|
||||
const options = objects.deepClone(_options);
|
||||
migrateOptions(options);
|
||||
return options;
|
||||
}
|
||||
Reference in New Issue
Block a user