Skip to content

catch failure with undojoin after undo #584

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
stevearc merged 1 commit into from
Nov 24, 2024
Merged

catch failure with undojoin after undo #584

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion lua/conform/runner.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,9 @@ M.apply_format = function(
if not dry_run then
log.trace("Applying text edits: %s", text_edits)
if undojoin then
vim.cmd.undojoin()
-- may fail if after undo
-- Vim:E790: undojoin is not allowed after undo
pcall(vim.cmd.undojoin)
end
vim.lsp.util.apply_text_edits(text_edits, bufnr, "utf-8")
log.trace("Done formatting %s", bufname)
Expand Down