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

Encapsulate retrieval of blamed bufnr

Browse Source
This commit is contained in:
Tim Pope 2019-08-08 19:57:30 -04:00
parent 206b54a147
commit 4a42d4e21c
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
autoload/fugitive.vim
View File

@ -4568,8 +4568,13 @@ function! s:linechars(pattern) abort
return chars return chars
endfunction endfunction
function! s:BlameBufnr(...) abort
let val = getbufvar(a:0 ? a:1 : '', 'fugitive_blamed_bufnr')
return val > 0 ? val : -1
endfunction
function! s:BlameLeave() abort function! s:BlameLeave() abort
let bufwinnr = bufwinnr(get(b:, 'fugitive_blamed_bufnr', -1)) let bufwinnr = bufwinnr(s:BlameBufnr())
if bufwinnr > 0 if bufwinnr > 0
let bufnr = bufnr('') let bufnr = bufnr('')
exe bufwinnr . 'wincmd w' exe bufwinnr . 'wincmd w'
@ -4628,14 +4633,14 @@ function! s:BlameCommand(line1, line2, range, count, bang, mods, reg, arg, args)
endif endif
if a:count > 0 if a:count > 0
let edit = s:Mods(a:mods) . get(['edit', 'split', 'pedit'], a:count - (a:line1 ? a:line1 : 1), 'split') let edit = s:Mods(a:mods) . get(['edit', 'split', 'pedit'], a:count - (a:line1 ? a:line1 : 1), 'split')
return s:BlameCommit(edit, get(readfile(temp), 0, '')) return s:BlameCommit(edit, get(readfile(temp), 0, ''), bufnr(''))
else else
for winnr in range(winnr('$'),1,-1) for winnr in range(winnr('$'),1,-1)
call setwinvar(winnr, '&scrollbind', 0) call setwinvar(winnr, '&scrollbind', 0)
if exists('+cursorbind') if exists('+cursorbind')
call setwinvar(winnr, '&cursorbind', 0) call setwinvar(winnr, '&cursorbind', 0)
endif endif
if getbufvar(winbufnr(winnr), 'fugitive_blamed_bufnr') if s:BlameBufnr(winbufnr(winnr)) > 0
execute winbufnr(winnr).'bdelete' execute winbufnr(winnr).'bdelete'
endif endif
endfor endfor
@ -4715,8 +4720,11 @@ function! s:BlameCommit(cmd, ...) abort
endif endif
let lnum = matchstr(line, ' \zs\d\+\ze\s\+[([:digit:]]') let lnum = matchstr(line, ' \zs\d\+\ze\s\+[([:digit:]]')
let path = matchstr(line, '^\^\=\x\+\s\+\zs.\{-\}\ze\s*\d\+ ') let path = matchstr(line, '^\^\=\x\+\s\+\zs.\{-\}\ze\s*\d\+ ')
if path ==# '' if empty(path)
let path = fugitive#Path(a:0 ? @% : bufname(b:fugitive_blamed_bufnr), '') let path = fugitive#Path(bufname(a:0 ? a:2 : s:BlameBufnr()), '')
endif
if empty(path)
return 'echoerr ' . string('fugitive: could not determine filename for blame')
endif endif
execute cmd execute cmd
if a:cmd ==# 'pedit' if a:cmd ==# 'pedit'
@ -4761,13 +4769,17 @@ function! s:BlameJump(suffix) abort
endif endif
let lnum = matchstr(getline('.'),' \zs\d\+\ze\s\+[([:digit:]]') let lnum = matchstr(getline('.'),' \zs\d\+\ze\s\+[([:digit:]]')
let path = matchstr(getline('.'),'^\^\=\x\+\s\+\zs.\{-\}\ze\s*\d\+ ') let path = matchstr(getline('.'),'^\^\=\x\+\s\+\zs.\{-\}\ze\s*\d\+ ')
if path ==# '' let original_bufnr = s:BlameBufnr()
let path = fugitive#Path(bufname(b:fugitive_blamed_bufnr), '') if empty(path)
let path = fugitive#Path(bufname(original_bufnr), '')
endif endif
let args = b:fugitive_blame_arguments if empty(path)
return 'echoerr ' . string('fugitive: could not determine filename for blame')
endif
let args = get(b:, 'fugitive_blame_arguments', '')
let offset = line('.') - line('w0') let offset = line('.') - line('w0')
let bufnr = bufnr('%') let bufnr = bufnr('%')
let winnr = bufwinnr(b:fugitive_blamed_bufnr) let winnr = bufwinnr(original_bufnr)
if winnr > 0 if winnr > 0
exe winnr.'wincmd w' exe winnr.'wincmd w'
endif endif