feat: util.on_config

lua/settings/plugins/jsonls.lua

@@ -5,12 +5,10 @@ local Schema = require("settings.schema")
 local M = {}
 
 function M.setup()
-  local lsputil = require("lspconfig.util")
-  local hook = lsputil.add_hook_after
-
-  lsputil.on_setup = hook(lsputil.on_setup, function(config)
-    config.on_new_config = hook(config.on_new_config, Util.protect(M.on_new_config, "Failed to setup jsonls"))
-  end)
+  Util.on_config({
+    name = "settings/plugins/jsonls",
+    on_config = M.on_new_config,
+  })
 end
 
 function M.on_new_config(config, root_dir)

lua/settings/plugins/lspconfig.lua

@@ -5,18 +5,13 @@ local Settings = require("settings.settings")
 local M = {}
 
 function M.setup()
-  local lsputil = require("lspconfig.util")
-  local hook = lsputil.add_hook_before
   local settings_root = Util.root_pattern(unpack(Util.file_patterns({ global = false })))
 
-
-  lsputil.on_setup = hook(lsputil.on_setup, function(config)
-    config.on_new_config = hook(config.on_new_config, Util.protect(M.on_new_config, "Failed to setup lspconfig"))
-    local root_dir = config.root_dir
-    config.root_dir = function(...)
-      return settings_root(...) or root_dir(...)
-    end
-  end)
+  Util.on_config({
+    name = "settings/plugins/lspconfig",
+    on_config = M.on_new_config,
+    root_dir = settings_root
+  })
 end
 
 function M.on_new_config(config, root_dir)

lua/settings/plugins/sumneko.lua

@@ -4,12 +4,10 @@ local Config = require("settings.config")
 local M = {}
 
 function M.setup()
-  local lsputil = require("lspconfig.util")
-  local hook = lsputil.add_hook_after
-
-  lsputil.on_setup = hook(lsputil.on_setup, function(config)
-    config.on_new_config = hook(config.on_new_config, Util.protect(M.on_new_config, "Failed to setup sumneko_lua"))
-  end)
+  Util.on_config({
+    name = "settings/plugins/sumneko",
+    on_config = M.on_new_config,
+  })
 end
 
 function M.on_new_config(config, root_dir)

lua/settings/util.lua

@@ -30,6 +30,26 @@ function M.find_git_ancestor(...)
   return require("lspconfig.util").find_git_ancestor(...)
 end
 
+---@param opts { on_config: fun(config, root_dir:string), root_dir: fun(), name: string }
+function M.on_config(opts)
+  local lsputil = require("lspconfig.util")
+  local hook = lsputil.add_hook_after
+
+  lsputil.on_setup = hook(lsputil.on_setup, function(config)
+    if opts.on_config then
+      config.on_new_config = hook(config.on_new_config,
+        M.protect(opts.on_config,
+          "Failed to run client.before_init" .. (opts.name and (" for " .. opts.name) or "")))
+    end
+    if opts.root_dir then
+      local root_dir = config.root_dir
+      config.root_dir = function(...)
+        return opts.root_dir(...) or root_dir(...)
+      end
+    end
+  end)
+end
+
 function M.file_patterns(opts)
   opts = M.merge({ ["local"] = true, ["global"] = true }, opts)
   local ret = {}