Skip to content

fix config bug #355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 27, 2018
Merged

fix config bug #355

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions pyls/config/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down