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

start using a specialised param class for CallDef

Browse Source
This commit is contained in:
Dave Halter
2014-03-13 11:16:00 +01:00
parent c71247e9c9
commit a835fcd0ce
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
jedi/api/classes.py
View File

@@ -436,24 +436,30 @@ class Definition(BaseDefinition):
if isinstance(d, compiled.CompiledObject): if isinstance(d, compiled.CompiledObject):
return d.name return d.name
elif isinstance(d, pr.Name): elif isinstance(d, pr.Name):
return d.names[-1] if d.names else None return unicode(d.names[-1]) if d.names else None
elif isinstance(d, iterable.Array): elif isinstance(d, iterable.Array):
return unicode(d.type) name = d.type
elif isinstance(d, (pr.Class, er.Class, er.Instance, elif isinstance(d, (pr.Class, er.Class, er.Instance,
er.Function, pr.Function)): er.Function, pr.Function)):
return unicode(d.name) name = d.name
elif isinstance(d, pr.Module): elif isinstance(d, pr.Module):
return self.module_name name = self.module_name
elif isinstance(d, pr.Import): elif isinstance(d, pr.Import):
try: try:
return d.get_defined_names()[0].names[-1] name = d.get_defined_names()[0].names[-1]
except (AttributeError, IndexError): except (AttributeError, IndexError):
return None return None
elif isinstance(d, pr.Statement): elif isinstance(d, pr.Statement):
try: try:
return d.assignment_details[0][1].values[0][0].name.names[-1] name = d.assignment_details[0][1].values[0][0].name.names[-1]
except IndexError: except IndexError:
if isinstance(d, pr.Param):
try:
name = d.expression_list()[0].name.names[-1]
except IndexError:
pass
return None return None
return unicode(name)
@property @property
def description(self): def description(self):
@@ -551,16 +557,17 @@ class CallDef(object):
def params(self): def params(self):
if self._executable.isinstance(er.Function): if self._executable.isinstance(er.Function):
if isinstance(self._executable, er.InstanceElement): if isinstance(self._executable, er.InstanceElement):
return self._executable.params[1:] params = self._executable.params[1:]
return self._executable.params return self._executable.params
elif self._executable.isinstance(er.compiled.CompiledObject): elif self._executable.isinstance(er.compiled.CompiledObject):
return self._executable.params params = self._executable.params
else: else:
try: try:
sub = self._executable.get_subscope_by_name('__init__') sub = self._executable.get_subscope_by_name('__init__')
return sub.params[1:] # ignore self params = sub.params[1:] # ignore self
except KeyError: except KeyError:
return [] return []
return [Param(p) for p in params]
@property @property
def bracket_start(self): def bracket_start(self):
@@ -583,3 +590,8 @@ class CallDef(object):
def __repr__(self): def __repr__(self):
return '<%s: %s index %s>' % (type(self).__name__, self._executable, return '<%s: %s index %s>' % (type(self).__name__, self._executable,
self.index) self.index)
class Param(Definition):
def get_code(self):
return self._definition.get_code()