Skip to content

Commit 1cb83a4

Browse files
committed
1 parent 7516e0e commit 1cb83a4

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,19 @@ function readTransientState(model: IModel, codeEditorService: ICodeEditorService
5454
}
5555

5656
function readWordWrapState(model: IModel, configurationService: IConfigurationService, codeEditorService: ICodeEditorService): IWordWrapState {
57-
const _configuredWordWrap = configurationService.lookup<'on' | 'off' | 'wordWrapColumn' | 'bounded'>('editor.wordWrap', model.getLanguageIdentifier().language);
57+
let _configuredWordWrap = configurationService.lookup<'on' | 'off' | 'wordWrapColumn' | 'bounded'>('editor.wordWrap', model.getLanguageIdentifier().language).value;
58+
59+
// Compatibility with old true or false values
60+
if (<any>_configuredWordWrap === true) {
61+
_configuredWordWrap = 'on';
62+
} else if (<any>_configuredWordWrap === false) {
63+
_configuredWordWrap = 'off';
64+
}
65+
5866
const _configuredWordWrapMinified = configurationService.lookup<boolean>('editor.wordWrapMinified', model.getLanguageIdentifier().language);
5967
const _transientState = readTransientState(model, codeEditorService);
6068
return {
61-
configuredWordWrap: _configuredWordWrap.value,
69+
configuredWordWrap: _configuredWordWrap,
6270
configuredWordWrapMinified: (typeof _configuredWordWrapMinified.value === 'undefined' ? DefaultConfig.editor.wordWrapMinified : _configuredWordWrapMinified.value),
6371
transientState: _transientState
6472
};

0 commit comments

Comments
 (0)