From f93c079202ea3ccbc792d992b983dc6baa3640d7 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Tue, 5 May 2020 16:44:22 +0200 Subject: [PATCH] fix #96655 --- src/vs/platform/configuration/common/configurationModels.ts | 2 +- .../workbench/services/configuration/browser/configuration.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vs/platform/configuration/common/configurationModels.ts b/src/vs/platform/configuration/common/configurationModels.ts index 97590263cde..5a829e2e800 100644 --- a/src/vs/platform/configuration/common/configurationModels.ts +++ b/src/vs/platform/configuration/common/configurationModels.ts @@ -231,7 +231,7 @@ export class ConfigurationModelParser { } public parseContent(content: string | null | undefined): void { - if (content) { + if (!types.isUndefinedOrNull(content)) { const raw = this.doParseContent(content); this.parseRaw(raw); } diff --git a/src/vs/workbench/services/configuration/browser/configuration.ts b/src/vs/workbench/services/configuration/browser/configuration.ts index 60691e87e95..d7afe8cde6a 100644 --- a/src/vs/workbench/services/configuration/browser/configuration.ts +++ b/src/vs/workbench/services/configuration/browser/configuration.ts @@ -127,12 +127,12 @@ class FileServiceBasedConfiguration extends Disposable { this._folderSettingsModelParser.parseContent(''); // parse - if (settingsContents[0]) { + if (settingsContents[0] !== undefined) { this._folderSettingsModelParser.parseContent(settingsContents[0]); } for (let index = 0; index < standAloneConfigurationContents.length; index++) { const contents = standAloneConfigurationContents[index]; - if (contents) { + if (contents !== undefined) { const standAloneConfigurationModelParser = new StandaloneConfigurationModelParser(this.standAloneConfigurationResources[index][1].toString(), this.standAloneConfigurationResources[index][0]); standAloneConfigurationModelParser.parseContent(contents); this._standAloneConfigurations.push(standAloneConfigurationModelParser.configurationModel); -- GitLab