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

refactoring exception fixes

Browse Source
This commit is contained in:
David Halter
2013-02-21 20:02:10 +04:30
parent d05018757d
commit 78fd8372a5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jedi/refactoring.py
View File

@@ -116,7 +116,7 @@ def extract(script, new_name):
arr, index = helpers.array_for_pos(user_stmt, pos)
if arr is not None:
s = arr.start_pos[0], arr.start_pos[1] + 1
positions = [s] + arr.arr_el_pos + [arr.end_pos]
positions = [s] + [a.start_pos for a in arr] + [arr.end_pos]
start_pos = positions[index]
end_pos = positions[index + 1][0], positions[index + 1][1] - 1
@@ -179,14 +179,14 @@ def inline(script):
reverse=True)
commands = stmt.get_commands()
# don't allow multiline refactorings for now.
assert commands.start_pos[0] == commands.end_pos[0]
index = commands.start_pos[0] - 1
assert stmt.start_pos[0] == stmt.end_pos[0]
index = stmt.start_pos[0] - 1
line = new_lines[index]
replace_str = line[commands.start_pos[1]:commands.end_pos[1] + 1]
replace_str = line[stmt.start_pos[1]:stmt.end_pos[1] + 1]
replace_str = replace_str.strip()
# tuples need parentheses
if len(commands.values) > 1:
if len(commands) > 1:
replace_str = '(%s)' % replace_str
# if it's the only assignment, remove the statement