code factorization

Author: fabi1cazenave

plugin/ranger.vim

@@ -44,45 +44,39 @@ if !exists('s:choice_file_path')
   let s:choice_file_path = '/tmp/chosenfile'
 endif
 
+function! EditFiles(cmd)
+  try
+    if filereadable(s:choice_file_path)
+      for f in readfile(s:choice_file_path)
+        exec a:cmd . split(f, getcwd() . '/')[0]
+      endfor
+      call delete(s:choice_file_path)
+    endif
+  endtry
+endfunction
+
+function! GetRangerCmd(path)
+  return s:ranger_command . ' --choosefiles=' . s:choice_file_path .
+      \ (isdirectory(a:path) ? ' "' : ' --selectfile="') . expand(a:path) . '"'
+endfunction
+
 if has('nvim')
   function! OpenRangerIn(path, edit_cmd)
-    let currentPath = expand(a:path)
     let rangerCallback = { 'name': 'ranger', 'edit_cmd': a:edit_cmd }
     function! rangerCallback.on_exit(job_id, code, event)
       if a:code == 0
         silent! Bclose!
       endif
-      try
-        if filereadable(s:choice_file_path)
-          for f in readfile(s:choice_file_path)
-            exec self.edit_cmd . split(f, getcwd() . '/')[0]
-          endfor
-          call delete(s:choice_file_path)
-        endif
-      endtry
+      call EditFiles(self.edit_cmd)
     endfunction
     enew
-    if isdirectory(currentPath)
-      call termopen(s:ranger_command . ' --choosefiles=' . s:choice_file_path . ' "' . currentPath . '"', rangerCallback)
-    else
-      call termopen(s:ranger_command . ' --choosefiles=' . s:choice_file_path . ' --selectfile="' . currentPath . '"', rangerCallback)
-    endif
+    call termopen(GetRangerCmd(a:path), rangerCallback)
     startinsert
   endfunction
 else
   function! OpenRangerIn(path, edit_cmd)
-    let currentPath = expand(a:path)
-    if isdirectory(currentPath)
-      silent exec '!' . s:ranger_command . ' --choosefiles=' . s:choice_file_path . ' "' . currentPath . '"'
-    else
-      silent exec '!' . s:ranger_command . ' --choosefiles=' . s:choice_file_path . ' --selectfile="' . currentPath . '"'
-    endif
-    if filereadable(s:choice_file_path)
-      for f in readfile(s:choice_file_path)
-        exec a:edit_cmd . split(f, getcwd() . '/')[0]
-      endfor
-      call delete(s:choice_file_path)
-    endif
+    silent exec '!' . GetRangerCmd(a:path)
+    call EditFiles(a:edit_cmd)
     redraw!
     " reset the filetype to fix the issue that happens
     " when opening ranger on VimEnter (with `vim .`)