vim/ctrlp.vim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sanitize user input for :\d

Browse Source
This commit is contained in:
Kien N 2011-09-10 02:50:03 +07:00
parent 8569c1257a
commit afef48719d
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
autoload/ctrlp.vim
View File

@ -191,20 +191,27 @@ func! s:SplitPattern(str,...) "{{{
if s:igspace if s:igspace
let str = substitute(a:str, ' ', '', 'g') let str = substitute(a:str, ' ', '', 'g')
endif endif
" clear the jumptoline var
if exists('s:jmpln') | unl s:jmpln | endif
if s:regexp || match(str, '[*^$+|]') >= 0 if s:regexp || match(str, '[*^$+|]') >= 0
\ || match(str, '\\\(zs\|ze\|<\|>\)') >= 0 \ || match(str, '\\\(zs\|ze\|<\|>\)') >= 0
let str = substitute(str, '\\\\', '\', 'g') let str = substitute(str, '\\\\', '\', 'g')
" If pattern contains :\d (e.g. abc:25)
if match(str, ':\d*$') >= 0
" get the line to jump to
let s:jmpln = matchstr(str, ':\zs\d*$')
" remove the line number
let str = substitute(str, '\zs:\d*$', '', 'g')
endif
" don't split but turn it into a patterns list with 1 entry
let array = [str] let array = [str]
if match(str, ':\d*$') >= 0 " If pattern contains :\d (e.g. abc:25)
let s:jmpln = matchstr(str, ':\d*$')
let array[0] = substitute(array[0], ':\d*$', '', 'g')
endif
elseif match(str, ':\d*$') >= 0 " If string contains :\d elseif match(str, ':\d*$') >= 0 " If string contains :\d
let tmp = split(str, ':\ze\d*$') " get the line to jump to
let array = split(tmp[0], '\zs') let s:jmpln = matchstr(str, ':\zs\d*$')
if len(tmp) >= 2 " remove the line number
cal add(array, ':'.tmp[1]) let str = substitute(str, '\zs:\d*$', '', 'g')
endif " split into chars
let array = split(str, '\zs')
else else
let array = split(str, '\zs') let array = split(str, '\zs')
endif endif
@ -226,12 +233,6 @@ func! s:GetMatchedItems(items, pats, limit) "{{{
let items = a:items let items = a:items
let pats = a:pats let pats = a:pats
let limit = a:limit let limit = a:limit
" if pattern contains line number
if match(pats[-1], ':\d*$') >= 0
if exists('s:jmpln') | unl s:jmpln | endif
let s:jmpln = substitute(pats[-1], '.*\ze:\d*$', '', 'g')
cal remove(pats, -1)
endif
" if items is longer than s:mltipats_lim, use only the last pattern " if items is longer than s:mltipats_lim, use only the last pattern
if len(items) >= s:mltipats_lim if len(items) >= s:mltipats_lim
let pats = [pats[-1]] let pats = [pats[-1]]
@ -361,7 +362,7 @@ func! s:Renderer(lines) "{{{
" Output to buffer " Output to buffer
if len(nls) >= 1 if len(nls) >= 1
setl cul setl cul
if s:itemtype != 2 if index([2], s:itemtype) < 0
cal sort(nls, 's:compare') cal sort(nls, 's:compare')
endif endif
if s:mwreverse if s:mwreverse
@ -530,7 +531,7 @@ endfunc
func! s:PrtClearCache() func! s:PrtClearCache()
cal ctrlp#clearallcaches() cal ctrlp#clearallcaches()
sil! cal s:SetLines(s:itemtype) cal s:SetLines(s:itemtype)
cal s:statusline() cal s:statusline()
cal s:BuildPrompt() cal s:BuildPrompt()
endfunc endfunc
@ -746,7 +747,7 @@ func! s:AcceptSelection(mode,...) "{{{
else else
exe 'bo '.cmd.' '.filepath exe 'bo '.cmd.' '.filepath
endif endif
if exists('s:jmpln') if exists('s:jmpln') && empty('s:jmpln')
exe s:jmpln exe s:jmpln
keepj norm! 0zz keepj norm! 0zz
endif endif
@ -844,16 +845,16 @@ endfunc "}}}
func! ctrlp#init(type, ...) "{{{ func! ctrlp#init(type, ...) "{{{
let s:nomatches = 1 let s:nomatches = 1
if exists('a:1') if exists('a:1')
sil! cal ctrlp#SetWorkingPath(a:1) cal ctrlp#SetWorkingPath(a:1)
else else
sil! cal ctrlp#SetWorkingPath() cal ctrlp#SetWorkingPath()
endif endif
sil! cal s:BufOpen('ControlP') cal s:BufOpen('ControlP')
sil! cal s:SetupBlank() cal s:SetupBlank()
sil! cal s:MapKeys() cal s:MapKeys()
sil! cal s:SetLines(a:type) cal s:SetLines(a:type)
cal s:BuildPrompt() cal s:BuildPrompt()
sil! cal s:syntax() cal s:syntax()
endfunc "}}} endfunc "}}}
aug CtrlPAug "{{{ aug CtrlPAug "{{{