From de2eecff0528cd0fd5b82ab6947651276c532197 Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Fri, 1 Dec 2017 10:05:17 +0100 Subject: [PATCH] avoid OOME on detection of file type from its content (IDEA-182793) --- .../src/com/intellij/openapi/fileChooser/FileElement.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/platform-api/src/com/intellij/openapi/fileChooser/FileElement.java b/platform/platform-api/src/com/intellij/openapi/fileChooser/FileElement.java index 9a0cd32adcea..5731c8abb2b9 100644 --- a/platform/platform-api/src/com/intellij/openapi/fileChooser/FileElement.java +++ b/platform/platform-api/src/com/intellij/openapi/fileChooser/FileElement.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.fileChooser; +import com.intellij.openapi.fileTypes.FileTypeManager; import com.intellij.openapi.fileTypes.FileTypes; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.SystemInfo; @@ -109,7 +110,7 @@ public class FileElement { if (file == null) return false; if (isArchiveFileSystem(file) && file.getParent() == null) return true; return !file.isDirectory() && - file.getFileType() == FileTypes.ARCHIVE && + FileTypeManager.getInstance().getFileTypeByFileName(file.getNameSequence()) == FileTypes.ARCHIVE && !isArchiveFileSystem(file.getParent()); }