Skip to content

edit files using a relative path when possible #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fabi1cazenave wants to merge 2 commits into
base: master
Choose a base branch
from
Open

edit files using a relative path when possible #71

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98e3e73
edit files using a relative path when possible
fabi1cazenave Nov 30, 2018
60146fb
don't include a trailing space in `edit_cmd`
fabi1cazenave Dec 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 28 additions & 33 deletions plugin/ranger.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,45 +44,40 @@ if !exists('s:choice_file_path')
let s:choice_file_path = '/tmp/chosenfile'
endif

function! s:EditFiles(cmd)
try
if filereadable(s:choice_file_path)
let cwd = getcwd()
for f in readfile(s:choice_file_path)
exec a:cmd . ' ' . (f[0:len(cwd)-1] ==# cwd ? f[len(cwd)+1:-1] : f)
endfor
call delete(s:choice_file_path)
endif
endtry
endfunction

function! s:GetRangerCmd(path)
return s:ranger_command . ' --choosefiles=' . s:choice_file_path .
\ (isdirectory(a:path) ? ' "' : ' --selectfile="') . expand(a:path) . '"'
Copy link
Owner

@francoiscabrol francoiscabrol Dec 10, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know why but the path is not concatenated correctly and that breaks the default behaviour:

  • if you open a file in vim
  • then you open ranger in the same window
  • it should select the file in Ranger and it does not (see the command RangerCurrentFile).

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 . f
endfor
call delete(s:choice_file_path)
endif
endtry
call s: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(s: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 . f
endfor
call delete(s:choice_file_path)
endif
silent exec '!' . s:GetRangerCmd(a:path)
call s:EditFiles(a:edit_cmd)
redraw!
" reset the filetype to fix the issue that happens
" when opening ranger on VimEnter (with `vim .`)
Expand All @@ -92,20 +87,20 @@ endif

" For backwards-compatibility (deprecated)
if exists('g:ranger_open_new_tab') && g:ranger_open_new_tab
let s:default_edit_cmd='tabedit '
let s:default_edit_cmd='tabedit'
else
let s:default_edit_cmd='edit '
let s:default_edit_cmd='edit'
endif

command! RangerCurrentFile call OpenRangerIn("%", s:default_edit_cmd)
command! RangerCurrentFile call OpenRangerIn("%", s:default_edit_cmd)
command! RangerCurrentDirectory call OpenRangerIn("%:p:h", s:default_edit_cmd)
command! RangerWorkingDirectory call OpenRangerIn(".", s:default_edit_cmd)
command! RangerWorkingDirectory call OpenRangerIn(".", s:default_edit_cmd)
command! Ranger RangerCurrentFile

" To open the selected file in a new tab
command! RangerCurrentFileNewTab call OpenRangerIn("%", 'tabedit ')
command! RangerCurrentDirectoryNewTab call OpenRangerIn("%:p:h", 'tabedit ')
command! RangerWorkingDirectoryNewTab call OpenRangerIn(".", 'tabedit ')
command! RangerCurrentFileNewTab call OpenRangerIn("%", 'tabedit')
command! RangerCurrentDirectoryNewTab call OpenRangerIn("%:p:h", 'tabedit')
command! RangerWorkingDirectoryNewTab call OpenRangerIn(".", 'tabedit')
command! RangerNewTab RangerCurrentDirectoryNewTab

" For retro-compatibility
Expand Down