Skip to content

Commit 217643c

Browse files
author
Colin Grant
committed
alphabetize editor configuration
1 parent cec5696 commit 217643c

File tree

2 files changed

+25
-24
lines changed

2 files changed

+25
-24
lines changed

packages/editor/src/browser/editor-preferences.ts

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -74,37 +74,47 @@ export const DEFAULT_WORD_SEPARATORS = '`~!@#$%^&*()-=+[{]}\\|;:\'",.<>/?';
7474
// 4. Apply `quotemark` quick fixes
7575
// 5. Fix the rest manually
7676
const codeEditorPreferenceProperties = {
77-
'editor.tabSize': {
78-
'type': 'number',
79-
'default': EDITOR_MODEL_DEFAULTS.tabSize,
80-
'minimum': 1,
81-
'markdownDescription': nls.localizeByDefault('The number of spaces a tab is equal to. This setting is overridden based on the file contents when `#editor.detectIndentation#` is on.')
82-
},
8377
'editor.defaultFormatter': {
8478
'type': 'string',
8579
'default': null,
8680
'description': 'Default formatter.'
8781
},
88-
'editor.insertSpaces': {
89-
'type': 'boolean',
90-
'default': EDITOR_MODEL_DEFAULTS.insertSpaces,
91-
'markdownDescription': nls.localizeByDefault('Insert spaces when pressing `Tab`. This setting is overridden based on the file contents when `#editor.detectIndentation#` is on.')
92-
},
9382
'editor.detectIndentation': {
9483
'type': 'boolean',
9584
'default': EDITOR_MODEL_DEFAULTS.detectIndentation,
9685
'markdownDescription': nls.localizeByDefault('Controls whether `#editor.tabSize#` and `#editor.insertSpaces#` will be automatically detected when a file is opened based on the file contents.')
9786
},
98-
'editor.trimAutoWhitespace': {
87+
'editor.insertSpaces': {
9988
'type': 'boolean',
100-
'default': EDITOR_MODEL_DEFAULTS.trimAutoWhitespace,
101-
'description': nls.localizeByDefault('Remove trailing auto inserted whitespace.')
89+
'default': EDITOR_MODEL_DEFAULTS.insertSpaces,
90+
'markdownDescription': nls.localizeByDefault('Insert spaces when pressing `Tab`. This setting is overridden based on the file contents when `#editor.detectIndentation#` is on.')
10291
},
10392
'editor.largeFileOptimizations': {
10493
'type': 'boolean',
10594
'default': EDITOR_MODEL_DEFAULTS.largeFileOptimizations,
10695
'description': nls.localizeByDefault('Special handling for large files to disable certain memory intensive features.')
10796
},
97+
'editor.semanticHighlighting.enabled': {
98+
'enum': [true, false, 'configuredByTheme'],
99+
'markdownEnumDescriptions': [
100+
nls.localizeByDefault('Semantic highlighting enabled for all color themes.'),
101+
nls.localizeByDefault('Semantic highlighting disabled for all color themes.'),
102+
nls.localizeByDefault('Semantic highlighting is configured by the current color theme\'s `semanticHighlighting` setting.')
103+
],
104+
'default': 'configuredByTheme',
105+
'description': nls.localizeByDefault('Controls whether the semanticHighlighting is shown for the languages that support it.')
106+
},
107+
'editor.tabSize': {
108+
'type': 'number',
109+
'default': EDITOR_MODEL_DEFAULTS.tabSize,
110+
'minimum': 1,
111+
'markdownDescription': nls.localizeByDefault('The number of spaces a tab is equal to. This setting is overridden based on the file contents when `#editor.detectIndentation#` is on.')
112+
},
113+
'editor.trimAutoWhitespace': {
114+
'type': 'boolean',
115+
'default': EDITOR_MODEL_DEFAULTS.trimAutoWhitespace,
116+
'description': nls.localizeByDefault('Remove trailing auto inserted whitespace.')
117+
},
108118
'editor.wordBasedSuggestions': {
109119
'type': 'boolean',
110120
'default': true,
@@ -120,16 +130,6 @@ const codeEditorPreferenceProperties = {
120130
],
121131
'description': nls.localizeByDefault('Controls form what documents word based completions are computed.')
122132
},
123-
'editor.semanticHighlighting.enabled': {
124-
'enum': [true, false, 'configuredByTheme'],
125-
'markdownEnumDescriptions': [
126-
nls.localizeByDefault('Semantic highlighting enabled for all color themes.'),
127-
nls.localizeByDefault('Semantic highlighting disabled for all color themes.'),
128-
nls.localizeByDefault('Semantic highlighting is configured by the current color theme\'s `semanticHighlighting` setting.')
129-
],
130-
'default': 'configuredByTheme',
131-
'description': nls.localizeByDefault('Controls whether the semanticHighlighting is shown for the languages that support it.')
132-
},
133133
'editor.stablePeek': {
134134
'type': 'boolean',
135135
'default': false,

packages/monaco/uplift-journal.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,4 @@ To do:
8383
> Nevermind that, too. Seems that any language that's open in an editor _on start_ won't work during that session. But anything in a language that wasn't open on start is fine.
8484
- [] Add new editor preferences.
8585
- [] There's a context-menu command to open the command palette. In VSCode, that opens in the same place as the keyboard shortcut, but in Theia it's opening inside the editor.
86+
- [] Editor context menu 'goto' commands not working (no peek editor shown).

0 commit comments

Comments
 (0)