From c0fa721adeabf1d93ad71e598782b52c43d8e8f7 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 25 Jul 2023 19:02:39 +0800
Subject: [PATCH] fix(startup): make recovery mode work without --headless
 (#24477)

---
 src/nvim/main.c                       | 20 ++++++++++----------
 test/functional/core/remote_spec.lua  |  5 ++---
 test/functional/core/startup_spec.lua | 13 +++++++++++++
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/nvim/main.c b/src/nvim/main.c
index 567d364284..377b804661 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -305,6 +305,16 @@ int main(int argc, char **argv)
     }
   }
 
+  if (GARGCOUNT > 0) {
+    fname = get_fname(&params, cwd);
+  }
+
+  // Recovery mode without a file name: List swap files.
+  // In this case, no UI is needed.
+  if (recoverymode && fname == NULL) {
+    headless_mode = true;
+  }
+
 #ifdef MSWIN
   // on windows we use CONIN special file, thus we don't know this yet.
   bool has_term = true;
@@ -336,16 +346,6 @@ int main(int argc, char **argv)
     ui_client_channel_id = rv;
   }
 
-  if (GARGCOUNT > 0) {
-    fname = get_fname(&params, cwd);
-  }
-
-  // Recovery mode without a file name: List swap files.
-  // In this case, no UI is needed.
-  if (recoverymode && fname == NULL) {
-    headless_mode = true;
-  }
-
   TIME_MSG("expanding arguments");
 
   if (params.diff_mode && params.window_count == -1) {
diff --git a/test/functional/core/remote_spec.lua b/test/functional/core/remote_spec.lua
index 39b1ee2f5f..a0ec748446 100644
--- a/test/functional/core/remote_spec.lua
+++ b/test/functional/core/remote_spec.lua
@@ -43,7 +43,6 @@ describe('Remote', function()
     local function run_remote(...)
       set_session(server)
       local addr = funcs.serverlist()[1]
-      local client_argv = { nvim_prog, '--clean', '--headless', '--server', addr, ... }
 
       -- Create an nvim instance just to run the remote-invoking nvim. We want
       -- to wait for the remote instance to exit and calling jobwait blocks
@@ -52,7 +51,7 @@ describe('Remote', function()
       local client_starter = spawn(new_argv(), false, nil, true)
       set_session(client_starter)
       -- Call jobstart() and jobwait() in the same RPC request to reduce flakiness.
-      eq({ 0 }, exec_lua([[return vim.fn.jobwait({ vim.fn.jobstart(..., {
+      eq({ 0 }, exec_lua([[return vim.fn.jobwait({ vim.fn.jobstart({...}, {
         stdout_buffered = true,
         stderr_buffered = true,
         on_stdout = function(_, data, _)
@@ -61,7 +60,7 @@ describe('Remote', function()
         on_stderr = function(_, data, _)
           _G.Remote_stderr = table.concat(data, '\n')
         end,
-      }) })]], client_argv))
+      }) })]], nvim_prog, '--clean', '--headless', '--server', addr, ...))
       local res = exec_lua([[return { _G.Remote_stdout, _G.Remote_stderr }]])
       client_starter:close()
       set_session(server)
diff --git a/test/functional/core/startup_spec.lua b/test/functional/core/startup_spec.lua
index dcbb55a9d7..c1e07f0c76 100644
--- a/test/functional/core/startup_spec.lua
+++ b/test/functional/core/startup_spec.lua
@@ -21,6 +21,7 @@ local nvim_set = helpers.nvim_set
 local read_file = helpers.read_file
 local retry = helpers.retry
 local rmdir = helpers.rmdir
+local skip = helpers.skip
 local sleep = helpers.sleep
 local startswith = helpers.startswith
 local write_file = helpers.write_file
@@ -460,6 +461,18 @@ describe('startup', function()
     ]])
   end)
 
+  it('-r works without --headless in PTY #23294', function()
+    skip(is_os('win'))
+    eq({ 0 }, exec_lua([[return vim.fn.jobwait({ vim.fn.jobstart({...}, {
+      pty = true,
+      stdout_buffered = true,
+      on_stdout = function(_, data, _)
+        _G.Recovery_stdout = data
+      end,
+    }) })]], nvim_prog, '-u', 'NONE', '-i', 'NONE', '-r'))
+    matches('Swap files found:\r*', exec_lua('return _G.Recovery_stdout[1]'))
+  end)
+
   it('fixed hang issue with --headless (#11386)', function()
     local expected = ''
     local period = 100