Add jump_expansion

This commit is contained in:
Israel Chauca Fuentes
2017-02-10 19:55:02 -05:00
parent 015e0efe53
commit 6fddbc5568
2 changed files with 13 additions and 6 deletions
+11 -1
View File
@@ -5,6 +5,7 @@ let s:defaults.delimitMate_quotes = ['"', "'", '`']
let s:defaults.delimitMate_enabled = 1 let s:defaults.delimitMate_enabled = 1
let s:defaults.delimitMate_autoclose = 1 let s:defaults.delimitMate_autoclose = 1
let s:defaults.delimitMate_expand_space = 0 let s:defaults.delimitMate_expand_space = 0
let s:defaults.delimitMate_jump_expansion = 0
let s:defaults.delimitMate_expand_inside_quotes = 0 let s:defaults.delimitMate_expand_inside_quotes = 0
let s:defaults.delimitMate_smart_pairs = 1 let s:defaults.delimitMate_smart_pairs = 1
let s:defaults.delimitMate_smart_pairs_extra = [] let s:defaults.delimitMate_smart_pairs_extra = []
@@ -293,16 +294,25 @@ endfunction
function! s:keys4right(char, pair, info, opts) "{{{1 function! s:keys4right(char, pair, info, opts) "{{{1
if !a:opts.autoclose if !a:opts.autoclose
if s:info.cur.around == a:pair if s:info.cur.around == a:pair
echom 41
return "\<Del>" return "\<Del>"
elseif s:info.cur.p_char == strcharpart(a:pair, 0, 1) elseif s:info.cur.p_char == strcharpart(a:pair, 0, 1)
echom 42
return "\<C-G>U\<Left>" return "\<C-G>U\<Left>"
endif endif
echom 43
return "" return ""
endif endif
if strcharpart(a:info.cur.text[a:info.cur.col - 1 :], 0, 1) ==# a:char if strcharpart(a:info.cur.text[a:info.cur.col - 1 :], 0, 1) ==# a:char
echom 41 echom 44
return "\<Del>" return "\<Del>"
endif endif
if a:opts.expand_space && a:opts.jump_expansion
\ && matchstr(a:info.cur.ahead, '^ ['.escape(a:char, '\^[]').']') ==# ' ' . a:char
echom 45
return "\<Del>\<Del>\<C-G>U\<Left> \<C-G>U\<Right>"
endif
echom 49
return '' return ''
endfunction endfunction
+2 -5
View File
@@ -14,16 +14,13 @@ call vimtest#StartTap()
call vimtap#Plan(12) call vimtap#Plan(12)
let g:delimitMate_expand_space = 1 let g:delimitMate_expand_space = 1
DelimitMateReload
" Issue #95 " Issue #95
let b:delimitMate_jump_expansion = 1 let b:delimitMate_jump_expansion = 1
DelimitMateReload call DMTest_pairs('', "i( test)x", '( test )x')
call DMTest_pairs('', "( test)x", '( test )x')
let delimitMate_expand_inside_quotes = 1 let delimitMate_expand_inside_quotes = 1
DelimitMateReload
call DMTest_quotes('', "' x", "' x '") call DMTest_quotes('', "i' x", "' x '")
call vimtest#Quit() call vimtest#Quit()