From 969ba5cc5203229d195c4cee33dfec26108c45d7 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Thu, 21 Feb 2013 12:38:34 +0400 Subject: [PATCH] [diff] Fix extension, don't treat empty file as text * Add "." to the temp file suffix to produce the file extension. * Don't treat any empty file as text with stub content: let it have the same type as detected by extension. This will show "Image can't be loaded" warning, for an empty jpg file, for example, but it is expected behavior. This doesn't affect ADDED changes: they don't have before revision at all and don't create FileContent for them. --- .../src/com/intellij/openapi/diff/FileContent.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/platform/platform-api/src/com/intellij/openapi/diff/FileContent.java b/platform/platform-api/src/com/intellij/openapi/diff/FileContent.java index 49263568b607..152d8e398f4c 100644 --- a/platform/platform-api/src/com/intellij/openapi/diff/FileContent.java +++ b/platform/platform-api/src/com/intellij/openapi/diff/FileContent.java @@ -82,12 +82,8 @@ public class FileContent extends DiffContent { } public static FileContent createFromTempFile(Project project, String name, String ext, @NotNull byte[] content) throws IOException { - final File tempFile; - if (content.length == 0) { - tempFile = FileUtil.createTempFile(name, "txt"); - FileUtil.writeToFile(tempFile, "Does not exist"); - } else { - tempFile = FileUtil.createTempFile(name, ext); + File tempFile = FileUtil.createTempFile(name, "." + ext); + if (content.length != 0) { FileUtil.writeToFile(tempFile, content); } tempFile.deleteOnExit();