Add index option to RunAgain, update docs

Author: ledesmablt

README.md

@@ -53,8 +53,8 @@ vim -c 'helptags vim-run/doc' -c quit
 :RunSplit [<command>]
 :RunVSplit [<command>]
 :RunNoStream [<command>]
-:RunAgain
-:RunAgainEdit
+:RunAgain [<index>]
+:RunAgainEdit [<index>]
 :RunSendKeys [<text>]
 
 " kill jobs
@@ -78,6 +78,7 @@ vim -c 'helptags vim-run/doc' -c quit
 ```vim
 let g:rundir = ~/.vim/rundir
 let g:run_shell = $SHELL
+let g:run_use_loclist = 0
 let g:run_quiet_default = 0
 let g:run_autosave_logs = 0
 let g:run_nostream_default = 0

autoload/run.vim

@@ -5,7 +5,7 @@ let s:loaded_run = 1
 
 " script vars
 let s:run_jobs                = get(s:, 'run_jobs', {})
-let s:run_last_command        = get(s:, 'run_last_command', '')
+let s:run_last_commands       = get(s:, 'run_last_commands', [])
 let s:run_last_options        = get(s:, 'run_last_options', {})
 let s:run_killall_ongoing     = get(s:, 'run_killall_ongoing', 0)
 let s:run_timestamp_format    = get(s:, 'run_timestamp_format', '%Y-%m-%d %H:%M:%S')
@@ -83,7 +83,8 @@ function! run#Run(cmd, ...) abort
 
   if empty(trim(a:cmd))
     " no text provided in cmd input
-    if get(options, 'is_from_editor') && !get(options, 'edit_last')
+    let edit_cmd = get(options, 'edit_cmd', '')
+    if get(options, 'is_from_editor') && empty(edit_cmd)
       call run#print_formatted('WarningMsg', 'User cancelled command input.')
       return
     endif
@@ -98,8 +99,8 @@ function! run#Run(cmd, ...) abort
     let s:run_edit_options = options
     let s:run_edit_path = s:run_cmd_path . 'edit-' . timestamp . '.sh'
     let editor_lines = [s:edit_msg, '']
-    if get(options, 'edit_last')
-      call extend(editor_lines, split(s:run_last_command, "\n"))
+    if !empty(edit_cmd)
+      call extend(editor_lines, split(edit_cmd, "\n"))
     else
       call add(editor_lines, '')
     endif
@@ -108,7 +109,7 @@ function! run#Run(cmd, ...) abort
     return
   endif
 
-  let s:run_last_command = a:cmd
+  let s:run_last_commands = extend([a:cmd], s:run_last_commands)
   let s:run_last_options = options
   let shortcmd = run#clean_cmd_name(a:cmd)
   let fname = timestamp . '__' . shortcmd . '.log'
@@ -219,23 +220,47 @@ function! run#RunNoStream(cmd) abort
   call run#Run(a:cmd, { 'nostream': 1 })
 endfunction
 
-function! run#RunAgain() abort
-  if empty(s:run_last_command)
+function! run#RunAgain(...) abort
+  if empty(s:run_last_commands)
     call run#print_formatted('ErrorMsg', 'Please run a command first.')
     return
   endif
-  call run#Run(s:run_last_command, s:run_last_options)
+  let index = get(a:, 1)
+  if empty(index) | let index = '0' | endif
+  if index !~# '^\d\+$'
+    call run#print_formatted('ErrorMsg', 'Index must be a number.')
+    return
+  endif
+  try
+    let selected_command = s:run_last_commands[index]
+  catch
+    call run#print_formatted('ErrorMsg', 'Index '.index.' out of range')
+    return
+  endtry
+  call run#Run(selected_command, s:run_last_options)
 endfunction
 
-function! run#RunAgainEdit() abort
-  if empty(s:run_last_command)
+function! run#RunAgainEdit(...) abort
+  if empty(s:run_last_commands)
     call run#print_formatted('ErrorMsg', 'Please run a command first.')
     return
   endif
+  let index = get(a:, 1)
+  if empty(index) | let index = '0' | endif
+  if index !~# '^\d\+$'
+    call run#print_formatted('ErrorMsg', 'Index must be a number.')
+    return
+  endif
+  try
+    let selected_command = s:run_last_commands[index]
+  catch
+    call run#print_formatted('ErrorMsg', 'Index '.index.' out of range')
+    return
+  endtry
   let new_opts = deepcopy(s:run_last_options)
-  let new_opts['edit_last'] = 1
+  let new_opts['edit_cmd'] = selected_command
   call run#Run('', new_opts)
-  unlet new_opts['edit_last']
+  unlet new_opts['edit_cmd']
   let s:run_last_options = new_opts
 endfunction
 

doc/vim-run.txt

@@ -69,23 +69,24 @@ COMMANDS                                                      *vim-run-commands*
 :RunSplit [<command>]                                                *:RunSplit*
     Calls |:Run| <command> and opens the log buffer in a window above.
 
-:RunVSplit [<command>]                                               *:RunVSplit*
+:RunVSplit [<command>]                                              *:RunVSplit*
     Calls |:Run| <command> and opens the log buffer in a window to the right.
 
-:RunNoStream [<command>]                                           *:RunNoStream*
+:RunNoStream [<command>]                                          *:RunNoStream*
     Calls |:Run| <command> without creating a log buffer. The results only will 
     be written once the command stops. This is ideal for commands that produce
     a large amount of output quickly, which may cause performance issues.
 
     Enabling |g:run_nostream_default| will cause all |:Run| commands to behave
     this way.
 
-:RunAgain                                                            *:RunAgain*
-    Calls the last |:Run| command with its settings (quiet, watch, etc.)
+:RunAgain [<index>]                                                  *:RunAgain*
+    Calls the last |:Run| command with its settings (quiet, watch, etc.). You
+    may provide an <index> argument to call older commands (default = 0).
 
-:RunAgainEdit                                                    *:RunAgainEdit*
-    Calls |:RunAgain| but opens the last command in a temporary window before
-    starting its job (similar to calling |:Run| with no arguments).
+:RunAgainEdit [<index>]                                          *:RunAgainEdit*
+    Calls |:RunAgain| [<index>] but opens the last command in a temporary window
+    before starting its job (similar to calling |:Run| with no arguments).
 
 :RunSendKeys [<text>]                                             *:RunSendKeys*
     Sends <text> to the job of the currently focused buffer, similar to

plugin/run.vim

@@ -55,8 +55,8 @@ command -nargs=* -complete=file RunWatch :call run#RunWatch(<q-args>)
 command -nargs=* -complete=file RunSplit :call run#RunSplit(<q-args>)
 command -nargs=* -complete=file RunVSplit :call run#RunVSplit(<q-args>)
 command -nargs=* -complete=file RunNoStream :call run#RunNoStream(<q-args>)
-command RunAgain :call run#RunAgain()
-command RunAgainEdit :call run#RunAgainEdit()
+command -nargs=? RunAgain :call run#RunAgain(<q-args>)
+command -nargs=? RunAgainEdit :call run#RunAgainEdit(<q-args>)
 command -nargs=* -complete=file RunSendKeys :call run#RunSendKeys(<q-args>)
 
 command -nargs=? -complete=custom,run#list_running_jobs RunKill :call run#RunKill(<q-args>)