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

Fix expanding abbreviations. Close #145.

Browse Source
This commit is contained in:
Israel Chauca Fuentes
2013-12-18 23:55:02 -05:00
parent 3dde5cc8cb
commit b45536fe8d
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
plugin/delimitMate.vim
View File

@@ -261,7 +261,7 @@ function! s:NoAutoClose() "{{{
if delim == '|' if delim == '|'
let delim = '<Bar>' let delim = '<Bar>'
endif endif
exec 'inoremap <silent> <Plug>delimitMate' . delim . ' <C-R>=delimitMate#SkipDelim("' . escape(delim,'"') . '")<CR>' exec 'inoremap <silent> <Plug>delimitMate' . delim . ' <C-]><C-R>=delimitMate#SkipDelim("' . escape(delim,'"') . '")<CR>'
exec 'silent! imap <unique> <buffer> '.delim.' <Plug>delimitMate'.delim exec 'silent! imap <unique> <buffer> '.delim.' <Plug>delimitMate'.delim
endfor endfor
endfunction "}}} endfunction "}}}
@@ -274,7 +274,7 @@ function! s:AutoClose() "{{{
let ld = s:g('left_delims')[i] == '|' ? '<bar>' : s:g('left_delims')[i] let ld = s:g('left_delims')[i] == '|' ? '<bar>' : s:g('left_delims')[i]
let rd = s:g('right_delims')[i] == '|' ? '<bar>' : s:g('right_delims')[i] let rd = s:g('right_delims')[i] == '|' ? '<bar>' : s:g('right_delims')[i]
exec 'inoremap <expr><silent> <Plug>delimitMate' . ld exec 'inoremap <expr><silent> <Plug>delimitMate' . ld
\. ' delimitMate#ParenDelim("' . escape(rd, '|') . '")' \. ' "\<C-]>".delimitMate#ParenDelim("' . escape(rd, '|') . '")'
exec 'silent! imap <unique> <buffer> '.ld exec 'silent! imap <unique> <buffer> '.ld
\.' <Plug>delimitMate'.ld \.' <Plug>delimitMate'.ld
let i += 1 let i += 1
@@ -283,7 +283,7 @@ function! s:AutoClose() "{{{
" Exit from inside the matching pair: " Exit from inside the matching pair:
for delim in s:g('right_delims') for delim in s:g('right_delims')
exec 'inoremap <expr><silent> <Plug>delimitMate' . delim exec 'inoremap <expr><silent> <Plug>delimitMate' . delim
\. ' delimitMate#JumpOut("\' . delim . '")' \. ' "\<C-]>".delimitMate#JumpOut("\' . delim . '")'
exec 'silent! imap <unique> <buffer> ' . delim exec 'silent! imap <unique> <buffer> ' . delim
\. ' <Plug>delimitMate'. delim \. ' <Plug>delimitMate'. delim
endfor endfor
@@ -294,7 +294,7 @@ function! s:AutoClose() "{{{
if delim == '|' if delim == '|'
let delim = '<Bar>' let delim = '<Bar>'
endif endif
exec 'inoremap <silent> <Plug>delimitMate' . delim . ' <C-R>=delimitMate#QuoteDelim("\' . delim . '")<CR>' exec 'inoremap <silent> <Plug>delimitMate' . delim . ' <C-]><C-R>=delimitMate#QuoteDelim("\' . delim . '")<CR>'
exec 'silent! imap <unique> <buffer> ' . delim . ' <Plug>delimitMate' . delim exec 'silent! imap <unique> <buffer> ' . delim . ' <Plug>delimitMate' . delim
endfor endfor
@@ -323,22 +323,22 @@ function! s:ExtraMappings() "{{{
silent! imap <unique> <buffer> <S-BS> <Plug>delimitMateS-BS silent! imap <unique> <buffer> <S-BS> <Plug>delimitMateS-BS
endif endif
" Expand return if inside an empty pair: " Expand return if inside an empty pair:
inoremap <silent> <Plug>delimitMateCR <C-R>=delimitMate#ExpandReturn()<CR> inoremap <silent> <Plug>delimitMateCR <C-]><C-R>=delimitMate#ExpandReturn()<CR>
if s:g('expand_cr') && !hasmapto('<Plug>delimitMateCR', 'i') && maparg('<CR>', 'i') == '' if s:g('expand_cr') && !hasmapto('<Plug>delimitMateCR', 'i') && maparg('<CR>', 'i') == ''
silent! imap <unique> <buffer> <CR> <Plug>delimitMateCR silent! imap <unique> <buffer> <CR> <Plug>delimitMateCR
endif endif
" Expand space if inside an empty pair: " Expand space if inside an empty pair:
inoremap <silent> <Plug>delimitMateSpace <C-R>=delimitMate#ExpandSpace()<CR> inoremap <silent> <Plug>delimitMateSpace <C-]><C-R>=delimitMate#ExpandSpace()<CR>
if s:g('expand_space') && !hasmapto('<Plug>delimitMateSpace', 'i') && maparg('<Space>', 'i') == '' if s:g('expand_space') && !hasmapto('<Plug>delimitMateSpace', 'i') && maparg('<Space>', 'i') == ''
silent! imap <unique> <buffer> <Space> <Plug>delimitMateSpace silent! imap <unique> <buffer> <Space> <Plug>delimitMateSpace
endif endif
" Jump over any delimiter: " Jump over any delimiter:
inoremap <silent> <Plug>delimitMateS-Tab <C-R>=delimitMate#JumpAny()<CR> inoremap <silent> <Plug>delimitMateS-Tab <C-]><C-R>=delimitMate#JumpAny()<CR>
if s:g('tab2exit') && !hasmapto('<Plug>delimitMateS-Tab', 'i') && maparg('<S-Tab>', 'i') == '' if s:g('tab2exit') && !hasmapto('<Plug>delimitMateS-Tab', 'i') && maparg('<S-Tab>', 'i') == ''
silent! imap <unique> <buffer> <S-Tab> <Plug>delimitMateS-Tab silent! imap <unique> <buffer> <S-Tab> <Plug>delimitMateS-Tab
endif endif
" Jump over next delimiters " Jump over next delimiters
inoremap <buffer> <Plug>delimitMateJumpMany <C-R>=delimitMate#JumpMany()<CR> inoremap <buffer> <Plug>delimitMateJumpMany <C-]><C-R>=delimitMate#JumpMany()<CR>
if !hasmapto('<Plug>delimitMateJumpMany', 'i') && maparg("<C-G>g", 'i') == '' if !hasmapto('<Plug>delimitMateJumpMany', 'i') && maparg("<C-G>g", 'i') == ''
imap <silent> <buffer> <C-G>g <Plug>delimitMateJumpMany imap <silent> <buffer> <C-G>g <Plug>delimitMateJumpMany
endif endif

4
test/autoclose_matchpairs.txt
View File

@@ -35,3 +35,7 @@ let b:delimitMate_eol_marker = ';'
%d %d
# BS should behave accordingly. # BS should behave accordingly.
"abc(\<BS>" "abc;" "abc(\<BS>" "abc;"
# Expand iabbreviations
unlet b:delimitMate_eol_marker
iabb def ghi
"def(" "ghi()"

3
test/autoclose_quotes.txt
View File

@@ -48,3 +48,6 @@ let g:delimitMate_nesting_quotes = split(g:delimitMate_quotes, '\s\+')
"''x" "''x" "''x" "''x"
"'x" "'x'" "'x" "'x'"
unlet g:delimitMate_nesting_quotes unlet g:delimitMate_nesting_quotes
# expand iabbreviations
iabb def ghi
"def'" "ghi'"