From 299274c1f5cfb83ad3afb20a726d690426a0186b Mon Sep 17 00:00:00 2001 From: Mikhail Arkhipov Date: Mon, 17 Aug 2020 14:17:16 -0700 Subject: [PATCH] Fix settings retrieval --- src/LanguageServer/Impl/LanguageServer.Configuration.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/LanguageServer/Impl/LanguageServer.Configuration.cs b/src/LanguageServer/Impl/LanguageServer.Configuration.cs index 0a286f30f..4fd0fa57a 100644 --- a/src/LanguageServer/Impl/LanguageServer.Configuration.cs +++ b/src/LanguageServer/Impl/LanguageServer.Configuration.cs @@ -43,16 +43,14 @@ public async Task DidChangeConfiguration(JToken token, CancellationToken cancell using (await _prioritizer.ConfigurationPriorityAsync(cancellationToken)) { Debug.Assert(_initialized); - var settings = new LanguageServerSettings(); - // https://github.com/microsoft/python-language-server/issues/915 // If token or settings are missing, assume defaults. - var rootSection = token?["settings"]; - var pythonSection = rootSection?["python"]; + var pythonSection = await GetPythonConfigurationAsync(cancellationToken); if (pythonSection == null) { return; } + var settings = new LanguageServerSettings(); var autoComplete = pythonSection["autoComplete"]; settings.completion.showAdvancedMembers = GetSetting(autoComplete, "showAdvancedMembers", true); settings.completion.addBrackets = GetSetting(autoComplete, "addBrackets", false);