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

Account for perma cache when use_caching is bigger than 1

Browse Source
This commit is contained in:
Kien N 2012-08-14 20:23:13 +07:00
parent 08375f24d2
commit 46afd98e19
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
autoload/ctrlp.vim
View File

@ -144,6 +144,8 @@ let s:compare_lim = 3000
let s:ficounts = {} let s:ficounts = {}
let s:ccex = s:pref.'clear_cache_on_exit'
" Regexp " Regexp
let s:fpats = { let s:fpats = {
\ '^\(\\|\)\|\(\\|\)$': '\\|', \ '^\(\\|\)\|\(\\|\)$': '\\|',
@ -294,7 +296,7 @@ endf
" * Files {{{1 " * Files {{{1
fu! ctrlp#files() fu! ctrlp#files()
let cafile = ctrlp#utils#cachefile() let cafile = ctrlp#utils#cachefile()
if g:ctrlp_newcache || !filereadable(cafile) || s:nocache() if g:ctrlp_newcache || !filereadable(cafile) || s:nocache(cafile)
let [lscmd, s:initcwd, g:ctrlp_allfiles] = [s:lsCmd(), s:dyncwd, []] let [lscmd, s:initcwd, g:ctrlp_allfiles] = [s:lsCmd(), s:dyncwd, []]
" Get the list of files " Get the list of files
if empty(lscmd) if empty(lscmd)
@ -1521,7 +1523,7 @@ endf
fu! s:leavepre() fu! s:leavepre()
if exists('s:bufnr') && s:bufnr == bufnr('%') | bw! | en if exists('s:bufnr') && s:bufnr == bufnr('%') | bw! | en
if !( exists('g:ctrlp_clear_cache_on_exit') && !g:ctrlp_clear_cache_on_exit ) if !( exists(s:ccex) && !{s:ccex} )
\ && !( has('clientserver') && len(split(serverlist(), "\n")) > 1 ) \ && !( has('clientserver') && len(split(serverlist(), "\n")) > 1 )
cal ctrlp#clra() cal ctrlp#clra()
en en
@ -1841,16 +1843,25 @@ fu! s:mmode()
retu matchmodes[s:mfunc] retu matchmodes[s:mfunc]
endf endf
" Cache {{{2 " Cache {{{2
fu! s:writecache(cache_file) fu! s:writecache(cafile)
if ( g:ctrlp_newcache || !filereadable(a:cache_file) ) && !s:nocache() if ( g:ctrlp_newcache || !filereadable(a:cafile) ) && !s:nocache()
cal ctrlp#utils#writecache(g:ctrlp_allfiles) cal ctrlp#utils#writecache(g:ctrlp_allfiles)
let g:ctrlp_newcache = 0 let g:ctrlp_newcache = 0
en en
endf endf
fu! s:nocache() fu! s:nocache(...)
retu !s:caching || if !s:caching
\ ( s:caching > 1 && get(s:ficounts, s:dyncwd, [0, 0])[0] < s:caching ) retu 1
elsei s:caching > 1
if !( exists(s:ccex) && !{s:ccex} ) || has_key(s:ficounts, s:dyncwd)
retu get(s:ficounts, s:dyncwd, [0, 0])[0] < s:caching
elsei a:0 && filereadable(a:1)
retu len(ctrlp#utils#readfile(a:1)) < s:caching
en
retu 1
en
retu 0
endf endf
fu! s:insertcache(str) fu! s:insertcache(str)