Merge pull request #288 from lambdalisue/fix-refresh-directory

Ignore and remove expanded directory on 'reload' action if the directory has removed outside of fern

Author: lambdalisue

autoload/fern/comparator/default.vim

@@ -26,10 +26,10 @@ function! s:compare(n1, n2) abort
     endif
   endfor
   " Shorter first
-  let r = s:comp(l1, l2)
-  return r is# 0 ? s:comp(!a:n1.status, !a:n2.status) : r
-endfunction
-
-function! s:comp(i1, i2) abort
-  return a:i1 == a:i2 ? 0 : a:i1 > a:i2 ? 1 : -1
+  let r = fern#util#compare(l1, l2)
+  if r isnot# 0
+    return r
+  endif
+  " Leaf first
+  return fern#util#compare(!a:n1.status, !a:n2.status)
 endfunction

autoload/fern/internal/node.vim

@@ -173,17 +173,20 @@ function! fern#internal#node#reload(node, nodes, provider, comparator, token) ab
   let inner = s:Promise.resolve(copy(a:nodes))
         \.then(s:AsyncLambda.filter_f({ v -> K(v) == k  }))
         \.then(s:AsyncLambda.filter_f({ v -> v.status is# s:STATUS_EXPANDED }))
-  let descendants = inner
-        \.then({v -> copy(v)})
         \.then(s:AsyncLambda.map_f({ v ->
-        \   fern#internal#node#children(v, a:provider, a:token, { 'cache': 0 }).then({ children ->
-        \     s:Lambda.if(v.status is# s:STATUS_EXPANDED, { -> children }, { -> []})
+        \   fern#internal#node#children(v, a:provider, a:token, {
+        \    'cache': 0,
+        \   }).then({ children ->
+        \     s:Lambda.if(v.status is# s:STATUS_EXPANDED, { -> [v] + children }, { -> [v]})
+        \   }).catch({ error ->
+        \     s:Lambda.pass([], fern#logger#warn(error))
         \   })
         \ }))
         \.then({ v -> s:Promise.all(v) })
         \.then(s:AsyncLambda.reduce_f({ a, v -> a + v }, []))
+        \.then({ v -> s:sort(v, { a, b -> fern#util#compare(b.status, a.status) }) })
   let l:Done = fern#internal#node#process(a:node)
-  return s:Promise.all([outer, inner, descendants])
+  return s:Promise.all([outer, inner])
         \.finally({ -> Profile('all') })
         \.then(s:AsyncLambda.reduce_f({ a, v -> a + v }, []))
         \.finally({ -> Profile('reduce') })

autoload/fern/util.vim

@@ -1,5 +1,9 @@
 let s:Promise = vital#fern#import('Async.Promise')
 
+function! fern#util#compare(i1, i2) abort
+  return a:i1 == a:i2 ? 0 : a:i1 > a:i2 ? 1 : -1
+endfunction
+
 function! fern#util#sleep(ms) abort
   return s:Promise.new({ resolve -> timer_start(a:ms, { -> resolve() }) })
 endfunction

doc/fern-develop.txt

@@ -681,6 +681,14 @@ fern#hook#emit({name}[, {args}...])
 	call fern#hook#emit('t', 'Hello', 'World')
 	" -> ['Hello', 'World']
 <
+						*fern#util#compare()*
+fern#util#compare({i1}, {i2})
+	Compare {i1} and {i2} and return -1, 0, or 1.
+	This is equivalent to the following code
+>
+	i1 == i2 ? 0 : i1 > i2 ? 1 : -1
+<
+
 						*fern#util#sleep()*
 fern#util#sleep({ms})
 	Return a promise which will be resolved after {ms} milliseconds.

test/fern/internal/node.vimspec

@@ -237,6 +237,57 @@ Describe fern#internal#node
       Assert Equals(r[6]._uri, '/shallow/gamma')
       Assert Equals(r[7]._uri, '/leaf')
     End
+
+    It keeps status of nodes
+      let [r, e] = Promise.wait(
+            \ fern#internal#node#reload(node, nodes, provider, Comparator, token),
+            \ { 'timeout': TIMEOUT },
+            \)
+      Assert Equals(e, v:null)
+      Assert Equals(len(r), 8)
+      Assert Equals(r[0].status, g:fern#STATUS_EXPANDED)
+      Assert Equals(r[1].status, g:fern#STATUS_COLLAPSED)
+      Assert Equals(r[2].status, g:fern#STATUS_COLLAPSED)
+      Assert Equals(r[3].status, g:fern#STATUS_EXPANDED)
+      Assert Equals(r[4].status, g:fern#STATUS_COLLAPSED)
+      Assert Equals(r[5].status, g:fern#STATUS_COLLAPSED)
+      Assert Equals(r[6].status, g:fern#STATUS_NONE)
+      Assert Equals(r[7].status, g:fern#STATUS_NONE)
+    End
+
+    It resolves to a list of nodes (root)
+      let [r, e] = Promise.wait(
+            \ fern#internal#node#reload(nodes[0], nodes, provider, Comparator, token),
+            \ { 'timeout': TIMEOUT },
+            \)
+      Assert Equals(e, v:null)
+      Assert Equals(len(r), 8)
+      Assert Equals(r[0]._uri, '/')
+      Assert Equals(r[1]._uri, '/deep')
+      Assert Equals(r[2]._uri, '/heavy')
+      Assert Equals(r[3]._uri, '/shallow')
+      Assert Equals(r[4]._uri, '/shallow/alpha')
+      Assert Equals(r[5]._uri, '/shallow/beta')
+      Assert Equals(r[6]._uri, '/shallow/gamma')
+      Assert Equals(r[7]._uri, '/leaf')
+    End
+
+    It keeps status of nodes (root)
+      let [r, e] = Promise.wait(
+            \ fern#internal#node#reload(nodes[0], nodes, provider, Comparator, token),
+            \ { 'timeout': TIMEOUT },
+            \)
+      Assert Equals(e, v:null)
+      Assert Equals(len(r), 8)
+      Assert Equals(r[0].status, g:fern#STATUS_EXPANDED)
+      Assert Equals(r[1].status, g:fern#STATUS_COLLAPSED)
+      Assert Equals(r[2].status, g:fern#STATUS_COLLAPSED)
+      Assert Equals(r[3].status, g:fern#STATUS_EXPANDED)
+      Assert Equals(r[4].status, g:fern#STATUS_COLLAPSED)
+      Assert Equals(r[5].status, g:fern#STATUS_COLLAPSED)
+      Assert Equals(r[6].status, g:fern#STATUS_NONE)
+      Assert Equals(r[7].status, g:fern#STATUS_NONE)
+    End
   End
 
   Describe #reveal()