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

Docstrings

Browse Source
This commit is contained in:
Dave Halter
2020-02-25 10:27:36 +01:00
parent 89398e5c87
commit ff60c0af87
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jedi/api/refactoring.py
+10 -3
View File
@@ -228,7 +228,7 @@ def extract_variable(grammar, path, module_node, name, pos, until_pos):
nodes = _find_nodes(module_node, pos, until_pos) nodes = _find_nodes(module_node, pos, until_pos)
debug.dbg('Extracting nodes: %s', nodes) debug.dbg('Extracting nodes: %s', nodes)
is_expression, message = _is_expression_with_issue(nodes) is_expression, message = _is_expression_with_error(nodes)
if not is_expression: if not is_expression:
raise RefactoringError(message) raise RefactoringError(message)
@@ -237,7 +237,10 @@ def extract_variable(grammar, path, module_node, name, pos, until_pos):
return Refactoring(grammar, file_to_node_changes) return Refactoring(grammar, file_to_node_changes)
def _is_expression_with_issue(nodes): def _is_expression_with_error(nodes):
"""
Returns a tuple (is_expression, error_string).
"""
if any(node.type == 'name' and node.is_definition() for node in nodes): if any(node.type == 'name' and node.is_definition() for node in nodes):
return False, 'Cannot extract a name that defines something' return False, 'Cannot extract a name that defines something'
@@ -247,6 +250,10 @@ def _is_expression_with_issue(nodes):
def _find_nodes(module_node, pos, until_pos): def _find_nodes(module_node, pos, until_pos):
"""
Looks up a module and tries to find the appropriate amount of nodes that
are in there.
"""
start_node = module_node.get_leaf_for_position(pos, include_prefixes=True) start_node = module_node.get_leaf_for_position(pos, include_prefixes=True)
if until_pos is None: if until_pos is None:
@@ -398,7 +405,7 @@ def _is_not_extractable_syntax(node):
def extract_function(inference_state, path, module_context, name, pos, until_pos): def extract_function(inference_state, path, module_context, name, pos, until_pos):
nodes = _find_nodes(module_context.tree_node, pos, until_pos) nodes = _find_nodes(module_context.tree_node, pos, until_pos)
is_expression, _ = _is_expression_with_issue(nodes) is_expression, _ = _is_expression_with_error(nodes)
context = module_context.create_context(nodes[0]) context = module_context.create_context(nodes[0])
is_bound_method = context.is_bound_method() is_bound_method = context.is_bound_method()
params, return_variables = list(_find_inputs_and_outputs(context, nodes)) params, return_variables = list(_find_inputs_and_outputs(context, nodes))