@@ -18,7 +18,7 @@ let s:subcmd_map = { 'Symbol' : 1,
18
18
19
19
20
20
function ! s: create_grep_options (word) abort
21
- if g: fuzzy
21
+ if g: codequery_fuzzy
22
22
let fuzzy_option = ' -f'
23
23
let word = ' "' . a: word . ' "'
24
24
else
@@ -29,28 +29,28 @@ function! s:create_grep_options(word) abort
29
29
let pipeline_script_option = ' \| cut -f 2,3'
30
30
31
31
let grepformat = ' %f:%l%m'
32
- let grepprg = ' cqsearch -s ' . g: db_path . ' -p ' . g: querytype . ' -t '
32
+ let grepprg = ' cqsearch -s ' . g: codequery_db_path . ' -p ' . g: codequery_querytype . ' -t '
33
33
\ . word . ' -u ' . fuzzy_option . pipeline_script_option
34
34
35
- if g: querytype == s: subcmd_map [' FileImporter' ]
36
- let grepprg = ' cqsearch -s ' . g: db_path . ' -p ' . g: querytype . ' -t '
35
+ if g: codequery_querytype == s: subcmd_map [' FileImporter' ]
36
+ let grepprg = ' cqsearch -s ' . g: codequery_db_path . ' -p ' . g: codequery_querytype . ' -t '
37
37
\ . word . ' -u ' . fuzzy_option
38
38
39
- elseif g: querytype == s: subcmd_map [' Callee' ] ||
40
- \ g: querytype == s: subcmd_map [' Caller' ] ||
41
- \ g: querytype == s: subcmd_map [' Member' ]
42
- let grepprg = ' cqsearch -s ' . g: db_path . ' -p ' . g: querytype . ' -t '
39
+ elseif g: codequery_querytype == s: subcmd_map [' Callee' ] ||
40
+ \ g: codequery_querytype == s: subcmd_map [' Caller' ] ||
41
+ \ g: codequery_querytype == s: subcmd_map [' Member' ]
42
+ let grepprg = ' cqsearch -s ' . g: codequery_db_path . ' -p ' . g: codequery_querytype . ' -t '
43
43
\ . word . ' -u ' . fuzzy_option . ' \| awk '' { print $2 " " $1 }'' '
44
44
45
- elseif g: querytype == s: subcmd_map [' Text' ]
45
+ elseif g: codequery_querytype == s: subcmd_map [' Text' ]
46
46
silent execute g: codequery_find_text_cmd . ' ' . a: word
47
47
call codequery#query#prettify_qf_layout_and_map_keys (getqflist ())
48
48
49
- let g: last_query_word = a: word
50
- let g: last_query_fuzzy = g: fuzzy
49
+ let g: codequery_last_query_word = a: word
50
+ let g: last_query_fuzzy = g: codequery_fuzzy
51
51
return
52
52
53
- elseif g: querytype == s: subcmd_map [' DefinitionGroup' ]
53
+ elseif g: codequery_querytype == s: subcmd_map [' DefinitionGroup' ]
54
54
echom ' Not Implement !'
55
55
return
56
56
endif
@@ -76,10 +76,10 @@ endfunction
76
76
77
77
function ! codequery#query#get_valid_input_word (args ) abort
78
78
let args = deepcopy (a: args )
79
- if g: fuzzy
79
+ if g: codequery_fuzzy
80
80
call remove (args , index (args , ' -f' ))
81
81
endif
82
- if g: append_to_quickfix
82
+ if g: codequery_append_to_qf
83
83
call remove (args , index (args , ' -a' ))
84
84
endif
85
85
@@ -92,9 +92,9 @@ endfunction
92
92
93
93
94
94
function ! codequery#query#get_final_query_word (iword, cword) abort
95
- if empty (a: iword ) && g: querytype == s: subcmd_map [' FunctionList' ]
95
+ if empty (a: iword ) && g: codequery_querytype == s: subcmd_map [' FunctionList' ]
96
96
return expand (' %' )
97
- elseif empty (a: iword ) && g: querytype == s: subcmd_map [' FileImporter' ]
97
+ elseif empty (a: iword ) && g: codequery_querytype == s: subcmd_map [' FileImporter' ]
98
98
return expand (' %:r' )
99
99
elseif empty (a: iword ) && ! empty (a: cword )
100
100
return a: cword
@@ -181,7 +181,7 @@ function! codequery#query#do_query(word) abort
181
181
182
182
" TODO: Rewrite it when Vim8 is coming
183
183
" ----------------------------------------------------------------
184
- let grepcmd = g: append_to_quickfix ? ' grepadd!' : ' grep!'
184
+ let grepcmd = g: codequery_append_to_qf ? ' grepadd!' : ' grep!'
185
185
let l: grepprg_bak = &l: grepprg
186
186
let l: grepformat_bak = &grepformat
187
187
try
@@ -200,21 +200,22 @@ function! codequery#query#do_query(word) abort
200
200
finally
201
201
let &l: grepprg = l: grepprg_bak
202
202
let &grepformat = l: grepformat_bak
203
- let g: last_query_word = a: word
204
- let g: last_query_fuzzy = g: fuzzy
203
+ let g: codequery_last_query_word = a: word
204
+ let g: last_query_fuzzy = g: codequery_fuzzy
205
205
endtry
206
206
" ----------------------------------------------------------------
207
207
endfunction
208
208
209
209
210
210
function ! codequery#query#set_options (args ) abort
211
- let g: querytype = get (s: subcmd_map , a: args [0 ])
211
+ let g: codequery_querytype = get (s: subcmd_map , a: args [0 ])
212
212
213
213
if index (a: args , ' -f' ) != -1
214
- let g: fuzzy = 1
214
+ let g: codequery_fuzzy = 1
215
215
endif
216
216
217
217
if index (a: args , ' -a' ) != -1
218
- let g: append_to_quickfix = 1
218
+ let g: codequery_append_to_qf = 1
219
219
endif
220
220
endfunction
221
+
0 commit comments