fix global variable scrope bug & add two options to enhance usability

devjoe · devjoe · commit d2184b74b0d2 · 2016-11-01T18:44:19.000+08:00
diff --git a/autoload/codequery.vim b/autoload/codequery.vim
@@ -53,6 +53,10 @@ function! codequery#run_codequery(args) abort
     call s:save_cwd()
     if !s:check_filetype(&filetype)
         echom 'Not Supported Filetype: ' . &filetype
+        if g:codequery_auto_switch_to_find_text_for_wrong_filetype
+            silent execute g:codequery_find_text_cmd
+            call codequery#query#prettify_qf_layout_and_map_keys(getqflist())
+        endif
         return
     endif
 
@@ -63,6 +67,9 @@ function! codequery#run_codequery(args) abort
     let g:codequery_db_path = ''
     if !s:set_db()
         call s:restore_cwd()
+        if g:codequery_trigger_build_db_when_db_not_found
+            execute 'CodeQueryMakeDB ' . &filetype
+        endif
         return
     endif
 
@@ -131,7 +138,7 @@ function! codequery#make_codequery_db(args) abort
         endif
 
         if v:version >= 800
-            echom 'Making ...'
+            echom 'Making DB ...'
             let mydict = {'db_path': db_path,
                          \'callback': function("codequery#db#make_db_callback")}
             let options = {'out_io': 'null',
diff --git a/autoload/codequery/menu.vim b/autoload/codequery/menu.vim
@@ -42,15 +42,13 @@ function! codequery#menu#use_unite_menu(magic) abort
 
     " DB not found => remove unnecessary items from menu
     let db_path = codequery#db#find_db_path(&filetype)
-    if empty(db_path)
-        let menu_frequent_cmds =
-            \[['▷  Find Text', g:codequery_find_text_cmd],
-            \ ['▷  Make DB', 'call feedkeys(":CodeQueryMakeDB ' . &filetype . '")']]
+    if empty(db_path) && &filetype !=# 'qf'
+        let menu_frequent_cmds = [['▷  Find Text', g:codequery_find_text_cmd]]
         let menu_function_cmds = []
         let menu_class_cmds = []
         let menu_other_cmds = []
         let menu_delimiter = []
-        let menu_db_cmds = []
+        let menu_db_cmds = [['▷  Make DB', 'call feedkeys(":CodeQueryMakeDB ' . &filetype . '")']]
         let menu_goto_magic = []
         let menu_goto_full = []
         if index(g:codequery_supported_filetype_list, &filetype) == -1
diff --git a/plugin/codequery.vim b/plugin/codequery.vim
@@ -1,12 +1,30 @@
 " Copyright (c) 2016 excusemejoe
 " MIT License
 
+
+if exists('g:loaded_loaded_codequery')
+    finish
+endif
+let g:loaded_codequery = 1
+
+
 " =============================================================================
 " Options
 
 " Init with default value
-let g:codequery_find_text_cmd = 'Ack!'
-let g:codequery_find_text_from_current_file_dir = 0
+if !exists('g:codequery_find_text_cmd')
+    let g:codequery_find_text_cmd = 'Ack!'
+endif
+if !exists('g:codequery_find_text_from_current_file_dir')
+    let g:codequery_find_text_from_current_file_dir = 0
+endif
+if !exists('g:codequery_auto_switch_to_find_text_for_wrong_filetype')
+    let g:codequery_auto_switch_to_find_text_for_wrong_filetype = 0
+endif
+if !exists('g:codequery_trigger_build_db_when_db_not_found')
+    let g:codequery_trigger_build_db_when_db_not_found = 0
+endif
+
 
 
 " No need to init
