Skip to content

Allow multiple -G options in the same request #352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vds2212 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow multiple -G options in the same request #352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 27 additions & 24 deletions autoload/ctrlsf/backend.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,30 +147,33 @@ func! s:BuildCommand(args, for_shell) abort
" filematch (NOT SUPPORTED BY ALL BACKEND)
" support backend: ag, ack, pt, rg
if !empty(ctrlsf#opt#GetOpt('filematch'))
if runner ==# 'ag'
call extend(tokens, [
\ '--file-search-regex',
\ s:Escape(a:for_shell, ctrlsf#opt#GetOpt('filematch'))
\ ])
elseif runner ==# 'pt'
call add(tokens, printf("--file-search-regex=%s",
\ s:Escape(a:for_shell, ctrlsf#opt#GetOpt('filematch'))))
elseif runner ==# 'rg'
call add(tokens, printf("-g %s",
\ s:Escape(a:for_shell, ctrlsf#opt#GetOpt('filematch'))))
elseif runner ==# 'ack'
" pipe: 'ack -g ${filematch} ${path} |'
let pipe_tokens = [
\ g:ctrlsf_backend,
\ '-g',
\ s:Escape(a:for_shell, ctrlsf#opt#GetOpt('filematch'))
\ ]
call extend(pipe_tokens, ctrlsf#opt#GetPath())
call add(pipe_tokens, '|')

call insert(tokens, join(pipe_tokens, ' '))
call add(tokens, '--files-from=-')
endif
let filematches = ctrlsf#opt#GetOpt('filematch')
for filematch in filematches
if runner ==# 'ag'
call extend(tokens, [
\ '--file-search-regex',
\ s:Escape(a:for_shell, filematch)
\ ])
elseif runner ==# 'pt'
call add(tokens, printf("--file-search-regex=%s",
\ s:Escape(a:for_shell, filematch)))
elseif runner ==# 'rg'
call add(tokens, printf("-g %s",
\ s:Escape(a:for_shell, filematch)))
elseif runner ==# 'ack'
" pipe: 'ack -g ${filematch} ${path} |'
let pipe_tokens = [
\ g:ctrlsf_backend,
\ '-g',
\ s:Escape(a:for_shell, filematch)
\ ]
call extend(pipe_tokens, ctrlsf#opt#GetPath())
call add(pipe_tokens, '|')

call insert(tokens, join(pipe_tokens, ' '))
call add(tokens, '--files-from=-')
endif
endfor
endif

" follow symlink
Expand Down
46 changes: 30 additions & 16 deletions autoload/ctrlsf/opt.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@

" option list of CtrlSF
let s:option_list = {
\ '-after' : {'args': 1},
\ '-before' : {'args': 1},
\ '-context' : {'args': 1},
\ '-filetype' : {'args': 1},
\ '-word' : {'args': 0},
\ '-filematch' : {'args': 1},
\ '-ignorecase' : {'args': 0},
\ '-ignoredir' : {'args': 1},
\ '-literal' : {'args': 0},
\ '-matchcase' : {'args': 0},
\ '-regex' : {'args': 0},
\ '-smartcase' : {'args': 0},
\ '-hidden' : {'args': 0},
\ '-encoding' : {'args': 1},
\ '-after' : {'args': '1'},
\ '-before' : {'args': '1'},
\ '-context' : {'args': '1'},
\ '-filetype' : {'args': '1'},
\ '-word' : {'args': '0'},
\ '-filematch' : {'args': '*'},
\ '-ignorecase' : {'args': '0'},
\ '-ignoredir' : {'args': '1'},
\ '-literal' : {'args': '0'},
\ '-matchcase' : {'args': '0'},
\ '-regex' : {'args': '0'},
\ '-smartcase' : {'args': '0'},
\ '-hidden' : {'args': '0'},
\ '-encoding' : {'args': '1'},
\ '-A': {'fullname': '-after'},
\ '-B': {'fullname': '-before'},
\ '-C': {'fullname': '-context'},
Expand Down Expand Up @@ -291,16 +291,30 @@ func! s:ParseOptions(options_str) abort
let opt = s:option_list[opt.fullname]
endif

if opt.args == 0
if opt.args == '0'
let options[name] = 1
elseif opt.args == 1

elseif opt.args == '1'
if tokens[i] =~# '^\d\+$'
let options[name] = str2nr(tokens[i])
else
let options[name] = tokens[i]
endif

let i += 1

elseif opt.args == '*'
if !has_key(options, name)
let options[name] = []
endif

if tokens[i] =~# '^\d\+$'
call add(options[name], str2nr(tokens[i]))
else
call add(options[name], tokens[i])
endif

let i += 1
else
let argv = []
for j in range(opt.args)
Expand Down