Mercurial > dotfiles
changeset 329:111f178824b9
Fix delimitMate expansion of CR for completion results
| author | Zeger Van de Vannet <zegervdv@me.com> |
|---|---|
| date | Tue, 12 Jan 2021 16:35:09 +0100 |
| parents | 855380bb5a3b |
| children | 471701051c92 |
| files | dot_config/nvim/config.lua dot_config/nvim/init.vim |
| diffstat | 2 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/dot_config/nvim/config.lua Tue Jan 12 13:36:27 2021 +0100 +++ b/dot_config/nvim/config.lua Tue Jan 12 16:35:09 2021 +0100 @@ -66,7 +66,6 @@ -- Parentheses etc use {'tpope/vim-surround'} use {'raimondi/delimitMate'} - use {'zegervdv/vim-endwise'} -- Moving around within lines use {'wellle/targets.vim', event = 'InsertEnter *'} @@ -204,7 +203,6 @@ vim.fn.nvim_buf_set_keymap(0, mode, key, result, {noremap=noremap, silent=true}) end - -- vim.api.nvim_command('autocmd CursorHold <buffer> lua vim.lsp.diagnostic.show_line_diagnostics()') mapper('n', '<CR>', '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics({show_header=false})<CR>') mapper('n', 'gd', '<cmd>lua vim.lsp.buf.declaration()<CR>') mapper('n', '<c-]>', '<cmd>lua vim.lsp.buf.definition()<CR>')
--- a/dot_config/nvim/init.vim Tue Jan 12 13:36:27 2021 +0100 +++ b/dot_config/nvim/init.vim Tue Jan 12 16:35:09 2021 +0100 @@ -1007,6 +1007,9 @@ return !col || getline('.')[col - 1] =~# '\s' endfunction +" let g:completion_confirm_key_rhs = "\<Plug>delimitMateCR" +let g:completion_confirm_key = "" +imap <expr> <CR> (pumvisible() ? (complete_info()["selected"] != "-1" ? "\<Plug>(completion_confirm_completion)" : "\<Plug>delimitMateCR") : "\<Plug>delimitMateCR") " Auto close popup menu when finish completion autocmd! CompleteDone * if pumvisible() == 0 | pclose | endif @@ -1022,11 +1025,9 @@ set shortmess+=c let g:completion_enable_snippet = 'UltiSnips' -"Fallback for https://github.com/Raimondi/delimitMate expanding on enter -let g:completion_confirm_key_rhs = "\<Plug>delimitMateCR" let g:UltiSnipsJumpForwardTrigger="<c-b>" let g:UltiSnipsJumpBackwardTrigger="<c-z>" -let g:completion_enable_auto_paren=1 +let g:completion_enable_auto_paren=0 let delimitMate_expand_cr = 1 let delimitMate_expand_space = 1