Merge pull request #336 from hiberabyss/update

support CtrlSFUpdate override search options

Author: dyng

autoload/ctrlsf.vim

@@ -17,12 +17,13 @@ let s:current_query = ''
 "
 " Basic process: query, parse, render and display.
 "
-func! s:ExecSearch(args) abort
+func! s:ExecSearch(args, override = v:false) abort
     " reset all states
-    call s:Reset()
+
+    call s:Reset(a:override)
 
     try
-        call ctrlsf#opt#ParseOptions(a:args)
+        call ctrlsf#opt#ParseOptions(a:args, a:override)
     catch /ParseOptionsException/
         return -1
     endtry
@@ -43,9 +44,11 @@ endf
 "
 " Reset all states of many modules
 "
-func! s:Reset() abort
+func! s:Reset(override) abort
     call ctrlsf#db#Reset()
-    call ctrlsf#opt#Reset()
+    if !a:override
+        call ctrlsf#opt#Reset()
+    endif
     call ctrlsf#win#Reset()
     call ctrlsf#view#Reset()
     call ctrlsf#async#Reset()
@@ -164,11 +167,11 @@ endf
 
 " Update()
 "
-func! ctrlsf#Update() abort
+func! ctrlsf#Update(args) abort
     if empty(s:current_query)
         return -1
     endif
-    call s:ExecSearch(s:current_query)
+    call s:ExecSearch(a:args, v:true)
 endf
 
 " Open()

autoload/ctrlsf/opt.vim

@@ -313,10 +313,20 @@ func! s:ParseOptions(options_str) abort
     return options
 endf
 
+function! ctrlsf#opt#Options()
+    return s:options
+endfunction
+
 " ParseOptions()
 "
-func! ctrlsf#opt#ParseOptions(options_str) abort
-    let s:options = s:ParseOptions(a:options_str)
+func! ctrlsf#opt#ParseOptions(options_str, override = v:false) abort
+    let opts = s:ParseOptions(a:options_str)
+
+    if a:override
+        call extend(s:options, opts, 'force')
+    else
+        let s:options = opts
+    endif
 
     " derivative options
 

doc/ctrlsf.txt

@@ -155,10 +155,11 @@ mode:
   If CtrlSF window is closed (by <q> or |:CtrlSFClose|), reopen it. If the
   window is already on display, then focus it.
 
-:CtrlSFUpdate                                                    *:CtrlSFUpdate*
+:CtrlSFUpdate [arguments] {pattern} [path] ...                   *:CtrlSFUpdate*
 
-  Update CtrlSF result by invoking a new search with same arguments and pattern
-  of last one.
+  If no arguments, update CtrlSF result by invoking a new search with same
+  arguments and pattern of last one. Otherwise, will override last search
+  arguments and do the search.
 
 :CtrlSFClose                                                      *:CtrlSFClose*
 

plugin/ctrlsf.vim

@@ -321,7 +321,7 @@ endif
 com! -n=* -comp=customlist,ctrlsf#comp#Completion CtrlSF         call ctrlsf#Search(<q-args>)
 com! -n=* -comp=customlist,ctrlsf#comp#Completion CtrlSFQuickfix call ctrlsf#Quickfix(<q-args>)
 com! -n=0                                         CtrlSFOpen     call ctrlsf#Open()
-com! -n=0                                         CtrlSFUpdate   call ctrlsf#Update()
+com! -n=* -comp=customlist,ctrlsf#comp#Completion CtrlSFUpdate   call ctrlsf#Update(<q-args>)
 com! -n=0                                         CtrlSFClose    call ctrlsf#Quit()
 com! -n=0                                         CtrlSFClearHL  call ctrlsf#ClearSelectedLine()
 com! -n=0                                         CtrlSFToggle   call ctrlsf#Toggle()