From dee172dfd65f3cf0247f9d8660c7e4a08189be65 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Fri, 28 Jul 2017 14:35:45 +0530 Subject: [PATCH] Fix #31558 --- .../browser/preferencesRenderers.ts | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts index c546e80e0af..5e722c2d374 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts @@ -999,26 +999,23 @@ class UnsupportedWorkbenchSettingsRenderer extends Disposable { } public render(): void { - this.editor.changeDecorations(changeAccessor => this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, [])); - + const ranges: IRange[] = []; const configurationRegistry = Registry.as(ConfigurationExtensions.Configuration).getConfigurationProperties(); - const folderKeys = this.configurationService.keys({ resource: this.workspaceSettingsEditorModel.uri }).folder; - const workbenchKeys = folderKeys.filter(key => configurationRegistry[key] && configurationRegistry[key].scope === ConfigurationScope.WINDOW); - if (workbenchKeys.length) { - const ranges: IRange[] = []; - for (const unsupportedKey of workbenchKeys) { - const setting = this.workspaceSettingsEditorModel.getPreference(unsupportedKey); - if (setting) { - ranges.push({ - startLineNumber: setting.keyRange.startLineNumber, - startColumn: setting.keyRange.startColumn - 1, - endLineNumber: setting.valueRange.endLineNumber, - endColumn: setting.valueRange.endColumn - }); + for (const settingsGroup of this.workspaceSettingsEditorModel.settingsGroups) { + for (const section of settingsGroup.sections) { + for (const setting of section.settings) { + if (configurationRegistry[setting.key] && configurationRegistry[setting.key].scope === ConfigurationScope.WINDOW) { + ranges.push({ + startLineNumber: setting.keyRange.startLineNumber, + startColumn: setting.keyRange.startColumn - 1, + endLineNumber: setting.valueRange.endLineNumber, + endColumn: setting.valueRange.endColumn + }); + } } } - this.editor.changeDecorations(changeAccessor => this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, ranges.map(range => this.createDecoration(range, this.editor.getModel())))); } + this.editor.changeDecorations(changeAccessor => this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, ranges.map(range => this.createDecoration(range, this.editor.getModel())))); } private static _DIM_CONFIGUARATION_ = ModelDecorationOptions.register({ -- GitLab