From 306d0676985b503876e38f8984ae372cea420d2f Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Mon, 31 Jan 2022 14:27:03 +0100
Subject: [PATCH] remove incorrect @Nullable from getIcon() to avoid multiple
 "returning not null from nullable method" false positives

GitOrigin-RevId: f6db4092c037f563b2b19e909fed325e46af4ebe
---
 .../src/org/intellij/lang/regexp/RegExpFileType.java      | 2 --
 .../org/intellij/images/fileTypes/impl/SvgFileType.java   | 1 -
 java/java-impl/src/com/intellij/spi/SPIFileType.java      | 2 +-
 .../testSrc/com/intellij/psi/PsiDocumentManager2Test.java | 2 --
 .../src/org/jetbrains/lang/manifest/ManifestFileType.java | 2 +-
 json/src/com/intellij/json/JsonFileType.java              | 2 --
 .../psi/templateLanguages/TemplateDataElementType.java    | 1 -
 .../src/com/intellij/openapi/fileTypes/FileType.java      | 2 +-
 .../com/intellij/openapi/fileTypes/PlainTextFileType.java | 2 +-
 .../src/com/intellij/ide/scratch/ScratchFileType.java     | 2 --
 .../com/intellij/ide/util/gotoByName/GotoFileModel.java   | 2 +-
 .../impl/associate/OSAssociateFileTypesUtil.java          | 2 +-
 .../com/intellij/psi/search/FileTypeKeyDescriptor.java    | 1 -
 .../openapi/fileTypes/impl/DetectedByContentFileType.java | 2 +-
 .../intellij/openapi/fileTypes/impl/FileTypesTest.java    | 8 ++++----
 .../intellij/openapi/vfs/encoding/FileEncodingTest.java   | 4 ++--
 .../openapi/vcs/changes/ignore/lang/IgnoreFileType.java   | 2 --
 .../intellij/openapi/vcs/changes/patch/PatchFileType.java | 1 -
 .../jetbrains/idea/eclipse/config/EclipseFileType.java    | 2 --
 .../intellij/plugin/language/LombokConfigFileType.java    | 1 -
 .../intellij/plugins/markdown/lang/MarkdownFileType.java  | 2 --
 .../jira/src/com/intellij/tasks/jira/jql/JqlFileType.java | 2 +-
 .../intellij/tasks/youtrack/lang/YouTrackFileType.java    | 2 +-
 .../org/jetbrains/plugins/textmate/TextMateFileType.java  | 1 -
 plugins/yaml/src/org/jetbrains/yaml/YAMLFileType.java     | 1 -
 .../src/com/jetbrains/python/PythonFileType.java          | 1 -
 python/rest/src/com/jetbrains/rest/RestFileType.java      | 2 --
 .../commandInterface/commandLine/CommandLineFileType.java | 2 --
 .../src/com/intellij/spellchecker/DictionaryFileType.java | 2 --
 29 files changed, 15 insertions(+), 43 deletions(-)

diff --git a/RegExpSupport/src/org/intellij/lang/regexp/RegExpFileType.java b/RegExpSupport/src/org/intellij/lang/regexp/RegExpFileType.java
index 5c9fb86ff92c..0bda1253af38 100644
--- a/RegExpSupport/src/org/intellij/lang/regexp/RegExpFileType.java
+++ b/RegExpSupport/src/org/intellij/lang/regexp/RegExpFileType.java
@@ -20,7 +20,6 @@ import com.intellij.lang.Language;
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 
@@ -59,7 +58,6 @@ public class RegExpFileType extends LanguageFileType {
     }
 
     @Override
-    @Nullable
     public Icon getIcon() {
         return getLanguage() == RegExpLanguage.INSTANCE ? AllIcons.FileTypes.Regexp : null;
     }
