Skip to content

Add a delay before printing usage message #7

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Add a delay before printing usage message #7

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
8 changes: 5 additions & 3 deletions lua/jj-diffconflicts/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,9 +295,11 @@ h.setup_ui = function(conflicts, show_history, show_usage_message)

-- Display usage message
if show_usage_message then
vim.notify(
"Resolve conflicts leftward then save. Use :cq to abort.",
vim.log.levels.WARN
-- We defer printing the message by 100ms, otherwise it is cleared before
-- the UI is fully initialized
vim.defer_fn(
function() vim.notify("Resolve conflicts leftward then save. Use :cq to abort.") end,
100
)
end
end
Expand Down