Skip to content

fix(edit.lua): ensure proper termination of external terminal sessions #545

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jalvesaq merged 4 commits into from
Apr 8, 2026
Merged

fix(edit.lua): ensure proper termination of external terminal sessions #545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8f9090b
fix(edit.lua): ensure proper termination of external terminal sessions
PMassicotte Apr 8, 2026
4f78682
refactor(edit.lua): simplify vim_leave function logic by removing red…
PMassicotte Apr 8, 2026
c9e61a1
refactor(edit.lua): remove redundant quit logic to simplify vim_leave…
PMassicotte Apr 8, 2026
a16120e
fix(lsp/init.lua): remove unnecessary check for external_term in on_e…
PMassicotte Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions lua/r/edit.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,10 @@ M.add_for_deletion = function(fname)
end

M.vim_leave = function()
if vim.g.R_Nvim_status == 7 and config.auto_quit then
require("r.run").quit_R("nosave")
local i = 30
while i > 0 and vim.g.R_Nvim_status == 7 do
vim.wait(100)
i = i - 1
if config.auto_quit then
if vim.g.R_Nvim_status == 7 or vim.g.R_nvim_auto_quit_pending then
vim.g.R_nvim_auto_quit_pending = nil
require("r.send").cmd('quit(save = "no")')
end
end

Expand Down
5 changes: 5 additions & 0 deletions lua/r/lsp/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -758,6 +758,11 @@ end
---@param signal integer Number describing the signal used to terminate (if any)
---@param client integer Client handle
local function on_exit(code, signal, client)
local cfg = require("r.config").get_config()
if vim.g.R_Nvim_status == 7 and cfg.auto_quit then
vim.g.R_nvim_auto_quit_pending = true
end

vim.g.R_Nvim_status = 1
if code == 0 then return end
local msg = string.format("r_ls exit (%d, %d, %d)", code, signal, client)
Expand Down
Loading