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

Completion now also uses only NameParts as its _definition attribute.

Browse Source
This commit is contained in:
Dave Halter
2014-09-10 20:12:19 +02:00
parent 8f892e3922
commit 58526e2302
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
jedi/api/classes.py
View File

@@ -166,7 +166,7 @@ class BaseDefinition(object):
path.insert(0, x) path.insert(0, x)
if not isinstance(self._definition, keywords.Keyword): if not isinstance(self._definition, keywords.Keyword):
par = self._definition par = self._definition.get_definition()
while par is not None: while par is not None:
if isinstance(par, pr.Import): if isinstance(par, pr.Import):
insert_nonnone(par.namespace) insert_nonnone(par.namespace)
@@ -405,8 +405,7 @@ class Completion(BaseDefinition):
provide additional information about a completion. provide additional information about a completion.
""" """
def __init__(self, evaluator, name, needs_dot, like_name_length, base): def __init__(self, evaluator, name, needs_dot, like_name_length, base):
super(Completion, self).__init__(evaluator, name.get_definition(), super(Completion, self).__init__(evaluator, name, name.start_pos)
name.start_pos)
self._name = name self._name = name
self._needs_dot = needs_dot self._needs_dot = needs_dot
@@ -489,7 +488,7 @@ class Completion(BaseDefinition):
return '' return ''
t = self.type t = self.type
if t == 'statement' or t == 'import': if t == 'statement' or t == 'import':
desc = self._definition.get_code(False) desc = self._definition.get_definition().get_code(False)
else: else:
desc = '.'.join(unicode(p) for p in self._path()) desc = '.'.join(unicode(p) for p in self._path())
@@ -507,7 +506,7 @@ class Completion(BaseDefinition):
the ``foo.docstring(fast=False)`` on every object, because it the ``foo.docstring(fast=False)`` on every object, because it
parses all libraries starting with ``a``. parses all libraries starting with ``a``.
""" """
definition = self._definition definition = self._definition.get_definition()
if isinstance(definition, pr.Import): if isinstance(definition, pr.Import):
i = imports.ImportWrapper(self._evaluator, definition) i = imports.ImportWrapper(self._evaluator, definition)
if len(i.import_path) > 1 or not fast: if len(i.import_path) > 1 or not fast:
@@ -527,8 +526,9 @@ class Completion(BaseDefinition):
The type of the completion objects. Follows imports. For a further The type of the completion objects. Follows imports. For a further
description, look at :attr:`jedi.api.classes.BaseDefinition.type`. description, look at :attr:`jedi.api.classes.BaseDefinition.type`.
""" """
if isinstance(self._definition, pr.Import): definition = self._definition.get_definition()
i = imports.ImportWrapper(self._evaluator, self._definition) if isinstance(definition, pr.Import):
i = imports.ImportWrapper(self._evaluator, definition)
if len(i.import_path) <= 1: if len(i.import_path) <= 1:
return 'module' return 'module'
@@ -544,8 +544,9 @@ class Completion(BaseDefinition):
def _follow_statements_imports(self): def _follow_statements_imports(self):
# imports completion is very complicated and needs to be treated # imports completion is very complicated and needs to be treated
# separately in Completion. # separately in Completion.
if self._definition.isinstance(pr.Import) and self._definition.alias is None: definition = self._definition.get_definition()
i = imports.ImportWrapper(self._evaluator, self._definition, True) if definition.isinstance(pr.Import) and definition.alias is None:
i = imports.ImportWrapper(self._evaluator, definition, True)
import_path = i.import_path + (unicode(self._name),) import_path = i.import_path + (unicode(self._name),)
try: try:
return imports.get_importer(self._evaluator, import_path, return imports.get_importer(self._evaluator, import_path,