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

renaming and goto work now +/-

Browse Source
This commit is contained in:
David Halter
2012-09-22 00:15:32 +02:00
parent 32b51e0c68
commit fd760f1870
4 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
jedi/imports.py
View File

@@ -11,6 +11,7 @@ import modules
import debug
import parsing
import evaluate
import itertools
class ModuleNotFound(Exception):
@@ -138,17 +139,22 @@ class ImportPath(object):
debug.warning('Module not found: ' + str(self.import_stmt))
return []
scopes = [scope]
scopes += itertools.chain.from_iterable(
remove_star_imports(s) for s in scopes)
if len(rest) > 1 or rest and self.is_like_search:
scopes = []
elif rest:
scopes = list(evaluate.follow_path(iter(rest), scope))
else:
scopes = [scope]
new = []
for scope in scopes:
new += remove_star_imports(scope)
scopes += new
if is_goto:
#scopes = list(evaluate.follow_path(iter(rest), scope))
#scopes = evaluate.goto3_dini_mueter(rest)
scopes = itertools.chain.from_iterable(
evaluate.get_scopes_for_name(s, rest[0], is_goto=True)
for s in scopes)
else:
scopes = evaluate.follow_path(iter(rest), scope)
scopes = list(scopes)
if self.is_nested_import():
scopes.append(self.get_nested_import(scope))