Skip to content

Commit b11d96f

Browse files
committed
Simplify editor options
1 parent ad3289c commit b11d96f

4 files changed

Lines changed: 321 additions & 314 deletions

File tree

src/vs/editor/common/config/commonEditorConfig.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class EditorConfiguration2 {
7676
const options: { [key: string]: any; } = _options;
7777
const result = new RawEditorOptions();
7878
for (const editorOption of editorOptionsRegistry) {
79-
const value = options[editorOption.name];
79+
const value = (editorOption.name === '_never_' ? undefined : options[editorOption.name]);
8080
result._write(editorOption.id, value);
8181
}
8282
return result;
@@ -1023,7 +1023,7 @@ const editorConfiguration: IConfigurationNode = {
10231023
'editor.cursorBlinking': {
10241024
'type': 'string',
10251025
'enum': ['blink', 'smooth', 'phase', 'expand', 'solid'],
1026-
'default': EditorOptions.cursorBlinking.defaultValue,
1026+
'default': 'blink',
10271027
'description': nls.localize('cursorBlinking', "Control the cursor animation style.")
10281028
},
10291029
'editor.mouseWheelZoom': {
@@ -1039,7 +1039,7 @@ const editorConfiguration: IConfigurationNode = {
10391039
'editor.cursorStyle': {
10401040
'type': 'string',
10411041
'enum': ['block', 'block-outline', 'line', 'line-thin', 'underline', 'underline-thin'],
1042-
'default': EditorOptions.cursorStyle.defaultValue,
1042+
'default': 'line',
10431043
'description': nls.localize('cursorStyle', "Controls the cursor style.")
10441044
},
10451045
'editor.cursorWidth': {
@@ -1156,7 +1156,7 @@ const editorConfiguration: IConfigurationNode = {
11561156
nls.localize('accessibilitySupport.on', "The editor will be permanently optimized for usage with a Screen Reader."),
11571157
nls.localize('accessibilitySupport.off', "The editor will never be optimized for usage with a Screen Reader."),
11581158
],
1159-
'default': EditorOptions.accessibilitySupport.defaultValue,
1159+
'default': 'auto',
11601160
'description': nls.localize('accessibilitySupport', "Controls whether the editor should run in a mode where it is optimized for screen readers.")
11611161
},
11621162
'editor.showUnused': {

0 commit comments

Comments
 (0)