Skip to content

Commit 16c1772

Browse files
alexdimaalexdima
committed
renames
1 parent 9ab08c2 commit 16c1772

60 files changed

Lines changed: 364 additions & 364 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/vs/editor/browser/controller/mouseHandler.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { HorizontalRange } from 'vs/editor/common/view/renderingContext';
2121
import { ViewContext } from 'vs/editor/common/view/viewContext';
2222
import * as viewEvents from 'vs/editor/common/view/viewEvents';
2323
import { ViewEventHandler } from 'vs/editor/common/viewModel/viewEventHandler';
24-
import { EditorOptionId } from 'vs/editor/common/config/editorOptions';
24+
import { EditorOption } from 'vs/editor/common/config/editorOptions';
2525

2626

2727
/**
@@ -218,7 +218,7 @@ export class MouseHandler extends ViewEventHandler {
218218
const targetIsContent = (t.type === editorBrowser.MouseTargetType.CONTENT_TEXT || t.type === editorBrowser.MouseTargetType.CONTENT_EMPTY);
219219
const targetIsGutter = (t.type === editorBrowser.MouseTargetType.GUTTER_GLYPH_MARGIN || t.type === editorBrowser.MouseTargetType.GUTTER_LINE_NUMBERS || t.type === editorBrowser.MouseTargetType.GUTTER_LINE_DECORATIONS);
220220
const targetIsLineNumbers = (t.type === editorBrowser.MouseTargetType.GUTTER_LINE_NUMBERS);
221-
const selectOnLineNumbers = this._context.configuration.options.get(EditorOptionId.selectOnLineNumbers);
221+
const selectOnLineNumbers = this._context.configuration.options.get(EditorOption.selectOnLineNumbers);
222222
const targetIsViewZone = (t.type === editorBrowser.MouseTargetType.CONTENT_VIEW_ZONE || t.type === editorBrowser.MouseTargetType.GUTTER_VIEW_ZONE);
223223
const targetIsWidget = (t.type === editorBrowser.MouseTargetType.CONTENT_WIDGET);
224224

@@ -354,7 +354,7 @@ class MouseDownOperation extends Disposable {
354354
e.detail = this._mouseState.count;
355355

356356
const options = this._context.configuration.options;
357-
const readOnly = options.get(EditorOptionId.readOnly);
357+
const readOnly = options.get(EditorOption.readOnly);
358358

359359
if (!readOnly
360360
&& this._context.configuration.editor.dragAndDrop

‎src/vs/editor/browser/controller/mouseTarget.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { ClientCoordinates, EditorMouseEvent, EditorPagePosition, PageCoordinate
1010
import { PartFingerprint, PartFingerprints } from 'vs/editor/browser/view/viewPart';
1111
import { ViewLine } from 'vs/editor/browser/viewParts/lines/viewLine';
1212
import { IViewCursorRenderData } from 'vs/editor/browser/viewParts/viewCursors/viewCursor';
13-
import { EditorLayoutInfo, EditorOptionId } from 'vs/editor/common/config/editorOptions';
13+
import { EditorLayoutInfo, EditorOption } from 'vs/editor/common/config/editorOptions';
1414
import { Position } from 'vs/editor/common/core/position';
1515
import { Range as EditorRange } from 'vs/editor/common/core/range';
1616
import { HorizontalRange } from 'vs/editor/common/view/renderingContext';
@@ -240,7 +240,7 @@ export class HitTestContext {
240240
constructor(context: ViewContext, viewHelper: IPointerHandlerHelper, lastViewCursorsRenderData: IViewCursorRenderData[]) {
241241
this.model = context.model;
242242
const options = context.configuration.options;
243-
this.layoutInfo = options.get(EditorOptionId.layoutInfo);
243+
this.layoutInfo = options.get(EditorOption.layoutInfo);
244244
this.viewDomNode = viewHelper.viewDomNode;
245245
this.lineHeight = context.configuration.editor.lineHeight;
246246
this.typicalHalfwidthCharacterWidth = context.configuration.editor.fontInfo.typicalHalfwidthCharacterWidth;
@@ -715,7 +715,7 @@ export class MouseTargetFactory {
715715

716716
public getMouseColumn(editorPos: EditorPagePosition, pos: PageCoordinates): number {
717717
const options = this._context.configuration.options;
718-
const layoutInfo = options.get(EditorOptionId.layoutInfo);
718+
const layoutInfo = options.get(EditorOption.layoutInfo);
719719
const mouseContentHorizontalOffset = this._context.viewLayout.getCurrentScrollLeft() + pos.x - editorPos.x - layoutInfo.contentLeft;
720720
return MouseTargetFactory._getMouseColumn(mouseContentHorizontalOffset, this._context.configuration.editor.fontInfo.typicalHalfwidthCharacterWidth);
721721
}

‎src/vs/editor/browser/controller/textAreaHandler.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { ViewController } from 'vs/editor/browser/view/viewController';
1616
import { PartFingerprint, PartFingerprints, ViewPart } from 'vs/editor/browser/view/viewPart';
1717
import { LineNumbersOverlay } from 'vs/editor/browser/viewParts/lineNumbers/lineNumbers';
1818
import { Margin } from 'vs/editor/browser/viewParts/margin/margin';
19-
import { RenderLineNumbersType, EditorOptionId } from 'vs/editor/common/config/editorOptions';
19+
import { RenderLineNumbersType, EditorOption } from 'vs/editor/common/config/editorOptions';
2020
import { BareFontInfo } from 'vs/editor/common/config/fontInfo';
2121
import { WordCharacterClass, getMapForWordSeparators } from 'vs/editor/common/controller/wordCharacterClassifier';
2222
import { Position } from 'vs/editor/common/core/position';
@@ -120,9 +120,9 @@ export class TextAreaHandler extends ViewPart {
120120

121121
const conf = this._context.configuration.editor;
122122
const options = this._context.configuration.options;
123-
const layoutInfo = options.get(EditorOptionId.layoutInfo);
123+
const layoutInfo = options.get(EditorOption.layoutInfo);
124124

125-
this._accessibilitySupport = options.get(EditorOptionId.accessibilitySupport);
125+
this._accessibilitySupport = options.get(EditorOption.accessibilitySupport);
126126
this._contentLeft = layoutInfo.contentLeft;
127127
this._contentWidth = layoutInfo.contentWidth;
128128
this._contentHeight = layoutInfo.contentHeight;
@@ -145,7 +145,7 @@ export class TextAreaHandler extends ViewPart {
145145
this.textArea.setAttribute('autocapitalize', 'off');
146146
this.textArea.setAttribute('autocomplete', 'off');
147147
this.textArea.setAttribute('spellcheck', 'false');
148-
this.textArea.setAttribute('aria-label', options.get(EditorOptionId.ariaLabel));
148+
this.textArea.setAttribute('aria-label', options.get(EditorOption.ariaLabel));
149149
this.textArea.setAttribute('role', 'textbox');
150150
this.textArea.setAttribute('aria-multiline', 'true');
151151
this.textArea.setAttribute('aria-haspopup', 'false');
@@ -379,19 +379,19 @@ export class TextAreaHandler extends ViewPart {
379379
this._fontInfo = conf.fontInfo;
380380
}
381381
if (e.viewInfo) {
382-
this.textArea.setAttribute('aria-label', options.get(EditorOptionId.ariaLabel));
382+
this.textArea.setAttribute('aria-label', options.get(EditorOption.ariaLabel));
383383
}
384-
if (e.hasChanged(EditorOptionId.layoutInfo)) {
385-
const layoutInfo = options.get(EditorOptionId.layoutInfo);
384+
if (e.hasChanged(EditorOption.layoutInfo)) {
385+
const layoutInfo = options.get(EditorOption.layoutInfo);
386386
this._contentLeft = layoutInfo.contentLeft;
387387
this._contentWidth = layoutInfo.contentWidth;
388388
this._contentHeight = layoutInfo.contentHeight;
389389
}
390390
if (e.lineHeight) {
391391
this._lineHeight = conf.lineHeight;
392392
}
393-
if (e.hasChanged(EditorOptionId.accessibilitySupport)) {
394-
this._accessibilitySupport = options.get(EditorOptionId.accessibilitySupport);
393+
if (e.hasChanged(EditorOption.accessibilitySupport)) {
394+
this._accessibilitySupport = options.get(EditorOption.accessibilitySupport);
395395
this._textAreaInput.writeScreenReaderContent('strategy changed');
396396
}
397397
if (e.emptySelectionClipboard) {
@@ -553,7 +553,7 @@ export class TextAreaHandler extends ViewPart {
553553
if (this._context.configuration.editor.viewInfo.glyphMargin) {
554554
tac.setClassName('monaco-editor-background textAreaCover ' + Margin.OUTER_CLASS_NAME);
555555
} else {
556-
const renderLineNumbers = options.get(EditorOptionId.renderLineNumbers);
556+
const renderLineNumbers = options.get(EditorOption.renderLineNumbers);
557557
if (renderLineNumbers.renderType !== RenderLineNumbersType.Off) {
558558
tac.setClassName('monaco-editor-background textAreaCover ' + LineNumbersOverlay.CLASS_NAME);
559559
} else {

‎src/vs/editor/browser/editorBrowser.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
77
import { IMouseEvent, IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
88
import { IDisposable } from 'vs/base/common/lifecycle';
9-
import { OverviewRulerPosition, IConfigurationChangedEvent, EditorLayoutInfo, InternalEditorOptions, IComputedEditorOptions, EditorOptionId, FindComputedEditorOptionValueById, IEditorOptions } from 'vs/editor/common/config/editorOptions';
9+
import { OverviewRulerPosition, IConfigurationChangedEvent, EditorLayoutInfo, InternalEditorOptions, IComputedEditorOptions, EditorOption, FindComputedEditorOptionValueById, IEditorOptions } from 'vs/editor/common/config/editorOptions';
1010
import { ICursors } from 'vs/editor/common/controller/cursorCommon';
1111
import { ICursorPositionChangedEvent, ICursorSelectionChangedEvent } from 'vs/editor/common/controller/cursorEvents';
1212
import { IPosition, Position } from 'vs/editor/common/core/position';
@@ -538,7 +538,7 @@ export interface ICodeEditor extends editorCommon.IEditor {
538538

539539
getOptions(): IComputedEditorOptions;
540540

541-
getOption<T extends EditorOptionId>(id: T): FindComputedEditorOptionValueById<T>;
541+
getOption<T extends EditorOption>(id: T): FindComputedEditorOptionValueById<T>;
542542
/**
543543
* Returns the 'raw' editor's configuration (without any validation or defaults).
544544
* @internal

‎src/vs/editor/browser/view/viewImpl.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ import { ViewportData } from 'vs/editor/common/viewLayout/viewLinesViewportData'
4848
import { ViewEventHandler } from 'vs/editor/common/viewModel/viewEventHandler';
4949
import { IViewModel } from 'vs/editor/common/viewModel/viewModel';
5050
import { IThemeService, getThemeTypeSelector } from 'vs/platform/theme/common/themeService';
51-
import { EditorOptionId } from 'vs/editor/common/config/editorOptions';
51+
import { EditorOption } from 'vs/editor/common/config/editorOptions';
5252

5353

5454
export interface IContentWidgetData {
@@ -284,7 +284,7 @@ export class View extends ViewEventHandler {
284284

285285
private _setLayout(): void {
286286
const options = this._context.configuration.options;
287-
const layoutInfo = options.get(EditorOptionId.layoutInfo);
287+
const layoutInfo = options.get(EditorOption.layoutInfo);
288288
this.domNode.setWidth(layoutInfo.width);
289289
this.domNode.setHeight(layoutInfo.height);
290290

@@ -307,7 +307,7 @@ export class View extends ViewEventHandler {
307307
if (e.editorClassName) {
308308
this.domNode.setClassName(this.getEditorClassName());
309309
}
310-
if (e.hasChanged(EditorOptionId.layoutInfo)) {
310+
if (e.hasChanged(EditorOption.layoutInfo)) {
311311
this._setLayout();
312312
}
313313
return false;

‎src/vs/editor/browser/view/viewLayer.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
77
import { IStringBuilder, createStringBuilder } from 'vs/editor/common/core/stringBuilder';
88
import * as viewEvents from 'vs/editor/common/view/viewEvents';
99
import { ViewportData } from 'vs/editor/common/viewLayout/viewLinesViewportData';
10-
import { EditorOptionId } from 'vs/editor/common/config/editorOptions';
10+
import { EditorOption } from 'vs/editor/common/config/editorOptions';
1111

1212
/**
1313
* Represents a visible line
@@ -270,7 +270,7 @@ export class VisibleLinesCollection<T extends IVisibleLine> {
270270
// ---- begin view event handlers
271271

272272
public onConfigurationChanged(e: viewEvents.ViewConfigurationChangedEvent): boolean {
273-
if (e.hasChanged(EditorOptionId.layoutInfo)) {
273+
if (e.hasChanged(EditorOption.layoutInfo)) {
274274
return true;
275275
}
276276
return false;

‎src/vs/editor/browser/view/viewOverlays.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/common/v
1414
import { ViewContext } from 'vs/editor/common/view/viewContext';
1515
import * as viewEvents from 'vs/editor/common/view/viewEvents';
1616
import { ViewportData } from 'vs/editor/common/viewLayout/viewLinesViewportData';
17-
import { EditorOptionId } from 'vs/editor/common/config/editorOptions';
17+
import { EditorOption } from 'vs/editor/common/config/editorOptions';
1818

1919

2020
export class ViewOverlays extends ViewPart implements IVisibleLinesHost<ViewOverlayLine> {
@@ -218,7 +218,7 @@ export class ContentViewOverlays extends ViewOverlays {
218218
constructor(context: ViewContext) {
219219
super(context);
220220
const options = this._context.configuration.options;
221-
const layoutInfo = options.get(EditorOptionId.layoutInfo);
221+
const layoutInfo = options.get(EditorOption.layoutInfo);
222222
this._contentWidth = layoutInfo.contentWidth;
223223

224224
this.domNode.setHeight(0);
@@ -227,9 +227,9 @@ export class ContentViewOverlays extends ViewOverlays {
227227
// --- begin event handlers
228228

229229
public onConfigurationChanged(e: viewEvents.ViewConfigurationChangedEvent): boolean {
230-
if (e.hasChanged(EditorOptionId.layoutInfo)) {
230+
if (e.hasChanged(EditorOption.layoutInfo)) {
231231
const options = this._context.configuration.options;
232-
const layoutInfo = options.get(EditorOptionId.layoutInfo);
232+
const layoutInfo = options.get(EditorOption.layoutInfo);
233233
this._contentWidth = layoutInfo.contentWidth;
234234
}
235235
return super.onConfigurationChanged(e);
@@ -255,7 +255,7 @@ export class MarginViewOverlays extends ViewOverlays {
255255
super(context);
256256

257257
const options = this._context.configuration.options;
258-
const layoutInfo = options.get(EditorOptionId.layoutInfo);
258+
const layoutInfo = options.get(EditorOption.layoutInfo);
259259
this._contentLeft = layoutInfo.contentLeft;
260260

261261
this.domNode.setClassName('margin-view-overlays');
@@ -270,9 +270,9 @@ export class MarginViewOverlays extends ViewOverlays {
270270
Configuration.applyFontInfo(this.domNode, this._context.configuration.editor.fontInfo);
271271
shouldRender = true;
272272
}
273-
if (e.hasChanged(EditorOptionId.layoutInfo)) {
273+
if (e.hasChanged(EditorOption.layoutInfo)) {
274274
const options = this._context.configuration.options;
275-
const layoutInfo = options.get(EditorOptionId.layoutInfo);
275+
const layoutInfo = options.get(EditorOption.layoutInfo);
276276
this._contentLeft = layoutInfo.contentLeft;
277277
shouldRender = true;
278278
}

‎src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/common/v
1414
import { ViewContext } from 'vs/editor/common/view/viewContext';
1515
import * as viewEvents from 'vs/editor/common/view/viewEvents';
1616
import { ViewportData } from 'vs/editor/common/viewLayout/viewLinesViewportData';
17-
import { EditorOptionId } from 'vs/editor/common/config/editorOptions';
17+
import { EditorOption } from 'vs/editor/common/config/editorOptions';
1818

1919

2020
class Coordinate {
@@ -210,7 +210,7 @@ class Widget {
210210
this.suppressMouseDown = this._actual.suppressMouseDown || false;
211211

212212
const options = this._context.configuration.options;
213-
const layoutInfo = options.get(EditorOptionId.layoutInfo);
213+
const layoutInfo = options.get(EditorOption.layoutInfo);
214214

215215
this._fixedOverflowWidgets = this._context.configuration.editor.viewInfo.fixedOverflowWidgets;
216216
this._contentWidth = layoutInfo.contentWidth;
@@ -238,9 +238,9 @@ class Widget {
238238
if (e.lineHeight) {
239239
this._lineHeight = this._context.configuration.editor.lineHeight;
240240
}
241-
if (e.hasChanged(EditorOptionId.layoutInfo)) {
241+
if (e.hasChanged(EditorOption.layoutInfo)) {
242242
const options = this._context.configuration.options;
243-
const layoutInfo = options.get(EditorOptionId.layoutInfo);
243+
const layoutInfo = options.get(EditorOption.layoutInfo);
244244
this._contentLeft = layoutInfo.contentLeft;
245245
this._contentWidth = layoutInfo.contentWidth;
246246
this._maxWidth = this._getMaxWidth();

‎src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { RenderingContext } from 'vs/editor/common/view/renderingContext';
1010
import { ViewContext } from 'vs/editor/common/view/viewContext';
1111
import * as viewEvents from 'vs/editor/common/view/viewEvents';
1212
import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
13-
import { EditorOptionId } from 'vs/editor/common/config/editorOptions';
13+
import { EditorOption } from 'vs/editor/common/config/editorOptions';
1414

1515

1616
export class CurrentLineHighlightOverlay extends DynamicViewOverlay {
@@ -26,7 +26,7 @@ export class CurrentLineHighlightOverlay extends DynamicViewOverlay {
2626
super();
2727
this._context = context;
2828
const options = this._context.configuration.options;
29-
const layoutInfo = options.get(EditorOptionId.layoutInfo);
29+
const layoutInfo = options.get(EditorOption.layoutInfo);
3030

3131
this._lineHeight = this._context.configuration.editor.lineHeight;
3232
this._renderLineHighlight = this._context.configuration.editor.viewInfo.renderLineHighlight;
@@ -54,9 +54,9 @@ export class CurrentLineHighlightOverlay extends DynamicViewOverlay {
5454
if (e.viewInfo) {
5555
this._renderLineHighlight = this._context.configuration.editor.viewInfo.renderLineHighlight;
5656
}
57-
if (e.hasChanged(EditorOptionId.layoutInfo)) {
57+
if (e.hasChanged(EditorOption.layoutInfo)) {
5858
const options = this._context.configuration.options;
59-
const layoutInfo = options.get(EditorOptionId.layoutInfo);
59+
const layoutInfo = options.get(EditorOption.layoutInfo);
6060
this._contentWidth = layoutInfo.contentWidth;
6161
}
6262
return true;

‎src/vs/editor/browser/viewParts/currentLineMarginHighlight/currentLineMarginHighlight.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { RenderingContext } from 'vs/editor/common/view/renderingContext';
1010
import { ViewContext } from 'vs/editor/common/view/viewContext';
1111
import * as viewEvents from 'vs/editor/common/view/viewEvents';
1212
import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
13-
import { EditorOptionId } from 'vs/editor/common/config/editorOptions';
13+
import { EditorOption } from 'vs/editor/common/config/editorOptions';
1414

1515

1616
export class CurrentLineMarginHighlightOverlay extends DynamicViewOverlay {
@@ -25,7 +25,7 @@ export class CurrentLineMarginHighlightOverlay extends DynamicViewOverlay {
2525
super();
2626
this._context = context;
2727
const options = this._context.configuration.options;
28-
const layoutInfo = options.get(EditorOptionId.layoutInfo);
28+
const layoutInfo = options.get(EditorOption.layoutInfo);
2929
this._lineHeight = this._context.configuration.editor.lineHeight;
3030
this._renderLineHighlight = this._context.configuration.editor.viewInfo.renderLineHighlight;
3131

@@ -50,9 +50,9 @@ export class CurrentLineMarginHighlightOverlay extends DynamicViewOverlay {
5050
if (e.viewInfo) {
5151
this._renderLineHighlight = this._context.configuration.editor.viewInfo.renderLineHighlight;
5252
}
53-
if (e.hasChanged(EditorOptionId.layoutInfo)) {
53+
if (e.hasChanged(EditorOption.layoutInfo)) {
5454
const options = this._context.configuration.options;
55-
const layoutInfo = options.get(EditorOptionId.layoutInfo);
55+
const layoutInfo = options.get(EditorOption.layoutInfo);
5656
this._contentLeft = layoutInfo.contentLeft;
5757
}
5858
return true;

0 commit comments

Comments
 (0)