Skip to content
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

Add defx support #2282

Merged
merged 28 commits into from
Mar 10, 2019
Merged

Add defx support #2282

Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
9f34251
Add defx support
wsdjeg Oct 28, 2018
1be58e2
Add defx support
wsdjeg Oct 28, 2018
3fc7a33
Add defx support
wsdjeg Oct 28, 2018
3683074
Add defx support
wsdjeg Oct 28, 2018
d208f95
Add defx support
wsdjeg Oct 28, 2018
be7036d
Add status line for defx
wsdjeg Oct 28, 2018
17f2951
Add key bindings
wsdjeg Oct 28, 2018
68d0120
Merge branch 'master' into defx
wsdjeg Feb 12, 2019
ee1bf8f
Fix diff
wsdjeg Feb 12, 2019
06e9d52
Fix txt
wsdjeg Feb 12, 2019
b105419
Merge branch 'master' into defx
wsdjeg Feb 14, 2019
287e4eb
Merge branch 'master' into defx
wsdjeg Mar 2, 2019
79d24bf
Update function
wsdjeg Mar 2, 2019
6a73295
Merge branch 'master' into defx
wsdjeg Mar 10, 2019
cb017ef
Update defx support
wsdjeg Mar 10, 2019
348188c
Update icon
wsdjeg Mar 10, 2019
107f947
Update key bindings
wsdjeg Mar 10, 2019
58ca904
Remove root icon
wsdjeg Mar 10, 2019
5c6bf8c
Add file head
wsdjeg Mar 10, 2019
16dd8c4
Add key binding
wsdjeg Mar 10, 2019
3a6f204
Fix defx key binding
wsdjeg Mar 10, 2019
db0e73d
Add select key binding
wsdjeg Mar 10, 2019
b3c92e5
Smart close ignore defx
wsdjeg Mar 10, 2019
a30b2a3
Remvoe unused key
wsdjeg Mar 10, 2019
84775ef
Fix gx command
wsdjeg Mar 10, 2019
ae7a1ba
Fix key binding
wsdjeg Mar 10, 2019
59fa317
Add todo
wsdjeg Mar 10, 2019
d68ba94
Start defx in welcome func
wsdjeg Mar 10, 2019
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
Prev Previous commit
Next Next commit
Fix defx key binding
  • Loading branch information
@wsdjeg
wsdjeg committed Mar 10, 2019
commit 3a6f204588a9103c269d0abc17dce94a6b0d438b
40 changes: 32 additions & 8 deletions config/plugins/defx.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

" defx supported is added in https://github.com/SpaceVim/SpaceVim/pull/2282

let s:SYS = SpaceVim#api#import('system')

call defx#custom#option('_', {
\ 'winwidth': g:spacevim_sidebar_width,
\ 'split': 'vertical',
Expand Down Expand Up @@ -76,23 +78,20 @@ function! s:defx_init()
\ defx#do_action('move')
nnoremap <silent><buffer><expr> p
\ defx#do_action('paste')
nnoremap <silent><buffer><expr> h
\ defx#do_action('close_tree')
nnoremap <silent><buffer><expr> <Left>
\ defx#is_directory() ?
\ defx#do_action('close_tree') : ''
nnoremap <silent><buffer><expr> h defx#do_action('call', 'DefxSmartH')
nnoremap <silent><buffer><expr> <Left> defx#do_action('call', 'DefxSmartH')
nnoremap <silent><buffer><expr> l
\ defx#is_directory() ?
\ defx#do_action('open_tree') : defx#do_action('open')
nnoremap <silent><buffer><expr> <Right>
\ defx#is_directory() ?
\ defx#do_action('open_tree') : defx#do_action('open')
nnoremap <silent><buffer><expr> <Cr>
\ defx#is_directory() ?
\ defx#do_action('open_directory') : defx#do_action('drop')
nnoremap <silent><buffer><expr> <2-LeftMouse>
\ defx#is_directory() ?
\ defx#do_action('open_tree') : defx#do_action('drop')
nnoremap <silent><buffer><expr> <Right>
\ defx#is_directory() ?
\ defx#do_action('open_tree') : defx#do_action('open')
nnoremap <silent><buffer><expr> E
\ defx#do_action('open', 'vsplit')
nnoremap <silent><buffer><expr> P
Expand Down Expand Up @@ -128,3 +127,28 @@ function! s:defx_init()
nnoremap <silent><buffer><expr> cd
\ defx#do_action('change_vim_cwd')
endf

function! DefxSmartH(_)
" candidate is opend tree?
if defx#is_opened_tree()
return defx#call_action('close_tree')
endif

" parent is root?
let s:candidate = defx#get_candidate()
let s:parent = fnamemodify(s:candidate['action__path'], s:candidate['is_directory'] ? ':p:h:h' : ':p:h')
let sep = s:SYS.isWindows ? '\\' : '/'
if s:trim_right(s:parent, sep) == s:trim_right(b:defx.paths[0], sep)
return defx#call_action('cd', ['..'])
endif

" move to parent.
call defx#call_action('search', s:parent)

" if you want close_tree immediately, enable below line.
call defx#call_action('close_tree')
endfunction

function! s:trim_right(str, trim)
return substitute(a:str, printf('%s$', a:trim), '', 'g')
endfunction