mroot/lazyvim
1
0
Fork 0
mirror of https://github.com/LazyVim/LazyVim.git synced 2026-07-25 14:01:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(rust): move lspconfig opts to correct location

Browse source 
lspconfig's `opts` goes in rust-tools's `opts.server`; see
https://github.com/simrat39/rust-tools.nvim#configuration
This commit is contained in:
John Bernard 2023-06-30 03:28:58 -05:00
parent c992ebec46
commit 3c2d430ba0
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lua/lazyvim/plugins/extras/lang/rust.lua
View file

@ -66,7 +66,7 @@ return {
local codelldb_path = extension_path .. "adapter/codelldb" local codelldb_path = extension_path .. "adapter/codelldb"
local liblldb_path = vim.fn.has("mac") == 1 and extension_path .. "lldb/lib/liblldb.dylib" local liblldb_path = vim.fn.has("mac") == 1 and extension_path .. "lldb/lib/liblldb.dylib"
or extension_path .. "lldb/lib/liblldb.so" or extension_path .. "lldb/lib/liblldb.so"
local rust_tools_opts = vim.tbl_deep_extend("force", opts, { local rust_tools_opts = {
dap = { dap = {
adapter = require("rust-tools.dap").get_codelldb_adapter(codelldb_path, liblldb_path), adapter = require("rust-tools.dap").get_codelldb_adapter(codelldb_path, liblldb_path),
}, },
@ -81,7 +81,7 @@ return {
]]) ]])
end, end,
}, },
server = { server = vim.tbl_deep_extend("force", opts, {
settings = { settings = {
["rust-analyzer"] = { ["rust-analyzer"] = {
cargo = { cargo = {
@ -105,8 +105,8 @@ return {
}, },
}, },
}, },
}, }),
}) }
require("rust-tools").setup(rust_tools_opts) require("rust-tools").setup(rust_tools_opts)
return true return true
end, end,