From c13edf9961fa8cfcd00c98a6b3b9dea2d9237bc4 Mon Sep 17 00:00:00 2001 From: Ching Pei Yang Date: Fri, 26 Sep 2025 00:29:22 +0200 Subject: [PATCH] treewide: remove usage of default_on_attach outside LspAttach --- modules/neovim/init/lsp.nix | 1 - modules/plugins/languages/clang.nix | 4 ---- modules/plugins/languages/csharp.nix | 11 +++++------ modules/plugins/languages/dart.nix | 1 - modules/plugins/languages/haskell.nix | 4 +--- modules/plugins/languages/python.nix | 2 -- modules/plugins/languages/rust.nix | 1 - modules/plugins/languages/ts.nix | 3 --- modules/plugins/languages/yaml.nix | 20 ++++++++++---------- 9 files changed, 16 insertions(+), 31 deletions(-) diff --git a/modules/neovim/init/lsp.nix b/modules/neovim/init/lsp.nix index 6c18b98e..b17c5554 100644 --- a/modules/neovim/init/lsp.nix +++ b/modules/neovim/init/lsp.nix @@ -77,7 +77,6 @@ in { { vim.lsp.servers."*" = { capabilities = mkDefault (mkLuaInline "capabilities"); - on_attach = mkDefault (mkLuaInline "default_on_attach"); }; } diff --git a/modules/plugins/languages/clang.nix b/modules/plugins/languages/clang.nix index 487bc151..20e4fab1 100644 --- a/modules/plugins/languages/clang.nix +++ b/modules/plugins/languages/clang.nix @@ -26,8 +26,6 @@ workspace_required = true; on_attach = mkLuaInline '' function(client, bufnr) - default_on_attach(client, bufnr) - local function switch_source_header(bufnr) local method_name = "textDocument/switchSourceHeader" local params = vim.lsp.util.make_text_document_params(bufnr) @@ -77,8 +75,6 @@ }; on_attach = mkLuaInline '' function(client, bufnr) - default_on_attach(client, bufnr) - local function switch_source_header(bufnr) local method_name = "textDocument/switchSourceHeader" local client = vim.lsp.get_clients({ bufnr = bufnr, name = "clangd", })[1] diff --git a/modules/plugins/languages/csharp.nix b/modules/plugins/languages/csharp.nix index 9e13a5ef..bbfff251 100644 --- a/modules/plugins/languages/csharp.nix +++ b/modules/plugins/languages/csharp.nix @@ -63,12 +63,11 @@ }; on_attach = mkLuaInline '' function(client, bufnr) - default_on_attach(client, bufnr) - local oe = require("omnisharp_extended") - ${mkLspBinding "goToDefinition" "oe.lsp_definition"} - ${mkLspBinding "goToType" "oe.lsp_type_definition"} - ${mkLspBinding "listReferences" "oe.lsp_references"} - ${mkLspBinding "listImplementations" "oe.lsp_implementation"} + local oe = require("omnisharp_extended") + ${mkLspBinding "goToDefinition" "oe.lsp_definition"} + ${mkLspBinding "goToType" "oe.lsp_type_definition"} + ${mkLspBinding "listReferences" "oe.lsp_references"} + ${mkLspBinding "listImplementations" "oe.lsp_implementation"} end ''; settings = { diff --git a/modules/plugins/languages/dart.nix b/modules/plugins/languages/dart.nix index 52dcd560..ff665e7d 100644 --- a/modules/plugins/languages/dart.nix +++ b/modules/plugins/languages/dart.nix @@ -161,7 +161,6 @@ in { }, capabilities = capabilities, - on_attach = default_on_attach; }, ${optionalString cfg.dap.enable '' debugger = { diff --git a/modules/plugins/languages/haskell.nix b/modules/plugins/languages/haskell.nix index 600c7724..2b26640a 100644 --- a/modules/plugins/languages/haskell.nix +++ b/modules/plugins/languages/haskell.nix @@ -10,11 +10,10 @@ inherit (lib.strings) optionalString; inherit (lib.modules) mkIf mkMerge; inherit (lib.nvim.types) mkGrammarOption; - inherit (lib.nvim.dag) entryAfter entryBefore; + inherit (lib.nvim.dag) entryAfter; inherit (lib.nvim.lua) expToLua; inherit (lib.meta) getExe'; inherit (lib.generators) mkLuaInline; - inherit (lib.nvim.attrsets) mapListToAttrs; inherit (pkgs) haskellPackages; inherit (lib.nvim.lua) toLuaObject; @@ -34,7 +33,6 @@ '' function(client, bufnr) local ht = require("haskell-tools") - default_on_attach(client, bufnr, ht) local opts = { noremap = true, silent = true, buffer = bufnr } vim.keymap.set('n', 'cl', vim.lsp.codelens.run, opts) vim.keymap.set('n', 'hs', ht.hoogle.hoogle_signature, opts) diff --git a/modules/plugins/languages/python.nix b/modules/plugins/languages/python.nix index 8e1f0ebd..1bb7fdd2 100644 --- a/modules/plugins/languages/python.nix +++ b/modules/plugins/languages/python.nix @@ -42,7 +42,6 @@ }; on_attach = mkLuaInline '' function(client, bufnr) - default_on_attach(client, bufnr); vim.api.nvim_buf_create_user_command(bufnr, 'LspPyrightOrganizeImports', function() local params = { command = 'pyright.organizeimports', @@ -89,7 +88,6 @@ }; on_attach = mkLuaInline '' function(client, bufnr) - default_on_attach(client, bufnr); vim.api.nvim_buf_create_user_command(bufnr, 'LspPyrightOrganizeImports', function() local params = { command = 'basedpyright.organizeimports', diff --git a/modules/plugins/languages/rust.nix b/modules/plugins/languages/rust.nix index 09c54ae6..3a0a2a9e 100644 --- a/modules/plugins/languages/rust.nix +++ b/modules/plugins/languages/rust.nix @@ -160,7 +160,6 @@ in { ${cfg.lsp.opts} }, on_attach = function(client, bufnr) - default_on_attach(client, bufnr) local opts = { noremap=true, silent=true, buffer = bufnr } vim.keymap.set("n", "rr", ":RustLsp runnables", opts) vim.keymap.set("n", "rp", ":RustLsp parentModule", opts) diff --git a/modules/plugins/languages/ts.nix b/modules/plugins/languages/ts.nix index 40e598ae..3895c29a 100644 --- a/modules/plugins/languages/ts.nix +++ b/modules/plugins/languages/ts.nix @@ -50,8 +50,6 @@ }; on_attach = mkLuaInline '' function(client, bufnr) - default_on_attach(client, bufnr); - -- ts_ls provides `source.*` code actions that apply to the whole file. These only appear in -- `vim.lsp.buf.code_action()` if specified in `context.only`. vim.api.nvim_buf_create_user_command(0, 'LspTypescriptSourceAction', function() @@ -106,7 +104,6 @@ }; on_attach = mkLuaInline '' function(client, bufnr) - default_on_attach(client, bufnr) vim.api.nvim_buf_create_user_command(0, 'LspDenolsCache', function() client:exec_cmd({ command = 'deno.cache', diff --git a/modules/plugins/languages/yaml.nix b/modules/plugins/languages/yaml.nix index b06ef17f..ea9e65d0 100644 --- a/modules/plugins/languages/yaml.nix +++ b/modules/plugins/languages/yaml.nix @@ -15,18 +15,18 @@ cfg = config.vim.languages.yaml; - on_attach = mkLuaInline ( + on_attach = if config.vim.languages.helm.lsp.enable && config.vim.languages.helm.enable - then '' - function(client, bufnr) - default_on_attach() - local filetype = vim.bo[bufnr].filetype - if filetype == "helm" then - client.stop() + then + mkLuaInline '' + function(client, bufnr) + local filetype = vim.bo[bufnr].filetype + if filetype == "helm" then + client.stop() + end end - end'' - else "default_on_attach" - ); + '' + else null; defaultServers = ["yaml-language-server"]; servers = {