1
0
mirror of https://github.com/amix/vimrc synced 2025-06-23 06:35:01 +08:00

Updated plugins

This commit is contained in:
Amir
2020-04-25 21:56:16 -04:00
parent d98c510eee
commit fef069af24
114 changed files with 4018 additions and 988 deletions

View File

@ -158,8 +158,8 @@ function! s:find_start_of_block(lnum, types, skip, multiple) abort
else
let re_skip = ''
endif
let lnum = a:lnum
let last_indent = indent(lnum) + 1
let last_indent = indent(a:lnum) + 1
let lnum = a:lnum - 1
while lnum > 0 && last_indent > 0
let indent = indent(lnum)
if indent < last_indent
@ -260,7 +260,7 @@ function! s:indent_like_block(lnum)
endif
let [blocks, skip] = blocks_ignore
let indents = s:find_start_of_block(a:lnum - 1, blocks, skip, multiple)
let indents = s:find_start_of_block(a:lnum, blocks, skip, multiple)
if empty(indents)
return -1
endif

View File

@ -774,3 +774,23 @@ describe "elif after else" do
indent.should == 4
end
end
describe "elif after two ifs" do
before {
vim.feedkeys '\<ESC>ggdG'
}
it "keeps its indent to the outer if" do
vim.feedkeys 'iif 1:\<CR>if 2:\<CR>pass\<CR>elif 3:\<CR>pass\<CR>'
indent.should == 4
vim.feedkeys '\<Esc>'
indent.should == 0
proposed_indent.should == shiftwidth
vim.feedkeys 'ielif 4:'
indent.should == 0
proposed_indent.should == 0
vim.feedkeys '\<CR>'
indent.should == 4
proposed_indent.should == 4
end
end