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

Directly importing FunctionContext.

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

3
jedi/api/classes.py
View File

@@ -17,8 +17,7 @@ from jedi.evaluate import compiled
from jedi.evaluate.filters import ParamName from jedi.evaluate.filters import ParamName
from jedi.evaluate.imports import ImportName from jedi.evaluate.imports import ImportName
from jedi.evaluate.context import instance from jedi.evaluate.context import instance
from jedi.evaluate.context.function import FunctionContext, FunctionExecutionContext from jedi.evaluate.context import ClassContext, FunctionContext, FunctionExecutionContext
from jedi.evaluate.context import ClassContext
from jedi.api.keywords import KeywordName from jedi.api.keywords import KeywordName

9
jedi/evaluate/__init__.py
View File

@@ -69,6 +69,7 @@ from parso.python import tree
import parso import parso
from jedi import debug from jedi import debug
from jedi import parser_utils
from jedi.evaluate.utils import unite from jedi.evaluate.utils import unite
from jedi.evaluate import imports from jedi.evaluate import imports
from jedi.evaluate import recursion from jedi.evaluate import recursion
@@ -76,15 +77,13 @@ from jedi.evaluate.cache import evaluator_function_cache
from jedi.evaluate import compiled from jedi.evaluate import compiled
from jedi.evaluate import helpers from jedi.evaluate import helpers
from jedi.evaluate.filters import TreeNameDefinition, ParamName from jedi.evaluate.filters import TreeNameDefinition, ParamName
from jedi.evaluate.context.iterable import CompForContext
from jedi.evaluate.context.instance import AnonymousInstance, BoundMethod
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.function import FunctionContext from jedi.evaluate.context import ClassContext, FunctionContext
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
from jedi import parser_utils
from jedi.evaluate.context import ClassContext
class Evaluator(object): class Evaluator(object):

2
jedi/evaluate/base_context.py
View File

@@ -242,7 +242,7 @@ class ContextSet(BaseContextSet):
return ContextSet.from_iterable(c.py__class__() for c in self._set) return ContextSet.from_iterable(c.py__class__() for c in self._set)
def iterate(self, contextualized_node=None): def iterate(self, contextualized_node=None):
from jedi.evaluate.context.lazy import get_merged_lazy_context from jedi.evaluate.lazy_context import get_merged_lazy_context
type_iters = [c.iterate(contextualized_node) for c in self._set] type_iters = [c.iterate(contextualized_node) for c in self._set]
for lazy_contexts in zip_longest(*type_iters): for lazy_contexts in zip_longest(*type_iters):
yield get_merged_lazy_context( yield get_merged_lazy_context(

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

@@ -1,3 +1,3 @@
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 from jedi.evaluate.context.function import FunctionContext, FunctionExecutionContext

2
jedi/evaluate/docstrings.py
View File

@@ -202,7 +202,7 @@ def _evaluate_for_statement_string(module_context, string):
except (AttributeError, IndexError): except (AttributeError, IndexError):
return [] return []
from jedi.evaluate.context.function import FunctionContext from jedi.evaluate.context import FunctionContext
function_context = FunctionContext( function_context = FunctionContext(
module_context.evaluator, module_context.evaluator,
module_context, module_context,

3
jedi/evaluate/syntax_tree.py
View File

@@ -17,9 +17,8 @@ from jedi.evaluate import helpers
from jedi.evaluate import analysis from jedi.evaluate import analysis
from jedi.evaluate import imports from jedi.evaluate import imports
from jedi.evaluate import param from jedi.evaluate import param
from jedi.evaluate.context import ClassContext from jedi.evaluate.context import ClassContext, FunctionContext
from jedi.evaluate.context import iterable from jedi.evaluate.context import iterable
from jedi.evaluate.context.function import FunctionContext
from jedi.evaluate.context.instance import TreeInstance, CompiledInstance from jedi.evaluate.context.instance 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