Async support added

Author: lucerion

autoload/executor.vim

@@ -3,57 +3,35 @@
 "               or selection and redirects output to a new buffer
 " Author:       Alexander Skachko <[email protected]>
 " Homepage:     https://github.com/lucerion/vim-executor
-" Version:      0.1
+" Version:      0.2
 " Licence:      BSD-3-Clause
 " ===========================================================================
 
 let s:previous_buffer = ''
 
-func! executor#exec(start_line, end_line, count, ...)
+func! executor#exec(start_line, end_line, ...)
   if !exists('g:loaded_buffr')
     call s:show_error('Please, install vim-buffr plugin first') | return
   endif
 
-  call s:execute(a:start_line, a:end_line, a:count, a:000)
-endfunc
-
-func! s:execute(start_line, end_line, count, command)
-  let l:selection = s:selection(a:start_line, a:end_line)
-  let l:command = s:command(a:command)
-  let l:result = s:result(l:command, l:selection, a:count)
-  let l:buffer_name = s:buffer_name(l:command)
-
-  call s:open_result(l:result, l:buffer_name)
-endfunc
-
-func! s:selection(start_line, end_line)
-  return getline(a:start_line, a:end_line)
-endfunc
+  let l:command = join(a:000)
+  let l:selection = getline(a:start_line, a:end_line)
 
-func! s:command(command)
-  let l:command = join(a:command)
-  if len(substitute(l:command, ' ', '', 'g'))
-    return l:command
+  if g:executor_exec_async && (v:version >= 800)
+    call executor#async#exec(l:command, l:selection)
+  else
+    call executor#default#exec(l:command, l:selection)
   end
-
-  return g:executor_default_command
 endfunc
 
-func! s:result(command, selection, count)
-  if len(a:selection) == 1
-    let l:command = a:command . ' ' . a:selection[0]
-    return system(l:command)
-  endif
-
-  if a:count
-    let l:selection = join(a:selection, "\n") . "\n"
-    return system(a:command, l:selection)
-  endif
-
-  return system(a:command)
+func! executor#open_result(result, command)
+  let l:buffer_name = s:buffer_name(a:command)
+  call s:open_buffer(l:buffer_name)
+  call append(0, a:result)
+  silent normal! Gddgg
 endfunc
 
-func! s:open_result(result, buffer_name)
+func! s:open_buffer(buffer_name)
   let l:buffer_name = a:buffer_name
 
   if g:executor_reuse_buffer
@@ -64,25 +42,23 @@ func! s:open_result(result, buffer_name)
   endif
 
   call buffr#open_or_create_buffer({
-    \ 'position': g:executor_position,
+    \ 'position': 'bottom',
     \ 'name': l:buffer_name
     \ })
   call s:set_buffer_defaults()
 
   if g:executor_reuse_buffer
     silent exec 'edit ' . escape(s:previous_buffer, ' ')
   endif
-
-  call append(0, split(a:result, "\n"))
-  silent exec 'normal! Gdd'
 endfunc
 
 func! s:buffer_name(command)
-  let l:buffer_name = g:executor_buffer_name
-  let l:buffer_name = substitute(l:buffer_name, '{command}', a:command, 'g')
-  let l:buffer_name = substitute(l:buffer_name, '{filename}', expand('%:t'), 'g')
+  let l:name = g:executor_buffer_name
+  let l:name = substitute(l:name, '{command}', a:command, 'g')
+  let l:name = substitute(l:name, '{filename}', expand('%:t'), 'g')
+  let l:name = escape(l:name, '|')
 
-  return escape(l:buffer_name, '|')
+  return l:name
 endfunc
 
 func! s:set_buffer_defaults()

autoload/executor/async.vim

@@ -0,0 +1,40 @@
+" ===========================================================================
+" Description:  Vim plugin that executes shell command with a buffer contents
+"               or selection and redirects output to a new buffer
+" Author:       Alexander Skachko <[email protected]>
+" Homepage:     https://github.com/lucerion/vim-executor
+" Version:      0.2
+" Licence:      BSD-3-Clause
+" ===========================================================================
+
+func! executor#async#exec(command, selection)
+  let s:command = a:command
+  let s:result = []
+  call s:execute(a:command, a:selection)
+endfunc
+
+func! s:execute(command, selection)
+  let l:command = a:command
+
+  if len(a:selection) == 1 && !empty(a:selection[0])
+    let l:command .= ' '
+    let l:command .= a:selection[0]
+  endif
+
+  if len(a:selection) > 1
+    let l:command = 'echo "' . join(a:selection, "\n") . '" | ' . l:command
+  endif
+
+  call job_start([&shell, &shellcmdflag, l:command], {
+    \ 'out_cb': function('s:out_callback'),
+    \ 'exit_cb': function('s:exit_callback')
+    \ })
+endfunc
+
+func! s:out_callback(channel, data)
+  call add(s:result, a:data)
+endfunc
+
+func! s:exit_callback(job, status)
+  call executor#open_result(s:result, s:command)
+endfunc

autoload/executor/default.vim

@@ -0,0 +1,27 @@
+" ===========================================================================
+" Description:  Vim plugin that executes shell command with a buffer contents
+"               or selection and redirects output to a new buffer
+" Author:       Alexander Skachko <[email protected]>
+" Homepage:     https://github.com/lucerion/vim-executor
+" Version:      0.2
+" Licence:      BSD-3-Clause
+" ===========================================================================
+
+func! executor#default#exec(command, selection)
+  let l:result = s:execute(a:command, a:selection)
+  call executor#open_result(split(l:result, "\n"), a:command)
+endfunc
+
+func! s:execute(command, selection)
+  if !len(a:selection) || (len(a:selection) == 1 && empty(a:selection[0]))
+    return system(a:command)
+  endif
+
+  if len(a:selection) == 1
+    let l:command = a:command . ' ' . a:selection[0]
+    return system(l:command)
+  endif
+
+  let l:selection = join(a:selection, "\n") . "\n"
+  return system(a:command, l:selection)
+endfunc

plugin/executor.vim

@@ -3,7 +3,7 @@
 "               or selection and redirects output to a new buffer
 " Author:       Alexander Skachko <[email protected]>
 " Homepage:     https://github.com/lucerion/vim-executor
-" Version:      0.1
+" Version:      0.2
 " Licence:      BSD-3-Clause
 " ===========================================================================
 
@@ -15,10 +15,6 @@ if !exists('g:executor_position')
   let g:executor_position = 'bottom'
 endif
 
-if !exists('g:executor_default_command')
-  let g:executor_default_command = 'sh -e'
-endif
-
 if !exists('g:executor_buffer_name')
   let g:executor_buffer_name = '{command}'
 endif
@@ -27,7 +23,11 @@ if !exists('g:executor_reuse_buffer')
   let g:executor_reuse_buffer = 0
 endif
 
-comm! -nargs=* -range=0 -complete=shellcmd Exec
-  \ call executor#exec(<line1>, <line2>, <count>, <q-args>)
+if !exists('g:executor_exec_async')
+  let g:executor_exec_async = 1
+endif
+
+comm! -nargs=+ -range=0 -complete=shellcmd Exec
+  \ call executor#exec(<line1>, <line2>, <q-args>)
 
 let g:loaded_executor = 1