VimPlug/delimitMate
1
0
Fork 0
mirror of https://github.com/Raimondi/delimitMate.git synced 2026-05-04 04:45:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix: Problem with jumping over pre-existing delims.

Browse Source
This commit is contained in:
Israel Chauca Fuentes
2010-05-03 13:21:24 -05:00
parent b9bd9e3229
commit 1e7a5c7f6e
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
autoload/delimitMate.vim
+23 -10
View File
@@ -193,10 +193,14 @@ function! delimitMate#JumpOut(char) "{{{
let line = getline('.')
let col = col('.')-2
if line[col+1] == a:char
call setline('.',line[:(col)].line[(col+2):])
call delimitMate#RmBuffer(1)
if len(b:delimitMate_buffer) == 0
return "\<Right>"
else
call setline('.',line[:(col)].line[(col+2):])
call delimitMate#RmBuffer(1)
return a:char
endif
endif
return a:char
endfunction " }}}
function! delimitMate#JumpAny() " {{{
@@ -204,15 +208,18 @@ function! delimitMate#JumpAny() " {{{
let char = getline('.')[col('.')-1]
if char == " "
" Space expansion.
let char = char . getline('.')[col('.')] . "\<Del>"
call delimitMate#RmBuffer(2)
"let char = char . getline('.')[col('.')] . delimitMate#Del()
return char . getline('.')[col('.')] . delimitMate#Del() . delimitMate#Del()
"call delimitMate#RmBuffer(1)
elseif char == ""
" CR expansion.
let char = "\<CR>" . getline(line('.') + 1)[0] . "\<Del>"
"let char = "\<CR>" . getline(line('.') + 1)[0] . "\<Del>"
let b:delimitMate_buffer = []
return "\<CR>" . getline(line('.') + 1)[0] . "\<Del>"
else
"call delimitMate#RmBuffer(1)
return char . delimitMate#Del()
endif
call delimitMate#RmBuffer(1)
return char . "\<Del>"
endfunction " delimitMate#JumpAny() }}}
function! delimitMate#SkipDelim(char) "{{{
@@ -222,12 +229,18 @@ function! delimitMate#SkipDelim(char) "{{{
return a:char
elseif cur[1] == a:char
" Exit pair
return delimitMate#WriteBefore(a:char)
"return delimitMate#WriteBefore(a:char)
if delimitMate#Del() == ''
return "\<Right>"
else
return a:char
endif
"elseif cur[1] == ' ' && cur[2] == a:char
"" I'm leaving this in case someone likes it. Jump an space and delimiter.
"return "\<Right>\<Right>"
elseif delimitMate#IsEmptyPair( cur[0] . a:char )
" Add closing delimiter and jump back to the middle.
call insert(b:delimitMate_buffer, a:char)
return delimitMate#WriteAfter(a:char)
else
" Nothing special here, return the same character.
@@ -423,7 +436,7 @@ function! delimitMate#ExtraMappings() "{{{
" Jump out ot any empty pair:
if b:delimitMate_tab2exit
inoremap <buffer> <expr> <S-Tab> delimitMate#ShouldJump() ? delimitMate#JumpAny() : "\<S-Tab>"
inoremap <buffer> <expr> <S-Tab> delimitMate#ShouldJump() ? "\<C-R>=delimitMate#JumpAny()\<CR>" : "\<S-Tab>"
endif
" Fix the re-do feature: