VimPlug/vim-fugitive
1
0
Fork 0
mirror of https://github.com/tpope/vim-fugitive.git synced 2025-12-07 04:34:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Expand ~ and $VAR in :Git arguments

Browse Source
This commit is contained in:
Tim Pope
2021-08-23 01:25:19 -04:00
parent 490e03c3ad
commit 0bd41bd387
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
autoload/fugitive.vim
View File

@@ -1698,7 +1698,7 @@ function! s:BufName(var) abort
endfunction endfunction
function! s:ExpandVarLegacy(str) abort function! s:ExpandVarLegacy(str) abort
if get(g:, 'fugitive_legacy_quoting', 1) if get(g:, 'fugitive_legacy_quoting', 0)
return substitute(a:str, '\\\ze[%#!]', '', 'g') return substitute(a:str, '\\\ze[%#!]', '', 'g')
else else
return a:str return a:str
@@ -1717,6 +1717,8 @@ function! s:ExpandVar(other, var, flags, esc, ...) abort
let buffer = s:BufName(len(a:other) > 1 ? '#'. a:other[1:-1] : '%') let buffer = s:BufName(len(a:other) > 1 ? '#'. a:other[1:-1] : '%')
let owner = s:Owner(buffer) let owner = s:Owner(buffer)
return len(owner) ? owner : '@' return len(owner) ? owner : '@'
elseif len(a:other)
return expand(a:other)
elseif a:var ==# '<cfile>' elseif a:var ==# '<cfile>'
let bufnames = [expand('<cfile>')] let bufnames = [expand('<cfile>')]
if v:version >= 704 && get(maparg('<Plug><cfile>', 'c', 0, 1), 'expr') if v:version >= 704 && get(maparg('<Plug><cfile>', 'c', 0, 1), 'expr')
@@ -1804,7 +1806,7 @@ function! s:SplitExpandChain(string, ...) abort
\ '\=s:DotRelative(s:Slash(simplify(getcwd() . "/" . submatch(0))), cwd)', '') \ '\=s:DotRelative(s:Slash(simplify(getcwd() . "/" . submatch(0))), cwd)', '')
endif endif
let arg = substitute(arg, let arg = substitute(arg,
\ '\(' . dquote . '''\%(''''\|[^'']\)*''\|\\[' . s:fnameescape . ']\|^\\[>+-]\|!\d*\)\|' . s:expand, \ '\(' . dquote . '''\%(''''\|[^'']\)*''\|\\[' . s:fnameescape . ']\|^\\[>+-]\|!\d*\|^\~\w*\|\$\w\+\)\|' . s:expand,
\ '\=s:ExpandVar(submatch(1),submatch(2),submatch(3),submatch(5), cwd)', 'g') \ '\=s:ExpandVar(submatch(1),submatch(2),submatch(3),submatch(5), cwd)', 'g')
call extend(list, split(arg, "\1", 1)) call extend(list, split(arg, "\1", 1))
if arg ==# '--' if arg ==# '--'