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

Cosmetic changes.

Browse Source
This commit is contained in:
Israel Chauca Fuentes
2010-06-16 01:54:58 -05:00
parent 6d1f48c1bf
commit 28ce6213fc
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
autoload/delimitMate.vim
View File

@@ -34,7 +34,7 @@ function! delimitMate#option_init(name, default) "{{{
endfunction "}}} endfunction "}}}
function! delimitMate#Init() "{{{ function! delimitMate#Init() "{{{
" Initialize variables: {{{ " Initialize variables:
" autoclose " autoclose
call delimitMate#option_init("autoclose", 1) call delimitMate#option_init("autoclose", 1)
@@ -66,7 +66,7 @@ function! delimitMate#Init() "{{{
let b:delimitMate_expand_space = 1 let b:delimitMate_expand_space = 1
endif endif
if exists("g:delimitMate_expand_space") && type(g:delimitMate_expand_space) == type("") if exists("g:delimitMate_expand_space") && type(g:delimitMate_expand_space) == type("")
echom "g:delimitMate_expand_space is '".g:delimitMate_expand_space."' but it must be either 1 or 0!" echom "delimitMate_expand_space is '".g:delimitMate_expand_space."' but it must be either 1 or 0!"
echom "Read :help 'delimitMate_expand_space' for more details." echom "Read :help 'delimitMate_expand_space' for more details."
unlet g:delimitMate_expand_space unlet g:delimitMate_expand_space
let b:delimitMate_expand_space = 1 let b:delimitMate_expand_space = 1
@@ -81,7 +81,7 @@ function! delimitMate#Init() "{{{
let b:delimitMate_expand_cr = 1 let b:delimitMate_expand_cr = 1
endif endif
if exists("g:delimitMate_expand_cr") && type(g:delimitMate_expand_cr) == type("") if exists("g:delimitMate_expand_cr") && type(g:delimitMate_expand_cr) == type("")
echom "g:delimitMate_expand_cr is '".g:delimitMate_expand_cr."' but it must be either 1 or 0!" echom "delimitMate_expand_cr is '".g:delimitMate_expand_cr."' but it must be either 1 or 0!"
echom "Read :help 'delimitMate_expand_cr' for more details." echom "Read :help 'delimitMate_expand_cr' for more details."
unlet g:delimitMate_expand_cr unlet g:delimitMate_expand_cr
let b:delimitMate_expand_cr = 1 let b:delimitMate_expand_cr = 1
@@ -140,28 +140,28 @@ function! delimitMate#ShouldJump() "{{{
let lcol = col('$') let lcol = col('$')
let char = getline('.')[col - 1] let char = getline('.')[col - 1]
" Closing delimiter on the right.
for cdel in b:delimitMate_right_delims + b:delimitMate_quotes_list for cdel in b:delimitMate_right_delims + b:delimitMate_quotes_list
if char == cdel if char == cdel
" Closing delimiter on the right.
return 1 return 1
endif endif
endfor endfor
" Closing delimiter with space expansion.
let nchar = getline('.')[col] let nchar = getline('.')[col]
if b:delimitMate_l_expand_space && char == " " if b:delimitMate_l_expand_space && char == " "
for cdel in b:delimitMate_right_delims + b:delimitMate_quotes_list for cdel in b:delimitMate_right_delims + b:delimitMate_quotes_list
if nchar == cdel if nchar == cdel
" Closing delimiter with space expansion.
return 1 return 1
endif endif
endfor endfor
endif endif
" Closing delimiter with CR expansion.
let uchar = getline(line('.') + 1)[0] let uchar = getline(line('.') + 1)[0]
if b:delimitMate_l_expand_cr && char == "" if b:delimitMate_l_expand_cr && char == ""
for cdel in b:delimitMate_right_delims + b:delimitMate_quotes_list for cdel in b:delimitMate_right_delims + b:delimitMate_quotes_list
if uchar == cdel if uchar == cdel
" Closing delimiter with CR expansion.
return 1 return 1
endif endif
endfor endfor

12
plugin/delimitMate.vim
View File

@@ -46,7 +46,7 @@ function! s:TestMappingsDo() "{{{
call delimitMate#UnMap() call delimitMate#UnMap()
call delimitMate#Map() call delimitMate#Map()
call delimitMate#TestMappings() call delimitMate#TestMappings()
exec "normal i\<CR>" normal o
endfor endfor
endfor endfor
let b:delimitMate_expand_space = temp_varsDM[0] let b:delimitMate_expand_space = temp_varsDM[0]
@@ -122,11 +122,17 @@ augroup delimitMate
autocmd FileType * call <SID>DelimitMateDo() autocmd FileType * call <SID>DelimitMateDo()
" Run on new buffers. " Run on new buffers.
autocmd BufNewFile,BufRead,BufEnter * if !exists("b:loaded_delimitMate") | call <SID>DelimitMateDo() | endif autocmd BufNewFile,BufRead,BufEnter *
\ if !exists("b:loaded_delimitMate") |
\ call <SID>DelimitMateDo() |
\ endif
" Flush the char buffer: " Flush the char buffer:
autocmd InsertEnter * call delimitMate#FlushBuffer() autocmd InsertEnter * call delimitMate#FlushBuffer()
autocmd BufEnter * if mode() == 'i' | call delimitMate#FlushBuffer() | endif autocmd BufEnter *
\ if mode() == 'i' |
\ call delimitMate#FlushBuffer() |
\ endif
augroup END augroup END