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

Get a first classmethod extraction working

Browse Source
This commit is contained in:
Dave Halter
2020-02-23 00:40:31 +01:00
parent b7be5a4fe2
commit a7110a4e08
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jedi/api/refactoring.py
View File

@@ -8,6 +8,7 @@ from parso import split_lines
from jedi import debug
from jedi.api.exceptions import RefactoringError
from jedi.common.utils import indent_block
from jedi.parser_utils import function_is_classmethod, function_is_staticmethod
_EXPRESSION_PARTS = (
'or_test and_test not_test comparison '
@@ -380,8 +381,6 @@ def _is_not_extractable_syntax(node):
def extract_function(inference_state, path, module_context, name, pos, until_pos):
is_class_method = False
is_method = False
is_expression = True
nodes = _find_nodes(module_context.tree_node, pos, until_pos)
return_variables = []
@@ -405,13 +404,14 @@ def extract_function(inference_state, path, module_context, name, pos, until_pos
output_var_str = ', '.join(return_variables)
code_block += '\nreturn ' + output_var_str + '\n'
if not context.is_bound_method():
decorator = ''
if context.is_bound_method():
if function_is_classmethod(context.tree_node):
decorator = '@classmethod\n'
else:
code_block += '\n'
function_call = '%s(%s)' % (name, ', '.join(params))
decorator = ''
if is_class_method:
decorator = '@classmethod\n'
function_code = '%sdef %s:\n%s' % (decorator, function_call, indent_block(code_block))
if is_expression: