All patches and comments are welcome. Please squash your changes to logical
commits before using git-format-patch and git-send-email to
patches@git.madduck.net.
If you'd read over the Git project's submission guidelines and adhered to them,
I'd be especially grateful.
The implementation clean up reintroduced a more severe
version of the bug. Plus, the test was slightly deficient
to catch the regression.
Problem
-------
Given two adjacent blocks where the 2nd block has
an equal or smaller indentation level compared to the 1st
block. If the 1st block does not end in a stop statement
it always sucks up the 2nd block.
This changes the meaning of code that already adheres to the
pep8 standard.
Solution
--------
Do not inherit indentation of the previous line if the current line
has less indentation but is valid.
let text = getline(lnum)
let start = s:find_start_of_multiline_statement(lnum)
let base = indent(start)
let text = getline(lnum)
let start = s:find_start_of_multiline_statement(lnum)
let base = indent(start)
+ let current = indent(lnum + 1)
" Jump to last character in previous line.
call cursor(lnum, len(text))
" Jump to last character in previous line.
call cursor(lnum, len(text))
+ " If this line is dedented and the number of indent spaces is valid
+ " (multiple of the indentation size), trust the user
+ let dedent_size = current - indent(a:lnum - 1)
+ if dedent_size < 0 && current % s:sw() == 0
+ return -1
+ endif
+
" In all other cases, line up with the start of the previous statement.
return base
endfunction
" In all other cases, line up with the start of the previous statement.
return base
endfunction
end
describe "when current line is dedented compared to previous line" do
end
describe "when current line is dedented compared to previous line" do
- before { vim.feedkeys 'i\<TAB>\<TAB>if x:\<CR>return True\<CR>\<ESC>' }
+ before { vim.feedkeys 'i\<TAB>\<TAB>if x:\<CR>y = True\<CR>\<ESC>' }
it "and current line has a valid indentation (Part 1)" do
vim.feedkeys '0i\<TAB>if y:'
proposed_indent.should == -1
it "and current line has a valid indentation (Part 1)" do
vim.feedkeys '0i\<TAB>if y:'
proposed_indent.should == -1