Update "fuzzy-snippets" bits-and-pieces.

damiendart · Jul 18, 2024 · 7581820 · 7581820
1 parent 103b46c
commit 7581820
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.vim/plugin/fuzzy-finders.vim b/.vim/plugin/fuzzy-finders.vim
@@ -133,7 +133,7 @@ function! s:FuzzyGrepSelection(visualmode)
   endtry
 endfunction
 
-function! s:FuzzySnippets() abort
+function! s:FuzzySnippets(...) abort
   function! Handler(input) closure
     if a:input[0] ==? 'f1'
       execute 'h :FS'
@@ -163,7 +163,10 @@ function! s:FuzzySnippets() abort
     endtry
   endfunction
 
-  call s:Fuzzy('fuzzy-snippets --vim', funcref('Handler'))
+  let l:arguments = copy(a:000)
+  let l:query = len(l:arguments) > 0 ? join(l:arguments, ' ') : ''
+
+  call s:Fuzzy('fuzzy-snippets --vim -- ' . shellescape(l:query), funcref('Handler'))
 endfunction
 
 function! s:ToQuickfix(line)
@@ -184,7 +187,7 @@ autocmd FileType fuzzyfinder let b:laststatus = &laststatus
   \| autocmd WinLeave <buffer> close!
 
 command! -bang -nargs=* FG call s:FuzzyGrep(<bang>0, <f-args>)
-command! FS call s:FuzzySnippets()
+command! -nargs=* FS call s:FuzzySnippets(<f-args>)
 
 nnoremap <silent> <leader>fg :<C-U>call <SID>FuzzyGrepSelection('n')<CR>
 vnoremap <silent> <leader>fg :<C-U>call <SID>FuzzyGrepSelection('v')<CR>
diff --git a/bin/fuzzy-snippets b/bin/fuzzy-snippets
@@ -97,7 +97,6 @@ while :; do
       ;;
     --vim)
       VIM_MODE=1
-      shift
       ;;
     --)
       shift
@@ -138,7 +137,7 @@ fi
 FZF_EXPECT='ctrl-p,f1'
 FZF_LABEL='ENTER: Copy snippet ╱ CTRL+P: Print snippet ╱ F1: Help'
 IFS=' '
-INITIAL_QUERY="$*"
+INITIAL_QUERY="${*:-}"
 
 if [ "$VIM_MODE" = 1 ]; then
   FZF_EXPECT='ctrl-y,f1'