VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

Common instance objects are now directly accessible

Browse Source
This commit is contained in:
Dave Halter
2017-09-30 18:19:25 +02:00
parent 604ca65a9b
commit b6bb251c96
6 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jedi/evaluate/__init__.py
View File

@@ -79,9 +79,9 @@ from jedi.evaluate import helpers
from jedi.evaluate.filters import TreeNameDefinition, ParamName from jedi.evaluate.filters import TreeNameDefinition, ParamName
from jedi.evaluate.base_context import ContextualizedName, ContextualizedNode, \ from jedi.evaluate.base_context import ContextualizedName, ContextualizedNode, \
ContextSet, NO_CONTEXTS, iterate_contexts ContextSet, NO_CONTEXTS, iterate_contexts
from jedi.evaluate.context import ClassContext, FunctionContext from jedi.evaluate.context import ClassContext, FunctionContext, \
AnonymousInstance, BoundMethod
from jedi.evaluate.context.iterable import CompForContext from jedi.evaluate.context.iterable import CompForContext
from jedi.evaluate.context.instance import AnonymousInstance, BoundMethod
from jedi.evaluate.syntax_tree import eval_trailer, eval_expr_stmt, \ from jedi.evaluate.syntax_tree import eval_trailer, eval_expr_stmt, \
eval_node, check_tuple_assignments eval_node, check_tuple_assignments

2
jedi/evaluate/compiled/__init__.py
View File

@@ -83,7 +83,7 @@ class CompiledObject(Context):
@CheckAttribute @CheckAttribute
def py__call__(self, params): def py__call__(self, params):
if inspect.isclass(self.obj): if inspect.isclass(self.obj):
from jedi.evaluate.context.instance import CompiledInstance 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, params))
else: else:
return ContextSet.from_iterable(self._execute_function(params)) return ContextSet.from_iterable(self._execute_function(params))

2
jedi/evaluate/context/__init__.py
View File

@@ -1,3 +1,5 @@
from jedi.evaluate.context.module import ModuleContext from jedi.evaluate.context.module import ModuleContext
from jedi.evaluate.context.klass import ClassContext from jedi.evaluate.context.klass import ClassContext
from jedi.evaluate.context.function import FunctionContext, FunctionExecutionContext from jedi.evaluate.context.function import FunctionContext, FunctionExecutionContext
from jedi.evaluate.context.instance import AnonymousInstance, BoundMethod, \
CompiledInstance, AbstractInstanceContext, TreeInstance

4
jedi/evaluate/context/klass.py
View File

@@ -142,14 +142,14 @@ class ClassContext(use_metaclass(CachedMetaClass, TreeContext)):
return [LazyKnownContext(compiled.create(self.evaluator, object))] return [LazyKnownContext(compiled.create(self.evaluator, object))]
def py__call__(self, params): def py__call__(self, params):
from jedi.evaluate.context.instance import TreeInstance 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, params))
def py__class__(self): def py__class__(self):
return compiled.create(self.evaluator, type) return compiled.create(self.evaluator, type)
def get_params(self): def get_params(self):
from jedi.evaluate.context.instance import AnonymousInstance from jedi.evaluate.context import AnonymousInstance
anon = AnonymousInstance(self.evaluator, self.parent_context, self) anon = AnonymousInstance(self.evaluator, self.parent_context, self)
return [AnonymousInstanceParamName(anon, param.name) for param in self.funcdef.get_params()] return [AnonymousInstanceParamName(anon, param.name) for param in self.funcdef.get_params()]

2
jedi/evaluate/finder.py
View File

@@ -19,7 +19,7 @@ from parso.python import tree
from parso.tree import search_ancestor from parso.tree import search_ancestor
from jedi import debug from jedi import debug
from jedi import settings from jedi import settings
from jedi.evaluate.context.instance import AbstractInstanceContext from jedi.evaluate.context import AbstractInstanceContext
from jedi.evaluate import compiled from jedi.evaluate import compiled
from jedi.evaluate import analysis from jedi.evaluate import analysis
from jedi.evaluate import flow_analysis from jedi.evaluate import flow_analysis

2
jedi/evaluate/syntax_tree.py
View File

@@ -19,7 +19,7 @@ from jedi.evaluate import imports
from jedi.evaluate import param from jedi.evaluate import param
from jedi.evaluate.context import ClassContext, FunctionContext from jedi.evaluate.context import ClassContext, FunctionContext
from jedi.evaluate.context import iterable from jedi.evaluate.context import iterable
from jedi.evaluate.context.instance import TreeInstance, CompiledInstance from jedi.evaluate.context import TreeInstance, CompiledInstance
from jedi.evaluate.finder import NameFinder from jedi.evaluate.finder import NameFinder
from jedi.evaluate.helpers import is_string, is_literal, is_number, is_compiled from jedi.evaluate.helpers import is_string, is_literal, is_number, is_compiled