1
0
forked from VimPlug/jedi

lots of small bugfixes

This commit is contained in:
Dave Halter
2014-01-12 02:15:59 +01:00
parent b93c761db6
commit 0bff729294
5 changed files with 14 additions and 10 deletions

View File

@@ -138,8 +138,10 @@ class BaseDefinition(object):
"""
# generate the type
stripped = self._definition
if isinstance(self._definition, er.InstanceElement):
stripped = self._definition.var
if isinstance(stripped, compiled.PyObject):
return stripped.type()
if isinstance(stripped, er.InstanceElement):
stripped = stripped.var
if isinstance(stripped, pr.Name):
stripped = stripped.parent
return type(stripped).__name__.lower()
@@ -438,7 +440,9 @@ class Definition(BaseDefinition):
if isinstance(d, er.InstanceElement):
d = d.var
if isinstance(d, pr.Name):
if isinstance(d, compiled.PyObject):
return d.name
elif isinstance(d, pr.Name):
return d.names[-1] if d.names else None
elif isinstance(d, iterable.Array):
return unicode(d.type)
@@ -457,7 +461,6 @@ class Definition(BaseDefinition):
return d.assignment_details[0][1].values[0][0].name.names[-1]
except IndexError:
return None
return None
@property
def description(self):