Merge branch 'master' into initialize_settings

plugin/vimux.vim

@@ -15,12 +15,12 @@ let g:VimuxRunnerType    = get(g:, 'VimuxRunnerType',    'pane')
 let g:VimuxTmuxCommand   = get(g:, 'VimuxTmuxCommand',   'tmux')
 let g:VimuxUseNearest    = get(g:, 'VimuxUseNearest',    v:true)
 
-function! s:VimuxOption(name) abort
+function! VimuxOption(name) abort
   return get(b:, a:name, get(g:, a:name))
 endfunction
 
-if !executable(s:VimuxOption('VimuxTmuxCommand'))
+if !executable(VimuxOption('VimuxTmuxCommand'))
-  echohl ErrorMsg | echomsg 'Failed to find executable '.s:VimuxOption('VimuxTmuxCommand') | echohl None
+  echohl ErrorMsg | echomsg 'Failed to find executable '.VimuxOption('VimuxTmuxCommand') | echohl None
   finish
 endif
 
@@ -55,21 +55,17 @@ function! VimuxRunLastCommand()
 endfunction
 
 function! VimuxRunCommand(command, ...)
-  if !exists('g:VimuxRunnerIndex') || s:VimuxHasRunner(g:VimuxRunnerIndex) ==# -1
+  if !exists('g:VimuxRunnerIndex') || s:hasRunner(g:VimuxRunnerIndex) ==# -1
     call VimuxOpenRunner()
   endif
-
   let l:autoreturn = 1
   if exists('a:1')
     let l:autoreturn = a:1
   endif
-
+  let resetSequence = VimuxOption('VimuxResetSequence')
-  let resetSequence = s:VimuxOption('VimuxResetSequence')
   let g:VimuxLastCommand = a:command
-
   call VimuxSendKeys(resetSequence)
   call VimuxSendText(a:command)
-
   if l:autoreturn ==# 1
     call VimuxSendKeys('Enter')
   endif
@@ -81,76 +77,74 @@ endfunction
 
 function! VimuxSendKeys(keys)
   if exists('g:VimuxRunnerIndex')
-    call s:VimuxTmux('send-keys -t '.g:VimuxRunnerIndex.' '.a:keys)
+    call VimuxTmux('send-keys -t '.g:VimuxRunnerIndex.' '.a:keys)
   else
     echo 'No vimux runner pane/window. Create one with VimuxOpenRunner'
   endif
 endfunction
 
 function! VimuxOpenRunner()
-  let nearestIndex = s:VimuxNearestIndex()
+  let nearestIndex = s:nearestIndex()
-
+  if VimuxOption('VimuxUseNearest') ==# 1 && nearestIndex != -1
-  if s:VimuxOption('VimuxUseNearest') ==# 1 && nearestIndex != -1
     let g:VimuxRunnerIndex = nearestIndex
   else
-    let extraArguments = s:VimuxOption('VimuxOpenExtraArgs')
+    let extraArguments = VimuxOption('VimuxOpenExtraArgs')
-    if s:VimuxOption('VimuxRunnerType') ==# 'pane'
+    if VimuxOption('VimuxRunnerType') ==# 'pane'
-      let height = s:VimuxOption('VimuxHeight')
+      let height = VimuxOption('VimuxHeight')
-      let orientation = s:VimuxOption('VimuxOrientation')
+      let orientation = VimuxOption('VimuxOrientation')
-      call s:VimuxTmux('split-window -p '.height.' -'.orientation.' '.extraArguments)
+      call VimuxTmux('split-window -p '.height.' -'.orientation.' '.extraArguments)
-    elseif s:VimuxOption('VimuxRunnerType') ==# 'window'
+    elseif VimuxOption('VimuxRunnerType') ==# 'window'
-      call s:VimuxTmux('new-window '.extraArguments)
+      call VimuxTmux('new-window '.extraArguments)
     endif
-
+    let g:VimuxRunnerIndex = s:tmuxIndex()
-    let g:VimuxRunnerIndex = s:VimuxTmuxIndex()
+    call s:setRunnerName()
-    call s:VimuxSetRunnerName()
+    call VimuxTmux('last-'.VimuxOption('VimuxRunnerType'))
-    call s:VimuxTmux('last-'.s:VimuxOption('VimuxRunnerType'))
   endif
 endfunction
 
 function! VimuxCloseRunner()
   if exists('g:VimuxRunnerIndex')
