From ac7ce7c481cb7d9c6457df8be95ce64b8b2d5e69 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Sun, 26 Aug 2018 03:37:26 +0200 Subject: [PATCH] Start implementing overload function --- jedi/evaluate/__init__.py | 2 +- jedi/evaluate/arguments.py | 1 + jedi/evaluate/compiled/context.py | 10 ++++++---- jedi/evaluate/context/instance.py | 2 +- jedi/evaluate/context/klass.py | 6 +++--- jedi/evaluate/context/typing.py | 12 ++++++++++-- jedi/plugins/stdlib.py | 6 +++--- jedi/plugins/typeshed.py | 3 ++- 8 files changed, 27 insertions(+), 15 deletions(-) diff --git a/jedi/evaluate/__init__.py b/jedi/evaluate/__init__.py index 78aea1e1..2339e6a8 100644 --- a/jedi/evaluate/__init__.py +++ b/jedi/evaluate/__init__.py @@ -92,7 +92,7 @@ def _execute(context, arguments): debug.warning("no execution possible %s", context) return NO_CONTEXTS else: - context_set = func(arguments) + context_set = func(arguments=arguments) debug.dbg('execute result: %s in %s', context_set, context) return context_set diff --git a/jedi/evaluate/arguments.py b/jedi/evaluate/arguments.py index a1320fbb..b7937c66 100644 --- a/jedi/evaluate/arguments.py +++ b/jedi/evaluate/arguments.py @@ -4,6 +4,7 @@ from parso.python import tree from jedi._compatibility import zip_longest from jedi import debug +from jedi.evaluate.utils import to_list from jedi.evaluate import analysis from jedi.evaluate.lazy_context import LazyKnownContext, LazyKnownContexts, \ LazyTreeContext, get_merged_lazy_context diff --git a/jedi/evaluate/compiled/context.py b/jedi/evaluate/compiled/context.py index 0ad9631f..ea9519f0 100644 --- a/jedi/evaluate/compiled/context.py +++ b/jedi/evaluate/compiled/context.py @@ -54,19 +54,21 @@ class CompiledObject(Context): self.tree_node = faked_class @CheckAttribute() - def py__call__(self, params): + def py__call__(self, arguments): if self.tree_node is not None and self.tree_node.type == 'funcdef': from jedi.evaluate.context.function import FunctionContext return FunctionContext( self.evaluator, parent_context=self.parent_context, tree_node=self.tree_node - ).py__call__(params) + ).py__call__(arguments=arguments) if self.access_handle.is_class(): from jedi.evaluate.context import CompiledInstance - return ContextSet(CompiledInstance(self.evaluator, self.parent_context, self, params)) + return ContextSet( + CompiledInstance(self.evaluator, self.parent_context, self, arguments) + ) else: - return ContextSet.from_iterable(self._execute_function(params)) + return ContextSet.from_iterable(self._execute_function(arguments)) @CheckAttribute() def py__class__(self): diff --git a/jedi/evaluate/context/instance.py b/jedi/evaluate/context/instance.py index 69359cb4..eb7e393e 100644 --- a/jedi/evaluate/context/instance.py +++ b/jedi/evaluate/context/instance.py @@ -130,7 +130,7 @@ class AbstractInstanceContext(Context): def py__getitem__(self, index_context_set, contextualized_node): names = self.get_function_slot_names(u'__getitem__') if not names: - debug.warning('No __getitem__, cannot access the array.') + debug.warning('Found no __getitem__ on %s', self) return NO_CONTEXTS args = ValuesArguments([index_context_set]) diff --git a/jedi/evaluate/context/klass.py b/jedi/evaluate/context/klass.py index 21688ef6..3266215a 100644 --- a/jedi/evaluate/context/klass.py +++ b/jedi/evaluate/context/klass.py @@ -17,7 +17,7 @@ and others. Here's a list: ====================================== ======================================== **Method** **Description** -------------------------------------- ---------------------------------------- -py__call__(params: Array) On callable objects, returns types. +py__call__(arguments: Array) On callable objects, returns types. py__bool__() Returns True/False/None; None means that there's no certainty. py__bases__() Returns a list of base classes. @@ -168,9 +168,9 @@ class ClassContext(use_metaclass(CachedMetaClass, TreeContext)): else: return [LazyKnownContext(compiled.builtin_from_name(self.evaluator, u'object'))] - def py__call__(self, params): + def py__call__(self, arguments): from jedi.evaluate.context import TreeInstance - return ContextSet(TreeInstance(self.evaluator, self.parent_context, self, params)) + return ContextSet(TreeInstance(self.evaluator, self.parent_context, self, arguments)) def py__class__(self): return compiled.builtin_from_name(self.evaluator, u'type') diff --git a/jedi/evaluate/context/typing.py b/jedi/evaluate/context/typing.py index 5763e925..5c2499db 100644 --- a/jedi/evaluate/context/typing.py +++ b/jedi/evaluate/context/typing.py @@ -7,6 +7,7 @@ from jedi import debug from jedi.evaluate.compiled import builtin_from_name, CompiledObject from jedi.evaluate.base_context import ContextSet, NO_CONTEXTS, Context from jedi.evaluate.context.iterable import SequenceLiteralContext +from jedi.evaluate.arguments import repack_with_argument_clinic from jedi.evaluate.filters import FilterWrapper, NameWrapper, \ AbstractTreeName @@ -58,7 +59,7 @@ class TypingModuleName(NameWrapper): evaluator = self.parent_context.evaluator if name in (_PROXY_CLASS_TYPES + _TYPE_ALIAS_TYPES): yield TypingClassContext(self) - elif name == _PROXY_TYPES: + elif name in _PROXY_TYPES: yield TypingContext(self) elif name == 'runtime': # We don't want anything here, not sure what this function is @@ -75,7 +76,7 @@ class TypingModuleName(NameWrapper): yield builtin_from_name(evaluator, u'True') elif name == 'overload': # TODO implement overload - pass + yield OverloadFunction(self) elif name == 'cast': # TODO implement cast for c in self._wrapped_name.infer(): # Fuck my life Python 2 @@ -305,3 +306,10 @@ class TypeVar(Context): def __repr__(self): return '<%s: %s>' % (self.__class__.__name__, self._name) + + +class OverloadFunction(_BaseTypingContext): + @repack_with_argument_clinic('func, /') + def py__call__(self, func_context_set): + debug.warning('overload used') + return NO_CONTEXTS diff --git a/jedi/plugins/stdlib.py b/jedi/plugins/stdlib.py index c50f5637..1ba143e9 100644 --- a/jedi/plugins/stdlib.py +++ b/jedi/plugins/stdlib.py @@ -48,7 +48,7 @@ class StdlibPlugin(BasePlugin): def execute(self, callback): def wrapper(context, arguments): if isinstance(context, BoundMethod): - return callback(context, arguments) + return callback(context, arguments=arguments) debug.dbg('execute: %s %s', context, arguments) try: @@ -69,8 +69,8 @@ class StdlibPlugin(BasePlugin): except KeyError: pass else: - return func(self._evaluator, context, arguments) - return callback(context, arguments) + return func(self._evaluator, context, arguments=arguments) + return callback(context, arguments=arguments) return wrapper diff --git a/jedi/plugins/typeshed.py b/jedi/plugins/typeshed.py index 9b2cb837..9185c704 100644 --- a/jedi/plugins/typeshed.py +++ b/jedi/plugins/typeshed.py @@ -311,7 +311,8 @@ class StubModuleContext(_StubContextFilterMixin, ModuleContext): class StubClassContext(_StubContextFilterMixin, ClassContext): def __getattribute__(self, name): - if name == ('py__getitem__', 'py__simple_getitem__', 'py__bases__'): + if name in ('py__getitem__', 'py__simple_getitem__', 'py__bases__', + 'execute_annotation'): # getitem is always done in the stub class. return getattr(self.stub_context, name) return super(StubClassContext, self).__getattribute__(name)