From 73690b3a66155bb2e99b7cb428daef60bba62060 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 12 Apr 2011 15:51:02 +0200 Subject: [PATCH] fix typo; refresh to find the virtual file for diff --- .../src/com/intellij/openapi/diff/DiffApplication.java | 2 +- .../platform-resources-en/src/messages/DiffBundle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/platform-api/src/com/intellij/openapi/diff/DiffApplication.java b/platform/platform-api/src/com/intellij/openapi/diff/DiffApplication.java index eacb902b65e2..9c87b23f9f54 100644 --- a/platform/platform-api/src/com/intellij/openapi/diff/DiffApplication.java +++ b/platform/platform-api/src/com/intellij/openapi/diff/DiffApplication.java @@ -88,7 +88,7 @@ public class DiffApplication implements ApplicationStarterEx { } private static VirtualFile findFile(final String path1) throws FileNotFoundException { - final VirtualFile vFile = LocalFileSystem.getInstance().findFileByIoFile(new File(path1)); + final VirtualFile vFile = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(new File(path1)); if (vFile == null) { throw new FileNotFoundException(DiffBundle.message("cannot.file.file.error.message", path1)); } diff --git a/platform/platform-resources-en/src/messages/DiffBundle.properties b/platform/platform-resources-en/src/messages/DiffBundle.properties index 827989f41247..b852cdd8f097 100644 --- a/platform/platform-resources-en/src/messages/DiffBundle.properties +++ b/platform/platform-resources-en/src/messages/DiffBundle.properties @@ -1,5 +1,5 @@ diff.application.usage.parameters.and.description=Usage: idea diff -cannot.file.file.error.message=Cannot file file: {0} +cannot.file.file.error.message=Cannot find file: {0} save.merge.result.command.name=Merge compare.file.vs.file.dialog.title={0} vs {1} diff.content.editor.content.title=Editor