mirror/LazyVim.LazyVim
1
0
Fork 0
mirror of https://github.com/LazyVim/LazyVim.git synced 2025-06-24 17:58:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(format): Don't leak bufnr into opts tables (#2794)

Browse source
This commit is contained in:
Alexander Arvidsson 2024-03-22 07:18:15 +01:00 • committed by GitHub
parent 70bc880330
commit 213493e766
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lua/lazyvim/plugins/formatting.lua
View file

@ -56,7 +56,7 @@ return {
local plugin = require("lazy.core.config").plugins["conform.nvim"] local plugin = require("lazy.core.config").plugins["conform.nvim"]
local Plugin = require("lazy.core.plugin") local Plugin = require("lazy.core.plugin")
local opts = Plugin.values(plugin, "opts", false) 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, end,
sources = function(buf) sources = function(buf)
local ret = require("conform").list_formatters(buf) local ret = require("conform").list_formatters(buf)

4
lua/lazyvim/util/lsp.lua
View file

@ -87,10 +87,10 @@ function M.formatter(opts)
primary = true, primary = true,
priority = 1, priority = 1,
format = function(buf) format = function(buf)
M.format(Util.merge(filter, { bufnr = buf })) M.format(Util.merge({}, filter, { bufnr = buf }))
end, end,
sources = function(buf) 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 ---@param client lsp.Client
local ret = vim.tbl_filter(function(client) local ret = vim.tbl_filter(function(client)
return client.supports_method("textDocument/formatting") return client.supports_method("textDocument/formatting")