From 1884f6e0e8760492f6e0a01cd43885ef77018c35 Mon Sep 17 00:00:00 2001
From: John Bernard <38332081+loqusion@users.noreply.github.com>
Date: Fri, 30 Jun 2023 08:08:35 -0500
Subject: [PATCH] feat(rust): allow user to extend rust-tools with `opts`

Also avoids calling rust-tools's `setup()` twice.
---
 lua/lazyvim/plugins/extras/lang/rust.lua | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/lang/rust.lua b/lua/lazyvim/plugins/extras/lang/rust.lua
index b86dbd0c..28298956 100644
--- a/lua/lazyvim/plugins/extras/lang/rust.lua
+++ b/lua/lazyvim/plugins/extras/lang/rust.lua
@@ -42,7 +42,11 @@ return {
   -- Correctly setup lspconfig for Rust 🚀
   {
     "neovim/nvim-lspconfig",
-    dependencies = { "simrat39/rust-tools.nvim" },
+    dependencies = {
+      "simrat39/rust-tools.nvim",
+      -- Avoid calling setup twice if user supplies `opts`
+      config = function() end,
+    },
     opts = {
       servers = {
         -- Ensure mason installs the server
@@ -66,7 +70,8 @@ return {
           local codelldb_path = extension_path .. "adapter/codelldb"
           local liblldb_path = vim.fn.has("mac") == 1 and extension_path .. "lldb/lib/liblldb.dylib"
             or extension_path .. "lldb/lib/liblldb.so"
-          local rust_tools_opts = {
+          local user_rust_tools_opts = require("lazyvim.util").opts("rust-tools.nvim")
+          local rust_tools_opts = vim.tbl_deep_extend("force", user_rust_tools_opts, {
             dap = {
               adapter = require("rust-tools.dap").get_codelldb_adapter(codelldb_path, liblldb_path),
             },
@@ -106,7 +111,7 @@ return {
                 },
               },
             }),
-          }
+          })
           require("rust-tools").setup(rust_tools_opts)
           return true
         end,