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

Simplify some more call signature things

Browse Source
This commit is contained in:
Dave Halter
2018-11-11 22:44:32 +01:00
parent a73c7092bb
commit 986c69abea
3 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jedi/api/__init__.py
View File

@@ -345,12 +345,11 @@ class Script(object):
) )
debug.speed('func_call followed') debug.speed('func_call followed')
return [classes.CallSignature(signature._context, signature, return [classes.CallSignature(self._evaluator, signature,
call_signature_details.bracket_leaf.start_pos, call_signature_details.bracket_leaf.start_pos,
call_signature_details.call_index, call_signature_details.call_index,
call_signature_details.keyword_name_str) call_signature_details.keyword_name_str)
for definition in definitions for signature in definitions.get_signatures()]
for signature in definition.get_signatures()]
def _analysis(self): def _analysis(self):
self._evaluator.is_analysis = True self._evaluator.is_analysis = True

4
jedi/api/classes.py
View File

@@ -574,8 +574,8 @@ class CallSignature(Definition):
It knows what functions you are currently in. e.g. `isinstance(` would It knows what functions you are currently in. e.g. `isinstance(` would
return the `isinstance` function. without `(` it would return nothing. return the `isinstance` function. without `(` it would return nothing.
""" """
def __init__(self, definition, signature, bracket_start_pos, index, key_name_str): def __init__(self, evaluator, signature, bracket_start_pos, index, key_name_str):
super(CallSignature, self).__init__(definition.evaluator, definition.name) super(CallSignature, self).__init__(evaluator, signature.name)
self._index = index self._index = index
self._key_name_str = key_name_str self._key_name_str = key_name_str
self._bracket_start_pos = bracket_start_pos self._bracket_start_pos = bracket_start_pos

14
jedi/evaluate/signature.py
View File

@@ -8,7 +8,7 @@ class AbstractSignature(object):
@abstractproperty @abstractproperty
def name(self): def name(self):
raise NotImplementedError return self._context.name
def annotation(self): def annotation(self):
return None return None
@@ -31,18 +31,6 @@ class TreeSignature(AbstractSignature):
super(TreeSignature, self).__init__(context, is_bound) super(TreeSignature, self).__init__(context, is_bound)
self._function_context = function_context or context self._function_context = function_context or context
@property
def name(self):
name = self._function_context.name
if name.string_name == '__init__':
try:
class_context = self._function_context.class_context
except AttributeError:
pass
else:
return class_context.name
return name
def bind(self, context): def bind(self, context):
return TreeSignature(context, self._function_context, is_bound=True) return TreeSignature(context, self._function_context, is_bound=True)