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

Treat :G ... ./path as relative to working directory

Browse Source 
References https://github.com/tpope/vim-fugitive/issues/504
This commit is contained in:
Tim Pope 2019-07-09 12:26:45 -04:00
parent f38c59af7c
commit ad2e408e15
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
autoload/fugitive.vim
View File

@ -987,15 +987,20 @@ function! s:ExpandSplit(string, ...) abort
let string = a:string let string = a:string
let handle_bar = a:0 && a:1 let handle_bar = a:0 && a:1
let dquote = handle_bar ? '"\%([^"]\|""\|\\"\)*"\|' : '' let dquote = handle_bar ? '"\%([^"]\|""\|\\"\)*"\|' : ''
let cwd = a:0 > 1 ? a:2 : getcwd()
while string =~# '\S' while string =~# '\S'
if handle_bar && string =~# '^\s*|' if handle_bar && string =~# '^\s*|'
return [list, substitute(string, '^\s*', '', '')] return [list, substitute(string, '^\s*', '', '')]
endif endif
let arg = matchstr(string, '^\s*\%(' . dquote . '''[^'']*''\|\\.\|[^[:space:] ' . (handle_bar ? '|' : '') . ']\)\+') let arg = matchstr(string, '^\s*\%(' . dquote . '''[^'']*''\|\\.\|[^[:space:] ' . (handle_bar ? '|' : '') . ']\)\+')
let string = strpart(string, len(arg)) let string = strpart(string, len(arg))
let arg = substitute(substitute(arg, '^\s\+', '', ''), let arg = substitute(arg, '^\s\+', '', '')
if arg =~# '^\.\.\=\%(/\|$\)'
let arg = s:DotRelative(s:Slash(simplify(getcwd() . '/' . arg)), cwd)
endif
let arg = substitute(arg,
\ '\(' . dquote . '''\%(''''\|[^'']\)*''\|\\[' . s:fnameescape . ']\|^\\[>+-]\|!\d*\)\|' . s:expand, \ '\(' . dquote . '''\%(''''\|[^'']\)*''\|\\[' . s:fnameescape . ']\|^\\[>+-]\|!\d*\)\|' . s:expand,
\ '\=s:ExpandVar(submatch(1),submatch(2),submatch(3),submatch(5), a:0 > 1 ? a:2 : getcwd())', 'g') \ '\=s:ExpandVar(submatch(1),submatch(2),submatch(3),submatch(5), cwd)', 'g')
call add(list, arg) call add(list, arg)
endwhile endwhile
return handle_bar ? [list, ''] : list return handle_bar ? [list, ''] : list