From 716f24ae70053b45d0d4da3a72ff670e9bd693df Mon Sep 17 00:00:00 2001 From: irengrig Date: Thu, 19 Aug 2010 14:19:02 +0400 Subject: [PATCH] VCS: if virtual file was not created when creating file path object, try to find it when gettings its document current contents --- .../openapi/vcs/changes/CurrentContentRevision.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/CurrentContentRevision.java b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/CurrentContentRevision.java index 8573057e0bc1..1adffafbf17c 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/CurrentContentRevision.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/CurrentContentRevision.java @@ -39,11 +39,16 @@ public class CurrentContentRevision implements ContentRevision { @Nullable public String getContent() { - final VirtualFile vFile = getVirtualFile(); - if (vFile == null) return null; + VirtualFile vFile = getVirtualFile(); + if (vFile == null) { + myFile.refresh(); + vFile = getVirtualFile(); + if (vFile == null) return null; + } + final VirtualFile finalVFile = vFile; final Document doc = ApplicationManager.getApplication().runReadAction(new Computable() { public Document compute() { - return FileDocumentManager.getInstance().getDocument(vFile); + return FileDocumentManager.getInstance().getDocument(finalVFile); }}); if (doc == null) return null; return doc.getText();