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

Trying to use prefer type annotations if they are available

Browse Source
This commit is contained in:
Dave Halter
2018-08-05 00:36:11 +02:00
parent 403cf02c65
commit faba29a42b
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jedi/evaluate/context/function.py
View File

@@ -150,8 +150,12 @@ class FunctionExecutionContext(TreeContext):
returns = get_yield_exprs(self.evaluator, funcdef) returns = get_yield_exprs(self.evaluator, funcdef)
else: else:
returns = funcdef.iter_return_stmts() returns = funcdef.iter_return_stmts()
context_set = docstrings.infer_return_types(self.function_context) context_set = pep0484.infer_return_types(self.function_context)
context_set |= pep0484.infer_return_types(self.function_context) if context_set:
# If there are annotations, prefer them over anything else.
# This will make it faster.
return context_set
context_set |= docstrings.infer_return_types(self.function_context)
for r in returns: for r in returns:
check = flow_analysis.reachability_check(self, funcdef, r) check = flow_analysis.reachability_check(self, funcdef, r)

2
jedi/evaluate/filters.py
View File

@@ -332,7 +332,7 @@ class _BuiltinMappedMethod(Context):
self._method = method self._method = method
self._builtin_func = builtin_func self._builtin_func = builtin_func
def py__call__(self, params): def py__call__(self, arguments):
# TODO add TypeError if params are given/or not correct. # TODO add TypeError if params are given/or not correct.
return self._method(self.parent_context) return self._method(self.parent_context)

3
jedi/plugins/typeshed.py
View File

@@ -290,4 +290,5 @@ class ClassStubContext(_StubContextFilterMixin, ClassContext):
class FunctionStubContext(_MixedStubContextMixin, FunctionContext): class FunctionStubContext(_MixedStubContextMixin, FunctionContext):
pass def py__call__(self, arguments):
return self.stub_context.py__call__(arguments)

4
test/test_plugin/test_stub.py
View File

@@ -74,3 +74,7 @@ def test_method(Script):
context = def_._name._context context = def_._name._context
assert isinstance(context, BoundMethod), context assert isinstance(context, BoundMethod), context
assert isinstance(context._function, typeshed.FunctionStubContext), context assert isinstance(context._function, typeshed.FunctionStubContext), context
def_, = Script(code + '()').goto_definitions()
context = def_._name._context
assert isinstance(context, BoundMethod), context