From 5efdfda9cd94cebf6e2c3e92478e47612bee10be Mon Sep 17 00:00:00 2001 From: Price Hiller Date: Tue, 16 Nov 2021 17:52:53 -0600 Subject: [PATCH] Removed COC replaced with COQ 8===D --- NvChad-Confs/configs/coc_bindings.vim | 166 -------------------------- NvChad-Confs/init.lua | 49 +++++--- 2 files changed, 35 insertions(+), 180 deletions(-) delete mode 100644 NvChad-Confs/configs/coc_bindings.vim diff --git a/NvChad-Confs/configs/coc_bindings.vim b/NvChad-Confs/configs/coc_bindings.vim deleted file mode 100644 index 491d4ec..0000000 --- a/NvChad-Confs/configs/coc_bindings.vim +++ /dev/null @@ -1,166 +0,0 @@ -" Set internal encoding of vim, not needed on neovim, since coc.nvim using some -" unicode characters in the file autoload/float.vim -set encoding=utf-8 - -" TextEdit might fail if hidden is not set. -set hidden - -" Some servers have issues with backup files, see #649. -set nobackup -set nowritebackup - -" Give more space for displaying messages. -set cmdheight=2 - -" Having longer updatetime (default is 4000 ms = 4 s) leads to noticeable -" delays and poor user experience. -set updatetime=300 - -" Don't pass messages to |ins-completion-menu|. -set shortmess+=c - -" Always show the signcolumn, otherwise it would shift the text each time -" diagnostics appear/become resolved. -if has("nvim-0.5.0") || has("patch-8.1.1564") - " Recently vim can merge signcolumn and number column into one - set signcolumn=number -else - set signcolumn=yes -endif - -" Use tab for trigger completion with characters ahead and navigate. -" NOTE: Use command ':verbose imap ' to make sure tab is not mapped by -" other plugin before putting this into your config. -inoremap - \ pumvisible() ? "\" : - \ check_back_space() ? "\" : - \ coc#refresh() -inoremap pumvisible() ? "\" : "\" - -function! s:check_back_space() abort - let col = col('.') - 1 - return !col || getline('.')[col - 1] =~# '\s' -endfunction - -" Use to trigger completion. -if has('nvim') - inoremap coc#refresh() -else - inoremap coc#refresh() -endif - -" Make auto-select the first completion item and notify coc.nvim to -" format on enter, could be remapped by other vim plugin -inoremap pumvisible() ? coc#_select_confirm() - \: "\u\\=coc#on_enter()\" - -" Use `[g` and `]g` to navigate diagnostics -" Use `:CocDiagnostics` to get all diagnostics of current buffer in location list. -nmap [g (coc-diagnostic-prev) -nmap ]g (coc-diagnostic-next) - -" GoTo code navigation. -nmap gd (coc-definition) -nmap gy (coc-type-definition) -nmap gi (coc-implementation) -nmap gr (coc-references) - -" Use K to show documentation in preview window. -nnoremap K :call show_documentation() - -function! s:show_documentation() - if (index(['vim','help'], &filetype) >= 0) - execute 'h '.expand('') - elseif (coc#rpc#ready()) - call CocActionAsync('doHover') - else - execute '!' . &keywordprg . " " . expand('') - endif -endfunction - -" Highlight the symbol and its references when holding the cursor. -autocmd CursorHold * silent call CocActionAsync('highlight') - -" Symbol renaming. -nmap rn (coc-rename) - -" Formatting selected code. -" xmap f (coc-format-selected) -" nmap f (coc-format-selected) - -augroup mygroup - autocmd! - " Setup formatexpr specified filetype(s). - autocmd FileType typescript,json setl formatexpr=CocAction('formatSelected') - " Update signature help on jump placeholder. - autocmd User CocJumpPlaceholder call CocActionAsync('showSignatureHelp') -augroup end - -" Applying codeAction to the selected region. -" Example: `aap` for current paragraph -xmap a (coc-codeaction-selected) -nmap a (coc-codeaction-selected) - -" Remap keys for applying codeAction to the current buffer. -nmap ac (coc-codeaction) -" Apply AutoFix to problem on the current line. -nmap qf (coc-fix-current) - -" Map function and class text objects -" NOTE: Requires 'textDocument.documentSymbol' support from the language server. -xmap if (coc-funcobj-i) -omap if (coc-funcobj-i) -xmap af (coc-funcobj-a) -omap af (coc-funcobj-a) -xmap ic (coc-classobj-i) -omap ic (coc-classobj-i) -xmap ac (coc-classobj-a) -omap ac (coc-classobj-a) - -" Remap and for scroll float windows/popups. -if has('nvim-0.4.0') || has('patch-8.2.0750') - nnoremap coc#float#has_scroll() ? coc#float#scroll(1) : "\" - nnoremap coc#float#has_scroll() ? coc#float#scroll(0) : "\" - inoremap coc#float#has_scroll() ? "\=coc#float#scroll(1)\" : "\" - inoremap coc#float#has_scroll() ? "\=coc#float#scroll(0)\" : "\" - vnoremap coc#float#has_scroll() ? coc#float#scroll(1) : "\" - vnoremap coc#float#has_scroll() ? coc#float#scroll(0) : "\" -endif - -" Use CTRL-S for selections ranges. -" Requires 'textDocument/selectionRange' support of language server. -nmap (coc-range-select) -xmap (coc-range-select) - -" Add `:Format` command to format current buffer. -command! -nargs=0 Format :call CocAction('format') -nmap .f :Format - -" Add `:Fold` command to fold current buffer. -command! -nargs=? Fold :call CocAction('fold', ) - -" Add `:OR` command for organize imports of the current buffer. -command! -nargs=0 OR :call CocAction('runCommand', 'editor.action.organizeImport') - -" Add (Neo)Vim's native statusline support. -" NOTE: Please see `:h coc-status` for integrations with external plugins that -" provide custom statusline: lightline.vim, vim-airline. -set statusline^=%{coc#status()}%{get(b:,'coc_current_function','')} - -" Mappings for CoCList -" Show all diagnostics. -nnoremap ,a :CocList diagnostics -" Manage extensions. -nnoremap ,e :CocList extensions -" Show commands. -nnoremap ,c :CocList commands -" Find symbol of current document. -nnoremap ,o :CocList outline -" Search workspace symbols. -nnoremap ,s :CocList -I symbols -" Do default action for next item. -nnoremap ,j :CocNext -" Do default action for previous item. -nnoremap ,k :CocPrev -" Resume latest coc list. -nnoremap ,p :CocListResume diff --git a/NvChad-Confs/init.lua b/NvChad-Confs/init.lua index 00e62ef..6e5544f 100644 --- a/NvChad-Confs/init.lua +++ b/NvChad-Confs/init.lua @@ -8,12 +8,15 @@ hooks.add("install_plugins", function(use) "williamboman/nvim-lsp-installer", config = function() local lsp_installer = require("nvim-lsp-installer") + require("packer").loader("coq_nvim coq.artifacts") + buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc') lsp_installer.on_server_ready(function(server) local opts = {} - - server:setup(opts) + server:setup(require("coq")().lsp_ensure_capabilities(opts)) + -- server:setup(opts) vim.cmd [[ do User LspAttachBuffers ]] + vim.cmd(":COQnow") end) end, } @@ -29,8 +32,16 @@ hooks.add("install_plugins", function(use) end, } use { - "neoclide/coc.nvim", - branch="release" + "ms-jpq/coq_nvim", + branch="coq" + } + use { + "ms-jpq/coq.artifacts", + branch="artifacts" + } + use { + "ms-jpq/coq.thirdparty", + branch="3p" } use { "gennaro-tedesco/nvim-peekup" @@ -38,16 +49,26 @@ hooks.add("install_plugins", function(use) end) --- COC NVIM KEYBINDS -vim.cmd("source ~/.config/nvim/lua/custom/configs/coc_bindings.vim") hooks.add("setup_mappings", function(map) - -- local lsp_opts = {} - -- map("n", "d", "lua vim.lsp.buf.hover()", lsp_opts) - -- map("n", "D", "lua vim.lsp.buf.signature_help()", lsp_opts) - -- map("n", "b", "lua vim.lsp.buf.definition()", lsp_opts) - -- map("n", "B", "lua vim.lsp.buf.implementation()", lsp_opts) - -- map("n", "r", "lua vim.lsp.buf.references()", lsp_opts) - -- map("n", "R", "lua vim.lsp.buf.rename()", lsp_opts) - -- map("n", "ca", "lua vim.lsp.buf.code_action()", lsp_opts) + + -- LSP MAPPINGS -- + local lsp_opts = { noremap=true } + map('n', 'gd', 'lua vim.lsp.buf.definition()', lsp_opts) + map('n', 'K', 'lua vim.lsp.buf.hover()', lsp_opts) + map('n', 'gi', 'lua vim.lsp.buf.implementation()', lsp_opts) + map('n', '', 'lua vim.lsp.buf.signature_help()', lsp_opts) + map('n', 'wa', 'lua vim.lsp.buf.add_workspace_folder()', lsp_opts) + map('n', 'wr', 'lua vim.lsp.buf.remove_workspace_folder()', lsp_opts) + map('n', 'wl', 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', lsp_opts) + map('n', 'D', 'lua vim.lsp.buf.type_definition()', lsp_opts) + map('n', 'rn', 'lua vim.lsp.buf.rename()', lsp_opts) + map('n', 'ca', 'lua vim.lsp.buf.code_action()', lsp_opts) + map('n', 'gr', 'lua vim.lsp.buf.references()', lsp_opts) + map('n', 'e', 'lua vim.lsp.diagnostic.show_line_diagnostics()', lsp_opts) + map('n', '[d', 'lua vim.lsp.diagnostic.goto_prev()', lsp_opts) + map('n', ']d', 'lua vim.lsp.diagnostic.goto_next()', lsp_opts) + map('n', 'q', 'lua vim.lsp.diagnostic.set_loclist()', lsp_opts) + map('n', 'f', 'lua vim.lsp.buf.formatting()', lsp_opts) + end)