refactor: LazyVim.lsp.on_attach

lua/lazyvim/plugins/extras/coding/copilot.lua

@@ -66,10 +66,8 @@ return {
           -- attach cmp source whenever copilot attaches
           -- fixes lazy-loading issues with the copilot cmp source
           LazyVim.lsp.on_attach(function(client)
-            if client.name == "copilot" then
             copilot_cmp._on_insert_enter({})
-            end
+          end, "copilot")
-          end)
         end,
       },
     },

lua/lazyvim/plugins/extras/lang/angular.lua

@@ -36,11 +36,9 @@ return {
       setup = {
         angularls = function()
           LazyVim.lsp.on_attach(function(client)
-            if client.name == "angularls" then
             --HACK: disable angular renaming capability due to duplicate rename popping up
             client.server_capabilities.renameProvider = false
-            end
+          end, "angularls")
-          end)
         end,
       },
     },

lua/lazyvim/plugins/extras/lang/go.lua

@@ -61,7 +61,6 @@ return {
           -- workaround for gopls not supporting semanticTokensProvider
           -- https://github.com/golang/go/issues/54531#issuecomment-1464982242
           LazyVim.lsp.on_attach(function(client, _)
-            if client.name == "gopls" then
             if not client.server_capabilities.semanticTokensProvider then
               local semantic = client.config.capabilities.textDocument.semanticTokens
               client.server_capabilities.semanticTokensProvider = {
@@ -73,8 +72,7 @@ return {
                 range = true,
               }
             end
-            end
+          end, "gopls")
-          end)
           -- end workaround
         end,
       },

lua/lazyvim/plugins/extras/lang/helm.lua

@@ -1,13 +1,3 @@
-LazyVim.lsp.on_attach(function(client, buffer)
-  if client.name == "yamlls" then
-    if vim.api.nvim_get_option_value("filetype", { buf = buffer }) == "helm" then
-      vim.schedule(function()
-        vim.cmd("LspStop ++force yamlls")
-      end)
-    end
-  end
-end)
-
 return {
   recommended = function()
     return LazyVim.extras.wants({
@@ -25,9 +15,19 @@ return {
     "neovim/nvim-lspconfig",
     opts = {
       servers = {
-        yamlls = {},
         helm_ls = {},
       },
+      setup = {
+        yamlls = function()
+          LazyVim.lsp.on_attach(function(client, buffer)
+            if vim.bo[buffer].filetype == "helm" then
+              vim.schedule(function()
+                vim.cmd("LspStop ++force yamlls")
+              end)
+            end
+          end, "yamlls")
+        end,
+      },
     },
   },
 }

lua/lazyvim/plugins/extras/lang/python.lua

@@ -58,11 +58,9 @@ return {
       setup = {
         [ruff] = function()
           LazyVim.lsp.on_attach(function(client, _)
-            if client.name == ruff then
             -- Disable hover in favor of Pyright
             client.server_capabilities.hoverProvider = false
-            end
+          end, ruff)
-          end)
         end,
       },
     },

lua/lazyvim/plugins/extras/lang/yaml.lua

@@ -60,10 +60,8 @@ return {
           -- Neovim < 0.10 does not have dynamic registration for formatting
           if vim.fn.has("nvim-0.10") == 0 then
             LazyVim.lsp.on_attach(function(client, _)
-              if client.name == "yamlls" then
               client.server_capabilities.documentFormattingProvider = true
-              end
+            end, "yamlls")
-            end)
           end
         end,
       },