-    call s:VimuxTmux('kill-'.s:VimuxOption('VimuxRunnerType').' -t '.g:VimuxRunnerIndex)
+    call VimuxTmux('kill-'.VimuxOption('VimuxRunnerType').' -t '.g:VimuxRunnerIndex)
     unlet g:VimuxRunnerIndex
   endif
 endfunction
 
 function! VimuxTogglePane()
   if exists('g:VimuxRunnerIndex')
-    if s:VimuxOption('VimuxRunnerType') ==# 'window'
+    if VimuxOption('VimuxRunnerType') ==# 'window'
-      call s:VimuxTmux('join-pane -d -s '.g:VimuxRunnerIndex.' -p '.s:VimuxOption('VimuxHeight'))
+      call VimuxTmux('join-pane -d -s '.g:VimuxRunnerIndex.' -p '.VimuxOption('VimuxHeight'))
-      let s:VimuxOption('VimuxRunnerType') = 'pane'
+      let VimuxOption('VimuxRunnerType') = 'pane'
-    elseif s:VimuxOption('VimuxRunnerType') ==# 'pane'
+    elseif VimuxOption('VimuxRunnerType') ==# 'pane'
-      let g:VimuxRunnerIndex=substitute(s:VimuxTmux('break-pane -d -t '.g:VimuxRunnerIndex." -P -F '#{window_id}'"), '\n', '', '')
+      let g:VimuxRunnerIndex=substitute(VimuxTmux('break-pane -d -t '.g:VimuxRunnerIndex." -P -F '#{window_id}'"), '\n', '', '')
-      let s:VimuxOption('VimuxRunnerType') = 'window'
+      let VimuxOption('VimuxRunnerType') = 'window'
     endif
   endif
 endfunction
 
 function! VimuxZoomRunner()
   if exists('g:VimuxRunnerIndex')
-    if s:VimuxOption('VimuxRunnerType') ==# 'pane'
+    if VimuxOption('VimuxRunnerType') ==# 'pane'
-      call s:VimuxTmux('resize-pane -Z -t '.g:VimuxRunnerIndex)
+      call VimuxTmux('resize-pane -Z -t '.g:VimuxRunnerIndex)
-    elseif s:VimuxOption('VimuxRunnerType') ==# 'window'
+    elseif VimuxOption('VimuxRunnerType') ==# 'window'
-      call s:VimuxTmux('select-window -t '.g:VimuxRunnerIndex)
+      call VimuxTmux('select-window -t '.g:VimuxRunnerIndex)
     endif
   endif
 endfunction
 
 function! VimuxInspectRunner()
-  call s:VimuxTmux('select-'.s:VimuxOption('VimuxRunnerType').' -t '.g:VimuxRunnerIndex)
+  call VimuxTmux('select-'.VimuxOption('VimuxRunnerType').' -t '.g:VimuxRunnerIndex)
-  call s:VimuxTmux('copy-mode')
+  call VimuxTmux('copy-mode')
 endfunction
 
 function! VimuxScrollUpInspect()
   call VimuxInspectRunner()
-  call s:VimuxTmux('last-'.s:VimuxOption('VimuxRunnerType'))
+  call VimuxTmux('last-'.VimuxOption('VimuxRunnerType'))
   call VimuxSendKeys('C-u')
 endfunction
 
 function! VimuxScrollDownInspect()
   call VimuxInspectRunner()
-  call s:VimuxTmux('last-'.s:VimuxOption('VimuxRunnerType'))
+  call VimuxTmux('last-'.VimuxOption('VimuxRunnerType'))
   call VimuxSendKeys('C-d')
 endfunction
 
@@ -166,63 +160,61 @@ endfunction
 
 function! VimuxClearRunnerHistory()
   if exists('g:VimuxRunnerIndex')
-    call s:VimuxTmux('clear-history -t '.g:VimuxRunnerIndex)
+    call VimuxTmux('clear-history -t '.g:VimuxRunnerIndex)
   endif
 endfunction
 
 function! VimuxPromptCommand(...)
   let command = a:0 ==# 1 ? a:1 : ''
