From d153a0e89a246d7d25e5a3b76804f2678bf1caa5 Mon Sep 17 00:00:00 2001
From: Dmitro Batko <dmitry.batkovich@jetbrains.com>
Date: Tue, 31 Dec 2019 15:38:33 +0300
Subject: [PATCH] FileTypeManagerImpl return null if file type is not found by
 name

GitOrigin-RevId: b51e76fa0245de79c0c10dfea807d8b66991f3c4
---
 .../openapi/fileTypes/impl/FileTypeManagerImpl.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 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 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) {