From fbe4fd1c4b282a94a4cd242055f8084554bfa031 Mon Sep 17 00:00:00 2001
From: Tomas Slusny <slusnucky@gmail.com>
Date: Tue, 27 Jun 2017 15:04:01 +0200
Subject: [PATCH] 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 <slusnucky@gmail.com>
---
 .gitmodules                                          | 3 ---
 tmux/.tmux/bundle/vim-tmux-navigator                 | 2 +-
 vim/.vim/bundle/completor.vim                        | 1 -
 vim/.vim/bundle/fzf-contrib/autoload/fzf/contrib.vim | 8 +++++---
 vim/.vim/bundle/ultisnips                            | 2 +-
 vim/.vim/bundle/vim-dirvish                          | 2 +-
 vim/.vim/bundle/vim-javacomplete2                    | 2 +-
 vim/.vim/bundle/vim-snippets                         | 2 +-
 vim/.vimrc                                           | 5 -----
 zsh/.fzf                                             | 2 +-
 10 files changed, 11 insertions(+), 18 deletions(-)
 delete mode 160000 vim/.vim/bundle/completor.vim

diff --git a/.gitmodules b/.gitmodules
index 002018f8..b6eef2bb 100644
--- 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
index b93e176b..3e83ddc5 160000
--- a/tmux/.tmux/bundle/vim-tmux-navigator
+++ b/tmux/.tmux/bundle/vim-tmux-navigator
@@ -1 +1 @@
-Subproject commit b93e176b7150942d9f0556347d1c8f6d0b690124
+Subproject commit 3e83ddc509c66ac86b0c2961613076f74f34a2b6
diff --git a/vim/.vim/bundle/completor.vim b/vim/.vim/bundle/completor.vim
deleted file mode 160000
index 08945304..00000000
--- a/vim/.vim/bundle/completor.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 089453042184a6221a1db24de147cb0008bc9073
diff --git a/vim/.vim/bundle/fzf-contrib/autoload/fzf/contrib.vim b/vim/.vim/bundle/fzf-contrib/autoload/fzf/contrib.vim
index 48071174..a9be98f2 100644
--- 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
index 113a901f..6b187827 160000
--- a/vim/.vim/bundle/ultisnips
+++ b/vim/.vim/bundle/ultisnips
@@ -1 +1 @@
-Subproject commit 113a901f417917c53c7140bde7b35d94519701f7
+Subproject commit 6b187827e25e80fb8a4b4550faa318d5dbe01233
diff --git a/vim/.vim/bundle/vim-dirvish b/vim/.vim/bundle/vim-dirvish
index cd16c5f3..e1548de9 160000
--- a/vim/.vim/bundle/vim-dirvish
+++ b/vim/.vim/bundle/vim-dirvish
@@ -1 +1 @@
-Subproject commit cd16c5f307e06be9a6ac41af4e3fcb2003c51d32
+Subproject commit e1548de9dcfe3cd89be9c02ce238a552717fbf60
diff --git a/vim/.vim/bundle/vim-javacomplete2 b/vim/.vim/bundle/vim-javacomplete2
index 6b1c0fab..ae351ecf 160000
--- a/vim/.vim/bundle/vim-javacomplete2
+++ b/vim/.vim/bundle/vim-javacomplete2
@@ -1 +1 @@
-Subproject commit 6b1c0fab0e9b902800ce90c1ab18ebb478f9ce4a
+Subproject commit ae351ecf333e77873fa4682b4d4b05f077047bc4
diff --git a/vim/.vim/bundle/vim-snippets b/vim/.vim/bundle/vim-snippets
index 4a462103..94622013 160000
--- a/vim/.vim/bundle/vim-snippets
+++ b/vim/.vim/bundle/vim-snippets
@@ -1 +1 @@
-Subproject commit 4a462103b2d5c8ed2157c66b657b5e85d3f0b218
+Subproject commit 94622013f675b864e2be9de6f3cbb7c98d429b60
diff --git a/vim/.vimrc b/vim/.vimrc
index 5a3b2217..cdb8196d 100644
--- 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
index 1a68698d..70cfa6af 160000
--- a/zsh/.fzf
+++ b/zsh/.fzf
@@ -1 +1 @@
-Subproject commit 1a68698d76d3a07b5c2c41621ca4feb51ec9afdc
+Subproject commit 70cfa6af13e56bf50c70c46e62085f9d9b52f909