From 213493e766df7a5405050205f6050ff24e5a2d6d Mon Sep 17 00:00:00 2001 From: Alexander Arvidsson Date: Fri, 22 Mar 2024 07:18:15 +0100 Subject: [PATCH] fix(format): Don't leak bufnr into opts tables (#2794) --- lua/lazyvim/plugins/formatting.lua | 2 +- lua/lazyvim/util/lsp.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/lazyvim/plugins/formatting.lua b/lua/lazyvim/plugins/formatting.lua index 296cd944..d1c9a34c 100644 --- a/lua/lazyvim/plugins/formatting.lua +++ b/lua/lazyvim/plugins/formatting.lua @@ -56,7 +56,7 @@ return { local plugin = require("lazy.core.config").plugins["conform.nvim"] local Plugin = require("lazy.core.plugin") local opts = Plugin.values(plugin, "opts", false) - require("conform").format(Util.merge(opts.format, { bufnr = buf })) + require("conform").format(Util.merge({}, opts.format, { bufnr = buf })) end, sources = function(buf) local ret = require("conform").list_formatters(buf) diff --git a/lua/lazyvim/util/lsp.lua b/lua/lazyvim/util/lsp.lua index a40e9415..d9ef04e6 100644 --- a/lua/lazyvim/util/lsp.lua +++ b/lua/lazyvim/util/lsp.lua @@ -87,10 +87,10 @@ function M.formatter(opts) primary = true, priority = 1, format = function(buf) - M.format(Util.merge(filter, { bufnr = buf })) + M.format(Util.merge({}, filter, { bufnr = buf })) end, sources = function(buf) - local clients = M.get_clients(Util.merge(filter, { bufnr = buf })) + local clients = M.get_clients(Util.merge({}, filter, { bufnr = buf })) ---@param client lsp.Client local ret = vim.tbl_filter(function(client) return client.supports_method("textDocument/formatting")