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

Modules also use a NamePart as a name, now.

Browse Source
This commit is contained in:
Dave Halter
2014-09-22 12:52:48 +02:00
parent 779618c08b
commit c4e45916c6
6 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
jedi/api/__init__.py
View File

@@ -180,7 +180,8 @@ class Script(object):
comp_dct = {}
for c, s in set(completions):
# TODO Remove this line. c should be a namepart even before that.
c = c.names[-1]
if isinstance(c, pr.Name):
c = c.names[-1]
n = str(c)
if settings.case_insensitive_completion \
and n.lower().startswith(like.lower()) \
@@ -189,7 +190,7 @@ class Script(object):
if isinstance(c.parent.parent, (pr.Function, pr.Class)):
# TODO I think this is a hack. It should be an
# er.Function/er.Class before that.
c = er.wrap(self._evaluator, c.parent.parent).name.names[-1]
c = er.wrap(self._evaluator, c.parent.parent).name
new = classes.Completion(self._evaluator, c, needs_dot, len(like), s)
k = (new.name, new.complete) # key
if k in comp_dct and settings.no_completion_duplicates:
@@ -455,7 +456,7 @@ class Script(object):
if next(context) in ('class', 'def'):
# The cursor is on a class/function name.
user_scope = self._parser.user_scope()
definitions = set([user_scope.name.names[-1]])
definitions = set([user_scope.name])
elif isinstance(user_stmt, pr.Import):
s, name_part = helpers.get_on_import_stmt(self._evaluator,
self._user_context, user_stmt)