From f421af99fe4bb134688b9343db470d8e76a19524 Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Tue, 30 Sep 2025 14:14:47 +0100 Subject: [PATCH] modules/lsp: print keymaps table multiline Makes `init.lua` easier to read. Follow up to 9faa339d9e930be3eb7d751af35ecfed7c493d14 --- modules/lsp/keymaps.nix | 7 ++++++- tests/test-sources/modules/lsp.nix | 30 +++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/modules/lsp/keymaps.nix b/modules/lsp/keymaps.nix index cdf57777..694b9ce3 100644 --- a/modules/lsp/keymaps.nix +++ b/modules/lsp/keymaps.nix @@ -104,7 +104,12 @@ in group = "nixvim_lsp_binds"; callback = lib.nixvim.mkRaw '' function(args) - local __keymaps = ${lib.nixvim.toLuaObject cfg.keymaps} + local __keymaps = ${ + lib.nixvim.lua.toLua' { + multiline = true; + indent = " "; + } cfg.keymaps + } for _, keymap in ipairs(__keymaps) do local options = vim.tbl_extend( diff --git a/tests/test-sources/modules/lsp.nix b/tests/test-sources/modules/lsp.nix index 05ffb7df..4cb066a2 100644 --- a/tests/test-sources/modules/lsp.nix +++ b/tests/test-sources/modules/lsp.nix @@ -82,7 +82,35 @@ actual = pkgs.writeText "actual.lua" (autoCmd.callback.__raw or ""); expected = pkgs.writeText "expected.lua" '' function(args) - local __keymaps = { { action = vim.lsp.buf["definition"], key = "gd", lspBufAction = "definition", mode = "" }, { action = vim.lsp.buf["hover"], key = "K", lspBufAction = "hover", mode = "" }, { action = function() vim.diagnostic.jump({ count=-1, float=true }) end, key = "k", mode = "" }, { action = function() vim.diagnostic.jump({ count=1, float=true }) end, key = "j", mode = "" }, { action = "LspStop", key = "lx", mode = "" } } + local __keymaps = { + { + action = vim.lsp.buf["definition"], + key = "gd", + lspBufAction = "definition", + mode = "" + }, + { + action = vim.lsp.buf["hover"], + key = "K", + lspBufAction = "hover", + mode = "" + }, + { + action = function() vim.diagnostic.jump({ count=-1, float=true }) end, + key = "k", + mode = "" + }, + { + action = function() vim.diagnostic.jump({ count=1, float=true }) end, + key = "j", + mode = "" + }, + { + action = "LspStop", + key = "lx", + mode = "" + } + } for _, keymap in ipairs(__keymaps) do local options = vim.tbl_extend(