Gaze/SpaceVim
1
0
Fork 0
mirror of https://github.com/SpaceVim/SpaceVim.git synced 2025-01-23 13:10:04 +08:00
Code Issues Projects Releases Wiki Activity

Fix SPC '

Browse Source
This commit is contained in:
wsdjeg 2017-07-28 06:24:37 +08:00
parent e68fb5f706
commit cc40bf717d
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
autoload/SpaceVim/layers/shell.vim
View File

@ -17,7 +17,7 @@ function! SpaceVim#layers#shell#plugins() abort
return plugins return plugins
endfunction endfunction
function! SpaceVim#layers#shell#config() function! SpaceVim#layers#shell#config() abort
call SpaceVim#mapping#space#def('nnoremap', ["'"], 'call call(' call SpaceVim#mapping#space#def('nnoremap', ["'"], 'call call('
\ . string(function('s:open_default_shell')) . ', [])', \ . string(function('s:open_default_shell')) . ', [])',
@ -25,14 +25,22 @@ function! SpaceVim#layers#shell#config()
endfunction endfunction
function! SpaceVim#layers#shell#set_variable(var) function! SpaceVim#layers#shell#set_variable(var) abort
let s:default_shell = get(a:var, 'defaut_shell', 'terminal') let s:default_shell = get(a:var, 'defaut_shell', 'terminal')
let s:default_position = get(a:var, 'default_position', 'top') let s:default_position = get(a:var, 'default_position', 'top')
let s:default_height = get(a:var, 'default_height', 30) let s:default_height = get(a:var, 'default_height', 30)
endfunction endfunction
let s:shell_win_nr = 0
function! s:open_default_shell() abort function! s:open_default_shell() abort
if s:shell_win_nr != 0 && getwinvar(s:shell_win_nr, '&buftype') ==# 'terminal' && &buftype !=# 'terminal'
exe s:shell_win_nr . 'wincmd w'
return
endif
if &buftype ==# 'terminal'
bwipeout! %
return
endif
let cmd = s:default_position ==# 'top' ? let cmd = s:default_position ==# 'top' ?
\ 'topleft split' : \ 'topleft split' :
\ s:default_position ==# 'bottom' ? \ s:default_position ==# 'bottom' ?
@ -44,4 +52,14 @@ function! s:open_default_shell() abort
if lines < winheight(0) && (s:default_position ==# 'top' || s:default_position ==# 'bottom') if lines < winheight(0) && (s:default_position ==# 'top' || s:default_position ==# 'bottom')
exe 'resize ' . lines exe 'resize ' . lines
endif endif
if s:default_shell ==# 'terminal'
if exists(':te')
exe 'te'
let s:shell_win_nr = winnr()
else
echo ':terminal is not supported in this version'
endif
elseif s:default_shell ==# 'VimShell'
VimShell
endif
endfunction endfunction

2
config/neovim.vim
View File

@ -71,7 +71,7 @@ let g:terminal_color_15 = '#ebdbb2'
augroup Terminal augroup Terminal
au! au!
au TermOpen * let g:last_terminal_job_id = b:terminal_job_id | IndentLinesDisable au TermOpen * let g:last_terminal_job_id = b:terminal_job_id | IndentLinesDisable
au BufWinEnter term://* startinsert | IndentLinesDisable au WinEnter,BufWinEnter term://* startinsert | IndentLinesDisable
if has('timers') if has('timers')
au TermClose * let g:_spacevim_termclose_abuf = expand('<abuf>') | call timer_start(5, 'SpaceVim#mapping#close_term_buffer') au TermClose * let g:_spacevim_termclose_abuf = expand('<abuf>') | call timer_start(5, 'SpaceVim#mapping#close_term_buffer')
else else