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

Fixed #640: Parse \graphicspath for img completion

Browse Source 
Note: This deprecates the option g:vimtex_complete_img_use_tail!
This commit is contained in:
Karl Yngve Lervåg 2017-01-09 21:47:50 +01:00
parent c98b178377
commit f86a72ce90
2 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
autoload/vimtex/complete.vim
View File

@ -10,7 +10,6 @@ function! vimtex#complete#init_options() " {{{1
call vimtex#util#set_default('g:vimtex_complete_close_braces', 0) call vimtex#util#set_default('g:vimtex_complete_close_braces', 0)
call vimtex#util#set_default('g:vimtex_complete_recursive_bib', 0) call vimtex#util#set_default('g:vimtex_complete_recursive_bib', 0)
call vimtex#util#set_default('g:vimtex_complete_img_use_tail', 0)
endfunction endfunction
" }}}1 " }}}1
@ -378,26 +377,22 @@ let s:img = {
\ 'patterns' : ['\v\\includegraphics\*?%(\s*\[[^]]*\]){0,2}\s*\{[^}]*$'], \ 'patterns' : ['\v\\includegraphics\*?%(\s*\[[^]]*\]){0,2}\s*\{[^}]*$'],
\ 'ext_re' : '\v\.%(' \ 'ext_re' : '\v\.%('
\ . join(['png', 'jpg', 'eps', 'pdf', 'pgf', 'tikz'], '|') \ . join(['png', 'jpg', 'eps', 'pdf', 'pgf', 'tikz'], '|')
\ . ')$' \ . ')$',
\} \}
function! s:img.complete(regex) dict " {{{2 function! s:img.complete(regex) dict " {{{2
let self.candidates = [] call self.get_graphicspaths()
let self.candidates = split(globpath(b:vimtex.root, '**/*.*'), '\n') call self.gather_candidates()
let l:output = b:vimtex.out()
call filter(self.candidates, 'v:val !=# l:output')
call filter(self.candidates, 'v:val =~? self.ext_re')
call filter(self.candidates, 'v:val =~# a:regex') call filter(self.candidates, 'v:val =~# a:regex')
call map(self.candidates, 'strpart(v:val, len(b:vimtex.root)+1)')
call map(self.candidates, '{ call map(self.candidates, '{
\ ''abbr'' : v:val, \ ''abbr'' : v:val,
\ ''word'' : v:val, \ ''word'' : v:val,
\ ''menu'' : '' [graphics]'', \ ''menu'' : '' [graphics]'',
\ }') \ }')
if g:vimtex_complete_img_use_tail if !empty(self.graphicspaths)
for l:cand in self.candidates for l:cand in self.candidates
let l:cand.word = fnamemodify(l:cand.word, ':t') let l:cand.word = fnamemodify(l:cand.word, ':t')
endfor endfor
@ -406,6 +401,36 @@ function! s:img.complete(regex) dict " {{{2
return self.candidates return self.candidates
endfunction endfunction
function! s:img.get_graphicspaths() dict " {{{2
" Get preamble text and remove comments
let l:preamble = vimtex#parser#tex(b:vimtex.tex, {
\ 're_stop': '\\begin{document}',
\ 'detailed': 0,
\})
call map(l:preamble, 'substitute(v:val, ''\\\@<!%.*'', '''', '''')')
" Parse preamble for graphicspath command
let l:graphicspath = matchstr(join(l:preamble, ' '),
\ '\\graphicspath{\s*{\s*\zs.*\ze\s*}\s*}')
let self.graphicspaths = map(split(l:graphicspath, '}\s*{'),
\ 'v:val[0] ==# ''/'' ? v:val : simplify(b:vimtex.root . ''/'' . v:val)')
endfunction
function! s:img.gather_candidates() dict " {{{2
if !empty(self.graphicspaths)
let self.candidates = split(globpath(expand('%:p:h'), '*.*'), '\n')
for l:path in self.graphicspaths
let self.candidates += split(globpath(l:path, '*.*'), '\n')
endfor
else
let self.candidates = split(globpath(b:vimtex.root, '**/*.*'), '\n')
endif
call filter(self.candidates, 'v:val !=# b:vimtex.out()')
call filter(self.candidates, 'v:val =~? self.ext_re')
call map(self.candidates, 'vimtex#paths#shorten_relative(v:val)')
endfunction
" }}}1 " }}}1
" {{{1 Filenames (\input and \include) " {{{1 Filenames (\input and \include)

6
doc/vimtex.txt
View File

@ -375,12 +375,6 @@ Options~
Default value: 0 Default value: 0
*g:vimtex_complete_img_use_tail*
If enabled, only the tail part of file names are completed. This is useful
if one uses the `graphicx` package and the `\graphicspath` command.
Default value: 0
*g:vimtex_delim_toggle_mod_list* *g:vimtex_delim_toggle_mod_list*
Define list of delimiter modifiers to toggle through with Define list of delimiter modifiers to toggle through with
|<plug>(vimtex-delim-toggle-modifier)|. |<plug>(vimtex-delim-toggle-modifier)|.