Add optional argument winid for vista#finder#fzf#sink()

Ref liuchengxu/vim-clap#523
liuchengxu · Sep 17, 2020 · 7972a7c · 7972a7c
1 parent 7f97d30
commit 7972a7c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/autoload/vista/finder/fzf.vim b/autoload/vista/finder/fzf.vim
@@ -79,11 +79,18 @@ function! vista#finder#fzf#extract(line) abort
   return [lnum, tag]
 endfunction
 
-function! vista#finder#fzf#sink(line) abort
+" Optional argument: winid for the origin tags window
+function! vista#finder#fzf#sink(line, ...) abort
   let [lnum, tag] = vista#finder#fzf#extract(a:line)
   let col = stridx(g:vista.source.line(lnum), tag)
   let col = col == -1 ? 1 : col + 1
-  call vista#source#GotoWin()
+  if a:0 > 0
+    if win_getid() != a:1
+      noautocmd call win_gotoid(a:1)
+    endif
+  else
+    call vista#source#GotoWin()
+  endif
   call cursor(lnum, col)
   normal! zz
   call call('vista#util#Blink', get(g:, 'vista_blink', [2, 100]))

diff --git a/autoload/vista/source.vim b/autoload/vista/source.vim
@@ -5,7 +5,7 @@
 if exists('*bufwinid')
   function! s:GotoSourceWindow() abort
     let winid = g:vista.source.get_winid()
-    if winid != -1
+    if winid != -1 && win_getid() != winid
       noautocmd call win_gotoid(winid)
     else
       return vista#error#('Cannot find the source window id')