From 6b89ee768812e5116372fadd9b74f3ec5c5b5a01 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Mon, 19 Mar 2018 16:51:56 +0300 Subject: [PATCH] IDEA-188244 diff: fix dir-diff type detection for jar files in a project --- .../src/com/intellij/diff/actions/CompareFilesAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/diff-impl/src/com/intellij/diff/actions/CompareFilesAction.java b/platform/diff-impl/src/com/intellij/diff/actions/CompareFilesAction.java index 2278336c3836..1d1bc17ae61f 100644 --- a/platform/diff-impl/src/com/intellij/diff/actions/CompareFilesAction.java +++ b/platform/diff-impl/src/com/intellij/diff/actions/CompareFilesAction.java @@ -164,8 +164,8 @@ public class CompareFilesAction extends BaseShowDiffAction { @NotNull private static Type getType(@Nullable VirtualFile file) { if (file == null) return Type.FILE; - if (file.isDirectory()) return Type.DIRECTORY; if (file.getFileType() instanceof ArchiveFileType) return Type.ARCHIVE; + if (file.isDirectory()) return Type.DIRECTORY; return Type.FILE; }