diff --git a/src/vs/editor/browser/config/configuration.ts b/src/vs/editor/browser/config/configuration.ts index 560e591a878..f4175c0bf63 100644 --- a/src/vs/editor/browser/config/configuration.ts +++ b/src/vs/editor/browser/config/configuration.ts @@ -314,7 +314,6 @@ export class Configuration extends CommonEditorConfiguration { } private readonly _elementSizeObserver: ElementSizeObserver; - private _reservedHeight: number = 0; constructor( isSimpleWidget: boolean, @@ -366,7 +365,7 @@ export class Configuration extends CommonEditorConfiguration { return { extraEditorClassName: Configuration._getExtraEditorClassName(), outerWidth: this._elementSizeObserver.getWidth(), - outerHeight: this._elementSizeObserver.getHeight() - this._reservedHeight, + outerHeight: this._elementSizeObserver.getHeight(), emptySelectionClipboard: browser.isWebKit || browser.isFirefox, pixelRatio: browser.getPixelRatio(), zoomLevel: browser.getZoomLevel(), @@ -381,9 +380,4 @@ export class Configuration extends CommonEditorConfiguration { protected readConfiguration(bareFontInfo: BareFontInfo): FontInfo { return CSSBasedConfiguration.INSTANCE.readConfiguration(bareFontInfo); } - - public reserveHeight(height: number) { - this._reservedHeight = height; - this._recomputeOptions(); - } } diff --git a/src/vs/editor/common/config/commonEditorConfig.ts b/src/vs/editor/common/config/commonEditorConfig.ts index b874b8a70f8..cbb3314229e 100644 --- a/src/vs/editor/common/config/commonEditorConfig.ts +++ b/src/vs/editor/common/config/commonEditorConfig.ts @@ -313,6 +313,7 @@ export abstract class CommonEditorConfiguration extends Disposable implements IC private _rawOptions: IEditorOptions; private _readOptions: RawEditorOptions; protected _validatedOptions: ValidatedEditorOptions; + private _reservedHeight: number = 0; constructor(isSimpleWidget: boolean, _options: Readonly) { super(); @@ -367,7 +368,7 @@ export abstract class CommonEditorConfiguration extends Disposable implements IC const env: IEnvironmentalOptions = { memory: this._computeOptionsMemory, outerWidth: partialEnv.outerWidth, - outerHeight: partialEnv.outerHeight, + outerHeight: partialEnv.outerHeight - this._reservedHeight, fontInfo: this.readConfiguration(bareFontInfo), extraEditorClassName: partialEnv.extraEditorClassName, isDominatedByLongLines: this._isDominatedByLongLines, @@ -458,7 +459,10 @@ export abstract class CommonEditorConfiguration extends Disposable implements IC protected abstract readConfiguration(styling: BareFontInfo): FontInfo; - public abstract reserveHeight(height: number): void; + public reserveHeight(height: number) { + this._reservedHeight = height; + this._recomputeOptions(); + } } export const editorConfigurationBaseNode = Object.freeze({ diff --git a/src/vs/editor/test/common/mocks/testConfiguration.ts b/src/vs/editor/test/common/mocks/testConfiguration.ts index 044fcae5ac0..ec94f2201ce 100644 --- a/src/vs/editor/test/common/mocks/testConfiguration.ts +++ b/src/vs/editor/test/common/mocks/testConfiguration.ts @@ -47,8 +47,4 @@ export class TestConfiguration extends CommonEditorConfiguration { maxDigitWidth: 10, }, true); } - - public reserveHeight(height: number): void { - throw new Error('Not supported'); - } }