From bc15a9937ea7a3c332853eac0c462544bc4fa8cc Mon Sep 17 00:00:00 2001 From: Alexander Zolotov Date: Thu, 1 Aug 2019 18:29:47 +0300 Subject: [PATCH] Enabled detecting file by content for PlainTextLike file types (IDEA-219004) GitOrigin-RevId: a47be1dd389e19a8d7f0a257968673e5430489d2 --- .../openapi/fileTypes/impl/FileTypeManagerImpl.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java index 0498a5dd3542..6f296f0693c9 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java @@ -708,12 +708,10 @@ public class FileTypeManagerImpl extends FileTypeManagerEx implements Persistent @NotNull public FileType getFileTypeByFile(@NotNull VirtualFile file, @Nullable byte[] content) { FileType fileType = getByFile(file); - - if (fileType == null) { - fileType = file instanceof StubVirtualFile ? UnknownFileType.INSTANCE : getOrDetectFromContent(file, content); + if ((fileType == null || fileType instanceof PlainTextLikeFileType) && file instanceof StubVirtualFile) { + return getOrDetectFromContent(file, content); } - - return fileType; + return ObjectUtils.notNull(fileType, UnknownFileType.INSTANCE); } @Nullable // null means all conventional detect methods returned UnknownFileType.INSTANCE, have to detect from content