mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-04-21 06:45:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(health): "q" keymap not set when health.style=float #37007

Browse Source 
Problem:
The q keymap is already set in open_floating_preview, so maparg('q') is not empty.

Solution:
Add a health.style check before setting the q keymap.
This commit is contained in:
glepnir
2025-12-17 23:53:08 +08:00
committed by GitHub
parent 99e8b61376
commit 856391bc7f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
runtime/lua/vim/health.lua
View File

@@ -384,11 +384,7 @@ function M._check(mods, plugin_names)
local emptybuf = vim.fn.bufnr('$') == 1 and vim.fn.getline(1) == '' and 1 == vim.fn.line('$') local emptybuf = vim.fn.bufnr('$') == 1 and vim.fn.getline(1) == '' and 1 == vim.fn.line('$')
local bufnr ---@type integer local bufnr ---@type integer
if if vim.tbl_get(vim.g, 'health', 'style') == 'float' then
vim.g.health
and type(vim.g.health) == 'table'
and vim.tbl_get(vim.g.health, 'style') == 'float'
then
local available_lines = vim.o.lines - 12 local available_lines = vim.o.lines - 12
local max_height = math.min(math.floor(vim.o.lines * 0.8), available_lines) local max_height = math.min(math.floor(vim.o.lines * 0.8), available_lines)
local max_width = 80 local max_width = 80
@@ -485,7 +481,10 @@ function M._check(mods, plugin_names)
-- Quit with 'q' inside healthcheck buffers. -- Quit with 'q' inside healthcheck buffers.
vim._with({ buf = bufnr }, function() vim._with({ buf = bufnr }, function()
if vim.fn.maparg('q', 'n', false, false) == '' then if
vim.tbl_get(vim.g, 'health', 'style') == 'float'
or vim.fn.maparg('q', 'n', false, false) == ''
then
vim.keymap.set('n', 'q', function() vim.keymap.set('n', 'q', function()
if not pcall(vim.cmd.close) then if not pcall(vim.cmd.close) then
vim.cmd.bdelete() vim.cmd.bdelete()

1
test/functional/plugin/health_spec.lua
View File

@@ -88,6 +88,7 @@ describe(':checkhealth', function()
return vim.api.nvim_win_get_config(0).relative return vim.api.nvim_win_get_config(0).relative
]]) ]])
) )
matches('health%.lua:%d+>$', fn.maparg('q', 'n', false, false))
-- gO should not close the :checkhealth floating window. #34784 -- gO should not close the :checkhealth floating window. #34784
command('checkhealth full_render') command('checkhealth full_render')