shimun/nvim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(nvim): switch rust-tools to rustaceanvim

Browse Source
This commit is contained in:
u2515h 2024-01-06 22:04:48 +01:00
parent 09559b017a
commit f25a55cfad
3 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
completion.lua
View File

@ -22,8 +22,12 @@ autocmd CursorHold * lua vim.diagnostic.open_float(nil, { focusable = false })
vim.opt.spell = true vim.opt.spell = true
vim.opt.spelllang = {'en_us'} vim.opt.spelllang = {'en_us'}
vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.handlers["textDocument/publishDiagnostics"] =
vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, vim.lsp.with(
{virtual_text = true}) vim.lsp.diagnostic.on_publish_diagnostics,
{
virtual_text = true,
}
)
-- Completion Plugin Setup -- Completion Plugin Setup
local cmp = require 'cmp' local cmp = require 'cmp'
cmp.setup({ cmp.setup({

2
default.nix
View File

@ -62,7 +62,7 @@ in
(if config.programs.neovim.package.version == "0.10.0" then throw "lsp-inlayhints-nvim may be removed" else lsp-inlayhints-nvim) # https://github.com/mrcjkb/rustaceanvim/discussions/46#discussioncomment-7620822 (if config.programs.neovim.package.version == "0.10.0" then throw "lsp-inlayhints-nvim may be removed" else lsp-inlayhints-nvim) # https://github.com/mrcjkb/rustaceanvim/discussions/46#discussioncomment-7620822
cmp-conventionalcommits cmp-conventionalcommits
cmp-calc cmp-calc
rust-tools-nvim rustaceanvim
plenary-nvim plenary-nvim
crates-nvim crates-nvim
nvim-lspconfig nvim-lspconfig

34
rust.lua
View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
local nvim_lsp = require 'lspconfig' local nvim_lsp = require 'lspconfig'
local c = vim.lsp.protocol.make_client_capabilities() local c = vim.lsp.protocol.make_client_capabilities()
local deps = require("nvim-deps") local deps = require("nvim-deps")
@ -122,26 +121,29 @@ vim.g.rustaceanvim = {
require('crates').setup() require('crates').setup()
local keymap_opts = {buffer = bufnr} local keymap_opts = {buffer = bufnr}
-- Hover actions -- Hover actions
-- call twice to focus -- call twice to focus
vim.keymap.set("n", "<leader>K", vim.keymap.set("n", "<leader>K",
function() function()
vim.cmd.RustLsp {'hover', 'actions'} vim.cmd.RustLsp { 'hover', 'actions' }
end, keymap_opts) end, keymap_opts)
-- Code action groups -- Code action groups
vim.keymap.set("n", "<leader>as", vim.keymap.set("n", "<leader>as",
function() function()
vim.cmd.RustLsp {'hover', 'actions'} vim.cmd.RustLsp { 'hover', 'actions' }
end, keymap_opts) end, keymap_opts)
vim.keymap.set('n', '<leader>cc', vim.keymap.set('n', '<leader>cc',
function() vim.cmd.RustLsp('openCargo') end, function()
keymap_opts) vim.cmd.RustLsp('openCargo')
vim.keymap.set('n', '<leader>cr', function() end, keymap_opts)
vim.cmd.RustLsp {'runnables', 'last' --[[ optional ]] } vim.keymap.set('n', '<leader>cr',
end, keymap_opts) function()
vim.keymap.set('n', '<leader>cd', function() vim.cmd.RustLsp {'runnables', 'last' --[[ optional ]] }
vim.cmd.RustLsp {'debuggables', 'last' --[[ optional ]] } end, keymap_opts)
end, keymap_opts) vim.keymap.set('n', '<leader>cd',
-- vim.keymap.set("n", "g0", vim.lsp.buf.document_symbol, keymap_opts) function()
vim.cmd.RustLsp {'debuggables', 'last' --[[ optional ]] }
end, keymap_opts)
-- vim.keymap.set("n", "g0", vim.lsp.buf.document_symbol, keymap_opts)
local diag_float_grp = vim.api.nvim_create_augroup( local diag_float_grp = vim.api.nvim_create_augroup(
"DiagnosticFloat", {clear = true}) "DiagnosticFloat", {clear = true})
vim.api.nvim_create_autocmd("CursorHold", { vim.api.nvim_create_autocmd("CursorHold", {
@ -166,7 +168,6 @@ vim.g.rustaceanvim = {
} }
} }
} }
=======
local rt = require("rust-tools") local rt = require("rust-tools")
local deps = require("nvim-deps") local deps = require("nvim-deps")
@ -347,4 +348,3 @@ rt.setup(
}, },
} }
) )
>>>>>>> 5df3a02 (wip: feat(nvim/rust-tools): begin migration)