From c8682d90ea275e57ddd7d0bd2a4335a031404833 Mon Sep 17 00:00:00 2001 From: Michael Doronin Date: Wed, 23 May 2018 22:55:19 +0300 Subject: [PATCH] fix config bug --- pyls/config/config.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pyls/config/config.py b/pyls/config/config.py index 19ced8c5..9d0a2ccc 100644 --- a/pyls/config/config.py +++ b/pyls/config/config.py @@ -91,7 +91,9 @@ def settings(self, document_path=None): sources = self._settings.get('configurationSources', DEFAULT_CONFIG_SOURCES) for source_name in reversed(sources): - source = self._config_sources[source_name] + source = self._config_sources.get(source_name) + if not source: + continue source_conf = source.user_config() log.debug("Got user config from %s: %s", source.__class__.__name__, source_conf) settings = _utils.merge_dicts(settings, source_conf) @@ -104,7 +106,9 @@ def settings(self, document_path=None): log.debug("With lsp configuration: %s", settings) for source_name in reversed(sources): - source = self._config_sources[source_name] + source = self._config_sources.get(source_name) + if not source: + continue source_conf = source.project_config(document_path or self._root_path) log.debug("Got project config from %s: %s", source.__class__.__name__, source_conf) settings = _utils.merge_dicts(settings, source_conf)