8000 fix config bug (#355) · llan-ml/python-lsp-server@d8eb65f · GitHub
[go: up one dir, main page]

Skip to content

Commit d8eb65f

Browse files
purplePgatesn
authored andcommitted
fix config bug (python-lsp#355)
1 parent 8a34aa2 commit d8eb65f

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

pyls/config/config.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,9 @@ def settings(self, document_path=None):
9191
sources = self._settings.get('configurationSources', DEFAULT_CONFIG_SOURCES)
9292

9393
for source_name in reversed(sources):
94-
source = self._config_sources[source_name]
94+
source = self._config_sources.get(source_name)
95+
if not source:
96+
continue
9597
source_conf = source.user_config()
9698
log.debug("Got user config from %s: %s", source.__class__.__name__, source_conf)
9799
settings = _utils.merge_dicts(settings, source_conf)
@@ -104,7 +106,9 @@ def settings(self, document_path=None):
104106
log.debug("With lsp configuration: %s", settings)
105107

106108
for source_name in reversed(sources):
107-
source = self._config_sources[source_name]
109+
source = self._config_sources.get(source_name)
110+
if not source:
111+
continue
108112
source_conf = source.project_config(document_path or self._root_path)
109113
log.debug("Got project config from %s: %s", source.__class__.__name__, source_conf)
110114
settings = _utils.merge_dicts(settings, source_conf)

0 commit comments

Comments
 (0)
0