mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-02-18 17:38:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(highlight): refresh highlight attrs before message output #25737

Browse Source 
Problem:
When MsgArea highlight is changed, the next message may flash
and disappear because msg_start() renders with stale highlight attributes.

msg_puts_len() uses HL_ATTR(HLF_MSG) to render message text, which
happens before update_screen() calls highlight_changed().
So the message is rendered with outdated attrs.

Solution:
Call highlight_changed() in msg_start().
This commit is contained in:
glepnir
2026-02-17 20:59:07 +08:00
committed by GitHub
parent 73c4472d4a
commit bd12aef784
5 changed files with 112 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/message.c
View File

@@ -1655,6 +1655,10 @@ void msg_start(void)
need_fileinfo = false;
}
if (need_highlight_changed) {
highlight_changed();
}
if (need_clr_eos || (p_ch == 0 && redrawing_cmdline)) {
// Halfway an ":echo" command and getting an (error) message: clear
// any text from the command.

17
test/functional/core/startup_spec.lua
View File

@@ -1788,15 +1788,20 @@ describe('inccommand on ex mode', function()
fn.chansend(id, '%s/N')
screen:add_extra_attr_ids({
[101] = {
background = Screen.colors.NvimDarkGrey2,
foreground = Screen.colors.NvimLightGrey2,
background = Screen.colors.NvimDarkGrey4,
foreground = Screen.colors.NvimLightGray2,
},
[102] = {
background = Screen.colors.NvimDarkGray2,
foreground = Screen.colors.NvimLightGray2,
},
})
screen:expect([[
{101:^ }|
{101: }|*6
{101:Entering Ex mode. Type "visual" to go to Normal mode. }|
{101::%s/N }|
{102:^ }|
{102: }|*5
{101: }|
{102:Entering Ex mode. Type "visual" to go to Normal mode. }|
{102::%s/N }|
|
]])
end)

135
test/functional/terminal/cursor_spec.lua
View File

@@ -533,7 +533,8 @@ describe('buffer cursor position is correct in terminal without number column',
cols = 70,
})
screen:expect([[
|*4
|*3
{2: }|
Entering Ex mode. Type "visual" to go to Normal mode. |
:^ |
{5:-- TERMINAL --} |
@@ -553,7 +554,8 @@ describe('buffer cursor position is correct in terminal without number column',
it('at the end', function()
feed('<C-R>r')
screen:expect([[
|*4
|*3
{2: }|
Entering Ex mode. Type "visual" to go to Normal mode. |
:aaaaaaaa^ |
{5:-- TERMINAL --} |
@@ -561,7 +563,8 @@ describe('buffer cursor position is correct in terminal without number column',
eq({ 6, 9 }, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
|*4
|*3
{2: }|
Entering Ex mode. Type "visual" to go to Normal mode. |
:aaaaaaa^a |
|
@@ -572,7 +575,8 @@ describe('buffer cursor position is correct in terminal without number column',
it('near the end', function()
feed('<C-R>r<C-X><C-X>')
screen:expect([[
|*4
|*3
{2: }|
Entering Ex mode. Type "visual" to go to Normal mode. |
:aaaaaa^aa |
{5:-- TERMINAL --} |
@@ -580,7 +584,8 @@ describe('buffer cursor position is correct in terminal without number column',
eq({ 6, 7 }, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
|*4
|*3
{2: }|
Entering Ex mode. Type "visual" to go to Normal mode. |
:aaaaa^aaa |
|
@@ -591,7 +596,8 @@ describe('buffer cursor position is correct in terminal without number column',
it('near the start', function()
feed('<C-R>r<C-B><C-O>')
screen:expect([[
|*4
|*3
{2: }|
Entering Ex mode. Type "visual" to go to Normal mode. |
:a^aaaaaaa |
{5:-- TERMINAL --} |
@@ -599,7 +605,8 @@ describe('buffer cursor position is correct in terminal without number column',
eq({ 6, 2 }, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
|*4
|*3
{2: }|
Entering Ex mode. Type "visual" to go to Normal mode. |
:^aaaaaaaa |
|
@@ -616,7 +623,8 @@ describe('buffer cursor position is correct in terminal without number column',
it('at the end', function()
feed('<C-R>r')
screen:expect([[
|*4
|*3
{2: }|
Entering Ex mode. Type "visual" to go to Normal mode. |
:µµµµµµµµ^ |
{5:-- TERMINAL --} |
@@ -624,7 +632,8 @@ describe('buffer cursor position is correct in terminal without number column',
eq({ 6, 17 }, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
|*4
|*3
{2: }|
Entering Ex mode. Type "visual" to go to Normal mode. |
:µµµµµµµ^µ |
|
@@ -635,7 +644,8 @@ describe('buffer cursor position is correct in terminal without number column',
it('near the end', function()
feed('<C-R>r<C-X><C-X>')
screen:expect([[
|*4
|*3
{2: }|
Entering Ex mode. Type "visual" to go to Normal mode. |
:µµµµµµ^µµ |
{5:-- TERMINAL --} |
@@ -643,7 +653,8 @@ describe('buffer cursor position is correct in terminal without number column',
eq({ 6, 13 }, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
|*4
|*3
{2: }|
Entering Ex mode. Type "visual" to go to Normal mode. |
:µµµµµ^µµµ |
|
@@ -654,7 +665,8 @@ describe('buffer cursor position is correct in terminal without number column',
it('near the start', function()
feed('<C-R>r<C-B><C-O>')
screen:expect([[
|*4
|*3
{2: }|
Entering Ex mode. Type "visual" to go to Normal mode. |
:µ^µµµµµµµ |
{5:-- TERMINAL --} |
@@ -662,7 +674,8 @@ describe('buffer cursor position is correct in terminal without number column',
eq({ 6, 3 }, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
|*4
|*3
{2: }|
Entering Ex mode. Type "visual" to go to Normal mode. |
:^µµµµµµµµ |
|
@@ -679,7 +692,8 @@ describe('buffer cursor position is correct in terminal without number column',
it('at the end', function()
feed('<C-R>r')
screen:expect([[
|*4
|*3
{2: }|
Entering Ex mode. Type "visual" to go to Normal mode. |
:µ̳µ̳µ̳µ̳µ̳µ̳µ̳µ̳^ |
{5:-- TERMINAL --} |
@@ -687,7 +701,8 @@ describe('buffer cursor position is correct in terminal without number column',
eq({ 6, 33 }, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
|*4
|*3
{2: }|
Entering Ex mode. Type "visual" to go to Normal mode. |
:µ̳µ̳µ̳µ̳µ̳µ̳µ̳^µ̳ |
|
@@ -699,7 +714,8 @@ describe('buffer cursor position is correct in terminal without number column',
skip(is_os('win'))
feed('<C-R>r<C-X><C-X>')
screen:expect([[
|*4
|*3
{2: }|
Entering Ex mode. Type "visual" to go to Normal mode. |
:µ̳µ̳µ̳µ̳µ̳µ̳^µ̳µ̳ |
{5:-- TERMINAL --} |
@@ -707,7 +723,8 @@ describe('buffer cursor position is correct in terminal without number column',
eq({ 6, 25 }, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
|*4
|*3
{2: }|
Entering Ex mode. Type "visual" to go to Normal mode. |
:µ̳µ̳µ̳µ̳µ̳^µ̳µ̳µ̳ |
|
@@ -719,7 +736,8 @@ describe('buffer cursor position is correct in terminal without number column',
skip(is_os('win'))
feed('<C-R>r<C-B><C-O>')
screen:expect([[
|*4
|*3
{2: }|
Entering Ex mode. Type "visual" to go to Normal mode. |
:µ̳^µ̳µ̳µ̳µ̳µ̳µ̳µ̳ |
{5:-- TERMINAL --} |
@@ -727,7 +745,8 @@ describe('buffer cursor position is correct in terminal without number column',
eq({ 6, 5 }, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
|*4
|*3
{2: }|
Entering Ex mode. Type "visual" to go to Normal mode. |
:^µ̳µ̳µ̳µ̳µ̳µ̳µ̳µ̳ |
|
@@ -744,7 +763,8 @@ describe('buffer cursor position is correct in terminal without number column',
it('at the end', function()
feed('<C-R>r')
screen:expect([[
|*4
|*3
{2: }|
Entering Ex mode. Type "visual" to go to Normal mode. |
:哦哦哦哦哦哦哦哦^ |
{5:-- TERMINAL --} |
@@ -752,7 +772,8 @@ describe('buffer cursor position is correct in terminal without number column',
eq({ 6, 25 }, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
|*4
|*3
{2: }|
Entering Ex mode. Type "visual" to go to Normal mode. |
:哦哦哦哦哦哦哦^哦 |
|
@@ -763,7 +784,8 @@ describe('buffer cursor position is correct in terminal without number column',
it('near the end', function()
feed('<C-R>r<C-X><C-X>')
screen:expect([[
|*4
|*3
{2: }|
Entering Ex mode. Type "visual" to go to Normal mode. |
:哦哦哦哦哦哦^哦哦 |
{5:-- TERMINAL --} |
@@ -771,7 +793,8 @@ describe('buffer cursor position is correct in terminal without number column',
eq({ 6, 19 }, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
|*4
|*3
{2: }|
Entering Ex mode. Type "visual" to go to Normal mode. |
:哦哦哦哦哦^哦哦哦 |
|
@@ -782,7 +805,8 @@ describe('buffer cursor position is correct in terminal without number column',
it('near the start', function()
feed('<C-R>r<C-B><C-O>')
screen:expect([[
|*4
|*3
{2: }|
Entering Ex mode. Type "visual" to go to Normal mode. |
:哦^哦哦哦哦哦哦哦 |
{5:-- TERMINAL --} |
@@ -790,7 +814,8 @@ describe('buffer cursor position is correct in terminal without number column',
eq({ 6, 4 }, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
|*4
|*3
{2: }|
Entering Ex mode. Type "visual" to go to Normal mode. |
:^哦哦哦哦哦哦哦哦 |
|
@@ -803,7 +828,8 @@ describe('buffer cursor position is correct in terminal without number column',
setup_ex_register('aaaaaaaa ')
feed('<C-R>r')
screen:expect([[
|*4
|*3
{2: }|
Entering Ex mode. Type "visual" to go to Normal mode. |
:aaaaaaaa ^ |
{5:-- TERMINAL --} |
@@ -812,7 +838,8 @@ describe('buffer cursor position is correct in terminal without number column',
eq({ 6, 13 }, eval('nvim_win_get_cursor(0)'))
feed([[<C-\><C-N>]])
screen:expect([[
|*4
|*3
{2: }|
Entering Ex mode. Type "visual" to go to Normal mode. |
:aaaaaaaa ^ |
|
@@ -847,7 +874,7 @@ describe('buffer cursor position is correct in terminal with number column', fun
{121: 1 } |
{121: 2 } |
{121: 3 } |
{121: 4 } |
{121: 4 }{2: }|
{121: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
{121: 6 }:^ |
{5:-- TERMINAL --} |
@@ -873,7 +900,7 @@ describe('buffer cursor position is correct in terminal with number column', fun
{121: 1 } |
{121: 2 } |
{121: 3 } |
{121: 4 } |
{121: 4 }{2: }|
{121: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
{121: 6 }:aaaaaaaa^ |
{5:-- TERMINAL --} |
@@ -884,7 +911,7 @@ describe('buffer cursor position is correct in terminal with number column', fun
{121: 1 } |
{121: 2 } |
{121: 3 } |
{121: 4 } |
{121: 4 }{2: }|
{121: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
{121: 6 }:aaaaaaa^a |
|
@@ -898,7 +925,7 @@ describe('buffer cursor position is correct in terminal with number column', fun
{121: 1 } |
{121: 2 } |
{121: 3 } |
{121: 4 } |
{121: 4 }{2: }|
{121: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
{121: 6 }:aaaaaa^aa |
{5:-- TERMINAL --} |
@@ -909,7 +936,7 @@ describe('buffer cursor position is correct in terminal with number column', fun
{121: 1 } |
{121: 2 } |
{121: 3 } |
{121: 4 } |
{121: 4 }{2: }|
{121: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
{121: 6 }:aaaaa^aaa |
|
@@ -923,7 +950,7 @@ describe('buffer cursor position is correct in terminal with number column', fun
{121: 1 } |
{121: 2 } |
{121: 3 } |
{121: 4 } |
{121: 4 }{2: }|
{121: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
{121: 6 }:a^aaaaaaa |
{5:-- TERMINAL --} |
@@ -934,7 +961,7 @@ describe('buffer cursor position is correct in terminal with number column', fun
{121: 1 } |
{121: 2 } |
{121: 3 } |
{121: 4 } |
{121: 4 }{2: }|
{121: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
{121: 6 }:^aaaaaaaa |
|
@@ -954,7 +981,7 @@ describe('buffer cursor position is correct in terminal with number column', fun
{121: 1 } |
{121: 2 } |
{121: 3 } |
{121: 4 } |
{121: 4 }{2: }|
{121: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
{121: 6 }:µµµµµµµµ^ |
{5:-- TERMINAL --} |
@@ -965,7 +992,7 @@ describe('buffer cursor position is correct in terminal with number column', fun
{121: 1 } |
{121: 2 } |
{121: 3 } |
{121: 4 } |
{121: 4 }{2: }|
{121: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
{121: 6 }:µµµµµµµ^µ |
|
@@ -979,7 +1006,7 @@ describe('buffer cursor position is correct in terminal with number column', fun
{121: 1 } |
{121: 2 } |
{121: 3 } |
{121: 4 } |
{121: 4 }{2: }|
{121: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
{121: 6 }:µµµµµµ^µµ |
{5:-- TERMINAL --} |
@@ -990,7 +1017,7 @@ describe('buffer cursor position is correct in terminal with number column', fun
{121: 1 } |
{121: 2 } |
{121: 3 } |
{121: 4 } |
{121: 4 }{2: }|
{121: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
{121: 6 }:µµµµµ^µµµ |
|
@@ -1004,7 +1031,7 @@ describe('buffer cursor position is correct in terminal with number column', fun
{121: 1 } |
{121: 2 } |
{121: 3 } |
{121: 4 } |
{121: 4 }{2: }|
{121: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
{121: 6 }:µ^µµµµµµµ |
{5:-- TERMINAL --} |
@@ -1015,7 +1042,7 @@ describe('buffer cursor position is correct in terminal with number column', fun
{121: 1 } |
{121: 2 } |
{121: 3 } |
{121: 4 } |
{121: 4 }{2: }|
{121: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
{121: 6 }:^µµµµµµµµ |
|
@@ -1035,7 +1062,7 @@ describe('buffer cursor position is correct in terminal with number column', fun
{121: 1 } |
{121: 2 } |
{121: 3 } |
{121: 4 } |
{121: 4 }{2: }|
{121: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
{121: 6 }:µ̳µ̳µ̳µ̳µ̳µ̳µ̳µ̳^ |
{5:-- TERMINAL --} |
@@ -1046,7 +1073,7 @@ describe('buffer cursor position is correct in terminal with number column', fun
{121: 1 } |
{121: 2 } |
{121: 3 } |
{121: 4 } |
{121: 4 }{2: }|
{121: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
{121: 6 }:µ̳µ̳µ̳µ̳µ̳µ̳µ̳^µ̳ |
|
@@ -1061,7 +1088,7 @@ describe('buffer cursor position is correct in terminal with number column', fun
{121: 1 } |
{121: 2 } |
{121: 3 } |
{121: 4 } |
{121: 4 }{2: }|
{121: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
{121: 6 }:µ̳µ̳µ̳µ̳µ̳µ̳^µ̳µ̳ |
{5:-- TERMINAL --} |
@@ -1072,7 +1099,7 @@ describe('buffer cursor position is correct in terminal with number column', fun
{121: 1 } |
{121: 2 } |
{121: 3 } |
{121: 4 } |
{121: 4 }{2: }|
{121: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
{121: 6 }:µ̳µ̳µ̳µ̳µ̳^µ̳µ̳µ̳ |
|
@@ -1087,7 +1114,7 @@ describe('buffer cursor position is correct in terminal with number column', fun
{121: 1 } |
{121: 2 } |
{121: 3 } |
{121: 4 } |
{121: 4 }{2: }|
{121: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
{121: 6 }:µ̳^µ̳µ̳µ̳µ̳µ̳µ̳µ̳ |
{5:-- TERMINAL --} |
@@ -1098,7 +1125,7 @@ describe('buffer cursor position is correct in terminal with number column', fun
{121: 1 } |
{121: 2 } |
{121: 3 } |
{121: 4 } |
{121: 4 }{2: }|
{121: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
{121: 6 }:^µ̳µ̳µ̳µ̳µ̳µ̳µ̳µ̳ |
|
@@ -1118,7 +1145,7 @@ describe('buffer cursor position is correct in terminal with number column', fun
{121: 1 } |
{121: 2 } |
{121: 3 } |
{121: 4 } |
{121: 4 }{2: }|
{121: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
{121: 6 }:哦哦哦哦哦哦哦哦^ |
{5:-- TERMINAL --} |
@@ -1129,7 +1156,7 @@ describe('buffer cursor position is correct in terminal with number column', fun
{121: 1 } |
{121: 2 } |
{121: 3 } |
{121: 4 } |
{121: 4 }{2: }|
{121: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
{121: 6 }:哦哦哦哦哦哦哦^哦 |
|
@@ -1143,7 +1170,7 @@ describe('buffer cursor position is correct in terminal with number column', fun
{121: 1 } |
{121: 2 } |
{121: 3 } |
{121: 4 } |
{121: 4 }{2: }|
{121: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
{121: 6 }:哦哦哦哦哦哦^哦哦 |
{5:-- TERMINAL --} |
@@ -1154,7 +1181,7 @@ describe('buffer cursor position is correct in terminal with number column', fun
{121: 1 } |
{121: 2 } |
{121: 3 } |
{121: 4 } |
{121: 4 }{2: }|
{121: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
{121: 6 }:哦哦哦哦哦^哦哦哦 |
|
@@ -1168,7 +1195,7 @@ describe('buffer cursor position is correct in terminal with number column', fun
{121: 1 } |
{121: 2 } |
{121: 3 } |
{121: 4 } |
{121: 4 }{2: }|
{121: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
{121: 6 }:哦^哦哦哦哦哦哦哦 |
{5:-- TERMINAL --} |
@@ -1179,7 +1206,7 @@ describe('buffer cursor position is correct in terminal with number column', fun
{121: 1 } |
{121: 2 } |
{121: 3 } |
{121: 4 } |
{121: 4 }{2: }|
{121: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
{121: 6 }:^哦哦哦哦哦哦哦哦 |
|
@@ -1195,7 +1222,7 @@ describe('buffer cursor position is correct in terminal with number column', fun
{121: 1 } |
{121: 2 } |
{121: 3 } |
{121: 4 } |
{121: 4 }{2: }|
{121: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
{121: 6 }:aaaaaaaa ^ |
{5:-- TERMINAL --} |
@@ -1207,7 +1234,7 @@ describe('buffer cursor position is correct in terminal with number column', fun
{121: 1 } |
{121: 2 } |
{121: 3 } |
{121: 4 } |
{121: 4 }{2: }|
{121: 5 }Entering Ex mode. Type "visual" to go to Normal mode. |
{121: 6 }:aaaaaaaa ^ |
|

4
test/functional/ui/embed_spec.lua
View File

@@ -40,7 +40,7 @@ local function test_embed(ext_linegrid)
startup('--cmd', 'echoerr invalid+')
screen:expect([[
|*4
{102: }|
{3: }|
{9:Error in pre-vimrc command line:} |
{9:E121: Undefined variable: invalid} |
{6:Press ENTER or type command to continue}^ |
@@ -74,7 +74,7 @@ local function test_embed(ext_linegrid)
screen:expect {
grid = [[
|*3
{102: }|
{3: }|
{9:Error in pre-vimrc command line:} |
{9:foo} |
{9:bar} |

14
test/functional/ui/highlight_spec.lua
View File

@@ -2670,4 +2670,18 @@ describe('fg/bg special colors', function()
eq(new_guifg, eval('synIDattr(hlID("Visual"), "bg#")'))
eq(new_guibg, eval('synIDattr(hlID("Visual"), "sp#")'))
end)
it('changed highlight is reflected in messages before redraw #17832', function()
local screen = Screen.new(50, 7, { rgb = true })
command('set termguicolors')
-- :echomsg in the same request, before the next redraw.
command('call nvim_set_hl(0, "MsgArea", {"fg": "Red"}) | echomsg "foo"')
screen:expect({
grid = [[
^ |
{1:~ }|*5
{19:foo }|
]],
})
end)
end)