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

Optimize IsSpaceExpansion.

Browse Source
This commit is contained in:
Israel Chauca Fuentes
2012-02-08 03:50:43 -05:00
parent 8749708115
commit e688e20151
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
autoload/delimitMate.vim
View File

@@ -59,12 +59,12 @@ endfunction "}}}
function! delimitMate#GetCharFromCursor(...) "{{{ function! delimitMate#GetCharFromCursor(...) "{{{
let idx = col('.') - 1 let idx = col('.') - 1
if !a:0 || (a:0 && a:1 >= 0) if !a:0 || (a:0 && a:1 >= 0)
" Get chars from cursor. " Get char from cursor.
let line = getline('.')[idx :] let line = getline('.')[idx :]
let pos = a:0 ? a:1 : 0 let pos = a:0 ? a:1 : 0
return matchstr(line, '^'.repeat('.', pos).'\zs.') return matchstr(line, '^'.repeat('.', pos).'\zs.')
endif endif
" Get chars behind cursor. " Get char behind cursor.
let line = getline('.')[: idx - 1] let line = getline('.')[: idx - 1]
let pos = 0 - (1 + a:1) let pos = 0 - (1 + a:1)
return matchstr(line, '.\ze'.repeat('.', pos).'$') return matchstr(line, '.\ze'.repeat('.', pos).'$')
@@ -73,6 +73,7 @@ endfunction "delimitMate#GetCharFromCursor }}}
function! delimitMate#IsCRExpansion() " {{{ function! delimitMate#IsCRExpansion() " {{{
let nchar = getline(line('.')-1)[-1:] let nchar = getline(line('.')-1)[-1:]
let schar = getline(line('.')+1)[:0] let schar = getline(line('.')+1)[:0]
" TODO: Consider whitespace?
let isEmpty = getline('.') == "" let isEmpty = getline('.') == ""
if index(b:_l_delimitMate_left_delims, nchar) > -1 && if index(b:_l_delimitMate_left_delims, nchar) > -1 &&
\ index(b:_l_delimitMate_left_delims, nchar) == index(b:_l_delimitMate_right_delims, schar) && \ index(b:_l_delimitMate_left_delims, nchar) == index(b:_l_delimitMate_right_delims, schar) &&
@@ -88,12 +89,10 @@ function! delimitMate#IsCRExpansion() " {{{
endfunction " }}} delimitMate#IsCRExpansion() endfunction " }}} delimitMate#IsCRExpansion()
function! delimitMate#IsSpaceExpansion() " {{{ function! delimitMate#IsSpaceExpansion() " {{{
let line = getline('.') if col('.') > 2
let col = col('.')-2 let pchar = delimitMate#GetCharFromCursor(-2)
if col > 0 let nchar = delimitMate#GetCharFromCursor(1)
let pchar = line[col - 1] let isSpaces = (delimitMate#GetCharFromCursor(-1) == delimitMate#GetCharFromCursor(0) && delimitMate#GetCharFromCursor(-1) == " ")
let nchar = line[col + 2]
let isSpaces = (line[col] == line[col+1] && line[col] == " ")
if index(b:_l_delimitMate_left_delims, pchar) > -1 && if index(b:_l_delimitMate_left_delims, pchar) > -1 &&
\ index(b:_l_delimitMate_left_delims, pchar) == index(b:_l_delimitMate_right_delims, nchar) && \ index(b:_l_delimitMate_left_delims, pchar) == index(b:_l_delimitMate_right_delims, nchar) &&