diff --git a/jedi/api/__init__.py b/jedi/api/__init__.py index 48d7f304..3d6663fc 100644 --- a/jedi/api/__init__.py +++ b/jedi/api/__init__.py @@ -25,7 +25,6 @@ from jedi.api import classes from jedi.api import interpreter from jedi.api import usages from jedi.api import helpers -from jedi.api import inference from jedi.api.completion import Completion from jedi.evaluate import Evaluator from jedi.evaluate import representation as er diff --git a/jedi/api/completion.py b/jedi/api/completion.py index 00d1f5bf..9e1b3144 100644 --- a/jedi/api/completion.py +++ b/jedi/api/completion.py @@ -59,7 +59,6 @@ class Completion: self._evaluator = evaluator self._parser = parser self._module = evaluator.wrap(parser.module()) - self._user_context = user_context self._source = user_context.source self._pos = position self._call_signatures_method = call_signatures_method @@ -182,7 +181,7 @@ class Completion: return [] else: scopes = list(inference.type_inference( - self._evaluator, self._parser, self._user_context, + self._evaluator, self._parser, self._pos, completion_parts.path )) completion_names = [] diff --git a/jedi/api/helpers.py b/jedi/api/helpers.py index 4f92b09f..5fcf3362 100644 --- a/jedi/api/helpers.py +++ b/jedi/api/helpers.py @@ -5,7 +5,6 @@ import re from collections import namedtuple from jedi import common -from jedi.evaluate import imports from jedi.evaluate.helpers import call_of_leaf from jedi import parser from jedi.parser import tokenize, token @@ -29,19 +28,6 @@ def sorted_definitions(defs): return sorted(defs, key=lambda x: (x.module_path or '', x.line or 0, x.column or 0)) -def get_on_import_stmt(evaluator, user_context, user_stmt, is_like_search=False): - """ - Resolve the user statement, if it is an import. Only resolve the - parts until the user position. - """ - name = user_stmt.name_for_position(user_context.position) - if name is None: - return None, None - - i = imports.ImportWrapper(evaluator, name) - return i, name - - def _get_code(code, start_pos, end_pos): """ :param code_start_pos: is where the code starts. diff --git a/jedi/api/inference.py b/jedi/api/inference.py index 84ef1815..5f82daee 100644 --- a/jedi/api/inference.py +++ b/jedi/api/inference.py @@ -5,15 +5,9 @@ because we still want to infer types where the syntax is invalid. from jedi import debug from jedi.parser import Parser, ParseError from jedi.evaluate.cache import memoize_default -from jedi.api import helpers -def goto_checks(evaluator, parser, user_context, position, dotted_path, follow_types=False): - module = evaluator.wrap(parser.module()) - stack = helpers.get_stack_at_position(evaluator.grammar, self._source, module, position) - stack - -def type_inference(evaluator, parser, user_context, position, dotted_path): +def type_inference(evaluator, parser, position, dotted_path): """ Base for completions/goto. Basically it returns the resolved scopes under cursor.