diff --git a/src/vs/editor/browser/config/configuration.ts b/src/vs/editor/browser/config/editorConfiguration.ts similarity index 98% rename from src/vs/editor/browser/config/configuration.ts rename to src/vs/editor/browser/config/editorConfiguration.ts index 107bfa280c8..da81f4b385a 100644 --- a/src/vs/editor/browser/config/configuration.ts +++ b/src/vs/editor/browser/config/editorConfiguration.ts @@ -17,10 +17,11 @@ import { IEditorConstructionOptions } from 'vs/editor/browser/editorBrowser'; 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 { IConfiguration, IDimension } from 'vs/editor/common/editorCommon'; +import { IDimension } from 'vs/editor/common/editorCommon'; +import { IEditorConfiguration } from 'vs/editor/common/config/editorConfiguration'; import { AccessibilitySupport, IAccessibilityService } from 'vs/platform/accessibility/common/accessibility'; -export class Configuration extends Disposable implements IConfiguration { +export class EditorConfiguration extends Disposable implements IEditorConfiguration { private _onDidChange = this._register(new Emitter()); public readonly onDidChange: Event = this._onDidChange.event; diff --git a/src/vs/editor/browser/view/view.ts b/src/vs/editor/browser/view/view.ts index aae814ddd23..94e748e04f9 100644 --- a/src/vs/editor/browser/view/view.ts +++ b/src/vs/editor/browser/view/view.ts @@ -40,7 +40,8 @@ import { ViewCursors } from 'vs/editor/browser/viewParts/viewCursors/viewCursors import { ViewZones } from 'vs/editor/browser/viewParts/viewZones/viewZones'; import { Position } from 'vs/editor/common/core/position'; import { Range } from 'vs/editor/common/core/range'; -import { IConfiguration, ScrollType } from 'vs/editor/common/editorCommon'; +import { ScrollType } from 'vs/editor/common/editorCommon'; +import { IEditorConfiguration } from 'vs/editor/common/config/editorConfiguration'; import { RenderingContext } from 'vs/editor/common/view/renderingContext'; import { ViewContext } from 'vs/editor/common/view/viewContext'; import * as viewEvents from 'vs/editor/common/view/viewEvents'; @@ -92,7 +93,7 @@ export class View extends ViewEventHandler { constructor( commandDelegate: ICommandDelegate, - configuration: IConfiguration, + configuration: IEditorConfiguration, themeService: IThemeService, model: IViewModel, userInputEvents: ViewUserInputEvents, diff --git a/src/vs/editor/browser/view/viewController.ts b/src/vs/editor/browser/view/viewController.ts index c3c1b0124be..284810957a5 100644 --- a/src/vs/editor/browser/view/viewController.ts +++ b/src/vs/editor/browser/view/viewController.ts @@ -9,7 +9,7 @@ import { IEditorMouseEvent, IPartialEditorMouseEvent } from 'vs/editor/browser/e import { ViewUserInputEvents } from 'vs/editor/browser/view/viewUserInputEvents'; import { Position } from 'vs/editor/common/core/position'; import { Selection } from 'vs/editor/common/core/selection'; -import { IConfiguration } from 'vs/editor/common/editorCommon'; +import { IEditorConfiguration } from 'vs/editor/common/config/editorConfiguration'; import { IViewModel } from 'vs/editor/common/viewModel/viewModel'; import { IMouseWheelEvent } from 'vs/base/browser/mouseEvent'; import { EditorOption } from 'vs/editor/common/config/editorOptions'; @@ -45,13 +45,13 @@ export interface ICommandDelegate { export class ViewController { - private readonly configuration: IConfiguration; + private readonly configuration: IEditorConfiguration; private readonly viewModel: IViewModel; private readonly userInputEvents: ViewUserInputEvents; private readonly commandDelegate: ICommandDelegate; constructor( - configuration: IConfiguration, + configuration: IEditorConfiguration, viewModel: IViewModel, userInputEvents: ViewUserInputEvents, commandDelegate: ICommandDelegate diff --git a/src/vs/editor/browser/view/viewOverlays.ts b/src/vs/editor/browser/view/viewOverlays.ts index eb970cae6af..26838c6d229 100644 --- a/src/vs/editor/browser/view/viewOverlays.ts +++ b/src/vs/editor/browser/view/viewOverlays.ts @@ -9,7 +9,7 @@ import { DynamicViewOverlay } from 'vs/editor/browser/view/dynamicViewOverlay'; import { IVisibleLine, IVisibleLinesHost, VisibleLinesCollection } from 'vs/editor/browser/view/viewLayer'; import { ViewPart } from 'vs/editor/browser/view/viewPart'; import { IStringBuilder } from 'vs/editor/common/core/stringBuilder'; -import { IConfiguration } from 'vs/editor/common/editorCommon'; +import { IEditorConfiguration } from 'vs/editor/common/config/editorConfiguration'; import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/common/view/renderingContext'; import { ViewContext } from 'vs/editor/common/view/viewContext'; import * as viewEvents from 'vs/editor/common/view/viewEvents'; @@ -140,13 +140,13 @@ export class ViewOverlays extends ViewPart implements IVisibleLinesHost | null; private _renderedContent: string | null; private _lineHeight: number; - constructor(configuration: IConfiguration, dynamicOverlays: DynamicViewOverlay[]) { + constructor(configuration: IEditorConfiguration, dynamicOverlays: DynamicViewOverlay[]) { this._configuration = configuration; this._lineHeight = this._configuration.options.get(EditorOption.lineHeight); this._dynamicOverlays = dynamicOverlays; diff --git a/src/vs/editor/browser/viewParts/lines/viewLine.ts b/src/vs/editor/browser/viewParts/lines/viewLine.ts index 90fee66962b..f03c68aa466 100644 --- a/src/vs/editor/browser/viewParts/lines/viewLine.ts +++ b/src/vs/editor/browser/viewParts/lines/viewLine.ts @@ -9,7 +9,7 @@ import * as platform from 'vs/base/common/platform'; import { IVisibleLine } from 'vs/editor/browser/view/viewLayer'; import { RangeUtil } from 'vs/editor/browser/viewParts/lines/rangeUtil'; import { IStringBuilder } from 'vs/editor/common/core/stringBuilder'; -import { IConfiguration } from 'vs/editor/common/editorCommon'; +import { IEditorConfiguration } from 'vs/editor/common/config/editorConfiguration'; import { FloatHorizontalRange, VisibleRanges } from 'vs/editor/common/view/renderingContext'; import { LineDecoration } from 'vs/editor/common/viewLayout/lineDecorations'; import { CharacterMapping, ForeignElementType, RenderLineInput, renderViewLine, LineRange, DomPosition } from 'vs/editor/common/viewLayout/viewLineRenderer'; @@ -99,7 +99,7 @@ export class ViewLineOptions { public readonly stopRenderingLineAfter: number; public readonly fontLigatures: string; - constructor(config: IConfiguration, themeType: ColorScheme) { + constructor(config: IEditorConfiguration, themeType: ColorScheme) { this.themeType = themeType; const options = config.options; const fontInfo = options.get(EditorOption.fontInfo); diff --git a/src/vs/editor/browser/viewParts/minimap/minimap.ts b/src/vs/editor/browser/viewParts/minimap/minimap.ts index 6d8ce9ff8c9..5866f1a7cd7 100644 --- a/src/vs/editor/browser/viewParts/minimap/minimap.ts +++ b/src/vs/editor/browser/viewParts/minimap/minimap.ts @@ -16,7 +16,8 @@ import { PartFingerprint, PartFingerprints, ViewPart } from 'vs/editor/browser/v import { RenderMinimap, EditorOption, MINIMAP_GUTTER_WIDTH, EditorLayoutInfoComputer } from 'vs/editor/common/config/editorOptions'; import { Range } from 'vs/editor/common/core/range'; import { RGBA8 } from 'vs/editor/common/core/rgba'; -import { IConfiguration, ScrollType } from 'vs/editor/common/editorCommon'; +import { ScrollType } from 'vs/editor/common/editorCommon'; +import { IEditorConfiguration } from 'vs/editor/common/config/editorConfiguration'; import { ColorId } from 'vs/editor/common/modes'; import { MinimapCharRenderer } from 'vs/editor/browser/viewParts/minimap/minimapCharRenderer'; import { Constants } from 'vs/editor/browser/viewParts/minimap/minimapCharSheet'; @@ -105,7 +106,7 @@ class MinimapOptions { */ public readonly foregroundAlpha: number; - constructor(configuration: IConfiguration, theme: EditorTheme, tokensColorTracker: MinimapTokensColorTracker) { + constructor(configuration: IEditorConfiguration, theme: EditorTheme, tokensColorTracker: MinimapTokensColorTracker) { const options = configuration.options; const pixelRatio = options.get(EditorOption.pixelRatio); const layoutInfo = options.get(EditorOption.layoutInfo); diff --git a/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.ts b/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.ts index 2e401cd5aa9..43bc23e88e2 100644 --- a/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.ts +++ b/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.ts @@ -8,7 +8,7 @@ import { Color } from 'vs/base/common/color'; import { IDisposable } from 'vs/base/common/lifecycle'; import { ViewPart } from 'vs/editor/browser/view/viewPart'; import { Position } from 'vs/editor/common/core/position'; -import { IConfiguration } from 'vs/editor/common/editorCommon'; +import { IEditorConfiguration } from 'vs/editor/common/config/editorConfiguration'; import { TokenizationRegistry } from 'vs/editor/common/modes'; import { editorCursorForeground, editorOverviewRulerBorder, editorOverviewRulerBackground } from 'vs/editor/common/view/editorColorRegistry'; import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/common/view/renderingContext'; @@ -42,7 +42,7 @@ class Settings { public readonly x: number[]; public readonly w: number[]; - constructor(config: IConfiguration, theme: EditorTheme) { + constructor(config: IEditorConfiguration, theme: EditorTheme) { const options = config.options; this.lineHeight = options.get(EditorOption.lineHeight); this.pixelRatio = options.get(EditorOption.pixelRatio); diff --git a/src/vs/editor/browser/widget/codeEditorWidget.ts b/src/vs/editor/browser/widget/codeEditorWidget.ts index ad5786a31b8..2062b078ab1 100644 --- a/src/vs/editor/browser/widget/codeEditorWidget.ts +++ b/src/vs/editor/browser/widget/codeEditorWidget.ts @@ -16,7 +16,7 @@ import { Emitter, Event } from 'vs/base/common/event'; import { hash } from 'vs/base/common/hash'; import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle'; import { Schemas } from 'vs/base/common/network'; -import { Configuration } from 'vs/editor/browser/config/configuration'; +import { EditorConfiguration } from 'vs/editor/browser/config/editorConfiguration'; import * as editorBrowser from 'vs/editor/browser/editorBrowser'; import { EditorExtensionsRegistry, IEditorContributionDescription } from 'vs/editor/browser/editorExtensions'; import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; @@ -58,6 +58,7 @@ import { IViewModel } from 'vs/editor/common/viewModel/viewModel'; import { OutgoingViewModelEventKind } from 'vs/editor/common/viewModel/viewModelEventDispatcher'; import { ILanguageConfigurationService } from 'vs/editor/common/modes/languageConfigurationRegistry'; import { applyFontInfo } from 'vs/editor/browser/config/domFontInfo'; +import { IEditorConfiguration } from 'vs/editor/common/config/editorConfiguration'; let EDITOR_ID = 0; @@ -223,7 +224,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE private readonly _domElement: HTMLElement; private readonly _overflowWidgetsDomNode: HTMLElement | undefined; private readonly _id: number; - private readonly _configuration: editorCommon.IConfiguration; + private readonly _configuration: IEditorConfiguration; protected _contributions: { [key: string]: editorCommon.IEditorContribution; }; protected _actions: { [key: string]: editorCommon.IEditorAction; }; @@ -352,8 +353,8 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE this._codeEditorService.addCodeEditor(this); } - protected _createConfiguration(isSimpleWidget: boolean, options: Readonly, accessibilityService: IAccessibilityService): Configuration { - return new Configuration(isSimpleWidget, options, this._domElement, accessibilityService); + protected _createConfiguration(isSimpleWidget: boolean, options: Readonly, accessibilityService: IAccessibilityService): EditorConfiguration { + return new EditorConfiguration(isSimpleWidget, options, this._domElement, accessibilityService); } public getId(): string { diff --git a/src/vs/editor/common/config/editorConfiguration.ts b/src/vs/editor/common/config/editorConfiguration.ts new file mode 100644 index 00000000000..abb2296688d --- /dev/null +++ b/src/vs/editor/common/config/editorConfiguration.ts @@ -0,0 +1,62 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { Event } from 'vs/base/common/event'; +import { IDisposable } from 'vs/base/common/lifecycle'; +import { ConfigurationChangedEvent, IComputedEditorOptions, IEditorOptions } from 'vs/editor/common/config/editorOptions'; +import { IDimension } from 'vs/editor/common/editorCommon'; + +export interface IEditorConfiguration extends IDisposable { + /** + * Is this a simple widget (not a real code editor)? + */ + readonly isSimpleWidget: boolean; + /** + * Computed editor options. + */ + readonly options: IComputedEditorOptions; + /** + * The `options` have changed (quick event) + */ + onDidChangeFast: Event; + /** + * The `options` have changed (slow event) + */ + onDidChange: Event; + /** + * Get the raw options as they were passed in to the editor + * and merged with all calls to `updateOptions`. + */ + getRawOptions(): IEditorOptions; + /** + * Update the options with new partial options. All previous + * options will be kept and only present keys will be overwritten. + */ + updateOptions(newOptions: Readonly): void; + /** + * Recompute options with new reference element dimensions. + */ + observeContainer(dimension?: IDimension): void; + /** + * Recompute options with new pixel ratio. + */ + observePixelRatio(): void; + /** + * Set if the current model is dominated by long lines. + */ + setIsDominatedByLongLines(isDominatedByLongLines: boolean): void; + /** + * Set the current model line count. + */ + setModelLineCount(modelLineCount: number): void; + /** + * Set the current view model line count. + */ + setViewLineCount(viewLineCount: number): void; + /** + * Set reserved height above. + */ + setReservedHeight(reservedHeight: number): void; +} diff --git a/src/vs/editor/common/controller/cursorCommon.ts b/src/vs/editor/common/controller/cursorCommon.ts index 88e042ffe59..7a4d56121f2 100644 --- a/src/vs/editor/common/controller/cursorCommon.ts +++ b/src/vs/editor/common/controller/cursorCommon.ts @@ -8,7 +8,8 @@ import { LineTokens } from 'vs/editor/common/core/lineTokens'; import { Position } from 'vs/editor/common/core/position'; import { Range } from 'vs/editor/common/core/range'; import { ISelection, Selection } from 'vs/editor/common/core/selection'; -import { ICommand, IConfiguration } from 'vs/editor/common/editorCommon'; +import { ICommand } from 'vs/editor/common/editorCommon'; +import { IEditorConfiguration } from 'vs/editor/common/config/editorConfiguration'; import { ITextModel, PositionAffinity, TextModelResolvedOptions } from 'vs/editor/common/model'; import { TextModel } from 'vs/editor/common/model/textModel'; import { AutoClosingPairs } from 'vs/editor/common/modes/languageConfiguration'; @@ -106,7 +107,7 @@ export class CursorConfiguration { constructor( languageId: string, modelOptions: TextModelResolvedOptions, - configuration: IConfiguration, + configuration: IEditorConfiguration, private readonly languageConfigurationService: ILanguageConfigurationService ) { this._languageId = languageId; diff --git a/src/vs/editor/common/editorCommon.ts b/src/vs/editor/common/editorCommon.ts index dd1160cc182..ff079034d5a 100644 --- a/src/vs/editor/common/editorCommon.ts +++ b/src/vs/editor/common/editorCommon.ts @@ -7,7 +7,7 @@ import { IMarkdownString } from 'vs/base/common/htmlContent'; import { IDisposable } from 'vs/base/common/lifecycle'; import { Event } from 'vs/base/common/event'; import { URI, UriComponents } from 'vs/base/common/uri'; -import { ConfigurationChangedEvent, IComputedEditorOptions, IEditorOptions } from 'vs/editor/common/config/editorOptions'; +import { IEditorOptions } from 'vs/editor/common/config/editorOptions'; import { IPosition, Position } from 'vs/editor/common/core/position'; import { IRange, Range } from 'vs/editor/common/core/range'; import { ISelection, Selection } from 'vs/editor/common/core/selection'; @@ -146,59 +146,6 @@ export interface ILineChange extends IChange { readonly charChanges: ICharChange[] | undefined; } -/** - * @internal - */ -export interface IConfiguration extends IDisposable { - - /** - * Is this a simple widget (not a real code editor)? - */ - readonly isSimpleWidget: boolean; - /** - * Computed editor options. - */ - readonly options: IComputedEditorOptions; - - onDidChangeFast: Event; - onDidChange: Event; - - /** - * Get the raw options as they were passed in to the editor - * and merged with all calls to `updateOptions`. - */ - getRawOptions(): IEditorOptions; - /** - * Update the options with new partial options. All previous - * options will be kept and only present keys will be overwritten. - */ - updateOptions(newOptions: Readonly): void; - /** - * Recompute options with new reference element dimensions. - */ - observeContainer(dimension?: IDimension): void; - /** - * Recompute options with new pixel ratio. - */ - observePixelRatio(): void; - /** - * Set if the current model is dominated by long lines. - */ - setIsDominatedByLongLines(isDominatedByLongLines: boolean): void; - /** - * Set the current model line count. - */ - setModelLineCount(modelLineCount: number): void; - /** - * Set the current view model line count. - */ - setViewLineCount(viewLineCount: number): void; - /** - * Set reserved height above. - */ - setReservedHeight(reservedHeight: number): void; -} - // --- view export interface IScrollEvent { diff --git a/src/vs/editor/common/view/viewContext.ts b/src/vs/editor/common/view/viewContext.ts index b888fbec6ad..fea39d37b17 100644 --- a/src/vs/editor/common/view/viewContext.ts +++ b/src/vs/editor/common/view/viewContext.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IConfiguration } from 'vs/editor/common/editorCommon'; +import { IEditorConfiguration } from 'vs/editor/common/config/editorConfiguration'; import { ViewEventHandler } from 'vs/editor/common/viewModel/viewEventHandler'; import { IViewLayout, IViewModel } from 'vs/editor/common/viewModel/viewModel'; import { IColorTheme } from 'vs/platform/theme/common/themeService'; @@ -34,13 +34,13 @@ export class EditorTheme { export class ViewContext { - public readonly configuration: IConfiguration; + public readonly configuration: IEditorConfiguration; public readonly model: IViewModel; public readonly viewLayout: IViewLayout; public readonly theme: EditorTheme; constructor( - configuration: IConfiguration, + configuration: IEditorConfiguration, theme: IColorTheme, model: IViewModel ) { diff --git a/src/vs/editor/common/viewLayout/viewLayout.ts b/src/vs/editor/common/viewLayout/viewLayout.ts index 2f9d18b13ba..3354c8cfcda 100644 --- a/src/vs/editor/common/viewLayout/viewLayout.ts +++ b/src/vs/editor/common/viewLayout/viewLayout.ts @@ -7,7 +7,8 @@ import { Event, Emitter } from 'vs/base/common/event'; import { Disposable, IDisposable } from 'vs/base/common/lifecycle'; import { IScrollPosition, ScrollEvent, Scrollable, ScrollbarVisibility, INewScrollPosition } from 'vs/base/common/scrollable'; import { ConfigurationChangedEvent, EditorOption } from 'vs/editor/common/config/editorOptions'; -import { IConfiguration, ScrollType } from 'vs/editor/common/editorCommon'; +import { ScrollType } from 'vs/editor/common/editorCommon'; +import { IEditorConfiguration } from 'vs/editor/common/config/editorConfiguration'; import { LinesLayout, IEditorWhitespace, IWhitespaceChangeAccessor } from 'vs/editor/common/viewLayout/linesLayout'; import { IPartialViewLinesViewportData } from 'vs/editor/common/viewLayout/viewLinesViewportData'; import { IViewLayout, IViewWhitespaceViewportData, Viewport } from 'vs/editor/common/viewModel/viewModel'; @@ -146,14 +147,14 @@ class EditorScrollable extends Disposable { export class ViewLayout extends Disposable implements IViewLayout { - private readonly _configuration: IConfiguration; + private readonly _configuration: IEditorConfiguration; private readonly _linesLayout: LinesLayout; private readonly _scrollable: EditorScrollable; public readonly onDidScroll: Event; public readonly onDidContentSizeChange: Event; - constructor(configuration: IConfiguration, lineCount: number, scheduleAtNextAnimationFrame: (callback: () => void) => IDisposable) { + constructor(configuration: IEditorConfiguration, lineCount: number, scheduleAtNextAnimationFrame: (callback: () => void) => IDisposable) { super(); this._configuration = configuration; diff --git a/src/vs/editor/common/viewModel/viewModelDecorations.ts b/src/vs/editor/common/viewModel/viewModelDecorations.ts index a5436355596..8a0ebe9bae6 100644 --- a/src/vs/editor/common/viewModel/viewModelDecorations.ts +++ b/src/vs/editor/common/viewModel/viewModelDecorations.ts @@ -6,7 +6,7 @@ import { IDisposable } from 'vs/base/common/lifecycle'; import { Position } from 'vs/editor/common/core/position'; import { Range } from 'vs/editor/common/core/range'; -import * as editorCommon from 'vs/editor/common/editorCommon'; +import { IEditorConfiguration } from 'vs/editor/common/config/editorConfiguration'; import { IModelDecoration, ITextModel, PositionAffinity } from 'vs/editor/common/model'; import { IViewModelLines } from 'vs/editor/common/viewModel/viewModelLines'; import { ICoordinatesConverter, InlineDecoration, InlineDecorationType, ViewModelDecoration } from 'vs/editor/common/viewModel/viewModel'; @@ -28,7 +28,7 @@ export class ViewModelDecorations implements IDisposable { private readonly editorId: number; private readonly model: ITextModel; - private readonly configuration: editorCommon.IConfiguration; + private readonly configuration: IEditorConfiguration; private readonly _linesCollection: IViewModelLines; private readonly _coordinatesConverter: ICoordinatesConverter; @@ -37,7 +37,7 @@ export class ViewModelDecorations implements IDisposable { private _cachedModelDecorationsResolver: IDecorationsViewportData | null; private _cachedModelDecorationsResolverViewRange: Range | null; - constructor(editorId: number, model: ITextModel, configuration: editorCommon.IConfiguration, linesCollection: IViewModelLines, coordinatesConverter: ICoordinatesConverter) { + constructor(editorId: number, model: ITextModel, configuration: IEditorConfiguration, linesCollection: IViewModelLines, coordinatesConverter: ICoordinatesConverter) { this.editorId = editorId; this.model = model; this.configuration = configuration; diff --git a/src/vs/editor/common/viewModel/viewModelImpl.ts b/src/vs/editor/common/viewModel/viewModelImpl.ts index 5ca5f8f54ce..7d9a6d23c2c 100644 --- a/src/vs/editor/common/viewModel/viewModelImpl.ts +++ b/src/vs/editor/common/viewModel/viewModelImpl.ts @@ -17,7 +17,8 @@ import { CursorChangeReason } from 'vs/editor/common/controller/cursorEvents'; import { IPosition, Position } from 'vs/editor/common/core/position'; import { IRange, Range } from 'vs/editor/common/core/range'; import { ISelection, Selection } from 'vs/editor/common/core/selection'; -import { ICommand, IConfiguration, ICursorState, INewScrollPosition, IViewState, ScrollType } from 'vs/editor/common/editorCommon'; +import { ICommand, ICursorState, INewScrollPosition, IViewState, ScrollType } from 'vs/editor/common/editorCommon'; +import { IEditorConfiguration } from 'vs/editor/common/config/editorConfiguration'; import { EndOfLinePreference, ICursorStateComputer, IIdentifiedSingleEditOperation, ITextModel, PositionAffinity, TextModelResolvedOptions, TrackedRangeStickiness } from 'vs/editor/common/model'; import { IActiveIndentGuideInfo, BracketGuideOptions, IndentGuide } from 'vs/editor/common/model/guidesTextModelPart'; import { ModelDecorationMinimapOptions, ModelDecorationOptions, ModelDecorationOverviewRulerOptions } from 'vs/editor/common/model/textModel'; @@ -43,7 +44,7 @@ const USE_IDENTITY_LINES_COLLECTION = true; export class ViewModel extends Disposable implements IViewModel { private readonly _editorId: number; - private readonly _configuration: IConfiguration; + private readonly _configuration: IEditorConfiguration; public readonly model: ITextModel; private readonly _eventDispatcher: ViewModelEventDispatcher; public readonly onEvent: Event; @@ -62,7 +63,7 @@ export class ViewModel extends Disposable implements IViewModel { constructor( editorId: number, - configuration: IConfiguration, + configuration: IEditorConfiguration, model: ITextModel, domLineBreaksComputerFactory: ILineBreaksComputerFactory, monospaceLineBreaksComputerFactory: ILineBreaksComputerFactory, diff --git a/src/vs/editor/test/browser/config/commonEditorConfig.test.ts b/src/vs/editor/test/browser/config/commonEditorConfig.test.ts index 29e60837cf3..371e06dadd3 100644 --- a/src/vs/editor/test/browser/config/commonEditorConfig.test.ts +++ b/src/vs/editor/test/browser/config/commonEditorConfig.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as assert from 'assert'; -import { IEnvConfiguration } from 'vs/editor/browser/config/configuration'; +import { IEnvConfiguration } from 'vs/editor/browser/config/editorConfiguration'; import { ConfigurationChangedEvent, EditorOption, IEditorHoverOptions, IQuickSuggestionsOptions } from 'vs/editor/common/config/editorOptions'; import { EditorZoom } from 'vs/editor/common/config/editorZoom'; import { TestConfiguration } from 'vs/editor/test/browser/config/testConfiguration'; diff --git a/src/vs/editor/test/browser/config/editorLayoutProvider.test.ts b/src/vs/editor/test/browser/config/editorLayoutProvider.test.ts index c5d09243401..7d0867a76bc 100644 --- a/src/vs/editor/test/browser/config/editorLayoutProvider.test.ts +++ b/src/vs/editor/test/browser/config/editorLayoutProvider.test.ts @@ -5,7 +5,7 @@ import * as assert from 'assert'; import { EditorLayoutInfo, EditorLayoutInfoComputer, RenderMinimap, EditorOption, EditorMinimapOptions, InternalEditorScrollbarOptions, EditorOptions, RenderLineNumbersType, InternalEditorRenderLineNumbersOptions } from 'vs/editor/common/config/editorOptions'; -import { ComputedEditorOptions } from 'vs/editor/browser/config/configuration'; +import { ComputedEditorOptions } from 'vs/editor/browser/config/editorConfiguration'; interface IEditorLayoutProviderOpts { readonly outerWidth: number; diff --git a/src/vs/editor/test/browser/config/testConfiguration.ts b/src/vs/editor/test/browser/config/testConfiguration.ts index 5f27193c2b9..3b62f08d62c 100644 --- a/src/vs/editor/test/browser/config/testConfiguration.ts +++ b/src/vs/editor/test/browser/config/testConfiguration.ts @@ -3,13 +3,13 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { Configuration, IEnvConfiguration } from 'vs/editor/browser/config/configuration'; +import { EditorConfiguration, IEnvConfiguration } from 'vs/editor/browser/config/editorConfiguration'; import { EditorFontLigatures, IEditorOptions } from 'vs/editor/common/config/editorOptions'; import { BareFontInfo, FontInfo } from 'vs/editor/common/config/fontInfo'; import { AccessibilitySupport } from 'vs/platform/accessibility/common/accessibility'; import { TestAccessibilityService } from 'vs/platform/accessibility/test/common/testAccessibilityService'; -export class TestConfiguration extends Configuration { +export class TestConfiguration extends EditorConfiguration { constructor(opts: IEditorOptions) { super(false, opts, null, new TestAccessibilityService()); diff --git a/src/vs/editor/test/browser/testCodeEditor.ts b/src/vs/editor/test/browser/testCodeEditor.ts index 151f115e946..913fd96c348 100644 --- a/src/vs/editor/test/browser/testCodeEditor.ts +++ b/src/vs/editor/test/browser/testCodeEditor.ts @@ -44,7 +44,7 @@ import { IThemeService } from 'vs/platform/theme/common/themeService'; import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService'; import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo'; import { UndoRedoService } from 'vs/platform/undoRedo/common/undoRedoService'; -import { Configuration } from 'vs/editor/browser/config/configuration'; +import { EditorConfiguration } from 'vs/editor/browser/config/editorConfiguration'; export interface ITestCodeEditor extends IActiveCodeEditor { getViewModel(): ViewModel | undefined; @@ -55,7 +55,7 @@ export interface ITestCodeEditor extends IActiveCodeEditor { export class TestCodeEditor extends CodeEditorWidget implements ICodeEditor { //#region testing overrides - protected override _createConfiguration(isSimpleWidget: boolean, options: Readonly): Configuration { + protected override _createConfiguration(isSimpleWidget: boolean, options: Readonly): EditorConfiguration { return new TestConfiguration(options); } protected override _createView(viewModel: ViewModel): [View, boolean] {