y0rune/vimwiki
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use relative paths in omnicomplete

Browse Source 
Fix #70
Ref #72
This commit is contained in:
EinfachToll
2014-09-16 10:18:40 +02:00
parent 21b3f63a47
commit 24d690f32d
2 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ftplugin/vimwiki.vim
View File

@ -69,16 +69,21 @@ function! Complete_wikifiles(findstart, base)
if a:base =~# '^wiki\d:'
let wikinumber = eval(matchstr(a:base, '^wiki\zs\d'))
if wikinumber >= len(g:vimwiki_list)
return []
endif
let directory = VimwikiGet('path', wikinumber)
let ext = VimwikiGet('ext', wikinumber)
let prefix = matchstr(a:base, '^wiki\d:\zs.*')
let scheme = matchstr(a:base, '^wiki\d:\ze')
elseif a:base =~# '^diary:'
let wikinumber = g:vimwiki_current_idx
let directory = VimwikiGet('path').'/'.VimwikiGet('diary_rel_path')
let ext = VimwikiGet('ext')
let prefix = matchstr(a:base, '^diary:\zs.*')
let scheme = matchstr(a:base, '^diary:\ze')
else
else " current wiki
let wikinumber = g:vimwiki_current_idx
let directory = VimwikiGet('path')
let ext = VimwikiGet('ext')
let prefix = a:base
@ -86,12 +91,16 @@ function! Complete_wikifiles(findstart, base)
endif
let result = []
if wikinumber == g:vimwiki_current_idx
let cwd = vimwiki#u#wikify_path(expand('%:p:h'))
else
let cwd = vimwiki#u#wikify_path(directory)
endif
for wikifile in split(globpath(directory, '**/*'.ext), '\n')
" get the filename relative to the wiki path:
let subdir_filename = substitute(fnamemodify(wikifile, ':p:r'),
\ '\V'.fnamemodify(directory, ':p'), '', '')
if subdir_filename =~ '^'.vimwiki#u#escape(prefix)
call add(result, scheme . subdir_filename)
let wikifile = vimwiki#u#wikify_path(fnamemodify(wikifile, ':r'))
let relative_filename = vimwiki#u#relpath(cwd, wikifile)
if relative_filename =~ '^'.vimwiki#u#escape(prefix)
call add(result, scheme . relative_filename)
endif
endfor
return result