mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-26 12:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(diagnostic): fix option resolution in open_float (#16229)

Browse Source
This commit is contained in:
Gregory Anders
2021-11-04 06:59:24 -06:00
committed by GitHub
parent f26b391317
commit fd347840ba
2 changed files with 46 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
runtime/lua/vim/diagnostic.lua
View File

@@ -1154,6 +1154,17 @@ function M.open_float(bufnr, opts)
error("Invalid value for option 'scope'")
end
do
-- Resolve options with user settings from vim.diagnostic.config
-- Unlike the other decoration functions (e.g. set_virtual_text, set_signs, etc.) `open_float`
-- does not have a dedicated table for configuration options; instead, the options are mixed in
-- with its `opts` table which also includes "keyword" parameters. So we create a dedicated
-- options table that inherits missing keys from the global configuration before resolving.
local t = global_diagnostic_options.float
local float_opts = vim.tbl_extend("keep", opts, type(t) == "table" and t or {})
opts = get_resolved_options({ float = float_opts }, nil, bufnr).float
end
local diagnostics = M.get(bufnr, opts)
clamp_line_numbers(bufnr, diagnostics)
@@ -1184,17 +1195,6 @@ function M.open_float(bufnr, opts)
end
end
do
-- Resolve options with user settings from vim.diagnostic.config
-- Unlike the other decoration functions (e.g. set_virtual_text, set_signs, etc.) `open_float`
-- does not have a dedicated table for configuration options; instead, the options are mixed in
-- with its `opts` table which also includes "keyword" parameters. So we create a dedicated
-- options table that inherits missing keys from the global configuration before resolving.
local t = global_diagnostic_options.float
local float_opts = vim.tbl_extend("keep", opts, type(t) == "table" and t or {})
opts = get_resolved_options({ float = float_opts }, nil, bufnr).float
end
local lines = {}
local highlights = {}
local show_header = vim.F.if_nil(opts.show_header, true)