diff --git a/images/src/org/intellij/images/fileTypes/impl/SvgFileType.java b/images/src/org/intellij/images/fileTypes/impl/SvgFileType.java
index 34add281615a..a4241804fc2f 100644
--- a/images/src/org/intellij/images/fileTypes/impl/SvgFileType.java
+++ b/images/src/org/intellij/images/fileTypes/impl/SvgFileType.java
@@ -37,7 +37,6 @@ public final class SvgFileType extends XmlLikeFileType implements UIBasedFileTyp
     return "svg";
   }
 
-  @NotNull
   @Override
   public Icon getIcon() {
     return ImagesIcons.ImagesFileType;
diff --git a/java/java-impl/src/com/intellij/spi/SPIFileType.java b/java/java-impl/src/com/intellij/spi/SPIFileType.java
index be0e4f5cbd3a..53fc914ea766 100644
--- a/java/java-impl/src/com/intellij/spi/SPIFileType.java
+++ b/java/java-impl/src/com/intellij/spi/SPIFileType.java
@@ -54,7 +54,7 @@ public final class SPIFileType extends LanguageFileType implements FileTypeIdent
   }
 
   @Override
-  public @NotNull Icon getIcon() {
+  public Icon getIcon() {
     return AllIcons.FileTypes.Text;
   }
 
diff --git a/java/java-tests/testSrc/com/intellij/psi/PsiDocumentManager2Test.java b/java/java-tests/testSrc/com/intellij/psi/PsiDocumentManager2Test.java
index 146b4e6afa39..350aac73babe 100644
--- a/java/java-tests/testSrc/com/intellij/psi/PsiDocumentManager2Test.java
+++ b/java/java-tests/testSrc/com/intellij/psi/PsiDocumentManager2Test.java
@@ -11,7 +11,6 @@ import com.intellij.testFramework.HeavyPlatformTestCase;
 import com.intellij.testFramework.LightPlatformTestCase;
 import com.intellij.util.LocalTimeCounter;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.util.Objects;
@@ -43,7 +42,6 @@ public class PsiDocumentManager2Test extends LightPlatformTestCase {
       }
 
       @Override
-      @Nullable
       public Icon getIcon() {
         return null;
       }
diff --git a/java/manifest/src/org/jetbrains/lang/manifest/ManifestFileType.java b/java/manifest/src/org/jetbrains/lang/manifest/ManifestFileType.java
index 5c5d6213cad1..f0d8de1762db 100644
--- a/java/manifest/src/org/jetbrains/lang/manifest/ManifestFileType.java
+++ b/java/manifest/src/org/jetbrains/lang/manifest/ManifestFileType.java
@@ -62,7 +62,7 @@ public final class ManifestFileType extends LanguageFileType {
   }
 
   @Override
-  public @NotNull Icon getIcon() {
+  public Icon getIcon() {
     return AllIcons.FileTypes.Manifest;
   }
 }
\ No newline at end of file
diff --git a/json/src/com/intellij/json/JsonFileType.java b/json/src/com/intellij/json/JsonFileType.java
index 64a3a03b951a..76cbe157b065 100644
--- a/json/src/com/intellij/json/JsonFileType.java
+++ b/json/src/com/intellij/json/JsonFileType.java
@@ -4,7 +4,6 @@ import com.intellij.icons.AllIcons;
 import com.intellij.lang.Language;
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 
@@ -45,7 +44,6 @@ public class JsonFileType extends LanguageFileType{
     return DEFAULT_EXTENSION;
   }
 
-  @Nullable
   @Override
   public Icon getIcon() {
     // TODO: add JSON icon instead
diff --git a/platform/analysis-impl/src/com/intellij/psi/templateLanguages/TemplateDataElementType.java b/platform/analysis-impl/src/com/intellij/psi/templateLanguages/TemplateDataElementType.java
index 293d843a2917..0f586e8164c6 100644
--- a/platform/analysis-impl/src/com/intellij/psi/templateLanguages/TemplateDataElementType.java
+++ b/platform/analysis-impl/src/com/intellij/psi/templateLanguages/TemplateDataElementType.java
@@ -338,7 +338,6 @@ public class TemplateDataElementType extends IFileElementType implements ITempla
     }
 
     @Override
-    @Nullable
     public Icon getIcon() {
       return null;
     }
diff --git a/platform/core-api/src/com/intellij/openapi/fileTypes/FileType.java b/platform/core-api/src/com/intellij/openapi/fileTypes/FileType.java
index 03a3e9c5b824..b364cbf11552 100644
--- a/platform/core-api/src/com/intellij/openapi/fileTypes/FileType.java
+++ b/platform/core-api/src/com/intellij/openapi/fileTypes/FileType.java
@@ -45,7 +45,7 @@ public interface FileType extends Scheme {
   /**
    * Returns the icon used for showing files of the type, or {@code null} if no icon should be shown.
    */
-  @Nullable Icon getIcon();
+  Icon getIcon();
 
   /**
    * Returns {@code true} if files of the specified type contain binary data, {@code false} if the file is plain text.
diff --git a/platform/core-impl/src/com/intellij/openapi/fileTypes/PlainTextFileType.java b/platform/core-impl/src/com/intellij/openapi/fileTypes/PlainTextFileType.java
index 8b8d3c4d9efb..d7abe55cb32d 100644
--- a/platform/core-impl/src/com/intellij/openapi/fileTypes/PlainTextFileType.java
+++ b/platform/core-impl/src/com/intellij/openapi/fileTypes/PlainTextFileType.java
@@ -30,7 +30,7 @@ public final class PlainTextFileType extends LanguageFileType implements PlainTe
   }
 
   @Override
-  public @NotNull Icon getIcon() {
+  public Icon getIcon() {
     return AllIcons.FileTypes.Text;
   }
 
diff --git a/platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileType.java b/platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileType.java
index a89ea8a809f6..984170e1b8f0 100644
--- a/platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileType.java
+++ b/platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileType.java
@@ -7,7 +7,6 @@ import com.intellij.openapi.fileTypes.PlainTextLanguage;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 
@@ -49,7 +48,6 @@ public class ScratchFileType extends LanguageFileType {
     return "";
   }
 
-  @Nullable
   @Override
   public Icon getIcon() {
     return PlainTextFileType.INSTANCE.getIcon();
diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoFileModel.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoFileModel.java
index 9f82fad9c2af..09458d776faf 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoFileModel.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoFileModel.java
@@ -237,7 +237,7 @@ public class GotoFileModel extends FilteringGotoByModel<FileTypeRef> implements
     }
 
     @Override
-    public @Nullable Icon getIcon() {
+    public Icon getIcon() {
       return PlatformIcons.FOLDER_ICON;
     }
 
diff --git a/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/associate/OSAssociateFileTypesUtil.java b/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/associate/OSAssociateFileTypesUtil.java
index 70ca390a2cf3..78837073abeb 100644
--- a/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/associate/OSAssociateFileTypesUtil.java
+++ b/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/associate/OSAssociateFileTypesUtil.java
@@ -212,7 +212,7 @@ public class OSAssociateFileTypesUtil {
     }
 
     @Override
-    public @Nullable Icon getIcon() {
+    public Icon getIcon() {
       return myOriginalType.getIcon();
     }
 
diff --git a/platform/lang-impl/src/com/intellij/psi/search/FileTypeKeyDescriptor.java b/platform/lang-impl/src/com/intellij/psi/search/FileTypeKeyDescriptor.java
index f16b98ffcbef..114bf4149967 100644
--- a/platform/lang-impl/src/com/intellij/psi/search/FileTypeKeyDescriptor.java
+++ b/platform/lang-impl/src/com/intellij/psi/search/FileTypeKeyDescriptor.java
@@ -84,7 +84,6 @@ final class FileTypeKeyDescriptor implements KeyDescriptor<FileType> {
       throw new UnsupportedOperationException();
     }
 
-    @Nullable
     @Override
     public Icon getIcon() {
       throw new UnsupportedOperationException();
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/DetectedByContentFileType.java b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/DetectedByContentFileType.java
index 7cfdf610180a..7fb25b92ef4d 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/DetectedByContentFileType.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/DetectedByContentFileType.java
@@ -43,7 +43,7 @@ public final class DetectedByContentFileType implements FileType {
   }
 
   @Override
-  public @NotNull Icon getIcon() {
+  public Icon getIcon() {
     return AllIcons.FileTypes.Text;
   }
 
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/fileTypes/impl/FileTypesTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/fileTypes/impl/FileTypesTest.java
index eb1199b27eb7..47843fa22354 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/fileTypes/impl/FileTypesTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/fileTypes/impl/FileTypesTest.java
@@ -1063,7 +1063,7 @@ public class FileTypesTest extends HeavyPlatformTestCase {
       }
 
       @Override
-      public @Nullable Icon getIcon() {
+      public Icon getIcon() {
         return null;
       }
 
@@ -1145,7 +1145,7 @@ public class FileTypesTest extends HeavyPlatformTestCase {
     @Override public @NotNull String getDisplayName() { return getClass().getName(); }
     @Override public @NotNull String getDescription() { return getDisplayName(); }
     @Override public @NotNull String getDefaultExtension() { return "hs"; }
-    @Override public @Nullable Icon getIcon() { return null; }
+    @Override public Icon getIcon() { return null; }
     @Override  public boolean isBinary() { return false; }
   }
 
@@ -1250,7 +1250,7 @@ public class FileTypesTest extends HeavyPlatformTestCase {
     @Override public @NotNull String getName() { return NAME; }
     @Override public @NotNull String getDescription() { return ""; }
     @Override public @NotNull String getDefaultExtension() { return EXTENSION; }
-    @Override public @Nullable Icon getIcon() { return null; }
+    @Override public Icon getIcon() { return null; }
     @Override public boolean isBinary() { return false; }
   }
 
@@ -1262,7 +1262,7 @@ public class FileTypesTest extends HeavyPlatformTestCase {
     @Override public @NotNull String getName() { return NAME; }
     @Override public @NotNull String getDescription() { return ""; }
     @Override public @NotNull String getDefaultExtension() { return "hs"; }
-    @Override public @Nullable Icon getIcon() { return null; }
+    @Override public Icon getIcon() { return null; }
     @Override public boolean isBinary() { return false; }
   }
 
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/encoding/FileEncodingTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/encoding/FileEncodingTest.java
index 2a26b28e0da7..4af5cc11a080 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/encoding/FileEncodingTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/encoding/FileEncodingTest.java
@@ -1002,7 +1002,7 @@ public class FileEncodingTest extends HeavyPlatformTestCase implements TestDialo
       @Override public @NotNull String getName() { return "my"; }
       @Override public @NotNull String getDescription() { return getName(); }
       @Override public @NotNull String getDefaultExtension() { return "my"; }
-      @Override public @Nullable Icon getIcon() { return null; }
+      @Override public Icon getIcon() { return null; }
 
       @Override
       public Charset extractCharsetFromFileContent(@Nullable Project project, @Nullable VirtualFile file, @NotNull CharSequence content) {
@@ -1109,7 +1109,7 @@ public class FileEncodingTest extends HeavyPlatformTestCase implements TestDialo
       @Override public @NotNull String getName() { return "Test"; }
       @Override public @NotNull String getDescription() { return "Test"; }
       @Override public @NotNull String getDefaultExtension() { return ext; }
-      @Override public @Nullable Icon getIcon() { return null; }
+      @Override public Icon getIcon() { return null; }
       @Override public String getCharset(@NotNull VirtualFile file, byte @NotNull [] content) { return StandardCharsets.ISO_8859_1.name(); }
     }
     MyForcedFileType fileType = new MyForcedFileType();
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ignore/lang/IgnoreFileType.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ignore/lang/IgnoreFileType.java
index 72b8b404b3e9..cee022c1003b 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ignore/lang/IgnoreFileType.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ignore/lang/IgnoreFileType.java
@@ -26,7 +26,6 @@ package com.intellij.openapi.vcs.changes.ignore.lang;
 
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 
@@ -84,7 +83,6 @@ public class IgnoreFileType extends LanguageFileType {
    *
    * @return The icon instance, or null if no icon should be shown.
    */
-  @Nullable
   @Override
   public Icon getIcon() {
     return getIgnoreLanguage().getIcon();
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/PatchFileType.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/PatchFileType.java
index d25c91c974bf..bbfc6888cdfb 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/PatchFileType.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/PatchFileType.java
@@ -51,7 +51,6 @@ public class PatchFileType implements FileType {
   }
 
   @Override
-  @Nullable
   public Icon getIcon() {
     return AllIcons.Vcs.Patch_file;
   }
diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseFileType.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseFileType.java
index 79692224945a..03fd61df0525 100644
--- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseFileType.java
+++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseFileType.java
@@ -8,7 +8,6 @@ import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.idea.eclipse.EclipseBundle;
 import org.jetbrains.idea.eclipse.EclipseXml;
 
@@ -47,7 +46,6 @@ public class EclipseFileType implements FileType {
   }
 
   @Override
-  @Nullable
   public Icon getIcon() {
     return AllIcons.Providers.Eclipse;
   }
diff --git a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/language/LombokConfigFileType.java b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/language/LombokConfigFileType.java
index a6901e92b0b2..e1b921c6a8d9 100644
--- a/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/language/LombokConfigFileType.java
+++ b/plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/language/LombokConfigFileType.java
@@ -35,7 +35,6 @@ public class LombokConfigFileType extends LanguageFileType {
     return "config";
   }
 
-  @Nullable
   @Override
   public Icon getIcon() {
     return LombokIcons.Config;
diff --git a/plugins/markdown/core/src/org/intellij/plugins/markdown/lang/MarkdownFileType.java b/plugins/markdown/core/src/org/intellij/plugins/markdown/lang/MarkdownFileType.java
index 1c690364f202..ade0f816b75d 100644
--- a/plugins/markdown/core/src/org/intellij/plugins/markdown/lang/MarkdownFileType.java
+++ b/plugins/markdown/core/src/org/intellij/plugins/markdown/lang/MarkdownFileType.java
@@ -5,7 +5,6 @@ import com.intellij.openapi.fileTypes.LanguageFileType;
 import org.intellij.plugins.markdown.MarkdownBundle;
 import org.intellij.plugins.markdown.MarkdownIcons;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 
@@ -34,7 +33,6 @@ public final class MarkdownFileType extends LanguageFileType {
     return "md";
   }
 
-  @Nullable
   @Override
   public Icon getIcon() {
     return MarkdownIcons.MarkdownPlugin;
diff --git a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/jql/JqlFileType.java b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/jql/JqlFileType.java
index f80035c46d6d..d9f1b375e03b 100644
--- a/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/jql/JqlFileType.java
+++ b/plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/jql/JqlFileType.java
@@ -38,7 +38,7 @@ public final class JqlFileType extends LanguageFileType {
   }
 
   @Override
-  public @NotNull Icon getIcon() {
+  public Icon getIcon() {
     return TasksCoreIcons.Jira;
   }
 }
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/youtrack/lang/YouTrackFileType.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/youtrack/lang/YouTrackFileType.java
index 991103dbe0c7..ca2a457799a3 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/youtrack/lang/YouTrackFileType.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/youtrack/lang/YouTrackFileType.java
@@ -38,7 +38,7 @@ public final class YouTrackFileType extends LanguageFileType {
   }
 
   @Override
-  public @NotNull Icon getIcon() {
+  public Icon getIcon() {
     return TasksCoreIcons.Youtrack;
   }
 }
diff --git a/plugins/textmate/src/org/jetbrains/plugins/textmate/TextMateFileType.java b/plugins/textmate/src/org/jetbrains/plugins/textmate/TextMateFileType.java
index 9281715bedf5..d2d23e38ec5f 100644
--- a/plugins/textmate/src/org/jetbrains/plugins/textmate/TextMateFileType.java
+++ b/plugins/textmate/src/org/jetbrains/plugins/textmate/TextMateFileType.java
@@ -41,7 +41,6 @@ public final class TextMateFileType extends LanguageFileType implements FileType
     return "";
   }
 
-  @NotNull
   @Override
   public Icon getIcon() {
     return AllIcons.FileTypes.Text;
diff --git a/plugins/yaml/src/org/jetbrains/yaml/YAMLFileType.java b/plugins/yaml/src/org/jetbrains/yaml/YAMLFileType.java
index 16047a91cb5e..2a45cfa13bd3 100644
--- a/plugins/yaml/src/org/jetbrains/yaml/YAMLFileType.java
+++ b/plugins/yaml/src/org/jetbrains/yaml/YAMLFileType.java
@@ -35,7 +35,6 @@ public final class YAMLFileType extends LanguageFileType {
   }
 
   @Override
-  @NotNull
   public Icon getIcon() {
     return AllIcons.FileTypes.Yaml;
   }
diff --git a/python/python-psi-api/src/com/jetbrains/python/PythonFileType.java b/python/python-psi-api/src/com/jetbrains/python/PythonFileType.java
index 1d7ff58333f1..cb463d83b651 100644
--- a/python/python-psi-api/src/com/jetbrains/python/PythonFileType.java
+++ b/python/python-psi-api/src/com/jetbrains/python/PythonFileType.java
@@ -65,7 +65,6 @@ public class PythonFileType extends LanguageFileType {
   }
 
   @Override
-  @NotNull
   public Icon getIcon() {
     return PythonPsiApiIcons.PythonFile;
   }
diff --git a/python/rest/src/com/jetbrains/rest/RestFileType.java b/python/rest/src/com/jetbrains/rest/RestFileType.java
index d286ba239fbb..5eb7e216d5b8 100644
--- a/python/rest/src/com/jetbrains/rest/RestFileType.java
+++ b/python/rest/src/com/jetbrains/rest/RestFileType.java
@@ -5,7 +5,6 @@ import com.intellij.openapi.fileTypes.LanguageFileType;
 import icons.RestIcons;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 
@@ -41,7 +40,6 @@ public final class RestFileType extends LanguageFileType {
   }
 
   @Override
-  @Nullable
   public Icon getIcon() {
     return RestIcons.Rst;
   }
diff --git a/python/src/com/jetbrains/commandInterface/commandLine/CommandLineFileType.java b/python/src/com/jetbrains/commandInterface/commandLine/CommandLineFileType.java
index 12170ac95a64..8f693eb03ec6 100644
--- a/python/src/com/jetbrains/commandInterface/commandLine/CommandLineFileType.java
+++ b/python/src/com/jetbrains/commandInterface/commandLine/CommandLineFileType.java
@@ -17,7 +17,6 @@ package com.jetbrains.commandInterface.commandLine;
 
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 
@@ -54,7 +53,6 @@ public final class CommandLineFileType extends LanguageFileType {
     return EXTENSION;
   }
 
-  @Nullable
   @Override
   public Icon getIcon() {
     return null;
diff --git a/spellchecker/src/com/intellij/spellchecker/DictionaryFileType.java b/spellchecker/src/com/intellij/spellchecker/DictionaryFileType.java
index 05554db6c5a8..78ebd733199c 100644
--- a/spellchecker/src/com/intellij/spellchecker/DictionaryFileType.java
+++ b/spellchecker/src/com/intellij/spellchecker/DictionaryFileType.java
@@ -8,7 +8,6 @@ import com.intellij.spellchecker.util.SpellCheckerBundle;
 import icons.SpellcheckerIcons;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 
@@ -42,7 +41,6 @@ public class DictionaryFileType implements FileType {
     return "dic";
   }
 
-  @Nullable
   @Override
   public Icon getIcon() {
     return SpellcheckerIcons.Dictionary;