Skip to content

Commit 1339cae

Browse files
committed
rename global variables
1 parent 6c9cea0 commit 1339cae

File tree

3 files changed

+33
-32
lines changed

3 files changed

+33
-32
lines changed

autoload/codequery.vim

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ function! s:set_db() abort
2828
return 0
2929
endif
3030

31-
let g:db_path = path
31+
let g:codequery_db_path = path
3232
return 1
3333
endfunction
3434

@@ -44,11 +44,11 @@ function! codequery#run_codequery(args) abort
4444
return
4545
endif
4646

47-
let g:last_query_word = ''
48-
let g:fuzzy = 0
49-
let g:append_to_quickfix = 0
50-
let g:querytype = 1
51-
let g:db_path = ''
47+
let g:codequery_last_query_word = ''
48+
let g:codequery_fuzzy = 0
49+
let g:codequery_append_to_qf = 0
50+
let g:codequery_querytype = 1
51+
let g:codequery_db_path = ''
5252
if !s:set_db()
5353
return
5454
endif
@@ -206,9 +206,9 @@ endfunction
206206
function! codequery#run_codequery_again_with_different_subcmd(args) abort
207207
let args = split(a:args, ' ')
208208
let args_num = len(args)
209-
if !empty(g:last_query_word) && args_num > 0
209+
if !empty(g:codequery_last_query_word) && args_num > 0
210210
cclose
211-
let again_cmd = 'CodeQuery ' . args[0] . ' ' . g:last_query_word . ' '
211+
let again_cmd = 'CodeQuery ' . args[0] . ' ' . g:codequery_last_query_word . ' '
212212
\ . (g:last_query_fuzzy ? '-f' : '')
213213
execute again_cmd
214214
else

autoload/codequery/menu.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ function! codequery#menu#use_unite_menu(magic) abort
4747
\ menu_class_cmds)
4848
let menu_other_cmds = []
4949
let menu_goto_full = []
50-
if exists('g:last_query_word')
51-
let cword = g:last_query_word
50+
if exists('g:codequery_last_query_word')
51+
let cword = g:codequery_last_query_word
5252
endif
5353
endif
5454

autoload/codequery/query.vim

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ let s:subcmd_map = { 'Symbol' : 1,
1818

1919

2020
function! s:create_grep_options(word) abort
21-
if g:fuzzy
21+
if g:codequery_fuzzy
2222
let fuzzy_option = '-f'
2323
let word = '"' . a:word . '"'
2424
else
@@ -29,28 +29,28 @@ function! s:create_grep_options(word) abort
2929
let pipeline_script_option = ' \| cut -f 2,3'
3030

3131
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 '
3333
\ . word . ' -u ' . fuzzy_option . pipeline_script_option
3434

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 '
3737
\ . word . ' -u ' . fuzzy_option
3838

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 '
4343
\ . word . ' -u ' . fuzzy_option . ' \| awk ''{ print $2 " " $1 }'''
4444

45-
elseif g:querytype == s:subcmd_map['Text']
45+
elseif g:codequery_querytype == s:subcmd_map['Text']
4646
silent execute g:codequery_find_text_cmd . ' ' . a:word
4747
call codequery#query#prettify_qf_layout_and_map_keys(getqflist())
4848

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
5151
return
5252

53-
elseif g:querytype == s:subcmd_map['DefinitionGroup']
53+
elseif g:codequery_querytype == s:subcmd_map['DefinitionGroup']
5454
echom 'Not Implement !'
5555
return
5656
endif
@@ -76,10 +76,10 @@ endfunction
7676

7777
function! codequery#query#get_valid_input_word(args) abort
7878
let args = deepcopy(a:args)
79-
if g:fuzzy
79+
if g:codequery_fuzzy
8080
call remove(args, index(args, '-f'))
8181
endif
82-
if g:append_to_quickfix
82+
if g:codequery_append_to_qf
8383
call remove(args, index(args, '-a'))
8484
endif
8585

@@ -92,9 +92,9 @@ endfunction
9292

9393

9494
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']
9696
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']
9898
return expand('%:r')
9999
elseif empty(a:iword) && !empty(a:cword)
100100
return a:cword
@@ -181,7 +181,7 @@ function! codequery#query#do_query(word) abort
181181

182182
" TODO: Rewrite it when Vim8 is coming
183183
" ----------------------------------------------------------------
184-
let grepcmd = g:append_to_quickfix ? 'grepadd!' : 'grep!'
184+
let grepcmd = g:codequery_append_to_qf ? 'grepadd!' : 'grep!'
185185
let l:grepprg_bak = &l:grepprg
186186
let l:grepformat_bak = &grepformat
187187
try
@@ -200,21 +200,22 @@ function! codequery#query#do_query(word) abort
200200
finally
201201
let &l:grepprg = l:grepprg_bak
202202
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
205205
endtry
206206
" ----------------------------------------------------------------
207207
endfunction
208208

209209

210210
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])
212212

213213
if index(a:args, '-f') != -1
214-
let g:fuzzy = 1
214+
let g:codequery_fuzzy = 1
215215
endif
216216

217217
if index(a:args, '-a') != -1
218-
let g:append_to_quickfix = 1
218+
let g:codequery_append_to_qf = 1
219219
endif
220220
endfunction
221+

0 commit comments

Comments
 (0)