No asyncomplete's auto_popup, do only on demand

diff --git a/vim/.vim/plugin/lsp.vim b/vim/.vim/plugin/lsp.vim
index 1348fc4dbc4a7d040f2bd824ac5feb140afd4561..13d51d5aeb8bad48e54c8a58e30a43d85e0892a8 100644 (file)
--- a/vim/.vim/plugin/lsp.vim
+++ b/vim/.vim/plugin/lsp.vim
@@ -1,15 +1,18 @@
+let g:lsp_settings_enable_suggestions = 0
 let g:lsp_settings = {
 \  'clangd': {'cmd': ['clangd60']},
 \}
 
 let g:asyncomplete_auto_completeopt = 0
-let g:lsp_settings_enable_suggestions = 0
+let g:asyncomplete_auto_popup = 0
+imap <C-@> <Plug>(asyncomplete_force_refresh)
+autocmd! CompleteDone * if pumvisible() == 0 | pclose | endif
+
 let g:lsp_highlight_references_enabled = 1
 let g:lsp_diagnostics_echo_cursor = 1
+let g:lsp_diagnostics_echo_delay = -1
 
 function! s:on_lsp_buffer_enabled() abort
-    setlocal completeopt=menuone,noinsert,noselect
-    setlocal omnifunc=lsp#complete
     nmap <buffer> [g <Plug>(lsp-previous-diagnostic)
     nmap <buffer> ]g <Plug>(lsp-next-diagnostic)
     nmap <buffer> gd <plug>(lsp-definition)

diff --git a/vim/.vimrc b/vim/.vimrc
index ab10103833a82475e7471909ffd379c2593ea820..d44abc32fc2118d9092ba9b4a1c1f59373b6c862 100644 (file)
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -33,6 +33,7 @@ set showcmd
 set showmatch
 set listchars=trail:·,tab:>→,nbsp:% ",eol:¶
 set list
+set completeopt-=preview
 
 set cursorline
 set cursorcolumn