Merge pull request #425 from lambdalisue/popup-nobuflisted

Fix invalid behavior when popup window is shown on Neovim

Author: lambdalisue

autoload/fern/internal/drawer/auto_restore_focus.vim

@@ -13,7 +13,7 @@ endfunction
 
 function! s:auto_restore_focus_pre() abort
   let s:info = {
-        \ 'nwin': winnr('$'),
+        \ 'nwin': s:nwin(),
         \ 'tabpage': tabpagenr(),
         \ 'prev': win_getid(winnr('#')),
         \}
@@ -24,12 +24,27 @@ function! s:auto_restore_focus() abort
   if s:info is# v:null
     return
   endif
-  if s:info.tabpage is# tabpagenr() && s:info.nwin > winnr('$')
+  if s:info.tabpage is# tabpagenr() && s:info.nwin > s:nwin()
     call win_gotoid(s:info.prev)
   endif
   let s:info = v:null
 endfunction
 
+if exists('*nvim_win_get_config')
+  " NOTE:
+  " Remove Neovim flating window from the total count
+  function! s:nwin() abort
+    return len(filter(
+          \ range(1, winnr('$')),
+          \ { _, v -> nvim_win_get_config(win_getid(v)).relative ==# '' },
+          \))
+  endfunction
+else
+  function! s:nwin() abort
+    return winnr('$')
+  endfunction
+endif
+
 augroup fern_internal_drawer_auto_restore_focus
   autocmd!
   autocmd WinEnter * nested call s:auto_restore_focus()

autoload/vital/_fern/App/Action.vim

@@ -108,6 +108,7 @@ function! s:list(...) abort
   let conceal = a:0 ? a:1 : v:true
   let l:Sort = { a, b -> s:_compare(a[1], b[1]) }
   let rs = split(execute('nmap'), '\n')
+  call filter(rs, {_, v -> match(v, '^n') != -1})
   call map(rs, { _, v -> v[3:] })
   call map(rs, { _, v -> matchlist(v, '^\([^ ]\+\)\s*\*\?@\?\(.*\)$')[1:2] })
 

autoload/vital/_fern/App/WindowLocator.vim

@@ -16,6 +16,11 @@ let s:conditions = [
       \ { wi -> !getbufvar(wi.bufnr, '&previewwindow', 0) },
       \]
 
+" Add condition to make sure that the window is not floating
+if exists('*nvim_win_get_config')
+  call add(s:conditions, { wi -> nvim_win_get_config(wi.winid).relative ==# '' })
+endif
+
 function! s:score(winnr) abort
   let winid = win_getid(a:winnr)
   let wininfo = getwininfo(winid)

autoload/vital/fern.vital

@@ -1,5 +1,5 @@
 fern
-5591eeba1bdae8e615c6460be211ea6e88d95c05
+1f5becb7cfdb83ebe3af9228038d7714cf088726
 
 App.Spinner
 Async.CancellationTokenSource