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

Only try to expand abbreviations when supported. Close #151.

Browse Source
This commit is contained in:
Israel Chauca Fuentes
2013-12-20 18:21:34 -05:00
parent 5db098e953
commit 0528bdac15
1 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
plugin/delimitMate.vim
View File

@@ -255,13 +255,26 @@ endfunction "}}}
"}}} "}}}
" Mappers: {{{ " Mappers: {{{
function! s:TriggerAbb(expr) "{{{
if v:version < 703 || v:version == 703 && !has('patch489')
return ''
endif
if a:expr == 1
return '"\<C-]>".'
endif
if a:expr == 2
return "\<C-]>"
endif
return '<C-]>'
endfunction "}}}
function! s:NoAutoClose() "{{{ function! s:NoAutoClose() "{{{
" inoremap <buffer> ) <C-R>=delimitMate#SkipDelim('\)')<CR> " inoremap <buffer> ) <C-R>=delimitMate#SkipDelim('\)')<CR>
for delim in s:g('right_delims') + s:g('quotes_list') for delim in s:g('right_delims') + s:g('quotes_list')
if delim == '|' if delim == '|'
let delim = '<Bar>' let delim = '<Bar>'
endif endif
exec 'inoremap <silent> <Plug>delimitMate' . delim . ' <C-]><C-R>=delimitMate#SkipDelim("' . escape(delim,'"') . '")<CR>' exec 'inoremap <silent> <Plug>delimitMate' . delim . ' '.s:TriggerAbb(0).'<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 +287,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
\. ' "\<C-]>".delimitMate#ParenDelim("' . escape(rd, '|') . '")' \. ' '.s:TriggerAbb(1).'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 +296,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
\. ' "\<C-]>".delimitMate#JumpOut("\' . delim . '")' \. ' '.s:TriggerAbb(1).'delimitMate#JumpOut("\' . delim . '")'
exec 'silent! imap <unique> <buffer> ' . delim exec 'silent! imap <unique> <buffer> ' . delim
\. ' <Plug>delimitMate'. delim \. ' <Plug>delimitMate'. delim
endfor endfor
@@ -294,8 +307,10 @@ function! s:AutoClose() "{{{
if delim == '|' if delim == '|'
let delim = '<Bar>' let delim = '<Bar>'
endif endif
exec 'inoremap <silent> <Plug>delimitMate' . delim . ' <C-]><C-R>=delimitMate#QuoteDelim("\' . delim . '")<CR>' exec 'inoremap <silent> <Plug>delimitMate' . delim
exec 'silent! imap <unique> <buffer> ' . delim . ' <Plug>delimitMate' . delim \. ' '.s:TriggerAbb(0).'<C-R>=delimitMate#QuoteDelim("\' . delim . '")<CR>'
exec 'silent! imap <unique> <buffer> ' . delim
\. ' <Plug>delimitMate' . delim
endfor endfor
" Try to fix the use of apostrophes (kept for backward compatibility): " Try to fix the use of apostrophes (kept for backward compatibility):
@@ -323,22 +338,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-]><C-R>=delimitMate#ExpandReturn()<CR> inoremap <expr><silent> <Plug>delimitMateCR <SID>TriggerAbb(2)."\<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-]><C-R>=delimitMate#ExpandSpace()<CR> inoremap <expr><silent> <Plug>delimitMateSpace <SID>TriggerAbb(2)."\<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-]><C-R>=delimitMate#JumpAny()<CR> inoremap <expr><silent> <Plug>delimitMateS-Tab <SID>TriggerAbb(2)."\<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-]><C-R>=delimitMate#JumpMany()<CR> inoremap <expr><buffer> <Plug>delimitMateJumpMany <SID>TriggerAbb(2)."\<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