Use abort for all function declarations (#196)

See:
`:help func-abort`
`:help except-compat`
fix-tmux-next-3dot4
Michael van der Kamp 3 years ago committed by GitHub
parent ee0dfae330
commit a1650d5f9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -48,7 +48,7 @@ if VimuxOption('VimuxCloseOnExit')
augroup END augroup END
endif endif
function! VimuxRunCommandInDir(command, useFile) function! VimuxRunCommandInDir(command, useFile) abort
let l:file = '' let l:file = ''
if a:useFile ==# 1 if a:useFile ==# 1
let l:file = shellescape(expand('%:t'), 1) let l:file = shellescape(expand('%:t'), 1)
@ -56,7 +56,7 @@ function! VimuxRunCommandInDir(command, useFile)
call VimuxRunCommand('(cd '.shellescape(expand('%:p:h'), 1).' && '.a:command.' '.l:file.')') call VimuxRunCommand('(cd '.shellescape(expand('%:p:h'), 1).' && '.a:command.' '.l:file.')')
endfunction endfunction
function! VimuxRunLastCommand() function! VimuxRunLastCommand() abort
if exists('g:VimuxLastCommand') if exists('g:VimuxLastCommand')
call VimuxRunCommand(g:VimuxLastCommand) call VimuxRunCommand(g:VimuxLastCommand)
else else
@ -64,7 +64,7 @@ function! VimuxRunLastCommand()
endif endif
endfunction endfunction
function! VimuxRunCommand(command, ...) function! VimuxRunCommand(command, ...) abort
if !exists('g:VimuxRunnerIndex') || s:hasRunner(g:VimuxRunnerIndex) ==# -1 if !exists('g:VimuxRunnerIndex') || s:hasRunner(g:VimuxRunnerIndex) ==# -1
call VimuxOpenRunner() call VimuxOpenRunner()
endif endif
@ -81,11 +81,11 @@ function! VimuxRunCommand(command, ...)
endif endif
endfunction endfunction
function! VimuxSendText(text) function! VimuxSendText(text) abort
call VimuxSendKeys(shellescape(substitute(a:text, '\n$', ' ', ''))) call VimuxSendKeys(shellescape(substitute(a:text, '\n$', ' ', '')))
endfunction endfunction
function! VimuxSendKeys(keys) function! VimuxSendKeys(keys) abort
if exists('g:VimuxRunnerIndex') if exists('g:VimuxRunnerIndex')
call VimuxTmux('send-keys -t '.g:VimuxRunnerIndex.' '.a:keys) call VimuxTmux('send-keys -t '.g:VimuxRunnerIndex.' '.a:keys)
else else
@ -93,7 +93,7 @@ function! VimuxSendKeys(keys)
endif endif
endfunction endfunction
function! VimuxOpenRunner() function! VimuxOpenRunner() abort
let nearestIndex = s:nearestIndex() let nearestIndex = s:nearestIndex()
if VimuxOption('VimuxUseNearest') ==# 1 && nearestIndex != -1 if VimuxOption('VimuxUseNearest') ==# 1 && nearestIndex != -1
let g:VimuxRunnerIndex = nearestIndex let g:VimuxRunnerIndex = nearestIndex
@ -112,14 +112,14 @@ function! VimuxOpenRunner()
endif endif
endfunction endfunction
function! VimuxCloseRunner() function! VimuxCloseRunner() abort
if exists('g:VimuxRunnerIndex') if exists('g:VimuxRunnerIndex')
call VimuxTmux('kill-'.VimuxOption('VimuxRunnerType').' -t '.g:VimuxRunnerIndex) call VimuxTmux('kill-'.VimuxOption('VimuxRunnerType').' -t '.g:VimuxRunnerIndex)
unlet g:VimuxRunnerIndex unlet g:VimuxRunnerIndex
endif endif
endfunction endfunction
function! VimuxTogglePane() function! VimuxTogglePane() abort
if exists('g:VimuxRunnerIndex') if exists('g:VimuxRunnerIndex')
if VimuxOption('VimuxRunnerType') ==# 'window' if VimuxOption('VimuxRunnerType') ==# 'window'
call VimuxTmux('join-pane -s '.g:VimuxRunnerIndex.' -p '.VimuxOption('VimuxHeight')) call VimuxTmux('join-pane -s '.g:VimuxRunnerIndex.' -p '.VimuxOption('VimuxHeight'))
@ -133,7 +133,7 @@ function! VimuxTogglePane()
endif endif
endfunction endfunction
function! VimuxZoomRunner() function! VimuxZoomRunner() abort
if exists('g:VimuxRunnerIndex') if exists('g:VimuxRunnerIndex')
if VimuxOption('VimuxRunnerType') ==# 'pane' if VimuxOption('VimuxRunnerType') ==# 'pane'
call VimuxTmux('resize-pane -Z -t '.g:VimuxRunnerIndex) call VimuxTmux('resize-pane -Z -t '.g:VimuxRunnerIndex)
@ -143,40 +143,40 @@ function! VimuxZoomRunner()
endif endif
endfunction endfunction
function! VimuxInspectRunner() function! VimuxInspectRunner() abort
call VimuxTmux('select-'.VimuxOption('VimuxRunnerType').' -t '.g:VimuxRunnerIndex) call VimuxTmux('select-'.VimuxOption('VimuxRunnerType').' -t '.g:VimuxRunnerIndex)
call VimuxTmux('copy-mode') call VimuxTmux('copy-mode')
endfunction endfunction
function! VimuxScrollUpInspect() function! VimuxScrollUpInspect() abort
call VimuxInspectRunner() call VimuxInspectRunner()
call VimuxTmux('last-'.VimuxOption('VimuxRunnerType')) call VimuxTmux('last-'.VimuxOption('VimuxRunnerType'))
call VimuxSendKeys('C-u') call VimuxSendKeys('C-u')
endfunction endfunction
function! VimuxScrollDownInspect() function! VimuxScrollDownInspect() abort
call VimuxInspectRunner() call VimuxInspectRunner()
call VimuxTmux('last-'.VimuxOption('VimuxRunnerType')) call VimuxTmux('last-'.VimuxOption('VimuxRunnerType'))
call VimuxSendKeys('C-d') call VimuxSendKeys('C-d')
endfunction endfunction
function! VimuxInterruptRunner() function! VimuxInterruptRunner() abort
call VimuxSendKeys('^c') call VimuxSendKeys('^c')
endfunction endfunction
function! VimuxClearTerminalScreen() function! VimuxClearTerminalScreen() abort
if exists('g:VimuxRunnerIndex') if exists('g:VimuxRunnerIndex')
call VimuxSendKeys('C-l') call VimuxSendKeys('C-l')
endif endif
endfunction endfunction
function! VimuxClearRunnerHistory() function! VimuxClearRunnerHistory() abort
if exists('g:VimuxRunnerIndex') if exists('g:VimuxRunnerIndex')
call VimuxTmux('clear-history -t '.g:VimuxRunnerIndex) call VimuxTmux('clear-history -t '.g:VimuxRunnerIndex)
endif endif
endfunction endfunction
function! VimuxPromptCommand(...) function! VimuxPromptCommand(...) abort
let command = a:0 ==# 1 ? a:1 : '' let command = a:0 ==# 1 ? a:1 : ''
if VimuxOption('VimuxCommandShell') if VimuxOption('VimuxCommandShell')
let l:command = input(VimuxOption('VimuxPromptString'), command, 'shellcmd') let l:command = input(VimuxOption('VimuxPromptString'), command, 'shellcmd')
@ -189,18 +189,18 @@ function! VimuxPromptCommand(...)
call VimuxRunCommand(l:command) call VimuxRunCommand(l:command)
endfunction endfunction
function! VimuxTmux(arguments) function! VimuxTmux(arguments) abort
if VimuxOption('VimuxDebug') if VimuxOption('VimuxDebug')
echom VimuxOption('VimuxTmuxCommand').' '.a:arguments echom VimuxOption('VimuxTmuxCommand').' '.a:arguments
endif endif
return system(VimuxOption('VimuxTmuxCommand').' '.a:arguments) return system(VimuxOption('VimuxTmuxCommand').' '.a:arguments)
endfunction endfunction
function! s:tmuxSession() function! s:tmuxSession() abort
return s:tmuxProperty('#S') return s:tmuxProperty('#S')
endfunction endfunction
function! s:tmuxIndex() function! s:tmuxIndex() abort
if VimuxOption('VimuxRunnerType') ==# 'pane' if VimuxOption('VimuxRunnerType') ==# 'pane'
return s:tmuxPaneId() return s:tmuxPaneId()
else else
@ -208,15 +208,15 @@ function! s:tmuxIndex()
end end
endfunction endfunction
function! s:tmuxPaneId() function! s:tmuxPaneId() abort
return s:tmuxProperty('#{pane_id}') return s:tmuxProperty('#{pane_id}')
endfunction endfunction
function! s:tmuxWindowId() function! s:tmuxWindowId() abort
return s:tmuxProperty('#{window_id}') return s:tmuxProperty('#{window_id}')
endfunction endfunction
function! s:nearestIndex() function! s:nearestIndex() abort
let t = VimuxOption('VimuxRunnerType') let t = VimuxOption('VimuxRunnerType')
let filter = s:getTargetFilter() let filter = s:getTargetFilter()
let views = split(VimuxTmux('list-'.t."s -F '#{".t.'_active}:#{'.t."_id}'".filter), '\n') let views = split(VimuxTmux('list-'.t."s -F '#{".t.'_active}:#{'.t."_id}'".filter), '\n')
@ -228,7 +228,7 @@ function! s:nearestIndex()
return -1 return -1
endfunction endfunction
function! s:getTargetFilter() function! s:getTargetFilter() abort
let targetName = VimuxOption('VimuxRunnerName') let targetName = VimuxOption('VimuxRunnerName')
if targetName ==# '' if targetName ==# ''
return '' return ''
@ -241,7 +241,7 @@ function! s:getTargetFilter()
endif endif
endfunction endfunction
function! s:setRunnerName() function! s:setRunnerName() abort
let targetName = VimuxOption('VimuxRunnerName') let targetName = VimuxOption('VimuxRunnerName')
if targetName ==# '' if targetName ==# ''
return return
@ -254,11 +254,11 @@ function! s:setRunnerName()
endif endif
endfunction endfunction
function! s:tmuxProperty(property) function! s:tmuxProperty(property) abort
return substitute(VimuxTmux("display -p '".a:property."'"), '\n$', '', '') return substitute(VimuxTmux("display -p '".a:property."'"), '\n$', '', '')
endfunction endfunction
function! s:hasRunner(index) function! s:hasRunner(index) abort
let t = VimuxOption('VimuxRunnerType') let t = VimuxOption('VimuxRunnerType')
return match(VimuxTmux('list-'.t."s -F '#{".t."_id}'"), a:index) return match(VimuxTmux('list-'.t."s -F '#{".t."_id}'"), a:index)
endfunction endfunction

Loading…
Cancel
Save