From 34d5dd999b42984e21a600da0acad4d7ca716621 Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Wed, 21 Jul 2021 19:15:33 -0500 Subject: [PATCH 1/2] Validate if shared_data is not None when resolving items --- pylsp/plugins/jedi_completion.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pylsp/plugins/jedi_completion.py b/pylsp/plugins/jedi_completion.py index 1ac33c30..1110f5d5 100644 --- a/pylsp/plugins/jedi_completion.py +++ b/pylsp/plugins/jedi_completion.py @@ -107,8 +107,12 @@ def pylsp_completions(config, document, position): @hookimpl def pylsp_completion_item_resolve(completion_item, document): """Resolve formatted completion for given non-resolved completion""" - completion, data = document.shared_data['LAST_JEDI_COMPLETIONS'].get(completion_item['label']) - return _resolve_completion(completion, data) + shared_data = document.shared_data['LAST_JEDI_COMPLETIONS'].get(completion_item['label']) + if shared_data: + completion, data = shared_data + return _resolve_completion(completion, data) + else: + return completion_item def is_exception_class(name): From 89d2edfb15fa6875eb1a560bbfea66f0eded040d Mon Sep 17 00:00:00 2001 From: Carlos Cordoba Date: Wed, 21 Jul 2021 19:19:09 -0500 Subject: [PATCH 2/2] Fix Pylint warning --- pylsp/plugins/jedi_completion.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pylsp/plugins/jedi_completion.py b/pylsp/plugins/jedi_completion.py index 1110f5d5..a07e5254 100644 --- a/pylsp/plugins/jedi_completion.py +++ b/pylsp/plugins/jedi_completion.py @@ -111,8 +111,7 @@ def pylsp_completion_item_resolve(completion_item, document): if shared_data: completion, data = shared_data return _resolve_completion(completion, data) - else: - return completion_item + return completion_item def is_exception_class(name):