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

Import completion improvements.

Browse Source
This commit is contained in:
Dave Halter
2014-12-08 13:47:23 +01:00
parent 7cc2a07cd3
commit 6cc4d71822
3 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jedi/api/__init__.py
+16 -13
View File
@@ -131,30 +131,33 @@ class Script(object):
:rtype: list of :class:`classes.Completion`
"""
def get_completions(user_stmt, bs):
if user_stmt is None:
module = self._parser.module()
importer, only_modules = helpers.check_error_statements(
self._evaluator, module, self._pos
)
#print(importer.completion_names(self._evaluator, True))
if importer is not None:
names = importer.completion_names(self._evaluator, only_modules)
return [(name, module) for name in names]
elif isinstance(user_stmt, pr.Import):
module = self._parser.module()
importer, only_modules = helpers.check_error_statements(
self._evaluator, module, self._pos
)
completions = []
#print(importer.completion_names(self._evaluator, True))
if importer is not None:
names = importer.completion_names(self._evaluator, only_modules)
completions = [(name, module) for name in names]
if isinstance(user_stmt, pr.Import):
# TODO this paragraph is necessary, but not sure it works.
context = self._user_context.get_context()
next(context) # skip the path
if next(context) == 'from':
if False and next(context) == 'from':
# completion is just "import" if before stands from ..
return ((k, bs) for k in keywords.keyword_names('import'))
completions += ((k, bs) for k in keywords.keyword_names('import'))
module = self._parser.module()
name = user_stmt.name_for_position(self._pos)
imp = imports.ImportWrapper(self._evaluator, name)
return [(n, module) for n in imp.get_defined_names()]
completions += [(n, module) for n in imp.completions()]
if importer or isinstance(user_stmt, pr.Import):
return completions
return self._simple_complete(path, dot, like)
debug.speed('completions start')
path = self._user_context.get_path_until_cursor()
# dots following an int are not the start of a completion but a float