diff --git a/src/vs/workbench/api/electron-browser/mainThreadEditor.ts b/src/vs/workbench/api/electron-browser/mainThreadEditor.ts index 273c3fb671d1021bcdd54b47c88926fa25a073b9..7389af01738f544a89700fd0040573c100b24f47 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadEditor.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadEditor.ts @@ -10,11 +10,10 @@ import { RenderLineNumbersType, TextEditorCursorStyle, cursorStyleToString } fro import { IRange, Range } from 'vs/editor/common/core/range'; import { ISelection, Selection } from 'vs/editor/common/core/selection'; import * as editorCommon from 'vs/editor/common/editorCommon'; -import { EndOfLineSequence, IIdentifiedSingleEditOperation, ISingleEditOperation, ITextModel, ITextModelUpdateOptions } from 'vs/editor/common/model'; +import { IIdentifiedSingleEditOperation, ISingleEditOperation, ITextModel, ITextModelUpdateOptions } from 'vs/editor/common/model'; import { IModelService } from 'vs/editor/common/services/modelService'; import { SnippetController2 } from 'vs/editor/contrib/snippet/snippetController2'; import { IApplyEditsOptions, IEditorPropertiesChangeData, IResolvedTextEditorConfiguration, ITextEditorConfigurationUpdate, IUndoStopOptions, TextEditorRevealType } from 'vs/workbench/api/node/extHost.protocol'; -import { EndOfLine, TextEditorLineNumbersStyle } from 'vs/workbench/api/node/extHostTypes'; import { IEditor } from 'vs/workbench/common/editor'; import { withNullAsUndefined } from 'vs/base/common/types'; @@ -57,28 +56,17 @@ export class MainThreadTextEditorProperties { } let cursorStyle: TextEditorCursorStyle; - let lineNumbers: TextEditorLineNumbersStyle; + let lineNumbers: RenderLineNumbersType; if (codeEditor) { const codeEditorOpts = codeEditor.getConfiguration(); cursorStyle = codeEditorOpts.viewInfo.cursorStyle; - - switch (codeEditorOpts.viewInfo.renderLineNumbers) { - case RenderLineNumbersType.Off: - lineNumbers = TextEditorLineNumbersStyle.Off; - break; - case RenderLineNumbersType.Relative: - lineNumbers = TextEditorLineNumbersStyle.Relative; - break; - default: - lineNumbers = TextEditorLineNumbersStyle.On; - break; - } + lineNumbers = codeEditorOpts.viewInfo.renderLineNumbers; } else if (previousProperties) { cursorStyle = previousProperties.options.cursorStyle; lineNumbers = previousProperties.options.lineNumbers; } else { cursorStyle = TextEditorCursorStyle.Line; - lineNumbers = TextEditorLineNumbersStyle.On; + lineNumbers = RenderLineNumbersType.On; } const modelOptions = model.getOptions(); @@ -377,10 +365,10 @@ export class MainThreadTextEditor { if (typeof newConfiguration.lineNumbers !== 'undefined') { let lineNumbers: 'on' | 'off' | 'relative'; switch (newConfiguration.lineNumbers) { - case TextEditorLineNumbersStyle.On: + case RenderLineNumbersType.On: lineNumbers = 'on'; break; - case TextEditorLineNumbersStyle.Relative: + case RenderLineNumbersType.Relative: lineNumbers = 'relative'; break; default: @@ -459,11 +447,7 @@ export class MainThreadTextEditor { return false; } - if (opts.setEndOfLine === EndOfLine.CRLF) { - this._model.pushEOL(EndOfLineSequence.CRLF); - } else if (opts.setEndOfLine === EndOfLine.LF) { - this._model.pushEOL(EndOfLineSequence.LF); - } + this._model.pushEOL(opts.setEndOfLine); const transformedEdits = edits.map((edit): IIdentifiedSingleEditOperation => { return { diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts index 96ad44b4e85bdb81c5b5902b9531b5faa97cc85c..6ae2f6ca213122df9f33ea729ffc32909f0830e3 100644 --- a/src/vs/workbench/api/node/extHost.protocol.ts +++ b/src/vs/workbench/api/node/extHost.protocol.ts @@ -8,12 +8,12 @@ import { SerializedError } from 'vs/base/common/errors'; import { IDisposable } from 'vs/base/common/lifecycle'; import Severity from 'vs/base/common/severity'; import { URI, UriComponents } from 'vs/base/common/uri'; -import { TextEditorCursorStyle } from 'vs/editor/common/config/editorOptions'; +import { TextEditorCursorStyle, RenderLineNumbersType } from 'vs/editor/common/config/editorOptions'; import { IPosition } from 'vs/editor/common/core/position'; import { IRange } from 'vs/editor/common/core/range'; import { ISelection, Selection } from 'vs/editor/common/core/selection'; import * as editorCommon from 'vs/editor/common/editorCommon'; -import { ISingleEditOperation } from 'vs/editor/common/model'; +import { ISingleEditOperation, EndOfLineSequence } from 'vs/editor/common/model'; import { IModelChangedEvent } from 'vs/editor/common/model/mirrorTextModel'; import * as modes from 'vs/editor/common/modes'; import { CharacterPair, CommentRule, EnterAction } from 'vs/editor/common/modes/languageConfiguration'; @@ -29,7 +29,6 @@ import { IPatternInfo, IRawFileMatch2, IRawQuery, IRawTextQuery, ISearchComplete import { StatusbarAlignment as MainThreadStatusBarAlignment } from 'vs/platform/statusbar/common/statusbar'; import { ITelemetryInfo } from 'vs/platform/telemetry/common/telemetry'; import { ThemeColor } from 'vs/platform/theme/common/themeService'; -import { EndOfLine, IFileOperationOptions, TextEditorLineNumbersStyle } from 'vs/workbench/api/node/extHostTypes'; import { EditorViewColumn } from 'vs/workbench/api/shared/editor'; import { TaskDTO, TaskExecutionDTO, TaskFilterDTO, TaskHandleDTO, TaskProcessEndedDTO, TaskProcessStartedDTO, TaskSystemInfoDTO, TaskSetDTO } from 'vs/workbench/api/shared/tasks'; import { ITreeItem, IRevealOptions } from 'vs/workbench/common/views'; @@ -194,7 +193,7 @@ export interface ITextEditorConfigurationUpdate { indentSize?: number | 'tabSize'; insertSpaces?: boolean | 'auto'; cursorStyle?: TextEditorCursorStyle; - lineNumbers?: TextEditorLineNumbersStyle; + lineNumbers?: RenderLineNumbersType; } export interface IResolvedTextEditorConfiguration { @@ -202,7 +201,7 @@ export interface IResolvedTextEditorConfiguration { indentSize: number; insertSpaces: boolean; cursorStyle: TextEditorCursorStyle; - lineNumbers: TextEditorLineNumbersStyle; + lineNumbers: RenderLineNumbersType; } export enum TextEditorRevealType { @@ -218,7 +217,7 @@ export interface IUndoStopOptions { } export interface IApplyEditsOptions extends IUndoStopOptions { - setEndOfLine: EndOfLine; + setEndOfLine: EndOfLineSequence; } export interface ITextDocumentShowOptions { @@ -868,7 +867,12 @@ export interface WorkspaceSymbolsDto extends IdObject { export interface ResourceFileEditDto { oldUri?: UriComponents; newUri?: UriComponents; - options?: IFileOperationOptions; + options?: { + overwrite?: boolean; + ignoreIfExists?: boolean; + ignoreIfNotExists?: boolean; + recursive?: boolean; + }; } export interface ResourceTextEditDto { diff --git a/src/vs/workbench/api/node/extHostTextEditor.ts b/src/vs/workbench/api/node/extHostTextEditor.ts index d3080e367b6b8c515bb023cc71bc2e0903a70098..11e387bd2ba21e33b75aafac240226e43ca5b537 100644 --- a/src/vs/workbench/api/node/extHostTextEditor.ts +++ b/src/vs/workbench/api/node/extHostTextEditor.ts @@ -158,7 +158,7 @@ export class ExtHostTextEditorOptions implements vscode.TextEditorOptions { this._indentSize = source.indentSize; this._insertSpaces = source.insertSpaces; this._cursorStyle = source.cursorStyle; - this._lineNumbers = source.lineNumbers; + this._lineNumbers = TypeConverters.TextEditorLineNumbersStyle.to(source.lineNumbers); } public get tabSize(): number | string { @@ -295,7 +295,7 @@ export class ExtHostTextEditorOptions implements vscode.TextEditorOptions { } this._lineNumbers = value; warnOnError(this._proxy.$trySetOptions(this._id, { - lineNumbers: value + lineNumbers: TypeConverters.TextEditorLineNumbersStyle.from(value) })); } @@ -354,7 +354,7 @@ export class ExtHostTextEditorOptions implements vscode.TextEditorOptions { if (this._lineNumbers !== newOptions.lineNumbers) { this._lineNumbers = newOptions.lineNumbers; hasUpdate = true; - bulkConfigurationUpdate.lineNumbers = newOptions.lineNumbers; + bulkConfigurationUpdate.lineNumbers = TypeConverters.TextEditorLineNumbersStyle.from(newOptions.lineNumbers); } } @@ -607,7 +607,7 @@ export class ExtHostTextEditor implements vscode.TextEditor { }); return this._proxy.$tryApplyEdits(this._id, editData.documentVersionId, edits, { - setEndOfLine: editData.setEndOfLine, + setEndOfLine: TypeConverters.EndOfLine.from(editData.setEndOfLine), undoStopBefore: editData.undoStopBefore, undoStopAfter: editData.undoStopAfter }); diff --git a/src/vs/workbench/api/node/extHostTextEditors.ts b/src/vs/workbench/api/node/extHostTextEditors.ts index ce6b21dcc14cd9491b3b474950cf0c94c6072552..70addac754e5fb66cce34228d09638e6319337d4 100644 --- a/src/vs/workbench/api/node/extHostTextEditors.ts +++ b/src/vs/workbench/api/node/extHostTextEditors.ts @@ -118,7 +118,7 @@ export class ExtHostEditors implements ExtHostEditorsShape { if (data.options) { this._onDidChangeTextEditorOptions.fire({ textEditor: textEditor, - options: data.options + options: { ...data.options, lineNumbers: TypeConverters.TextEditorLineNumbersStyle.to(data.options.lineNumbers) } }); } if (data.selections) { diff --git a/src/vs/workbench/api/node/extHostTypeConverters.ts b/src/vs/workbench/api/node/extHostTypeConverters.ts index 078f2c166992d88d40a2dce2b682fbde4b317812..a0c9750bb3cd81f7952b142b705aab0255978dd2 100644 --- a/src/vs/workbench/api/node/extHostTypeConverters.ts +++ b/src/vs/workbench/api/node/extHostTypeConverters.ts @@ -29,6 +29,7 @@ import { parse } from 'vs/base/common/marshalling'; import { cloneAndChange } from 'vs/base/common/objects'; import { LogLevel as _MainLogLevel } from 'vs/platform/log/common/log'; import { coalesce } from 'vs/base/common/arrays'; +import { RenderLineNumbersType } from 'vs/editor/common/config/editorOptions'; export interface PositionLike { line: number; @@ -883,6 +884,31 @@ export namespace TextDocumentSaveReason { } } +export namespace TextEditorLineNumbersStyle { + export function from(style: vscode.TextEditorLineNumbersStyle): RenderLineNumbersType { + switch (style) { + case types.TextEditorLineNumbersStyle.Off: + return RenderLineNumbersType.Off; + case types.TextEditorLineNumbersStyle.Relative: + return RenderLineNumbersType.Relative; + case types.TextEditorLineNumbersStyle.On: + default: + return RenderLineNumbersType.On; + } + } + export function to(style: RenderLineNumbersType): vscode.TextEditorLineNumbersStyle { + switch (style) { + case RenderLineNumbersType.Off: + return types.TextEditorLineNumbersStyle.Off; + case RenderLineNumbersType.Relative: + return types.TextEditorLineNumbersStyle.Relative; + case RenderLineNumbersType.On: + default: + return types.TextEditorLineNumbersStyle.On; + } + } +} + export namespace EndOfLine { export function from(eol: vscode.EndOfLine): EndOfLineSequence | undefined { diff --git a/src/vs/workbench/test/electron-browser/api/extHostTextEditor.test.ts b/src/vs/workbench/test/electron-browser/api/extHostTextEditor.test.ts index a9bcfbeca01974dfee89aa6793fe0e12296ae830..5827fbaff2b722f76bcb0cfdac94b14aee72f25b 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostTextEditor.test.ts +++ b/src/vs/workbench/test/electron-browser/api/extHostTextEditor.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as assert from 'assert'; import { TextEditorLineNumbersStyle, Range } from 'vs/workbench/api/node/extHostTypes'; -import { TextEditorCursorStyle } from 'vs/editor/common/config/editorOptions'; +import { TextEditorCursorStyle, RenderLineNumbersType } from 'vs/editor/common/config/editorOptions'; import { MainThreadTextEditorsShape, IResolvedTextEditorConfiguration, ITextEditorConfigurationUpdate } from 'vs/workbench/api/node/extHost.protocol'; import { ExtHostTextEditorOptions, ExtHostTextEditor } from 'vs/workbench/api/node/extHostTextEditor'; import { ExtHostDocumentData } from 'vs/workbench/api/node/extHostDocumentData'; @@ -91,7 +91,7 @@ suite('ExtHostTextEditorOptions', () => { indentSize: 4, insertSpaces: false, cursorStyle: TextEditorCursorStyle.Line, - lineNumbers: TextEditorLineNumbersStyle.On + lineNumbers: RenderLineNumbersType.On }); }); @@ -118,7 +118,7 @@ suite('ExtHostTextEditorOptions', () => { indentSize: 4, insertSpaces: false, cursorStyle: TextEditorCursorStyle.Line, - lineNumbers: TextEditorLineNumbersStyle.On + lineNumbers: RenderLineNumbersType.On }); assert.deepEqual(calls, []); }); @@ -130,7 +130,7 @@ suite('ExtHostTextEditorOptions', () => { indentSize: 4, insertSpaces: false, cursorStyle: TextEditorCursorStyle.Line, - lineNumbers: TextEditorLineNumbersStyle.On + lineNumbers: RenderLineNumbersType.On }); assert.deepEqual(calls, [{ tabSize: 1 }]); }); @@ -142,7 +142,7 @@ suite('ExtHostTextEditorOptions', () => { indentSize: 4, insertSpaces: false, cursorStyle: TextEditorCursorStyle.Line, - lineNumbers: TextEditorLineNumbersStyle.On + lineNumbers: RenderLineNumbersType.On }); assert.deepEqual(calls, [{ tabSize: 2 }]); }); @@ -154,7 +154,7 @@ suite('ExtHostTextEditorOptions', () => { indentSize: 4, insertSpaces: false, cursorStyle: TextEditorCursorStyle.Line, - lineNumbers: TextEditorLineNumbersStyle.On + lineNumbers: RenderLineNumbersType.On }); assert.deepEqual(calls, [{ tabSize: 2 }]); }); @@ -166,7 +166,7 @@ suite('ExtHostTextEditorOptions', () => { indentSize: 4, insertSpaces: false, cursorStyle: TextEditorCursorStyle.Line, - lineNumbers: TextEditorLineNumbersStyle.On + lineNumbers: RenderLineNumbersType.On }); assert.deepEqual(calls, [{ tabSize: 'auto' }]); }); @@ -178,7 +178,7 @@ suite('ExtHostTextEditorOptions', () => { indentSize: 4, insertSpaces: false, cursorStyle: TextEditorCursorStyle.Line, - lineNumbers: TextEditorLineNumbersStyle.On + lineNumbers: RenderLineNumbersType.On }); assert.deepEqual(calls, []); }); @@ -190,7 +190,7 @@ suite('ExtHostTextEditorOptions', () => { indentSize: 4, insertSpaces: false, cursorStyle: TextEditorCursorStyle.Line, - lineNumbers: TextEditorLineNumbersStyle.On + lineNumbers: RenderLineNumbersType.On }); assert.deepEqual(calls, []); }); @@ -202,7 +202,7 @@ suite('ExtHostTextEditorOptions', () => { indentSize: 4, insertSpaces: false, cursorStyle: TextEditorCursorStyle.Line, - lineNumbers: TextEditorLineNumbersStyle.On + lineNumbers: RenderLineNumbersType.On }); assert.deepEqual(calls, []); }); @@ -214,7 +214,7 @@ suite('ExtHostTextEditorOptions', () => { indentSize: 4, insertSpaces: false, cursorStyle: TextEditorCursorStyle.Line, - lineNumbers: TextEditorLineNumbersStyle.On + lineNumbers: RenderLineNumbersType.On }); assert.deepEqual(calls, []); }); @@ -226,7 +226,7 @@ suite('ExtHostTextEditorOptions', () => { indentSize: 4, insertSpaces: false, cursorStyle: TextEditorCursorStyle.Line, - lineNumbers: TextEditorLineNumbersStyle.On + lineNumbers: RenderLineNumbersType.On }); assert.deepEqual(calls, []); }); @@ -238,7 +238,7 @@ suite('ExtHostTextEditorOptions', () => { indentSize: 1, insertSpaces: false, cursorStyle: TextEditorCursorStyle.Line, - lineNumbers: TextEditorLineNumbersStyle.On + lineNumbers: RenderLineNumbersType.On }); assert.deepEqual(calls, [{ indentSize: 1 }]); }); @@ -250,7 +250,7 @@ suite('ExtHostTextEditorOptions', () => { indentSize: 2, insertSpaces: false, cursorStyle: TextEditorCursorStyle.Line, - lineNumbers: TextEditorLineNumbersStyle.On + lineNumbers: RenderLineNumbersType.On }); assert.deepEqual(calls, [{ indentSize: 2 }]); }); @@ -262,7 +262,7 @@ suite('ExtHostTextEditorOptions', () => { indentSize: 2, insertSpaces: false, cursorStyle: TextEditorCursorStyle.Line, - lineNumbers: TextEditorLineNumbersStyle.On + lineNumbers: RenderLineNumbersType.On }); assert.deepEqual(calls, [{ indentSize: 2 }]); }); @@ -274,7 +274,7 @@ suite('ExtHostTextEditorOptions', () => { indentSize: 4, insertSpaces: false, cursorStyle: TextEditorCursorStyle.Line, - lineNumbers: TextEditorLineNumbersStyle.On + lineNumbers: RenderLineNumbersType.On }); assert.deepEqual(calls, [{ indentSize: 'tabSize' }]); }); @@ -286,7 +286,7 @@ suite('ExtHostTextEditorOptions', () => { indentSize: 4, insertSpaces: false, cursorStyle: TextEditorCursorStyle.Line, - lineNumbers: TextEditorLineNumbersStyle.On + lineNumbers: RenderLineNumbersType.On }); assert.deepEqual(calls, []); }); @@ -298,7 +298,7 @@ suite('ExtHostTextEditorOptions', () => { indentSize: 4, insertSpaces: false, cursorStyle: TextEditorCursorStyle.Line, - lineNumbers: TextEditorLineNumbersStyle.On + lineNumbers: RenderLineNumbersType.On }); assert.deepEqual(calls, []); }); @@ -310,7 +310,7 @@ suite('ExtHostTextEditorOptions', () => { indentSize: 4, insertSpaces: false, cursorStyle: TextEditorCursorStyle.Line, - lineNumbers: TextEditorLineNumbersStyle.On + lineNumbers: RenderLineNumbersType.On }); assert.deepEqual(calls, []); }); @@ -322,7 +322,7 @@ suite('ExtHostTextEditorOptions', () => { indentSize: 4, insertSpaces: false, cursorStyle: TextEditorCursorStyle.Line, - lineNumbers: TextEditorLineNumbersStyle.On + lineNumbers: RenderLineNumbersType.On }); assert.deepEqual(calls, []); }); @@ -334,7 +334,7 @@ suite('ExtHostTextEditorOptions', () => { indentSize: 4, insertSpaces: false, cursorStyle: TextEditorCursorStyle.Line, - lineNumbers: TextEditorLineNumbersStyle.On + lineNumbers: RenderLineNumbersType.On }); assert.deepEqual(calls, []); }); @@ -346,7 +346,7 @@ suite('ExtHostTextEditorOptions', () => { indentSize: 4, insertSpaces: false, cursorStyle: TextEditorCursorStyle.Line, - lineNumbers: TextEditorLineNumbersStyle.On + lineNumbers: RenderLineNumbersType.On }); assert.deepEqual(calls, []); }); @@ -358,7 +358,7 @@ suite('ExtHostTextEditorOptions', () => { indentSize: 4, insertSpaces: true, cursorStyle: TextEditorCursorStyle.Line, - lineNumbers: TextEditorLineNumbersStyle.On + lineNumbers: RenderLineNumbersType.On }); assert.deepEqual(calls, [{ insertSpaces: true }]); }); @@ -370,7 +370,7 @@ suite('ExtHostTextEditorOptions', () => { indentSize: 4, insertSpaces: false, cursorStyle: TextEditorCursorStyle.Line, - lineNumbers: TextEditorLineNumbersStyle.On + lineNumbers: RenderLineNumbersType.On }); assert.deepEqual(calls, []); }); @@ -382,7 +382,7 @@ suite('ExtHostTextEditorOptions', () => { indentSize: 4, insertSpaces: true, cursorStyle: TextEditorCursorStyle.Line, - lineNumbers: TextEditorLineNumbersStyle.On + lineNumbers: RenderLineNumbersType.On }); assert.deepEqual(calls, [{ insertSpaces: true }]); }); @@ -394,7 +394,7 @@ suite('ExtHostTextEditorOptions', () => { indentSize: 4, insertSpaces: false, cursorStyle: TextEditorCursorStyle.Line, - lineNumbers: TextEditorLineNumbersStyle.On + lineNumbers: RenderLineNumbersType.On }); assert.deepEqual(calls, [{ insertSpaces: 'auto' }]); }); @@ -406,7 +406,7 @@ suite('ExtHostTextEditorOptions', () => { indentSize: 4, insertSpaces: false, cursorStyle: TextEditorCursorStyle.Line, - lineNumbers: TextEditorLineNumbersStyle.On + lineNumbers: RenderLineNumbersType.On }); assert.deepEqual(calls, []); }); @@ -418,7 +418,7 @@ suite('ExtHostTextEditorOptions', () => { indentSize: 4, insertSpaces: false, cursorStyle: TextEditorCursorStyle.Block, - lineNumbers: TextEditorLineNumbersStyle.On + lineNumbers: RenderLineNumbersType.On }); assert.deepEqual(calls, [{ cursorStyle: TextEditorCursorStyle.Block }]); }); @@ -430,7 +430,7 @@ suite('ExtHostTextEditorOptions', () => { indentSize: 4, insertSpaces: false, cursorStyle: TextEditorCursorStyle.Line, - lineNumbers: TextEditorLineNumbersStyle.On + lineNumbers: RenderLineNumbersType.On }); assert.deepEqual(calls, []); }); @@ -442,9 +442,9 @@ suite('ExtHostTextEditorOptions', () => { indentSize: 4, insertSpaces: false, cursorStyle: TextEditorCursorStyle.Line, - lineNumbers: TextEditorLineNumbersStyle.Off + lineNumbers: RenderLineNumbersType.Off }); - assert.deepEqual(calls, [{ lineNumbers: TextEditorLineNumbersStyle.Off }]); + assert.deepEqual(calls, [{ lineNumbers: RenderLineNumbersType.Off }]); }); test('can do bulk updates 0', () => { @@ -459,7 +459,7 @@ suite('ExtHostTextEditorOptions', () => { indentSize: 4, insertSpaces: false, cursorStyle: TextEditorCursorStyle.Line, - lineNumbers: TextEditorLineNumbersStyle.On + lineNumbers: RenderLineNumbersType.On }); assert.deepEqual(calls, []); }); @@ -474,7 +474,7 @@ suite('ExtHostTextEditorOptions', () => { indentSize: 4, insertSpaces: true, cursorStyle: TextEditorCursorStyle.Line, - lineNumbers: TextEditorLineNumbersStyle.On + lineNumbers: RenderLineNumbersType.On }); assert.deepEqual(calls, [{ tabSize: 'auto', insertSpaces: true }]); }); @@ -489,7 +489,7 @@ suite('ExtHostTextEditorOptions', () => { indentSize: 4, insertSpaces: false, cursorStyle: TextEditorCursorStyle.Line, - lineNumbers: TextEditorLineNumbersStyle.On + lineNumbers: RenderLineNumbersType.On }); assert.deepEqual(calls, [{ tabSize: 3, insertSpaces: 'auto' }]); }); @@ -504,9 +504,9 @@ suite('ExtHostTextEditorOptions', () => { indentSize: 4, insertSpaces: false, cursorStyle: TextEditorCursorStyle.Block, - lineNumbers: TextEditorLineNumbersStyle.Relative + lineNumbers: RenderLineNumbersType.Relative }); - assert.deepEqual(calls, [{ cursorStyle: TextEditorCursorStyle.Block, lineNumbers: TextEditorLineNumbersStyle.Relative }]); + assert.deepEqual(calls, [{ cursorStyle: TextEditorCursorStyle.Block, lineNumbers: RenderLineNumbersType.Relative }]); }); });