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

Use findfile to simplify recursive file finding

Browse Source
This commit is contained in:
Karl Yngve Lervåg 2017-01-03 23:11:02 +01:00
parent ed0106cbcf
commit b1696f0767
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
autoload/vimtex.vim
View File

@ -592,31 +592,23 @@ function! s:get_main_from_subfile() " {{{1
\ '^\C\s*\\documentclass\[\zs.*\ze\]{subfiles}') \ '^\C\s*\\documentclass\[\zs.*\ze\]{subfiles}')
if len(l:filename) > 0 if len(l:filename) > 0
if l:filename[0] ==# '/' if l:filename[0] ==# '/'
" Absolute path " Specified path is absolute
if filereadable(l:filename) | return l:filename | endif if filereadable(l:filename) | return l:filename | endif
else else
" First try relative path " Try specified path as relative to current file path
let l:candidate = simplify(expand('%:p:h') . '/' . l:filename) let l:candidate = simplify(expand('%:p:h') . '/' . l:filename)
if filereadable(l:candidate) | return l:candidate | endif if filereadable(l:candidate) | return l:candidate | endif
" Now assume that the path is relative to the main file root. This is " Try specified path as relative to the project main file. This is
" difficult, since the main file is the one we are looking for. We " difficult, since the main file is the one we are looking for. We
" therefore assume that the main file lives somewhere in the directory " therefore assume that the main file lives somewhere upwards in the
" tree closer to the root. " directory tree.
let l:path = expand('%:p:h') let l:candidate = findfile(l:filename, '.;')
let l:candidates = [l:path] if filereadable(l:candidate)
while l:path != fnamemodify(l:path, ':h') let s:root = fnamemodify(l:candidate, ':h')
let l:path = fnamemodify(l:path, ':h') let s:base = strpart(expand('%:p'), len(s:root) + 1)
let l:candidates += [l:path] return l:candidate
endwhile endif
call map(l:candidates, 'v:val . ''/'' . l:filename')
for l:candidate in l:candidates
if filereadable(l:candidate)
let s:root = fnamemodify(l:candidate, ':h')
let s:base = strpart(expand('%:p'), len(s:root) + 1)
return l:candidate
endif
endfor
endif endif
endif endif
endfor endfor