From c746cf7f7ad289cd0fde4f9a1750dd82a8812bda Mon Sep 17 00:00:00 2001
From: Matteo Martellini <git@mercxry.me>
Date: Thu, 14 Mar 2024 22:38:56 +0100
Subject: [PATCH] fix: opam update before lsp upgrade

---
 lua/mason-core/installer/managers/opam.lua    | 21 ++++++++++++-------
 .../installer/managers/opam_spec.lua          |  7 ++++++-
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/lua/mason-core/installer/managers/opam.lua b/lua/mason-core/installer/managers/opam.lua
index 875ee12b4..41f73452a 100644
--- a/lua/mason-core/installer/managers/opam.lua
+++ b/lua/mason-core/installer/managers/opam.lua
@@ -15,13 +15,20 @@ function M.install(package, version)
     log.fmt_debug("opam: install %s %s", package, version)
     local ctx = installer.context()
     ctx.stdio_sink.stdout(("Installing opam package %s@%s…\n"):format(package, version))
-    return ctx.spawn.opam {
-        "install",
-        "--destdir=.",
-        "--yes",
-        "--verbose",
-        ("%s.%s"):format(package, version),
-    }
+    return Result.try(function(try)
+        try(ctx.spawn.opam {
+            "update",
+            "--yes",
+            "--verbose"
+        })
+        try(ctx.spawn.opam {
+            "install",
+            "--destdir=.",
+            "--yes",
+            "--verbose",
+            ("%s.%s"):format(package, version),
+        })
+    end)
 end
 
 ---@param bin string
diff --git a/tests/mason-core/installer/managers/opam_spec.lua b/tests/mason-core/installer/managers/opam_spec.lua
index cc5521147..a91c58005 100644
--- a/tests/mason-core/installer/managers/opam_spec.lua
+++ b/tests/mason-core/installer/managers/opam_spec.lua
@@ -10,7 +10,12 @@ describe("opam manager", function()
             opam.install("opam-package", "1.0.0")
         end)
 
-        assert.spy(ctx.spawn.opam).was_called(1)
+        assert.spy(ctx.spawn.opam).was_called(2)
+        assert.spy(ctx.spawn.opam).was_called_with {
+            "update",
+            "--yes",
+            "--verbose",
+        }
         assert.spy(ctx.spawn.opam).was_called_with {
             "install",
             "--destdir=.",