mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-17 20:05:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(diagnostic): make open_float respect global diagnostic options (#17879)

Browse Source 
* make `open_float` respect `scope` option set in `vim.diagnostic.config`
* Closes #17878
This commit is contained in:
Smitesh Patil
2022-03-27 19:40:03 +05:30
committed by GitHub
parent a86d3d3780
commit a8e2c45b94
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1224,6 +1224,18 @@ function M.open_float(opts, ...)
opts = opts or {} opts = opts or {}
bufnr = get_bufnr(bufnr or opts.bufnr) bufnr = get_bufnr(bufnr or opts.bufnr)
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 scope = ({l = "line", c = "cursor", b = "buffer"})[opts.scope] or opts.scope or "line" local scope = ({l = "line", c = "cursor", b = "buffer"})[opts.scope] or opts.scope or "line"
local lnum, col local lnum, col
if scope == "line" or scope == "cursor" then if scope == "line" or scope == "cursor" then
@@ -1242,17 +1254,6 @@ function M.open_float(opts, ...)
error("Invalid value for option 'scope'") error("Invalid value for option 'scope'")
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 diagnostics = get_diagnostics(bufnr, opts, true) local diagnostics = get_diagnostics(bufnr, opts, true)
if scope == "line" then if scope == "line" then