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 aef67caf6db5..ed8f9c8c6227 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 @@ -933,14 +933,15 @@ public class FileTypeManagerImpl extends FileTypeManagerEx implements Persistent FileType type = getStdFileType(fileTypeName); // TODO: Abstract file types are not std one, so need to be restored specially, // currently there are 6 of them and restoration does not happen very often so just iteration is enough - if (type == PlainTextFileType.INSTANCE && !fileTypeName.equals(type.getName())) { - for (FileType fileType: mySchemeManager.getAllSchemes()) { - if (fileTypeName.equals(fileType.getName())) { - return fileType; - } + if (type != PlainTextFileType.INSTANCE || fileTypeName.equals(type.getName())) { + return type; + } + for (FileType fileType: mySchemeManager.getAllSchemes()) { + if (fileTypeName.equals(fileType.getName())) { + return fileType; } } - return type; + return null; } private static boolean isDetectable(@NotNull final VirtualFile file) {