Many changes to nvim configs
- switch to nvim-cmp - add lsp-status stuff to statusline
This commit is contained in:
@@ -3,13 +3,14 @@
|
||||
|
||||
require("lsp.rust-analyzer")
|
||||
require("lsp.lua-language-server")
|
||||
require("lsp.pyls")
|
||||
-- require("lsp.pyls")
|
||||
|
||||
-- Set completeopt to have a better completion experience
|
||||
vim.o.completeopt= "menuone,noinsert,noselect"
|
||||
vim.o.completeopt= "menuone,noselect"
|
||||
|
||||
-- vim.api.nvim_command [[autocmd CursorHold <buffer> lua vim.lsp.buf.document_highlight()]]
|
||||
-- vim.api.nvim_command [[autocmd CursorHoldI <buffer> lua vim.lsp.buf.document_highlight()]]
|
||||
-- vim.api.nvim_command [[autocmd CursorMoved <buffer> lua vim.lsp.buf.clear_references()]]
|
||||
--
|
||||
vim.api.nvim_buf_set_option(0, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
|
||||
-- vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
|
||||
|
||||
@@ -1,23 +1,33 @@
|
||||
-- Built in lsp
|
||||
local lspconfig = require'lspconfig'
|
||||
-- local lspstatus = require('lsp-status')
|
||||
-- lspstatus.register_progress()
|
||||
|
||||
|
||||
lspconfig.rust_analyzer.setup{
|
||||
on_attach=function(client) require'completion'.on_attach(client) require'lsp-status'.on_attach(client) return end,
|
||||
on_attach=function(client) require'lsp-status'.on_attach(client) return end,
|
||||
capabilities = require'lsp-status'.capabilities,
|
||||
cmd = { "rust-analyzer" },
|
||||
filetypes = { "rust" },
|
||||
root_dir = lspconfig.util.root_pattern("Cargo.toml"),
|
||||
settings = {
|
||||
["rust-analyzer"] = {
|
||||
assist = {
|
||||
importGranularity = "module",
|
||||
importPrefix = "by_self",
|
||||
},
|
||||
procMacro = {
|
||||
enable = true,
|
||||
},
|
||||
checkOnSave = {
|
||||
command = "clippy",
|
||||
allTargets = true,
|
||||
},
|
||||
cargo = {
|
||||
loadOutDirsFromCheck = true,
|
||||
allFeatures = true,
|
||||
-- target = "aarch64-linux-android"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
lspconfig.rust_analyzer.setup{
|
||||
capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user