VimPlug/delimitMate
1
0
Fork 0
mirror of https://github.com/Raimondi/delimitMate.git synced 2025-12-06 20:54:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Consider indentation with BS on empty expanded CR.

Browse Source
This commit is contained in:
Israel Chauca Fuentes
2012-03-31 16:56:31 -04:00
parent 6bb98110b4
commit a9f51531d9
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
autoload/delimitMate.vim
View File

@@ -75,18 +75,17 @@ function! delimitMate#GetCharFromCursor(...) "{{{
return matchstr(line, '.\ze'.repeat('.', pos).'$')
endfunction "delimitMate#GetCharFromCursor }}}
function! delimitMate#IsCRExpansion() " {{{
function! delimitMate#IsCRExpansion(...) " {{{
let nchar = getline(line('.')-1)[-1:]
let schar = getline(line('.')+1)[:0]
" TODO: Consider whitespace?
let isEmpty = getline('.') == ""
if index(b:_l_delimitMate_left_delims, nchar) > -1 &&
\ index(b:_l_delimitMate_left_delims, nchar) == index(b:_l_delimitMate_right_delims, schar) &&
\ isEmpty
let schar = matchstr(getline(line('.')+1), '^\s*\zs\S')
let isEmpty = a:0 ? getline('.') =~ '^\s*$' : empty(getline('.'))
if index(b:_l_delimitMate_left_delims, nchar) > -1
\ && index(b:_l_delimitMate_left_delims, nchar) == index(b:_l_delimitMate_right_delims, schar)
\ && isEmpty
return 1
elseif index(b:_l_delimitMate_quotes_list, nchar) > -1 &&
\ index(b:_l_delimitMate_quotes_list, nchar) == index(b:_l_delimitMate_quotes_list, schar) &&
\ isEmpty
elseif index(b:_l_delimitMate_quotes_list, nchar) > -1
\ && index(b:_l_delimitMate_quotes_list, nchar) == index(b:_l_delimitMate_quotes_list, schar)
\ && isEmpty
return 1
else
return 0
@@ -453,7 +452,7 @@ function! delimitMate#BS() " {{{
return "\<BS>" . delimitMate#Del()
endif
if delimitMate#IsCRExpansion()
return "\<BS>\<Del>"
return "\<BS>" . repeat("\<Del>", len(matchstr(getline(line('.') + 1), '^\s*\S')))
endif
return "\<BS>"
endfunction " }}} delimitMate#BS()

6
test/expand_cr.txt
View File

@@ -18,3 +18,9 @@ exec "normal i(\<CR>test)x"
test
)x
--------------------------------------------------------------------------------
# Consider indentation with BS inside an empty CR expansion.
%d
exec "normal i(\<CR>\<BS>x"
================================================================================
(x)
--------------------------------------------------------------------------------