-  let l:command = input(s:VimuxOption('VimuxPromptString'), command, 'shellcmd')
+  let l:command = input(VimuxOption('VimuxPromptString'), command, 'shellcmd')
   call VimuxRunCommand(l:command)
 endfunction
 
-function! s:VimuxTmux(arguments)
+function! VimuxTmux(arguments)
-  if s:VimuxOption('VimuxDebug')
+  if VimuxOption('VimuxDebug')
-    echom s:VimuxOption('VimuxTmuxCommand').' '.a:arguments
+    echom VimuxOption('VimuxTmuxCommand').' '.a:arguments
   endif
-  return system(s:VimuxOption('VimuxTmuxCommand').' '.a:arguments)
+  return system(VimuxOption('VimuxTmuxCommand').' '.a:arguments)
 endfunction
 
-function! s:VimuxTmuxSession()
+function! s:tmuxSession()
-  return s:VimuxTmuxProperty('#S')
+  return s:tmuxProperty('#S')
 endfunction
 
-function! s:VimuxTmuxIndex()
+function! s:tmuxIndex()
-  if s:VimuxOption('VimuxRunnerType') ==# 'pane'
+  if VimuxOption('VimuxRunnerType') ==# 'pane'
-    return s:VimuxTmuxPaneId()
+    return s:tmuxPaneId()
   else
-    return s:VimuxTmuxWindowId()
+    return s:tmuxWindowId()
   end
 endfunction
 
-function! s:VimuxTmuxPaneId()
+function! s:tmuxPaneId()
-  return s:VimuxTmuxProperty('#{pane_id}')
+  return s:tmuxProperty('#{pane_id}')
 endfunction
 
-function! s:VimuxTmuxWindowId()
+function! s:tmuxWindowId()
-  return s:VimuxTmuxProperty('#{window_id}')
+  return s:tmuxProperty('#{window_id}')
 endfunction
 
-function! s:VimuxNearestIndex()
+function! s:nearestIndex()
-  let t = s:VimuxOption('VimuxRunnerType')
+  let t = VimuxOption('VimuxRunnerType')
-  let filter = s:VimuxGetTargetFilter()
+  let filter = s:getTargetFilter()
-  let views = split(s: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')
-
   for view in views
     if match(view, '1:') ==# -1
       return split(view, ':')[1]
     endif
   endfor
-
   return -1
 endfunction
 
-function! s:VimuxGetTargetFilter()
+function! s:getTargetFilter()
-  let targetName = s:VimuxOption('VimuxRunnerName')
+  let targetName = VimuxOption('VimuxRunnerName')
   if targetName ==# ''
     return ''
   endif
-  let t = s:VimuxOption('VimuxRunnerType')
+  let t = VimuxOption('VimuxRunnerType')
   if t ==# 'window'
     return " -f '#{==:#{window_name},".targetName."}'"
   elseif t ==# 'pane'
@@ -230,24 +222,24 @@ function! s:VimuxGetTargetFilter()
   endif
 endfunction
 
-function! s:VimuxSetRunnerName()
+function! s:setRunnerName()
-  let targetName = s:VimuxOption('VimuxRunnerName')
+  let targetName = VimuxOption('VimuxRunnerName')
   if targetName ==# ''
     return
   endif
-  let t = s:VimuxOption('VimuxRunnerType')
+  let t = VimuxOption('VimuxRunnerType')
   if t ==# 'window'
-    call s:VimuxTmux('rename-window '.targetName)
+    call VimuxTmux('rename-window '.targetName)
   elseif t ==# 'pane'
-    call s:VimuxTmux('select-pane -T '.targetName)
+    call VimuxTmux('select-pane -T '.targetName)
   endif
 endfunction
 
-function! s:VimuxTmuxProperty(property)
+function! s:tmuxProperty(property)
-  return substitute(s:VimuxTmux("display -p '".a:property."'"), '\n$', '', '')
+  return substitute(VimuxTmux("display -p '".a:property."'"), '\n$', '', '')
 endfunction
 
-function! s:VimuxHasRunner(index)
+function! s:hasRunner(index)
-  let t = s:VimuxOption('VimuxRunnerType')
+  let t = VimuxOption('VimuxRunnerType')
-  return match(s:VimuxTmux('list-'.t."s -F '#{".t."_id}'"), a:index)
+  return match(VimuxTmux('list-'.t."s -F '#{".t."_id}'"), a:index)
 endfunction