From 6219a86371c6d601ba7d633d1bed91390d0b87df Mon Sep 17 00:00:00 2001 From: Konstantin Hudyakov Date: Wed, 23 Oct 2024 18:40:46 +0300 Subject: [PATCH] IJOB-573 Fix stuck after commit in Git Commit lesson (cherry picked from commit 6139068f467f268af27626961b4ef51d1927649d) IJ-CR-147744 GitOrigin-RevId: 3926a59644d4751e4c330cf029bae06d3511db7e --- .../src/training/git/lesson/GitCommitLesson.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/git-features-trainer/src/training/git/lesson/GitCommitLesson.kt b/plugins/git-features-trainer/src/training/git/lesson/GitCommitLesson.kt index 0b27ada52c0e..d31c6f74f755 100644 --- a/plugins/git-features-trainer/src/training/git/lesson/GitCommitLesson.kt +++ b/plugins/git-features-trainer/src/training/git/lesson/GitCommitLesson.kt @@ -23,6 +23,7 @@ import com.intellij.util.PlatformUtils import com.intellij.util.ui.UIUtil import com.intellij.vcs.commit.AbstractCommitWorkflowHandler import com.intellij.vcs.commit.CommitActionsPanel +import com.intellij.vcs.commit.CommitNotification import com.intellij.vcs.commit.restoreState import com.intellij.vcs.log.ui.frame.VcsLogChangesBrowser import com.intellij.vcs.log.ui.table.VcsLogGraphTable @@ -180,7 +181,7 @@ class GitCommitLesson : GitLesson("Git.Commit", GitLessonsBundle.message("git.co triggerAndBorderHighlight().component { ui: JBOptionButton -> ui.text?.contains(commitButtonText) == true } - triggerOnNotification { it.displayId == VcsNotificationIdsHolder.COMMIT_FINISHED } + triggerOnNotification { it is CommitNotification } showWarningIfCommitWindowClosed() test { ideFrame { @@ -282,7 +283,7 @@ class GitCommitLesson : GitLesson("Git.Commit", GitLessonsBundle.message("git.co text(GitLessonsBundle.message("git.commit.amend.commit", strong(amendButtonText))) text(GitLessonsBundle.message("git.commit.amend.commit.balloon"), LearningBalloonConfig(Balloon.Position.above, width = 0)) - triggerOnNotification { it.displayId == VcsNotificationIdsHolder.COMMIT_FINISHED } + triggerOnNotification { it is CommitNotification } showWarningIfCommitWindowClosed() test { ideFrame {