fix auto merge
This commit is contained in:
parent
a6851c46dd
commit
c05a9c9c4d
|
@ -805,29 +805,6 @@ local plugins = {
|
||||||
version = "^4", -- Recommended
|
version = "^4", -- Recommended
|
||||||
ft = { "rust" },
|
ft = { "rust" },
|
||||||
config = function()
|
config = function()
|
||||||
vim.g.rustaceanvim = {
|
|
||||||
-- Plugin configuration
|
|
||||||
tools = {},
|
|
||||||
-- LSP configuration
|
|
||||||
server = {
|
|
||||||
on_attach = function(client, bufnr)
|
|
||||||
-- you can also put keymaps in here
|
|
||||||
end,
|
|
||||||
default_settings = {
|
|
||||||
-- rust-analyzer language server configuration
|
|
||||||
["rust-analyzer"] = {},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
-- DAP configuration
|
|
||||||
dap = {},
|
|
||||||
}
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"theHamsta/nvim-dap-virtual-text",
|
|
||||||
lazy = false, -- PERF: this can be done more elegant
|
|
||||||
config = function()
|
|
||||||
require("nvim-dap-virtual-text").setup()
|
|
||||||
local dap = require "dap"
|
local dap = require "dap"
|
||||||
vim.g.rustaceanvim = {
|
vim.g.rustaceanvim = {
|
||||||
-- Plugin configuration
|
-- Plugin configuration
|
||||||
|
@ -846,6 +823,13 @@ local plugins = {
|
||||||
}
|
}
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"theHamsta/nvim-dap-virtual-text",
|
||||||
|
lazy = false, -- PERF: this can be done more elegant
|
||||||
|
config = function()
|
||||||
|
require("nvim-dap-virtual-text").setup()
|
||||||
|
end,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
return plugins
|
return plugins
|
||||||
|
|
Loading…
Reference in New Issue