VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-08 06:44:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move some annotation inferring code to proper functions

Browse Source
This commit is contained in:
Dave Halter
2019-09-04 01:29:41 +02:00
parent 34f131e9b3
commit dd400f115a
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
jedi/inference/value/function.py
View File

@@ -161,6 +161,9 @@ class MethodValue(FunctionValue):
class BaseFunctionExecutionContext(ValueContext, TreeContextMixin): class BaseFunctionExecutionContext(ValueContext, TreeContextMixin):
def _infer_annotations(self):
raise NotImplementedError
@inference_state_method_cache(default=NO_VALUES) @inference_state_method_cache(default=NO_VALUES)
@recursion.execution_recursion_decorator() @recursion.execution_recursion_decorator()
def get_return_values(self, check_yields=False): def get_return_values(self, check_yields=False):
@@ -172,14 +175,13 @@ class BaseFunctionExecutionContext(ValueContext, TreeContextMixin):
value_set = NO_VALUES value_set = NO_VALUES
returns = get_yield_exprs(self.inference_state, funcdef) returns = get_yield_exprs(self.inference_state, funcdef)
else: else:
returns = funcdef.iter_return_stmts() value_set = self._infer_annotations()
from jedi.inference.gradual.annotation import infer_return_types
value_set = infer_return_types(self._value, self._arguments)
if value_set: if value_set:
# If there are annotations, prefer them over anything else. # If there are annotations, prefer them over anything else.
# This will make it faster. # This will make it faster.
return value_set return value_set
value_set |= docstrings.infer_return_types(self._value) value_set |= docstrings.infer_return_types(self._value)
returns = funcdef.iter_return_stmts()
for r in returns: for r in returns:
check = flow_analysis.reachability_check(self, funcdef, r) check = flow_analysis.reachability_check(self, funcdef, r)
@@ -328,6 +330,10 @@ class FunctionExecutionContext(BaseFunctionExecutionContext):
arguments=self._arguments arguments=self._arguments
) )
def _infer_annotations(self):
from jedi.inference.gradual.annotation import infer_return_types
return infer_return_types(self._value, self._arguments)
def get_param_names(self): def get_param_names(self):
return [ return [
ParamName(self._value, param.name, self._arguments) ParamName(self._value, param.name, self._arguments)
@@ -336,6 +342,11 @@ class FunctionExecutionContext(BaseFunctionExecutionContext):
class AnonymousFunctionExecution(BaseFunctionExecutionContext): class AnonymousFunctionExecution(BaseFunctionExecutionContext):
def _infer_annotations(self):
# I don't think inferring anonymous executions is a big thing.
# Anonymous contexts are mostly there for the user to work in. ~ dave
return NO_VALUES
def get_filters(self, until_position=None, origin_scope=None): def get_filters(self, until_position=None, origin_scope=None):
yield AnonymousFunctionExecutionFilter( yield AnonymousFunctionExecutionFilter(
self, self._value, self, self._value,