Play nice with builtin fold.

ipod825 · ipod825 · commit 31b84a32033f · 2020-11-28T12:01:28.000-08:00
diff --git a/autoload/netranger/fold.vim b/autoload/netranger/fold.vim
@@ -0,0 +1,3 @@
+function! netranger#fold#foldtext()
+    return substitute(getline(v:foldstart), '\e\[[0-9;]*m', '', 'g')
+endfunction
diff --git a/plugin/netranger.vim b/plugin/netranger.vim
@@ -40,6 +40,7 @@ function NetrangerInit()
         autocmd Filetype netranger autocmd WinEnter <buffer> exec g:_NETRPY.'ranger.on_winenter('.expand("<abuf>").')'
         autocmd Filetype netranger autocmd CursorMoved <buffer> exec g:_NETRPY.'ranger.on_cursormoved('.expand("<abuf>").')'
         autocmd Filetype netranger autocmd BufWriteCmd <buffer> exec g:_NETRPY.'ranger.NETRSave()'
+        autocmd Filetype netranger setlocal foldtext=netranger#fold#foldtext()
         autocmd ColorScheme * call netranger#syntax#define()
     augroup END
     silent doautocmd USER NETRInit
diff --git a/pythonx/netranger/netranger.py b/pythonx/netranger/netranger.py
@@ -1626,7 +1626,10 @@ def NETRToggleExpand(self):
         """ Expand the current node. """
         if self.cur_buf.fs_busy():
             return
-        self.cur_buf.toggle_expand()
+        if int(Vim.eval('foldclosed(".")')) > -1:
+            Vim.command('normal! za')
+        else:
+            self.cur_buf.toggle_expand()
 
     def NETRToggleExpandRec(self):
         """ Expand the current node recursively. """

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+function! netranger#fold#foldtext()`
	`2`	`+ return substitute(getline(v:foldstart), '\e\[[0-9;]*m', '', 'g')`
	`3`	`+endfunction`