Merge pull request devjoe#10 from devjoe/search-async-vim8

extract and refactor show_result function

Author: devjoe

README.md

@@ -40,7 +40,7 @@ This Vim plugin is built on top of the great tool [CodeQuery](https://github.com
 
 <br>
 
-## Demo 
+## Demo
 
 `Choose a query from menu ➙ Get results`  
 
@@ -52,30 +52,32 @@ This Vim plugin is built on top of the great tool [CodeQuery](https://github.com
 
 [more demo and screenshots](https://github.com/devjoe/vim-codequery/wiki/Screenshots-and-Demo)
 
+> These videos are quite old.
+> Now vim-codequery works better than what you see. (by supporting Vim8's async feature)
 <br>
   
 ## Schedule
 
 > **This project is almost ready to be released.**   
 >  
 > Main TODO:
-> * Use Vim8's new features to enhance usability.
+> * ~~Use Vim8's new features to enhance usability.~~
 > * ~~Do lazy-loading.~~
 > * Test it.
 > * Doc it.
 >  
 > Completeness: 92%  
 > Current Version: v0.8
 >  
-> It is Ok to try it! 👌  
+> Welcome to try it! 👌  
   
 <br>
 
 ## Installation
 
 #### 1. Make sure these commands are in your system
 <pre>
-echo mkdir mv cut find awk stat git(optional)
+/bin/sh echo mkdir mv cut find awk stat git(optional)
 </pre>
 
 #### 2. Install CodeQuery

autoload/codequery/query.vim

@@ -50,6 +50,17 @@ function! s:create_grep_options(word) abort
 endfunction
 
 
+function! s:show_result() abort
+    let results = getqflist()
+    call codequery#query#prettify_qf_layout_and_map_keys(results)
+    if !empty(results)
+        echom 'Found ' . len(results) . ' result' . (len(results) > 1 ? 's' : '')
+    else
+        echom 'Result Not Found'
+    endif
+endfunction
+
+
 
 " =============================================================================
 " Entries
@@ -183,31 +194,61 @@ function! codequery#query#do_query(word) abort
         return
     endif
 
-    " TODO: Rewrite it when Vim8 is coming
-    " ----------------------------------------------------------------
-    let grepcmd = g:codequery_append_to_qf ? 'grepadd!' : 'grep!'
-    let l:grepprg_bak    = &l:grepprg
-    let l:grepformat_bak = &grepformat
+    if v:version >= 800
+        echom 'Searching ... [' . a:word . ']'
+
+        let job_dict = {'is_append': g:codequery_append_to_qf ? 1 : 0,
+                       \'target_file': tempname(),
+                       \'backup_ef': &errorformat,
+                       \'word' : a:word,
+                       \'callback': function("codequery#query#do_query_callback")}
+        let options = {'out_io': 'file',
+                      \'out_name': job_dict.target_file,
+                      \'exit_cb': job_dict.callback}
+
+        let &errorformat = '%f:%l%m'
+        let grepprg .= ' \| awk "{ sub(/.*\/\.\//,x) }1"'
+        let shell_cmd = substitute(grepprg, '\\|', '|', "g")
+        let shell_cmd = substitute(shell_cmd, "''", "'", "g")
+
+        let s:query_job = job_start(['/bin/sh', '-c', shell_cmd], options)
+        let timer = timer_start(50,
+                               \{-> execute("call job_status(s:query_job)", "")},
+                               \{'repeat': 200})
+    else
+        let grepcmd = g:codequery_append_to_qf ? 'grepadd!' : 'grep!'
+        let l:grepprg_bak    = &l:grepprg
+        let l:grepformat_bak = &grepformat
+        try
+            let &l:grepformat = grepformat
+            let &l:grepprg = grepprg . ' \| awk "{ sub(/.*\/\.\//,x) }1"'
+            silent execute grepcmd
+            redraw!
+            call s:show_result()
+        finally
+            let &l:grepprg  = l:grepprg_bak
+            let &grepformat = l:grepformat_bak
+            let g:codequery_last_query_word = a:word
+            let g:last_query_fuzzy = g:codequery_fuzzy
+        endtry
+    endif
+endfunction
+
+
+function! codequery#query#do_query_callback(job, status) dict
     try
-        let &l:grepformat = grepformat
-        let &l:grepprg = grepprg . ' \| awk "{ sub(/.*\/\.\//,x) }1"'
-        silent execute grepcmd
-        redraw!
-
-        let results = getqflist()
-        call codequery#query#prettify_qf_layout_and_map_keys(results)
-        if !empty(results)
-            echom 'Found ' . len(results) . ' results'
+        if self.is_append
+            execute "caddfile " . self.target_file
         else
-            echom 'Result Not Found'
+            execute "cgetfile " . self.target_file
         endif
+        call s:show_result()
     finally
-        let &l:grepprg  = l:grepprg_bak
-        let &grepformat = l:grepformat_bak
-        let g:codequery_last_query_word = a:word
+        let g:codequery_last_query_word = self.word
         let g:last_query_fuzzy = g:codequery_fuzzy
+        let &errorformat = self.backup_ef
+        call delete(self.target_file)
     endtry
-    " ----------------------------------------------------------------
 endfunction
 
 
@@ -222,4 +263,3 @@ function! codequery#query#set_options(args) abort
         let g:codequery_append_to_qf = 1
     endif
 endfunction
-