VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-15 18:17:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

use _follow_statements_imports also in the BaseDefinition.params

Browse Source
This commit is contained in:
Dave Halter
2014-04-02 11:05:32 +02:00
parent 7763192850
commit dfd2b202ff
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
jedi/api/classes.py
View File

@@ -293,21 +293,18 @@ class BaseDefinition(object):
return '.'.join(path if path[0] else path[1:])
def _is_callable(self):
@memoize_default()
def _follow_statements_imports(self):
stripped = self._definition
if isinstance(stripped, pr.Name):
stripped = stripped.parent
return stripped.is_callable()
@memoize_default()
def _follow_statements_imports(self):
if self._definition.isinstance(pr.Statement):
return self._evaluator.eval_statement(self._definition)
elif self._definition.isinstance(pr.Import):
return imports.strip_imports(self._evaluator, [self._definition])
if stripped.isinstance(pr.Statement):
return self._evaluator.eval_statement(stripped)
elif stripped.isinstance(pr.Import):
return imports.strip_imports(self._evaluator, [stripped])
else:
return [self._definition]
return [stripped]
@property
@memoize_default()
@@ -316,19 +313,21 @@ class BaseDefinition(object):
Raises an ``AttributeError``if the definition is not callable.
Otherwise returns a list of `Definition` that represents the params.
"""
if not self._is_callable():
followed = self._follow_statements_imports()
if not followed or not followed[0].is_callable():
raise AttributeError()
followed = followed[0] # only check the first one.
if self._definition.isinstance(er.Function):
if isinstance(self._definition, er.InstanceElement):
params = self._definition.params[1:]
if followed.isinstance(er.Function):
if isinstance(followed, er.InstanceElement):
params = followed.params[1:]
else:
params = self._definition.params
elif self._definition.isinstance(er.compiled.CompiledObject):
params = self._definition.params
params = followed.params
elif followed.isinstance(er.compiled.CompiledObject):
params = followed.params
else:
try:
sub = self._definition.get_subscope_by_name('__init__')
sub = followed.get_subscope_by_name('__init__')
params = sub.params[1:] # ignore self
except KeyError:
return []