Skip to content

Commit 64b2a7b

Browse files
author
Matt Bierner
committed
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
1 parent b160164 commit 64b2a7b

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

‎src/vs/editor/common/config/editorOptions.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ export interface IEditorOptions {
9696
* Remove unusual line terminators like LINE SEPARATOR (LS), PARAGRAPH SEPARATOR (PS).
9797
* Defaults to 'prompt'.
9898
*/
99-
unusualLineTerminators?: 'off' | 'prompt' | 'auto';
99+
unusualLineTerminators?: 'auto' | 'off' | 'prompt';
100100
/**
101101
* Should the corresponding line be selected when clicking on the line number?
102102
* Defaults to true.
@@ -4217,8 +4217,8 @@ export const EditorOptions = {
42174217
)),
42184218
unusualLineTerminators: register(new EditorStringEnumOption(
42194219
EditorOption.unusualLineTerminators, 'unusualLineTerminators',
4220-
'prompt' as 'off' | 'prompt' | 'auto',
4221-
['off', 'prompt', 'auto'] as const,
4220+
'prompt' as 'auto' | 'off' | 'prompt',
4221+
['auto', 'off', 'prompt'] as const,
42224222
{
42234223
enumDescriptions: [
42244224
nls.localize('unusualLineTerminators.off', "Unusual line terminators are ignored."),

‎src/vs/editor/contrib/unusualLineTerminators/unusualLineTerminators.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class UnusualLineTerminatorsDetector extends Disposable implements IEditorContri
2727

2828
public static readonly ID = 'editor.contrib.unusualLineTerminatorsDetector';
2929

30-
private _config: 'off' | 'prompt' | 'auto';
30+
private _config: 'auto' | 'off' | 'prompt';
3131

3232
constructor(
3333
private readonly _editor: ICodeEditor,

‎src/vs/monaco.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2635,7 +2635,7 @@ declare namespace monaco.editor {
26352635
* Remove unusual line terminators like LINE SEPARATOR (LS), PARAGRAPH SEPARATOR (PS).
26362636
* Defaults to 'prompt'.
26372637
*/
2638-
unusualLineTerminators?: 'off' | 'prompt' | 'auto';
2638+
unusualLineTerminators?: 'auto' | 'off' | 'prompt';
26392639
/**
26402640
* Should the corresponding line be selected when clicking on the line number?
26412641
* Defaults to true.

0 commit comments

Comments
 (0)