From 697b974fc6369e4dff9a183f892c72621fd8e26a Mon Sep 17 00:00:00 2001 From: irengrig Date: Wed, 6 Apr 2011 14:22:20 +0400 Subject: [PATCH] VCS: check TODO before commit: when inspection is canceled, don't commit -> cancel commit --- .../com/intellij/openapi/vcs/checkin/TodoCheckinHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/openapi/vcs/checkin/TodoCheckinHandler.java b/platform/lang-impl/src/com/intellij/openapi/vcs/checkin/TodoCheckinHandler.java index 073c90ac0794..6ee90b6401f3 100644 --- a/platform/lang-impl/src/com/intellij/openapi/vcs/checkin/TodoCheckinHandler.java +++ b/platform/lang-impl/src/com/intellij/openapi/vcs/checkin/TodoCheckinHandler.java @@ -149,9 +149,9 @@ public class TodoCheckinHandler extends CheckinHandler { } }; final boolean completed = ProgressManager.getInstance().runProcessWithProgressSynchronously(runnable, "Looking for new and edited TODO items...", true, myProject); - if (! completed || (worker.getAddedOrEditedTodos().isEmpty() && worker.getInChangedTodos().isEmpty() && + if (completed && (worker.getAddedOrEditedTodos().isEmpty() && worker.getInChangedTodos().isEmpty() && worker.getSkipped().isEmpty())) return ReturnResult.COMMIT; - + if (! completed) return ReturnResult.CANCEL; return showResults(worker, executor); }