From 057be17c9b367ffa681ab9e2bc5a7f478e96f438 Mon Sep 17 00:00:00 2001 From: irengrig Date: Wed, 6 Apr 2011 11:45:14 +0400 Subject: [PATCH] http://ea.jetbrains.com/browser/ea_reports/268036 --- .../openapi/vcs/checkin/TodoCheckinHandlerWorker.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/openapi/vcs/checkin/TodoCheckinHandlerWorker.java b/platform/lang-impl/src/com/intellij/openapi/vcs/checkin/TodoCheckinHandlerWorker.java index 9a6f9aef0d04..e823573ef26e 100644 --- a/platform/lang-impl/src/com/intellij/openapi/vcs/checkin/TodoCheckinHandlerWorker.java +++ b/platform/lang-impl/src/com/intellij/openapi/vcs/checkin/TodoCheckinHandlerWorker.java @@ -34,6 +34,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vcs.FilePath; import com.intellij.openapi.vcs.VcsException; import com.intellij.openapi.vcs.changes.Change; +import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiFileFactory; @@ -104,8 +105,11 @@ public class TodoCheckinHandlerWorker { for (Change change : changes) { ProgressManager.checkCanceled(); if (change.getAfterRevision() == null) continue; - final VirtualFile afterFile = change.getAfterRevision().getFile().getVirtualFile(); - if (afterFile.isDirectory() || afterFile.getFileType().isBinary()) continue; + VirtualFile afterFile = change.getAfterRevision().getFile().getVirtualFile(); + if (afterFile == null) { + afterFile = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(change.getAfterRevision().getFile().getIOFile()); + } + if (afterFile == null || afterFile.isDirectory() || afterFile.getFileType().isBinary()) continue; myPsiFile = null; if (afterFile.isValid()) {