replace coc with lspconfig
This commit is contained in:
Robert Altner
parent
fd48e88cc3
commit
389c1ee2e2
20
init.vim
20
init.vim
|
|
@ -8,8 +8,8 @@ let g:startify_fortune_use_unicode = 1
|
|||
"lua require("plugins")
|
||||
lua require("init")
|
||||
lua require("keymap")
|
||||
lua require("coc")
|
||||
|
||||
" lua require("coc")
|
||||
"
|
||||
set number relativenumber
|
||||
set tabstop=4
|
||||
set shiftwidth=4
|
||||
|
|
@ -42,24 +42,24 @@ let g:ale_fixers = {
|
|||
\ 'c': ['clang-format']
|
||||
\}
|
||||
|
||||
inoremap <silent><expr> <UP> coc#pum#visible() ? coc#pum#prev(1) : ""
|
||||
inoremap <silent><expr> <DOWN> coc#pum#visible() ? coc#pum#next(1) : ""
|
||||
" inoremap <silent><expr> <UP> coc#pum#visible() ? coc#pum#prev(1) : ""
|
||||
" inoremap <silent><expr> <DOWN> coc#pum#visible() ? coc#pum#next(1) : ""
|
||||
|
||||
"Fix escape sending user to normal mode in fzf buffers
|
||||
autocmd FileType fzf tnoremap <buffer><silent><ESC> <ESC>
|
||||
|
||||
inoremap <silent><expr> <TAB>
|
||||
\ coc#pum#visible() ? coc#_select_confirm() :
|
||||
\ coc#expandableOrJumpable() ? "\<C-r>=coc#rpc#request('doKeymap', ['snippets-expand-jump',''])\<CR>" :
|
||||
\ CheckBackspace() ? "\<TAB>" :
|
||||
\ "\<TAB>"
|
||||
" inoremap <silent><expr> <TAB>
|
||||
" \ coc#pum#visible() ? coc#_select_confirm() :
|
||||
" \ coc#expandableOrJumpable() ? "\<C-r>=coc#rpc#request('doKeymap', ['snippets-expand-jump',''])\<CR>" :
|
||||
" \ CheckBackspace() ? "\<TAB>" :
|
||||
" \ "\<TAB>"
|
||||
|
||||
function! CheckBackspace() abort
|
||||
let col = col('.') - 1
|
||||
return !col || getline('.')[col - 1] =~# '\s'
|
||||
endfunction
|
||||
|
||||
let g:coc_snippet_next = '<tab>'
|
||||
" let g:coc_snippet_next = '<tab>'
|
||||
|
||||
"highlight LineNr guifg=#ff57d8
|
||||
set noexpandtab
|
||||
|
|
|
|||
52
lua/init.lua
52
lua/init.lua
|
|
@ -30,6 +30,58 @@ local colors = require("tokyonight.colors").setup()
|
|||
require("editorconfig").properties.trim_trailing_whitespace = false
|
||||
require('neoscroll').setup()
|
||||
|
||||
require("mason").setup({
|
||||
ui = {
|
||||
icons = {
|
||||
package_installed = "✓",
|
||||
package_pending = "➜",
|
||||
package_uninstalled = "✗"
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
require("mason-lspconfig").setup()
|
||||
|
||||
require("mason-lspconfig").setup_handlers {
|
||||
-- The first entry (without a key) will be the default handler
|
||||
-- and will be called for each installed server that doesn't have
|
||||
-- a dedicated handler.
|
||||
function (server_name) -- default handler (optional)
|
||||
require("lspconfig")[server_name].setup {}
|
||||
end
|
||||
}
|
||||
|
||||
vim.api.nvim_set_keymap("", "<UP>", "<NOP>", {})
|
||||
vim.api.nvim_set_keymap("", "<DOWn>", "<NOP>", {})
|
||||
vim.api.nvim_set_keymap("", "<LEFT>", "<NOP>", {})
|
||||
vim.api.nvim_set_keymap("", "<RIGHT>", "<NOP>", {})
|
||||
|
||||
require('goto-preview').setup {
|
||||
width = 120, -- Width of the floating window
|
||||
height = 15, -- Height of the floating window
|
||||
border = {"↖", "─" ,"┐", "│", "┘", "─", "└", "│"}, -- Border characters of the floating window
|
||||
default_mappings = false, -- Bind default mappings
|
||||
debug = false, -- Print debug information
|
||||
opacity = nil, -- 0-100 opacity level of the floating window where 100 is fully transparent.
|
||||
resizing_mappings = true, -- Binds arrow keys to resizing the floating window.
|
||||
post_open_hook = nil, -- A function taking two arguments, a buffer and a window to be ran as a hook.
|
||||
post_close_hook = nil, -- A function taking two arguments, a buffer and a window to be ran as a hook.
|
||||
references = { -- Configure the telescope UI for slowing the references cycling window.
|
||||
provider = "telescope", -- telescope|fzf_lua|snacks|mini_pick|default
|
||||
telescope = require("telescope.themes").get_dropdown({ hide_preview = false })
|
||||
},
|
||||
-- These two configs can also be passed down to the goto-preview definition and implementation calls for one off "peak" functionality.
|
||||
focus_on_open = true, -- Focus the floating window when opening it.
|
||||
dismiss_on_move = false, -- Dismiss the floating window when moving the cursor.
|
||||
force_close = true, -- passed into vim.api.nvim_win_close's second argument. See :h nvim_win_close
|
||||
bufhidden = "wipe", -- the bufhidden option to set on the floating window. See :h bufhidden
|
||||
stack_floating_preview_windows = true, -- Whether to nest floating windows
|
||||
same_file_float_preview = true, -- Whether to open a new floating window for a reference within the current file
|
||||
preview_window_title = { enable = true, position = "left" }, -- Whether to set the preview window title as the filename
|
||||
zindex = 1, -- Starting zindex for the stack of floating windows
|
||||
vim_ui_input = true, -- Whether to override vim.ui.input with a goto-preview floating window
|
||||
}
|
||||
|
||||
require("nvim-tree").setup({
|
||||
update_focused_file = {
|
||||
enable = true
|
||||
|
|
|
|||
|
|
@ -12,15 +12,19 @@ map("n", "<F3>", ":NvimTreeFindFileToggle<CR>")
|
|||
map("n", "<F4>", ":Buffers<CR>")
|
||||
|
||||
map("n", "<F2>", ":Outline<CR>")
|
||||
map("n", "<leader>e", ":CocList diagnostics<CR>")
|
||||
-- map("n", "<leader>e", ":CocList diagnostics<CR>")
|
||||
|
||||
map("n", "<C-P>", ":Telescope find_files<cr>")
|
||||
map("n", "<leader>s", ":Telescope live_grep glob_pattern=*.{ts,html,c,cc,cpp,h,go,json,py,sh,lua,vim,rs,txt}<cr>")
|
||||
|
||||
map("n", "<leader>sc", ":noh<CR>")
|
||||
|
||||
map("n", "gs", ":call CocAction('jumpDefinition', 'split')<CR>")
|
||||
map("n", "gt", ":CocCommand clangd.switchSourceHeader<CR>")
|
||||
-- map("n", "gs", ":call CocAction('jumpDefinition', 'split')<CR>")
|
||||
-- map("n", "gt", ":CocCommand clangd.switchSourceHeader<CR>")
|
||||
--
|
||||
map("n", "p<C-]>", "<cmd>lua require('goto-preview').goto_preview_definition()<CR>", {noremap=true})
|
||||
map("n", "q<C-]>", "<cmd>lua require('goto-preview').close_all_win()<CR>", {noremap=true})
|
||||
map("n", "r<C-]>", "<cmd>lua require('goto-preview').goto_preview_references()<CR>", {noremap=true})
|
||||
|
||||
map("n", "<leader>1", "1gt")
|
||||
map("n", "<leader>2", "2gt")
|
||||
|
|
@ -35,13 +39,13 @@ map("n", "<leader>0", ":tablast<cr>")
|
|||
|
||||
map("n", "<leader><F9>", ":call vimspector#ToggleBreakpoint( input( \"Enter condition: \" ) )<CR>")
|
||||
|
||||
map("", "<UP>", "<NOP>")
|
||||
map("", "<DOWN>", "<NOP>")
|
||||
map("", "<RIGHT>", "<NOP>")
|
||||
map("", "<LEFT>", "<NOP>")
|
||||
|
||||
map("i", "<RIGHT>", "<NOP>")
|
||||
map("i", "<LEFT>", "<NOP>")
|
||||
-- map("", "<UP>", "<NOP>")
|
||||
-- map("", "<DOWN>", "<NOP>")
|
||||
-- map("", "<RIGHT>", "<NOP>")
|
||||
-- map("", "<LEFT>", "<NOP>")
|
||||
--
|
||||
-- map("i", "<RIGHT>", "<NOP>")
|
||||
-- map("i", "<LEFT>", "<NOP>")
|
||||
|
||||
map("n", "<leader>c", ":bo 15split +term<CR>")
|
||||
map("n", "<leader>t", ":TodoTelescope theme=ivy<CR>")
|
||||
|
|
|
|||
|
|
@ -27,9 +27,24 @@ return {
|
|||
"nvim-tree/nvim-tree.lua",
|
||||
dependencies = {"nvim-tree/nvim-web-devicons"}
|
||||
},
|
||||
-- {
|
||||
-- "neoclide/coc.nvim",
|
||||
-- branch = "release"
|
||||
-- },
|
||||
{
|
||||
"neoclide/coc.nvim",
|
||||
branch = "release"
|
||||
"neovim/nvim-lspconfig"
|
||||
},
|
||||
{
|
||||
"williamboman/mason.nvim"
|
||||
},
|
||||
{
|
||||
"williamboman/mason-lspconfig.nvim"
|
||||
},
|
||||
{
|
||||
"rmagatti/goto-preview",
|
||||
dependencies = { "rmagatti/logger.nvim" },
|
||||
event = "BufEnter",
|
||||
config = true, -- necessary as per https://github.com/rmagatti/goto-preview/issues/88
|
||||
},
|
||||
{
|
||||
"nvim-telescope/telescope.nvim",
|
||||
|
|
|
|||
Loading…
Reference in a new issue