From 39c4e0f33667e8f4eae3229eb807694aad15347e Mon Sep 17 00:00:00 2001
From: luukvbaal <luukvbaal@gmail.com>
Date: Tue, 24 Feb 2026 19:01:31 +0100
Subject: [PATCH] fix(messages): unwanted ext_messages newlines for confirm()
 #38045

Problem:  Newlines emitted with ext_messages intended to position
          the message/prompt on the message grid.
Solution: Don't emit these newlines with ext_messages, followup to 4260f73e.
---
 src/nvim/message.c                    | 2 +-
 test/functional/lua/ui_event_spec.lua | 2 +-
 test/functional/ui/cmdline2_spec.lua  | 8 ++------
 test/functional/ui/messages2_spec.lua | 5 ++---
 test/functional/ui/messages_spec.lua  | 2 +-
 5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/nvim/message.c b/src/nvim/message.c
index 37aa539779..6ff6615062 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -3779,7 +3779,7 @@ static char *console_dialog_alloc(const char *message, const char *buttons, bool
 
   // Now allocate space for the strings
   confirm_msg = xmalloc((size_t)msg_len);
-  snprintf(confirm_msg, (size_t)msg_len, "\n%s\n", message);
+  snprintf(confirm_msg, (size_t)msg_len, ui_has(kUIMessages) ? "%s" : "\n%s\n", message);
 
   xfree(confirm_buttons);
   confirm_buttons = xmalloc((size_t)button_len);
diff --git a/test/functional/lua/ui_event_spec.lua b/test/functional/lua/ui_event_spec.lua
index 00fef163d6..c35311fc77 100644
--- a/test/functional/lua/ui_event_spec.lua
+++ b/test/functional/lua/ui_event_spec.lua
@@ -213,7 +213,7 @@ describe('vim.ui_attach', function()
       cmdline = {
         { content = { { '' } }, hl = 'MoreMsg', pos = 0, prompt = '[Y]es, (N)o, (C)ancel: ' },
       },
-      messages = { { content = { { '\nSave changes?\n', 6, 'MoreMsg' } }, kind = 'confirm' } },
+      messages = { { content = { { 'Save changes?', 6, 'MoreMsg' } }, kind = 'confirm' } },
     })
     feed('n')
     screen:expect_unchanged()
diff --git a/test/functional/ui/cmdline2_spec.lua b/test/functional/ui/cmdline2_spec.lua
index 66cdce8dbc..d4903105f5 100644
--- a/test/functional/ui/cmdline2_spec.lua
+++ b/test/functional/ui/cmdline2_spec.lua
@@ -245,11 +245,9 @@ describe('cmdline2', function()
     screen:try_resize(screen._width + 1, screen._height)
     screen:expect([[
                                                             |
-      {1:~                                                     }|*8
+      {1:~                                                     }|*10
       {3:                                                      }|
-                                                            |
       {6:Ok?}                                                   |
-                                                            |
       {6:[O]k: }^                                                |
     ]])
     -- And resizing the next event loop iteration also works.
@@ -257,11 +255,9 @@ describe('cmdline2', function()
     screen:try_resize(screen._width, screen._height + 1)
     screen:expect([[
                                                             |
-      {1:~                                                     }|*9
+      {1:~                                                     }|*11
       {3:                                                      }|
-                                                            |
       {6:Ok?}                                                   |
-                                                            |
       {6:[O]k: }^                                                |
     ]])
   end)
diff --git a/test/functional/ui/messages2_spec.lua b/test/functional/ui/messages2_spec.lua
index 31077b363b..a560c32f0b 100644
--- a/test/functional/ui/messages2_spec.lua
+++ b/test/functional/ui/messages2_spec.lua
@@ -710,12 +710,11 @@ describe('messages2', function()
     feed('<CR>')
     screen:expect([[
                                                            |
-      {1:~                                                    }|*7
+      {1:~                                                    }|*8
+      {1:~            }{9:E5108: Lua: [string ":lua"]:1: foo}{4:      }|
       {3:                                                     }|
-                                                           |
       {6:foo}                                                  |
       {6:bar}                                                  |
-                                                           |
       {6:[O]k: }^                                               |
     ]])
   end)
diff --git a/test/functional/ui/messages_spec.lua b/test/functional/ui/messages_spec.lua
index 9fb56617a3..1e1147e9ee 100644
--- a/test/functional/ui/messages_spec.lua
+++ b/test/functional/ui/messages_spec.lua
@@ -51,7 +51,7 @@ describe('ui/ext_messages', function()
         {1:~                        }|*3
       ]],
       cmdline = { { content = { { '' } }, hl = 'MoreMsg', pos = 0, prompt = '[O]k: ' } },
-      messages = { { content = { { '\ntest\n', 6, 'MoreMsg' } }, kind = 'confirm' } },
+      messages = { { content = { { 'test', 6, 'MoreMsg' } }, kind = 'confirm' } },
     })
     feed('<cr>')
     screen:expect({