From dc438eee1e4d721ed141d9d816cc6915be8b0f39 Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Thu, 23 Feb 2017 00:25:04 +0800
Subject: [PATCH] Improve incsearch config

---
 autoload/SpaceVim/layers/edit.vim      |  2 +-
 autoload/SpaceVim/layers/incsearch.vim | 36 +++++++++++++++++++++++++-
 autoload/SpaceVim/layers/tools.vim     |  1 -
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/autoload/SpaceVim/layers/edit.vim b/autoload/SpaceVim/layers/edit.vim
index 2c6259914..6ebd4c5a9 100644
--- a/autoload/SpaceVim/layers/edit.vim
+++ b/autoload/SpaceVim/layers/edit.vim
@@ -6,7 +6,7 @@ function! SpaceVim#layers#edit#plugins() abort
                 \ ['scrooloose/nerdcommenter'],
                 \ ['mattn/emmet-vim',                        { 'on_cmd' : 'EmmetInstall'}],
                 \ ['gcmt/wildfire.vim',{'on_map' : '<Plug>(wildfire-'}],
-                \ ['easymotion/vim-easymotion',{'on_map' : '<Plug>(easymotion-prefix)'}],
+                \ ['easymotion/vim-easymotion',{'on_map' : '<Plug>(easymotion-prefix)', 'on_func' : 'EasyMotion#go'}],
                 \ ['editorconfig/editorconfig-vim', { 'on_cmd' : 'EditorConfigReload'}],
                 \ ['floobits/floobits-neovim',      { 'on_cmd' : ['FlooJoinWorkspace','FlooShareDirPublic','FlooShareDirPrivate']}],
                 \ ]
diff --git a/autoload/SpaceVim/layers/incsearch.vim b/autoload/SpaceVim/layers/incsearch.vim
index 203875734..3691f200c 100644
--- a/autoload/SpaceVim/layers/incsearch.vim
+++ b/autoload/SpaceVim/layers/incsearch.vim
@@ -3,9 +3,43 @@ function! SpaceVim#layers#incsearch#plugins() abort
     call add(plugins, ['haya14busa/incsearch.vim', {'merged' : 0}])
     call add(plugins, ['haya14busa/incsearch-fuzzy.vim', {'merged' : 0}])
     call add(plugins, ['haya14busa/vim-asterisk', {'merged' : 0}])
+    call add(plugins, ['haya14busa/incsearch-easymotion.vim', {'merged' : 0}])
     return plugins
 endfunction
 
 function! SpaceVim#layers#incsearch#config() abort
-    
+    map /  <Plug>(incsearch-forward)
+    map ?  <Plug>(incsearch-backward)
+    map g/ <Plug>(incsearch-stay)
+    set hlsearch
+    let g:incsearch#auto_nohlsearch = 1
+    map n  <Plug>(incsearch-nohl-n)
+    map N  <Plug>(incsearch-nohl-N)
+    map *  <Plug>(incsearch-nohl-*)
+    map #  <Plug>(incsearch-nohl-#)
+    map g* <Plug>(incsearch-nohl-g*)
+    map g# <Plug>(incsearch-nohl-g#)
+    function! s:config_fuzzyall(...) abort
+        return extend(copy({
+                    \   'converters': [
+                    \     incsearch#config#fuzzy#converter(),
+                    \     incsearch#config#fuzzyspell#converter()
+                    \   ],
+                    \ }), get(a:, 1, {}))
+    endfunction
+
+    noremap <silent><expr> z/ incsearch#go(<SID>config_fuzzyall())
+    noremap <silent><expr> z? incsearch#go(<SID>config_fuzzyall({'command': '?'}))
+    noremap <silent><expr> zg? incsearch#go(<SID>config_fuzzyall({'is_stay': 1}))
+    function! s:config_easyfuzzymotion(...) abort
+        return extend(copy({
+                    \   'converters': [incsearch#config#fuzzy#converter()],
+                    \   'modules': [incsearch#config#easymotion#module()],
+                    \   'keymap': {"\<CR>": '<Over>(easymotion)'},
+                    \   'is_expr': 0,
+                    \   'is_stay': 1
+                    \ }), get(a:, 1, {}))
+    endfunction
+
+    noremap <silent><expr> <Space>/ incsearch#go(<SID>config_easyfuzzymotion())
 endfunction
diff --git a/autoload/SpaceVim/layers/tools.vim b/autoload/SpaceVim/layers/tools.vim
index 8024bb046..3d4612a88 100644
--- a/autoload/SpaceVim/layers/tools.vim
+++ b/autoload/SpaceVim/layers/tools.vim
@@ -7,7 +7,6 @@ function! SpaceVim#layers#tools#plugins() abort
                 \ ['junegunn/limelight.vim',    { 'on_cmd' : 'Limelight'}],
                 \ ['Yggdroot/LeaderF', {'merged' : 0, 'on_cmd' : 'LeaderF'}],
                 \ ['MattesGroeger/vim-bookmarks', { 'on_map' : '<Plug>Bookmark', 'loadconf_before' : 1}],
-                \ ['google/vim-searchindex'],
                 \ ['simnalamburt/vim-mundo',        { 'on_cmd' : 'MundoToggle'}],
                 \ ['mhinz/vim-grepper' , { 'on_cmd' : 'Grepper', 'loadconf' : 1} ],
                 \ ['tpope/vim-projectionist',{'on_cmd':['A','AS','AV','AT','AD','Cd','Lcd','ProjectDo']}],