Merge pull request #88 from lambdalisue/persistent-status

Keep hidden/include/exclude after enter/leave

Author: lambdalisue

autoload/fern/helper/async.vim

@@ -198,15 +198,36 @@ function! s:async_enter_tree(node) abort dict
   if a:node.status is# helper.STATUS_NONE
     return s:Promise.reject()
   endif
+  let saved = {
+        \ 'hidden': fern.hidden,
+        \ 'include': fern.include,
+        \ 'exclude': fern.exclude,
+        \}
   return s:Promise.resolve(a:node)
         \.then({ n -> s:enter(fern, n) })
+        \.then({ bufnr -> fern#helper#new(bufnr) })
+        \.then({ helper -> s:async_enter_tree_post(helper, saved) })
+endfunction
+function! s:async_enter_tree_post(helper, saved) abort
+  let fern = a:helper.fern
+  let fern.hidden = a:saved.hidden
+  let fern.include = a:saved.include
+  let fern.exclude = a:saved.exclude
+  return a:helper.async.update_nodes(fern.nodes)
+        \.then({ -> a:helper.async.redraw() })
 endfunction
 let s:async.enter_tree = funcref('s:async_enter_tree')
 
 function! s:async_leave_tree() abort dict
   let helper = self.helper
   let fern = helper.fern
   let root = helper.sync.get_root_node()
+  let saved = {
+        \ 'name': root.name,
+        \ 'hidden': fern.hidden,
+        \ 'include': fern.include,
+        \ 'exclude': fern.exclude,
+        \}
   return s:Promise.resolve()
         \.then({ -> fern#internal#node#parent(
         \   root,
@@ -215,8 +236,17 @@ function! s:async_leave_tree() abort dict
         \ )
         \})
         \.then({ n -> s:enter(fern, n) })
-        \.then({ -> fern#helper#new(winbufnr(helper.winid)) })
-        \.then({ h -> h.sync.focus_node([root.name]) })
+        \.then({ bufnr -> fern#helper#new(bufnr) })
+        \.then({ helper -> s:async_leave_tree_post(helper, saved) })
+endfunction
+function! s:async_leave_tree_post(helper, saved) abort
+  let fern = a:helper.fern
+  let fern.hidden = a:saved.hidden
+  let fern.include = a:saved.include
+  let fern.exclude = a:saved.exclude
+  return a:helper.async.update_nodes(fern.nodes)
+        \.then({ -> a:helper.async.redraw() })
+        \.then({ -> a:helper.sync.focus_node([a:saved.name]) })
 endfunction
 let s:async.leave_tree = funcref('s:async_leave_tree')
 

autoload/fern/internal/buffer.vim

@@ -26,7 +26,7 @@ function! fern#internal#buffer#open(bufname, ...) abort
   if options.opener ==# 'select'
     let options.opener = 'edit'
     if fern#internal#window#select()
-      return
+      return 1
     endif
   else
     if options.locator

autoload/fern/internal/viewer.vim

@@ -7,17 +7,17 @@ function! fern#internal#viewer#open(fri, options) abort
 endfunction
 
 function! fern#internal#viewer#init() abort
-  if exists('b:fern') && !get(g:, 'fern_debug')
-    return s:Promise.resolve()
-  endif
   let bufnr = bufnr('%')
   return s:init()
         \.then({ -> s:notify(bufnr, v:null) })
         \.catch({ e -> s:Lambda.pass(e, s:notify(bufnr, e)) })
 endfunction
 
 function! s:open(bufname, options, resolve, reject) abort
-  call fern#internal#buffer#open(a:bufname . '$', a:options)
+  if fern#internal#buffer#open(a:bufname . '$', a:options)
+    call a:reject('Cancelled')
+    return
+  endif
   let b:fern_notifier = {
         \ 'resolve': a:resolve,
         \ 'reject': a:reject,

plugin/fern.vim

@@ -14,6 +14,9 @@ command! -bar -nargs=*
       \ call fern#internal#command#focus#command(<q-mods>, [<f-args>])
 
 function! s:BufReadCmd() abort
+  if exists('b:fern') && !get(g:, 'fern_debug')
+    return
+  endif
   call fern#internal#viewer#init()
         \.catch({ e -> fern#logger#error(e) })
 endfunction