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

Add eol marker finished. Closes #102. Add s:g().

Browse Source
This commit is contained in:
Israel Chauca Fuentes
2013-06-19 00:06:10 -04:00
parent 8a8aad183f
commit d4ba528935
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
autoload/delimitMate.vim
View File

@@ -10,6 +10,10 @@
"let delimitMate_loaded = 1 "let delimitMate_loaded = 1
function! s:g(name, ...) "{{{
return eval('b:_l_delimitMate_' . a:name)
endfunction "}}}
function! delimitMate#ShouldJump(...) "{{{ function! delimitMate#ShouldJump(...) "{{{
" Returns 1 if the next character is a closing delimiter. " Returns 1 if the next character is a closing delimiter.
let char = delimitMate#GetCharFromCursor(0) let char = delimitMate#GetCharFromCursor(0)
@@ -197,8 +201,11 @@ function! delimitMate#FlushBuffer() " {{{
return '' return ''
endfunction " }}} endfunction " }}}
function! delimitMate#AddToBuffer(str) "{{{ function! delimitMate#AddToBuffer(str, ...) "{{{
call insert(b:_l_delimitMate_buffer, a:str) if a:0 && a:1 == 1
return add(b:_l_delimitMate_buffer, a:str)
endif
return insert(b:_l_delimitMate_buffer, a:str)
endfunction "delimitMate#AddToBuffer }}} endfunction "delimitMate#AddToBuffer }}}
function! delimitMate#BalancedParens(char) "{{{ function! delimitMate#BalancedParens(char) "{{{
@@ -335,14 +342,23 @@ function! delimitMate#QuoteDelim(char) "{{{
elseif delimitMate#IsSmartQuote(a:char) elseif delimitMate#IsSmartQuote(a:char)
" Seems like a smart quote, insert a single char. " Seems like a smart quote, insert a single char.
return a:char return a:char
elseif (char_before == a:char && char_at != a:char) && b:_l_delimitMate_smart_quotes elseif (char_before == a:char && char_at != a:char)
" Seems like we have an unbalanced quote, insert one quotation mark and jump to the middle. \ && b:_l_delimitMate_smart_quotes
" Seems like we have an unbalanced quote, insert one quotation
" mark and jump to the middle.
call delimitMate#AddToBuffer(a:char) call delimitMate#AddToBuffer(a:char)
return delimitMate#WriteAfter(a:char) return delimitMate#WriteAfter(a:char)
else else
" Insert a pair and jump to the middle. " Insert a pair and jump to the middle.
call delimitMate#AddToBuffer(a:char) let sufix = ''
call delimitMate#WriteAfter(a:char) if !empty(s:g('eol_marker')) && col('.') - 1 == len(getline('.'))
let idx = len(s:g('eol_marker')) * -1
let marker = getline('.')[idx : ]
let has_marker = marker == s:g('eol_marker')
let sufix = !has_marker ? s:g('eol_marker') : ''
endif
call delimitMate#AddToBuffer(a:char . sufix)
call delimitMate#WriteAfter(a:char . sufix)
return a:char return a:char
endif endif
endfunction "}}} endfunction "}}}
@@ -459,12 +475,12 @@ function! delimitMate#BS() " {{{
let extra = '' let extra = ''
endif endif
let tail_re = '\m\C\%(' let tail_re = '\m\C\%('
\ . join(b:_l_delimitMate_right_delims, '\|') \ . join(s:g('right_delims')+s:g('quotes_list'), '\|')
\ . '\)' \ . '\)'
\ . escape(b:_l_delimitMate_eol_marker, '\*.^$') \ . escape(s:g('eol_marker'), '\*.^$')
\ . '$' \ . '$'
if buffer_tail =~ tail_re && search('\%#'.tail_re, 'cWn') if buffer_tail =~ tail_re && search('\%#'.tail_re, 'cWn')
let extra .= join(map(split(b:_l_delimitMate_eol_marker, '\zs'), let extra .= join(map(split(s:g('eol_marker'), '\zs'),
\ 'delimitMate#Del()'), '') \ 'delimitMate#Del()'), '')
endif endif
return "\<BS>" . extra return "\<BS>" . extra

2
plugin/delimitMate.vim
View File

@@ -64,7 +64,7 @@ function! s:init() "{{{
" quotes " quotes
call s:option_init("quotes", "\" ' `") call s:option_init("quotes", "\" ' `")
call s:option_init("quotes_list", split(b:_l_delimitMate_quotes)) call s:option_init("quotes_list", split(b:_l_delimitMate_quotes, '\zs'))
" nesting_quotes " nesting_quotes
call s:option_init("nesting_quotes", []) call s:option_init("nesting_quotes", [])