Updated rust support
This commit is contained in:
parent
6a3d62f30b
commit
3608271d32
156
.vimrc
156
.vimrc
|
|
@ -94,7 +94,13 @@ Plug 'matze/vim-tex-fold'
|
|||
|
||||
" rust-lsp configuration
|
||||
Plug 'neovim/nvim-lspconfig'
|
||||
"Plug 'simrat39/rust-tools.nvim'
|
||||
Plug 'hrsh7th/nvim-cmp' " completion framework
|
||||
Plug 'hrsh7th/cmp-nvim-lsp' " LSP completion source for nvim-cmp
|
||||
Plug 'hrsh7th/cmp-vsnip' " snippet completion source for nvim-cmp
|
||||
Plug 'hrsh7th/cmp-path' " other usefull completion sources
|
||||
Plug 'hrsh7th/cmp-buffer'
|
||||
Plug 'simrat39/rust-tools.nvim'
|
||||
Plug 'hrsh7th/vim-vsnip' " snippet engine
|
||||
" Plug 'nvim-lua/lsp_extensions.nvim'
|
||||
|
||||
" File tree
|
||||
|
|
@ -117,52 +123,6 @@ lua require('feline').setup({components = require('catppuccin.core.integrations.
|
|||
lua require('gitsigns').setup()
|
||||
lua require('spellsitter').setup()
|
||||
|
||||
" LSP config
|
||||
lua << EOF
|
||||
-- Mappings.
|
||||
-- See `:help vim.diagnostic.*` for documentation on any of the below functions
|
||||
local opts = { noremap=true, silent=true }
|
||||
|
||||
-- Use an on_attach function to only map the following keys
|
||||
-- after the language server attaches to the current buffer
|
||||
local on_attach = function(client, bufnr)
|
||||
-- Enable completion triggered by <c-x><c-o>
|
||||
vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
|
||||
|
||||
-- Mappings.
|
||||
-- See `:help vim.lsp.*` for documentation on any of the below functions
|
||||
vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
|
||||
vim.api.nvim_buf_set_keymap(bufnr, 'n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
|
||||
vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
|
||||
vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
|
||||
vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
|
||||
vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
|
||||
end
|
||||
|
||||
-- Use a loop to conveniently call 'setup' on multiple servers and
|
||||
-- map buffer local keybindings when the language server attaches
|
||||
local servers = { 'pylsp', 'rust_analyzer', 'asm_lsp', 'gdscript' }
|
||||
for _, lsp in pairs(servers) do
|
||||
require('lspconfig')[lsp].setup {
|
||||
on_attach = on_attach,
|
||||
flags = {
|
||||
-- This will be the default in neovim 0.7+
|
||||
debounce_text_changes = 150,
|
||||
}
|
||||
}
|
||||
end
|
||||
require('lspconfig').arduino_language_server.setup({
|
||||
cmd = {
|
||||
-- Required
|
||||
"arduino-language-server",
|
||||
"-cli-config", "/home/erin/.arduino15/arduino-cli.yaml",
|
||||
-- Optional
|
||||
"-cli", "/usr/bin/arduino-cli",
|
||||
"-clangd", "/usr/bin/clangd"
|
||||
}
|
||||
})
|
||||
EOF
|
||||
|
||||
" Default value is clap
|
||||
let g:dashboard_default_executive ='fzf'
|
||||
let g:dashboard_custom_header=[
|
||||
|
|
@ -234,6 +194,8 @@ require'nvim-treesitter.configs'.setup {
|
|||
}
|
||||
EOF
|
||||
|
||||
" Rust LSP setup based on https://sharksforarms.dev/posts/neovim-rust/
|
||||
|
||||
" Set completeopt to have a better completion experience
|
||||
" :help completeopt
|
||||
" menuone: popup even when there's only one match
|
||||
|
|
@ -243,3 +205,103 @@ set completeopt=menuone,noinsert,noselect
|
|||
|
||||
" Avoid showing extra messages when using completion
|
||||
set shortmess+=c
|
||||
|
||||
|
||||
" Configure LSP through rust-tools.nvim plugin.
|
||||
" rust-tools will configure and enable certain LSP features for us.
|
||||
" See https://github.com/simrat39/rust-tools.nvim#configuration
|
||||
lua <<EOF
|
||||
local nvim_lsp = require'lspconfig'
|
||||
|
||||
local opts = {
|
||||
tools = { -- rust-tools options
|
||||
autoSetHints = true,
|
||||
hover_with_actions = true,
|
||||
inlay_hints = {
|
||||
show_parameter_hints = false,
|
||||
parameter_hints_prefix = "",
|
||||
other_hints_prefix = "",
|
||||
},
|
||||
},
|
||||
|
||||
-- all the opts to send to nvim-lspconfig
|
||||
-- these override the defaults set by rust-tools.nvim
|
||||
-- see https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#rust_analyzer
|
||||
server = {
|
||||
-- on_attach is a callback called when the language server attachs to the buffer
|
||||
-- on_attach = on_attach,
|
||||
settings = {
|
||||
-- to enable rust-analyzer settings visit:
|
||||
-- https://github.com/rust-analyzer/rust-analyzer/blob/master/docs/user/generated_config.adoc
|
||||
["rust-analyzer"] = {
|
||||
-- enable clippy on save
|
||||
checkOnSave = {
|
||||
command = "clippy"
|
||||
},
|
||||
}
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
require('rust-tools').setup(opts)
|
||||
-- Use a loop to conveniently call 'setup' on multiple servers and
|
||||
-- map buffer local keybindings when the language server attaches
|
||||
local servers = { 'pylsp', 'asm_lsp', 'gdscript' }
|
||||
for _, lsp in pairs(servers) do
|
||||
require('lspconfig')[lsp].setup {
|
||||
on_attach = on_attach,
|
||||
flags = {
|
||||
-- This will be the default in neovim 0.7+
|
||||
debounce_text_changes = 150,
|
||||
}
|
||||
}
|
||||
end
|
||||
EOF
|
||||
|
||||
" Setup Completion
|
||||
" See https://github.com/hrsh7th/nvim-cmp#basic-configuration
|
||||
lua <<EOF
|
||||
local cmp = require'cmp'
|
||||
cmp.setup({
|
||||
-- Enable LSP snippets
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
vim.fn["vsnip#anonymous"](args.body)
|
||||
end,
|
||||
},
|
||||
mapping = {
|
||||
['<C-p>'] = cmp.mapping.select_prev_item(),
|
||||
['<C-n>'] = cmp.mapping.select_next_item(),
|
||||
-- Add tab support
|
||||
['<S-Tab>'] = cmp.mapping.select_prev_item(),
|
||||
['<Tab>'] = cmp.mapping.select_next_item(),
|
||||
['<C-d>'] = cmp.mapping.scroll_docs(-4),
|
||||
['<C-f>'] = cmp.mapping.scroll_docs(4),
|
||||
['<C-Space>'] = cmp.mapping.complete(),
|
||||
['<C-e>'] = cmp.mapping.close(),
|
||||
['<CR>'] = cmp.mapping.confirm({
|
||||
behavior = cmp.ConfirmBehavior.Insert,
|
||||
select = true,
|
||||
})
|
||||
},
|
||||
|
||||
-- Installed sources
|
||||
sources = {
|
||||
{ name = 'nvim_lsp' },
|
||||
{ name = 'vsnip' },
|
||||
{ name = 'path' },
|
||||
{ name = 'buffer' },
|
||||
},
|
||||
})
|
||||
EOF
|
||||
|
||||
" Code navigation shortcuts
|
||||
nnoremap <silent> <c-]> <cmd>lua vim.lsp.buf.definition()<CR>
|
||||
nnoremap <silent> K <cmd>lua vim.lsp.buf.hover()<CR>
|
||||
nnoremap <silent> gD <cmd>lua vim.lsp.buf.implementation()<CR>
|
||||
nnoremap <silent> <c-k> <cmd>lua vim.lsp.buf.signature_help()<CR>
|
||||
nnoremap <silent> 1gD <cmd>lua vim.lsp.buf.type_definition()<CR>
|
||||
nnoremap <silent> gr <cmd>lua vim.lsp.buf.references()<CR>
|
||||
nnoremap <silent> g0 <cmd>lua vim.lsp.buf.document_symbol()<CR>
|
||||
nnoremap <silent> gW <cmd>lua vim.lsp.buf.workspace_symbol()<CR>
|
||||
nnoremap <silent> gd <cmd>lua vim.lsp.buf.definition()<CR>
|
||||
|
|
|
|||
Reference in New Issue