diff --git a/README.md b/README.md index 9c661c4..fc47658 100644 --- a/README.md +++ b/README.md @@ -84,6 +84,7 @@ let g:chopsticks_profile = 'full' " engineer + heavier Markdown feedback let g:chopsticks_enable_jk_escape = 1 " optional: insert-mode jk exits insert let g:chopsticks_enable_ctrl_s_save = 1 " optional: Ctrl-S saves let g:chopsticks_enable_sudo_save_bang = 1 " optional: :w!! sudo save +let g:chopsticks_enable_completion_keymaps = 1 " optional: Tab/Enter completion ``` `minimal` avoids LSP, ALE, completion plugins, extra language syntax plugins, diff --git a/modules/lsp.vim b/modules/lsp.vim index 2e2662e..9ff421b 100644 --- a/modules/lsp.vim +++ b/modules/lsp.vim @@ -51,9 +51,11 @@ let g:asyncomplete_auto_popup = 1 let g:asyncomplete_auto_completeopt = 0 let g:asyncomplete_popup_delay = 50 -inoremap pumvisible() ? "\" : "\" -inoremap pumvisible() ? "\" : "\" -inoremap pumvisible() ? asyncomplete#close_popup() : "\" +if get(g:, 'chopsticks_enable_completion_keymaps', 0) + inoremap pumvisible() ? "\" : "\" + inoremap pumvisible() ? "\" : "\" + inoremap pumvisible() ? asyncomplete#close_popup() : "\" +endif " ── Buffer Keymaps ────────────────────────────────────────────────────────── diff --git a/scripts/test.sh b/scripts/test.sh index 96acb19..4967ce5 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -204,6 +204,7 @@ check_vim() { XDG_CONFIG_HOME="$EMPTY_XDG" vim -u .vimrc -i NONE -es -N \ -c 'let last_change_map = nr2char(96) . "[v" . nr2char(96) . "]"' \ -c 'if maparg("0", "n") !=# "" || maparg("0", "v") !=# "" || maparg("Y", "n") !=# "" || maparg("Q", "n") !=# "" || maparg("", "n") !=# "" || maparg("//", "v") !=# "" || maparg("gV", "n") !=# "" || maparg("jk", "i") !=# "" || maparg("", "n") !=# "" || maparg("", "i") !=# "" || maparg("", "n") !=# "" || maparg("", "n") !=# "" || maparg("", "n") !=# "" || maparg("", "n") !=# "" || maparg("", "n") !=# "" || maparg("", "c") !=# "" || maparg("", "c") !=# "" || maparg("w!!", "c") !=# "" | cquit | endif' \ + -c 'if maparg("", "i") =~# "pumvisible" || maparg("", "i") =~# "pumvisible" || maparg("", "i") =~# "asyncomplete#close_popup" | cquit | endif' \ -c 'if maparg(",/", "v") !~# "escape" || maparg(",v", "n") !=# last_change_map || maparg(",ff", "n") !~# "SmartFiles" | cquit | endif' \ -c 'qa!' 2>&1 @@ -216,8 +217,10 @@ check_vim() { XDG_CONFIG_HOME="$EMPTY_XDG" vim -u NONE -i NONE -es -N \ -c 'let g:chopsticks_enable_ctrl_s_save = 1' \ -c 'let g:chopsticks_enable_sudo_save_bang = 1' \ + -c 'let g:chopsticks_enable_completion_keymaps = 1' \ -c 'source .vimrc' \ -c 'if maparg("", "n") !~# ":w" || maparg("", "i") !~# ":w" || maparg("w!!", "c") !~# "sudo tee" | cquit | endif' \ + -c 'if maparg("", "i") !~# "pumvisible" || maparg("", "i") !~# "pumvisible" || maparg("", "i") !~# "asyncomplete#close_popup" | cquit | endif' \ -c 'qa!' 2>&1 XDG_CONFIG_HOME="$EMPTY_XDG" vim -u .vimrc -i NONE -es -N \