Better fzf-completion

Signed-off-by: Tomas Slusny <[email protected]>

vim/.vim/bundle/fzf-contrib/autoload/fzf/contrib.vim

@@ -1,7 +1,6 @@
 function! fzf#contrib#completefunc(findstart, base) abort
   let Func = function(get(g:, 'fzf#contrib#completefunc', &omnifunc))
   let results = Func(a:findstart, a:base)
-  echom a:base
 
   if a:findstart
     return results
@@ -21,18 +20,16 @@ function! fzf#contrib#completefunc(findstart, base) abort
         \ && len(results) == 1
         \ && len(results[0]) > 1
         \ && split(results[0], "\t")[1] =~? '\[snip\]'
-    call feedkeys("\<c-r>=UltiSnips#ExpandSnippet()\<cr>")
+    call feedkeys("\<c-r>=UltiSnips#ExpandSnippet()\<cr>", 'n')
   endif
 
   return map(results, 'split(v:val, "\t")[0]')
 endfunction
 
 function! fzf#contrib#complete(...) abort
-  if len(a:000) && a:000[0]
-    if getline('.')[col('.') - 1] !~# '\S'
-      call feedkeys("\<tab>", 'n')
-      return
-    endif
+  if len(a:000) && a:000[0] && getline('.')[col('.') - 1] !~# '\S'
+    call feedkeys("\<tab>", 'n')
+    return
   endif
 
   setlocal completefunc=fzf#contrib#completefunc
@@ -46,7 +43,10 @@ function! fzf#contrib#grep(query, ...) abort
     let args = copy(a:000)
     let opts = len(args) > 1 ? remove(args, 0) : ''
     let command = opts . ' ' . "'".substitute(query, "'", "'\\\\''", 'g')."'"
-    return call('fzf#vim#grep', extend(['rg --no-heading --column --color always '.command, 1], args))
+
+    return call('fzf#vim#grep', extend(
+          \ ['rg --no-heading --column --color always '.command, 1],
+          \ args))
   endif
 
   return call('fzf#vim#ag', insert(copy(a:000), a:query, 0))