From a80cc8ea707b3857e34f6a60a7ef7419ae3449f6 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 7 Feb 2014 19:36:05 +0100
Subject: [PATCH] spi files: do not override std file types (IDEA-120291)

---
 java/java-impl/src/com/intellij/spi/SPIFileType.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/java/java-impl/src/com/intellij/spi/SPIFileType.java b/java/java-impl/src/com/intellij/spi/SPIFileType.java
index 0d4a3bd8e474..507540460353 100644
--- a/java/java-impl/src/com/intellij/spi/SPIFileType.java
+++ b/java/java-impl/src/com/intellij/spi/SPIFileType.java
@@ -18,12 +18,13 @@ package com.intellij.spi;
 import com.intellij.icons.AllIcons;
 import com.intellij.lang.spi.SPILanguage;
 import com.intellij.openapi.extensions.Extensions;
-import com.intellij.openapi.fileTypes.FileType;
-import com.intellij.openapi.fileTypes.LanguageFileType;
+import com.intellij.openapi.fileTypes.*;
 import com.intellij.openapi.fileTypes.ex.FileTypeIdentifiableByVirtualFile;
 import com.intellij.openapi.util.Condition;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.CharsetToolkit;
 import com.intellij.openapi.vfs.VirtualFile;
+import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -49,7 +50,7 @@ public class SPIFileType extends LanguageFileType implements FileTypeIdentifiabl
         for (Object condition : Extensions.getExtensions("com.intellij.vetoSPICondition")) {
           if (((Condition<String>)condition).value(fileName)) return false;
         }
-        return true;
+        return FileTypeRegistry.getInstance().getFileTypeByFileName(fileName) == FileTypes.UNKNOWN;
       }
     }
     return false;