diff --git a/jedi/api/refactoring/extract.py b/jedi/api/refactoring/extract.py index 1b826a32..f27fa7d7 100644 --- a/jedi/api/refactoring/extract.py +++ b/jedi/api/refactoring/extract.py @@ -266,7 +266,7 @@ def extract_function(inference_state, path, module_context, name, pos, until_pos if is_expression: replacement = function_call else: - replacement = _get_indentation(nodes[0]) + output_var_str + ' = ' + function_call + '\n' + replacement = output_var_str + ' = ' + function_call + '\n' replacement_dct = _replace(nodes, replacement, function_code, pos, insert_before_leaf, remaining_prefix) diff --git a/test/refactor/extract_function.py b/test/refactor/extract_function.py index 1e09c89a..b403d12a 100644 --- a/test/refactor/extract_function.py +++ b/test/refactor/extract_function.py @@ -211,3 +211,34 @@ def a(test, v3): y = a(test, v3) #raaaa y +# -------------------------------------------------- with-range-func-1 +import os +# comment1 +@dec +# comment2 +def x(v1): + #foo + #? 2 text {'new_name': 'a', 'until_line': 9, 'until_column': 5} + v2 = 2 + if 1: + x, y = os.listdir(v1 + v2 * v3) + #bar + return x, y +# ++++++++++++++++++++++++++++++++++++++++++++++++++ +import os +# comment1 +def a(v1, v2, v3): + v2 = 2 + if 1: + x, y = os.listdir(v1 + v2 * v3) + return x, y + + +@dec +# comment2 +def x(v1): + #foo + #? 2 text {'new_name': 'a', 'until_line': 9, 'until_column': 5} + x, y = a(v1, v2, v3) + #bar + return x, y