From 36b41911ab90fe19505af306a31a5a699342d3c3 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Thu, 18 Sep 2025 13:06:46 +0200
Subject: [PATCH] fix(lspconfig): remove all usage of `lspconfig`

---
 lua/lazyvim/plugins/extras/lang/java.lua  |  4 +++-
 lua/lazyvim/plugins/extras/lang/ocaml.lua | 19 +++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/lang/java.lua b/lua/lazyvim/plugins/extras/lang/java.lua
index e4926521..d4eb5f6e 100644
--- a/lua/lazyvim/plugins/extras/lang/java.lua
+++ b/lua/lazyvim/plugins/extras/lang/java.lua
@@ -91,7 +91,9 @@ return {
         table.insert(cmd, string.format("--jvm-arg=-javaagent:%s", lombok_jar))
       end
       return {
-        root_dir = require("lspconfig.util").root_pattern(vim.lsp.config.jdtls.root_markers),
+        root_dir = function(path)
+          return vim.fs.root(path, vim.lsp.config.jdtls.root_markers)
+        end,
 
         -- How to find the project name for a given root dir.
         project_name = function(root_dir)
diff --git a/lua/lazyvim/plugins/extras/lang/ocaml.lua b/lua/lazyvim/plugins/extras/lang/ocaml.lua
index 0e733a4a..631223d4 100644
--- a/lua/lazyvim/plugins/extras/lang/ocaml.lua
+++ b/lua/lazyvim/plugins/extras/lang/ocaml.lua
@@ -26,12 +26,19 @@ return {
             "reason",
             "dune",
           },
-          root_dir = function(bufnr, on_dir)
-            local util = require("lspconfig.util")
-            local fname = vim.api.nvim_buf_get_name(bufnr)
-            --stylua: ignore
-            on_dir(util.root_pattern("*.opam", "esy.json", "package.json", ".git", "dune-project", "dune-workspace", "*.ml")( fname))
-          end,
+          root_markers = {
+            function(name)
+              return name:match(".*%.opam$")
+            end,
+            "esy.json",
+            "package.json",
+            ".git",
+            "dune-project",
+            "dune-workspace",
+            function(name)
+              return name:match(".*%.ml$")
+            end,
+          },
         },
       },
     },