diff --git a/autoload/delimitMate.vim b/autoload/delimitMate.vim index e99c593..ed41bb3 100644 --- a/autoload/delimitMate.vim +++ b/autoload/delimitMate.vim @@ -653,7 +653,7 @@ function! delimitMate#VisualMaps() " {{{ let vleader = b:_l_delimitMate_visual_leader " Wrap the selection with matching pairs, but do nothing if blockwise visual mode is active: for del in b:_l_delimitMate_right_delims + b:_l_delimitMate_left_delims + b:_l_delimitMate_quotes_list - exec "silent! vnoremap " . vleader . del . ' delimitMate#Visual("' . escape(del, '")') . '")' + exec "silent vnoremap " . vleader . del . ' delimitMate#Visual("' . escape(del, '")') . '")' endfor endfunction "}}} @@ -755,14 +755,14 @@ endfunction " }}} delimitMate#UnMap() " Tools: {{{ function! delimitMate#TestMappings() "{{{ - exec "normal i*b:_l_delimitMate_autoclose = " . b:_l_delimitMate_autoclose . "\o" - exec "normal i*b:_l_delimitMate_expand_space = " . b:_l_delimitMate_expand_space . "\o" - exec "normal i*b:_l_delimitMate_expand_cr = " . b:_l_delimitMate_expand_cr . "\o\o" + exec "normal GGi*b:_l_delimitMate_autoclose = " . b:_l_delimitMate_autoclose . "\o" + exec "normal GGi*b:_l_delimitMate_expand_space = " . b:_l_delimitMate_expand_space . "\o" + exec "normal GGi*b:_l_delimitMate_expand_cr = " . b:_l_delimitMate_expand_cr . "\o\o" echom b:_l_delimitMate_autoclose.b:_l_delimitMate_expand_space.b:_l_delimitMate_expand_cr if b:_l_delimitMate_autoclose " {{{ for i in range(len(b:_l_delimitMate_left_delims)) - exec "normal GGoOpen & close: " . b:_l_delimitMate_left_delims[i]. "|" + exec "normal GGoOpen: " . b:_l_delimitMate_left_delims[i]. "|" exec "normal oDelete: " . b:_l_delimitMate_left_delims[i] . "\|" exec "normal oExit: " . b:_l_delimitMate_left_delims[i] . b:_l_delimitMate_right_delims[i] . "|" exec "normal oSpace: " . b:_l_delimitMate_left_delims[i] . " |" @@ -770,17 +770,17 @@ function! delimitMate#TestMappings() "{{{ exec "normal GGoVisual-L: v\v" . b:_l_delimitMate_visual_leader . b:_l_delimitMate_left_delims[i] exec "normal oVisual-R: v\v" . b:_l_delimitMate_visual_leader . b:_l_delimitMate_right_delims[i] exec "normal oCar return: " . b:_l_delimitMate_left_delims[i] . "\|" - exec "normal GGoDelete car return: " . b:_l_delimitMate_left_delims[i] . "\\|\GGA\o\o" + exec "normal GGoDelete car return: " . b:_l_delimitMate_left_delims[i] . "\\|\GG\o" endfor for i in range(len(b:_l_delimitMate_quotes_list)) - exec "normal GGAOpen & close: " . b:_l_delimitMate_quotes_list[i] . "|" - exec "normal oDelete: " + exec "normal GGAOpen: " . b:_l_delimitMate_quotes_list[i] . "|" + exec "normal oDelete: " . b:_l_delimitMate_left_delims[i] . b:_l_delimitMate_right_delims[i] . "\|" exec "normal oExit: " . b:_l_delimitMate_quotes_list[i] . b:_l_delimitMate_quotes_list[i] . "|" exec "normal oSpace: " . b:_l_delimitMate_quotes_list[i] . " |" exec "normal oDelete space: " . b:_l_delimitMate_quotes_list[i] . " \|" exec "normal GGoVisual: v\v" . b:_l_delimitMate_visual_leader . b:_l_delimitMate_quotes_list[i] exec "normal oCar return: " . b:_l_delimitMate_quotes_list[i] . "\|" - exec "normal GGoDelete car return: " . b:_l_delimitMate_quotes_list[i] . "\\|\GGA\o\o" + exec "normal GGoDelete car return: " . b:_l_delimitMate_quotes_list[i] . "\\|\GG\o" endfor "}}} else @@ -794,7 +794,7 @@ function! delimitMate#TestMappings() "{{{ exec "normal GGoVisual-L: v\v" . b:_l_delimitMate_visual_leader . b:_l_delimitMate_left_delims[i] exec "normal oVisual-R: v\v" . b:_l_delimitMate_visual_leader . b:_l_delimitMate_right_delims[i] exec "normal oCar return: " . b:_l_delimitMate_left_delims[i] . b:_l_delimitMate_right_delims[i] . "\|" - exec "normal GGoDelete car return: " . b:_l_delimitMate_left_delims[i] . b:_l_delimitMate_right_delims[i] . "\\|\GGA\o\o" + exec "normal GGoDelete car return: " . b:_l_delimitMate_left_delims[i] . b:_l_delimitMate_right_delims[i] . "\\|\GG\o" endfor for i in range(len(b:_l_delimitMate_quotes_list)) exec "normal GGoOpen & close: " . b:_l_delimitMate_quotes_list[i] . b:_l_delimitMate_quotes_list[i] . "|" @@ -804,10 +804,47 @@ function! delimitMate#TestMappings() "{{{ exec "normal oDelete space: " . b:_l_delimitMate_quotes_list[i] . b:_l_delimitMate_quotes_list[i] . " \|" exec "normal GGoVisual: v\v" . b:_l_delimitMate_visual_leader . b:_l_delimitMate_quotes_list[i] exec "normal oCar return: " . b:_l_delimitMate_quotes_list[i] . b:_l_delimitMate_quotes_list[i] . "\|" - exec "normal GGoDelete car return: " . b:_l_delimitMate_quotes_list[i] . b:_l_delimitMate_quotes_list[i] . "\\|\GGA\o\o" + exec "normal GGoDelete car return: " . b:_l_delimitMate_quotes_list[i] . b:_l_delimitMate_quotes_list[i] . "\\|\GG\o" endfor endif "}}} - exec "normal \i" + "exec "normal \i" + + let imaps = + \ b:_l_delimitMate_right_delims + + \ b:_l_delimitMate_left_delims + + \ b:_l_delimitMate_quotes_list + + \ b:_l_delimitMate_apostrophes_list + + \ ['', '', '', '', '', '', ''] + + \ ['', '', '', '', '', ''] + + \ ['', ''] + + let vmaps = + \ b:_l_delimitMate_right_delims + + \ b:_l_delimitMate_left_delims + + \ b:_l_delimitMate_quotes_list + + let ibroken = [] + for map in imaps + if maparg(map, "i") !~? 'delimitMate' + let ibroken = ibroken + [map.': is not set.'] + endif + endfor + let ibroken = len(ibroken) > 0 ? ['IMAP'] + ibroken : [] + + let vbroken = [] + if !exists("b:_l_delimitMate_visual_leader") + let vleader = "" + else + let vleader = b:_l_delimitMate_visual_leader + endif + for map in vmaps + if maparg(vleader . map, "v") !~? "delimitMate" + let vbroken = vbroken + [vleader.map.': is not set.'] + endif + endfor + let vbroken = len(vbroken) > 0 ? ['VMAP'] + vbroken : [] + + call append('$', ibroken + vbroken + ['--------------------', '', '']) endfunction "}}} "}}} diff --git a/plugin/delimitMate.vim b/plugin/delimitMate.vim index ccf08c9..f772d90 100644 --- a/plugin/delimitMate.vim +++ b/plugin/delimitMate.vim @@ -107,7 +107,7 @@ call s:DelimitMateDo() command! DelimitMateReload call s:DelimitMateDo(1) " Quick test: -command! DelimitMateTest call s:TestMappingsDo() +command! DelimitMateTest silent call s:TestMappingsDo() " Switch On/Off: command! DelimitMateSwitch call s:DelimitMateSwitch()