Remove completor, update dependencies

- completor.vim is bugged, so remove it and just use omnifunc for tab completion - Update fzf#contrib#complete to handle more different types of output from omnifunc Signed-off-by: Tomas Slusny <[email protected]>
deathbeam · Jun 27, 2017 · fbe4fd1 · fbe4fd1
1 parent 4711451
commit fbe4fd1
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 18 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -113,9 +113,6 @@
 [submodule "zsh/.zsh/bundle/alias-tips"]
 	path = zsh/.zsh/bundle/alias-tips
 	url = https://github.com/djui/alias-tips
-[submodule "vim/.vim/bundle/completor.vim"]
-	path = vim/.vim/bundle/completor.vim
-	url = https://github.com/maralla/completor.vim
 [submodule "tmux/.tmux/bundle/tmux-sessionist"]
 	path = tmux/.tmux/bundle/tmux-sessionist
 	url = https://github.com/tmux-plugins/tmux-sessionist

diff --git a/tmux/.tmux/bundle/vim-tmux-navigator b/tmux/.tmux/bundle/vim-tmux-navigator
diff --git a/vim/.vim/bundle/completor.vim b/vim/.vim/bundle/completor.vim
diff --git a/vim/.vim/bundle/fzf-contrib/autoload/fzf/contrib.vim b/vim/.vim/bundle/fzf-contrib/autoload/fzf/contrib.vim
@@ -8,9 +8,11 @@ function! fzf#contrib#completefunc(findstart, base) abort
 
   let words = type(results) == type({}) && has_key(results, 'words')
         \ ? len(results.words) && type(results.words[0]) == type({})
-        \ ? map(results.words, 'v:val.word . "\t" . v:val.menu')
-        \ : results.words
-        \ : results
+          \ ? map(results.words, 'v:val.word . "\t" . v:val.menu')
+          \ : results.words
+        \ : len(results) && type(results[0]) == type({})
+          \ ? map(results, 'v:val.word . "\t" . v:val.menu')
+          \ : results
 
   let results = len(words) > 1
         \ ? fzf#run({

diff --git a/vim/.vim/bundle/ultisnips b/vim/.vim/bundle/ultisnips
diff --git a/vim/.vim/bundle/vim-dirvish b/vim/.vim/bundle/vim-dirvish
diff --git a/vim/.vim/bundle/vim-javacomplete2 b/vim/.vim/bundle/vim-javacomplete2
diff --git a/vim/.vim/bundle/vim-snippets b/vim/.vim/bundle/vim-snippets
diff --git a/vim/.vimrc b/vim/.vimrc
@@ -260,10 +260,6 @@ command! -bar Session :call Session()
 " Ultisnips
 let g:UltiSnipsExpandTrigger = '<s-tab>'
 
-" Completor
-let g:completor_auto_trigger = 0
-let g:completor_min_chars = 1
-
 " VimWiki
 let g:vimwiki_list = [{'path': '~/vimwiki/', 'syntax': 'markdown', 'ext': '.md'}]
 let g:vimwiki_global_ext=0
@@ -299,7 +295,6 @@ nmap <silent> <leader>mT :TestSuite<CR>
 nmap <silent> <leader>mtt :TestNearest<CR>
 
 " FZF
-let g:fzf#contrib#completefunc = 'completor#completefunc'
 nmap <leader>/ :Grep<cr>
 nmap <leader>T :Tags<cr>
 nmap <leader>t :BTags<cr>

diff --git a/zsh/.fzf b/zsh/.fzf
+4 −0		UltiSnips/blade.snippets
+3 −3		UltiSnips/sh.snippets
+2 −1		snippets/javascript.es6.react.snippets
+1 −1		README.md
+1 −0		man/man1/fzf.1
+63 −14		shell/key-bindings.fish
+6 −4		src/tui/light.go