From eb87190ea47682d4c91aba2f54b9912da6173903 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Thu, 13 Jun 2019 10:46:46 +0200
Subject: [PATCH] Guard against incorrectly registered extensions
 (IDEA-CR-48285)

GitOrigin-RevId: 6578f81b58a245d9bd4f63a7778b1a8c8cdb90c1
---
 .../com/intellij/openapi/fileTypes/FileTypeExtension.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/platform/core-api/src/com/intellij/openapi/fileTypes/FileTypeExtension.java b/platform/core-api/src/com/intellij/openapi/fileTypes/FileTypeExtension.java
index 2547aa143a19..c186aa65bdfc 100644
--- a/platform/core-api/src/com/intellij/openapi/fileTypes/FileTypeExtension.java
+++ b/platform/core-api/src/com/intellij/openapi/fileTypes/FileTypeExtension.java
@@ -53,7 +53,10 @@ public class FileTypeExtension<T> extends KeyedExtensionCollector<T, FileType> {
     List<KeyedLazyInstance<T>> extensions = getExtensions();
     Map<FileType, T> result = new HashMap<>();
     for (KeyedLazyInstance<T> extension : extensions) {
-      result.put(FileTypeRegistry.getInstance().findFileTypeByName(extension.getKey()), extension.getInstance());
+      FileType fileType = FileTypeRegistry.getInstance().findFileTypeByName(extension.getKey());
+      if (fileType != null) {
+        result.put(fileType, extension.getInstance());
+      }
     }
     return result;
   }