From 64b2a7b0bd4e593e20c1fb02002910909afda4a6 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Sat, 19 Sep 2020 01:00:30 -0700 Subject: [PATCH] Reorder enum values in editor options With TS 4.1, the emit order of the string literal types here seems to have changed. Try reordering this --- src/vs/editor/common/config/editorOptions.ts | 6 +++--- .../unusualLineTerminators/unusualLineTerminators.ts | 2 +- src/vs/monaco.d.ts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts index c3029be4d43..f11ae86a4a7 100644 --- a/src/vs/editor/common/config/editorOptions.ts +++ b/src/vs/editor/common/config/editorOptions.ts @@ -96,7 +96,7 @@ export interface IEditorOptions { * Remove unusual line terminators like LINE SEPARATOR (LS), PARAGRAPH SEPARATOR (PS). * Defaults to 'prompt'. */ - unusualLineTerminators?: 'off' | 'prompt' | 'auto'; + unusualLineTerminators?: 'auto' | 'off' | 'prompt'; /** * Should the corresponding line be selected when clicking on the line number? * Defaults to true. @@ -4217,8 +4217,8 @@ export const EditorOptions = { )), unusualLineTerminators: register(new EditorStringEnumOption( EditorOption.unusualLineTerminators, 'unusualLineTerminators', - 'prompt' as 'off' | 'prompt' | 'auto', - ['off', 'prompt', 'auto'] as const, + 'prompt' as 'auto' | 'off' | 'prompt', + ['auto', 'off', 'prompt'] as const, { enumDescriptions: [ nls.localize('unusualLineTerminators.off', "Unusual line terminators are ignored."), diff --git a/src/vs/editor/contrib/unusualLineTerminators/unusualLineTerminators.ts b/src/vs/editor/contrib/unusualLineTerminators/unusualLineTerminators.ts index 2890a2852a2..2cef30f6fea 100644 --- a/src/vs/editor/contrib/unusualLineTerminators/unusualLineTerminators.ts +++ b/src/vs/editor/contrib/unusualLineTerminators/unusualLineTerminators.ts @@ -27,7 +27,7 @@ class UnusualLineTerminatorsDetector extends Disposable implements IEditorContri public static readonly ID = 'editor.contrib.unusualLineTerminatorsDetector'; - private _config: 'off' | 'prompt' | 'auto'; + private _config: 'auto' | 'off' | 'prompt'; constructor( private readonly _editor: ICodeEditor, diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts index 1e433773380..97005e1f82c 100644 --- a/src/vs/monaco.d.ts +++ b/src/vs/monaco.d.ts @@ -2635,7 +2635,7 @@ declare namespace monaco.editor { * Remove unusual line terminators like LINE SEPARATOR (LS), PARAGRAPH SEPARATOR (PS). * Defaults to 'prompt'. */ - unusualLineTerminators?: 'off' | 'prompt' | 'auto'; + unusualLineTerminators?: 'auto' | 'off' | 'prompt'; /** * Should the corresponding line be selected when clicking on the line number? * Defaults to true. -- GitLab