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

Usages/imports cleanup.

Browse Source
This commit is contained in:
Dave Halter
2014-12-18 03:22:46 +01:00
parent 1fb13837c4
commit 64ebfb0644
2 changed files with 1 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
jedi/api/usages.py
View File

@@ -1,4 +1,4 @@
from jedi._compatibility import u, unicode
from jedi._compatibility import unicode
from jedi.api import classes
from jedi.parser import tree as pr
from jedi.evaluate import imports
@@ -18,42 +18,6 @@ def usages(evaluator, definition_names, mods):
result.append((module, d.start_pos))
return result
def check_call_for_usage(call):
stmt = call.parent
while not stmt.parent.is_scope():
stmt = stmt.parent
# New definition, call cannot be a part of stmt
if call.next is None and call.name in stmt.get_defined_names():
# Class params are not definitions (like function params). They
# are super classes, that need to be resolved.
if not (isinstance(stmt, pr.Param) and isinstance(stmt.parent, pr.Class)):
return
follow = [] # There might be multiple search_name's in one call_path
call_path = list(call.generate_call_path())
for i, name in enumerate(call_path):
# name is `pr.Name`.
if u(name) == search_name:
follow.append(call_path[:i + 1])
for call_path in follow:
follow_res = evaluator.goto(call.parent, call_path)
search = call_path[-1]
# names can change (getattr stuff), therefore filter names that
# don't match `search`.
# TODO add something like that in the future - for now usages are
# completely broken anyway.
#follow_res = [r for r in follow_res if str(r) == search]
#print search.start_pos,search_name.start_pos
#print follow_res, search, search_name, [(r, r.start_pos) for r in follow_res]
follow_res = usages_add_import_modules(evaluator, follow_res)
compare_follow_res = compare_array(follow_res)
# compare to see if they match
if any(r in compare_definitions for r in compare_follow_res):
yield classes.Definition(evaluator, search)
search_name = unicode(list(definition_names)[0])
compare_definitions = compare_array(definition_names)
mods |= set([d.get_parent_until() for d in definition_names])

13
jedi/evaluate/imports.py
View File

@@ -71,19 +71,6 @@ class ImportWrapper(pr.Base):
self._import = name.get_parent_until(pr.Import)
self.import_path = self._import.path_for_name(name)
def completion_names(self):
# The import path needs to be reduced by one, because we're completing.
import_path = self.import_path[:-1]
module = self._import.get_parent_until()
importer = get_importer(self._evaluator, tuple(import_path),
module, self._import.level)
if isinstance(self._import, pr.ImportFrom):
c = self._import.children
only_modules = c[c.index('import')].start_pos >= self._name.start_pos
else:
only_modules = True
return importer.completion_names(self._evaluator, only_modules)
@memoize_default()
def follow(self, is_goto=False):
if self._evaluator.recursion_detector.push_stmt(self._import):