VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2026-01-31 04:25:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved keyword completion around to get it working in all cases.

Browse Source
This commit is contained in:
Dave Halter
2014-12-08 15:52:05 +01:00
parent 94ea2c1096
commit 51d309b0a8
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
jedi/api/__init__.py
View File

@@ -131,6 +131,8 @@ class Script(object):
:rtype: list of :class:`classes.Completion`
"""
def get_completions(user_stmt, bs):
# TODO this closure is ugly. it also doesn't work with
# simple_complete (used for Interpreter), somehow redo.
module = self._parser.module()
names, level, only_modules = helpers.check_error_statements(module, self._pos)
completions = []
@@ -154,10 +156,14 @@ class Script(object):
imp = imports.ImportWrapper(self._evaluator, name)
completions += [(n, module) for n in imp.completion_names()]
if names or isinstance(user_stmt, pr.Import):
return completions
return self._simple_complete(path, dot, like)
if not names and not isinstance(user_stmt, pr.Import):
if not path and not dot:
# add keywords
completions += ((k, b) for k in keywords.keyword_names(all=True))
# TODO delete? We should search for valid parser
# transformations.
completions += self._simple_complete(path, dot, like)
return completions
debug.speed('completions start')
path = self._user_context.get_path_until_cursor()
@@ -186,12 +192,6 @@ class Script(object):
if p._definition.stars == 0: # no *args/**kwargs
completions.append((p._name, p._name))
if not path and not isinstance(user_stmt, pr.Import):
# add keywords
completions += ((k, b) for k in keywords.keyword_names(all=True))
# TODO delete? We should search for valid parser
# transformations.
needs_dot = not dot and path
comps = []