From bb3eb2386456bfc6dcd85cf00d05d7a5e6acfe6e Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Sat, 24 Aug 2019 12:32:50 +0200 Subject: [PATCH] Move docstring param recognizing --- jedi/inference/names.py | 6 ++++++ jedi/inference/param.py | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jedi/inference/names.py b/jedi/inference/names.py index 0a6a668c..41799880 100644 --- a/jedi/inference/names.py +++ b/jedi/inference/names.py @@ -4,6 +4,7 @@ from parso.tree import search_ancestor from jedi._compatibility import Parameter from jedi.inference.base_value import ValueSet, NO_VALUES +from jedi.inference import docstrings from jedi.cache import memoize_method @@ -302,6 +303,11 @@ class ParamName(BaseTreeParamName): values = self.infer_annotation() if values: return values + + doc_params = docstrings.infer_param(self.parent_context, self._get_param_node()) + if doc_params: + return doc_params + return self.get_param().infer() def get_param(self): diff --git a/jedi/inference/param.py b/jedi/inference/param.py index 1b66c05c..7386b885 100644 --- a/jedi/inference/param.py +++ b/jedi/inference/param.py @@ -5,7 +5,6 @@ from jedi.inference.utils import PushBackIterator from jedi.inference import analysis from jedi.inference.lazy_value import LazyKnownValue, \ LazyTreeValue, LazyUnknownValue -from jedi.inference import docstrings from jedi.inference.value import iterable @@ -31,11 +30,6 @@ class ExecutedParam(object): return infer_param(self._execution_context, self._param_node) def infer(self, use_hints=True): - if use_hints: - doc_params = docstrings.infer_param(self._execution_context, self._param_node) - if doc_params: - return doc_params - return self._lazy_value.infer() def matches_signature(self):