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

Prevent errors when runner is closed by something other than vimux #237

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Prevent errors when runner is closed by something other than vimux #237

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 19 additions & 15 deletions plugin/vimux.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ function! VimuxRunLastCommand() abort
endfunction

function! VimuxRunCommand(command, ...) abort
if !exists('g:VimuxRunnerIndex') || s:hasRunner(g:VimuxRunnerIndex) ==# -1
if ! s:hasRunner()
call VimuxOpenRunner()
endif
let l:autoreturn = 1
Expand All @@ -87,14 +87,13 @@ function! VimuxSendText(text) abort
endfunction

function! VimuxSendKeys(keys) abort
if exists('g:VimuxRunnerIndex')
call VimuxTmux('send-keys -t '.g:VimuxRunnerIndex.' '.a:keys)
else
echo 'No vimux runner pane/window. Create one with VimuxOpenRunner'
endif
call VimuxTmux('send-keys -t '.g:VimuxRunnerIndex.' '.a:keys)
endfunction

function! VimuxOpenRunner() abort
if s:hasRunner()
return
endif
let existingId = s:existingRunnerId()
if existingId !=# ''
let g:VimuxRunnerIndex = existingId
Expand All @@ -112,14 +111,14 @@ function! VimuxOpenRunner() abort
endfunction

function! VimuxCloseRunner() abort
if exists('g:VimuxRunnerIndex')
if s:hasRunner()
call VimuxTmux('kill-'.VimuxOption('VimuxRunnerType').' -t '.g:VimuxRunnerIndex)
unlet g:VimuxRunnerIndex
endif
unlet g:VimuxRunnerIndex
endfunction

function! VimuxTogglePane() abort
if exists('g:VimuxRunnerIndex')
if s:hasRunner()
if VimuxOption('VimuxRunnerType') ==# 'window'
call VimuxTmux('join-pane -s '.g:VimuxRunnerIndex.' '.s:vimuxPaneOptions())
let g:VimuxRunnerType = 'pane'
Expand All @@ -138,7 +137,7 @@ function! VimuxTogglePane() abort
endfunction

function! VimuxZoomRunner() abort
if exists('g:VimuxRunnerIndex')
if s:hasRunner()
if VimuxOption('VimuxRunnerType') ==# 'pane'
call VimuxTmux('resize-pane -Z -t '.g:VimuxRunnerIndex)
elseif VimuxOption('VimuxRunnerType') ==# 'window'
Expand Down Expand Up @@ -169,14 +168,14 @@ function! VimuxInterruptRunner() abort
endfunction

function! VimuxClearTerminalScreen() abort
if exists('g:VimuxRunnerIndex') && s:hasRunner(g:VimuxRunnerIndex) !=# -1
if s:hasRunner()
call s:exitCopyMode()
call VimuxSendKeys('C-l')
endif
endfunction

function! VimuxClearRunnerHistory() abort
if exists('g:VimuxRunnerIndex') && s:hasRunner(g:VimuxRunnerIndex) !=# -1
if s:hasRunner()
call VimuxTmux('clear-history -t '.g:VimuxRunnerIndex)
endif
endfunction
Expand Down Expand Up @@ -327,9 +326,14 @@ function! s:tmuxProperty(property) abort
return substitute(VimuxTmux("display -p '".a:property."'"), '\n$', '', '')
endfunction

function! s:hasRunner(index) abort
let runnerType = VimuxOption('VimuxRunnerType')
return match(VimuxTmux('list-'.runnerType."s -F '#{".runnerType."_id}'"), a:index)
function! s:hasRunner() abort
if ! exists('g:VimuxRunnerIndex')
return v:false
endif
let l:runnerType = VimuxOption('VimuxRunnerType')
let l:command = 'list-'.runnerType."s -F '#{".runnerType."_id}'"
let l:found = match(VimuxTmux(l:command), g:VimuxRunnerIndex)
return l:found != -1
endfunction

function! s:autoclose() abort
Expand Down
Loading