IDEA-202038 Update icons and get rid of unused icons

RegExpSupport/gen/icons/RegExpSupportIcons.java

@@ -1,21 +0,0 @@
-/*
- * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
-
-package icons;
-
-import com.intellij.openapi.util.IconLoader;
-
-import javax.swing.*;
-
-/**
- * NOTE THIS FILE IS AUTO-GENERATED
- * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
- */
-public final class RegExpSupportIcons {
-  private static Icon load(String path) {
-    return IconLoader.getIcon(path, RegExpSupportIcons.class);
-  }
-
-  public static final Icon Regexp_filetype_icon = load("/org/intellij/lang/regexp/regexp-filetype-icon.png"); // 11x16
-}

RegExpSupport/src/org/intellij/lang/regexp/RegExpFileType.java

@@ -18,9 +18,6 @@ package org.intellij.lang.regexp;
 import com.intellij.icons.AllIcons;
 import com.intellij.lang.Language;
 import com.intellij.openapi.fileTypes.LanguageFileType;
-import com.intellij.openapi.util.IconLoader;
-import com.intellij.ui.LayeredIcon;
-import icons.RegExpSupportIcons;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -34,12 +31,7 @@ public class RegExpFileType extends LanguageFileType {
 
     private RegExpFileType() {
         super(RegExpLanguage.INSTANCE);
-        myIcon = new IconLoader.LazyIcon() {
-            @Override
-            protected Icon compute() {
-                return new LayeredIcon(AllIcons.FileTypes.Text, RegExpSupportIcons.Regexp_filetype_icon);
-            }
-        };
+        myIcon = AllIcons.FileTypes.Regexp;
     }
 
     public RegExpFileType(@NotNull Language language) {

images/resources/META-INF/ImagesPlugin.xml

@@ -29,7 +29,6 @@
   <actions>
     <action class="org.intellij.images.actions.EditExternallyAction"
             id="Images.EditExternally"
-            icon="ImagesIcons.EditExternally"
             text="Open Image in External Editor">
       <keyboard-shortcut first-keystroke="control alt F4" keymap="$default"/>
       <add-to-group anchor="after" group-id="ProjectViewPopupMenu" relative-to-action="EditSource"/>

images/src/icons/ImagesIcons.java

@@ -14,7 +14,6 @@ public final class ImagesIcons {
     return IconLoader.getIcon(path, ImagesIcons.class);
   }
 
-  public static final Icon EditExternally = load("/org/intellij/images/icons/EditExternally.png"); // 16x16
   public static final Icon ImagesFileType = load("/org/intellij/images/icons/ImagesFileType.svg"); // 16x16
   public static final Icon ThumbnailBlank = load("/org/intellij/images/icons/ThumbnailBlank.png"); // 75x86
   public static final Icon ThumbnailDirectory = load("/org/intellij/images/icons/ThumbnailDirectory.png"); // 75x82

platform/icons/src/fileTypes/regexp.svg

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <polygon fill="#9AA7B0" fill-opacity=".8" points="7 1 3 5 7 5"/>
+    <path fill="#9AA7B0" fill-opacity=".8" d="M13,8.07349254 C12.9019343,8.06711026 12.803012,8.06386931 12.7033328,8.06386931 C10.2180514,8.06386931 8.2033328,10.0785879 8.2033328,12.5638693 C8.2033328,13.4615629 8.46618976,14.2978629 8.9191343,15 L3,15 L3,6 L8,6 L8,1 L13,1 L13,8.07349254 Z"/>
+    <path fill="#231F20" fill-opacity=".7" d="M5,12 L8,12 L8,11 L5,11 L5,12 Z M5,10 L9,10 L9,9 L5,9 L5,10 Z M5,8 L11,8 L11,7 L5,7 L5,8 Z"/>
+    <path fill="#40B6E0" d="M13.3329895,11.2864308 L15.3140784,10.1426486 L16.0140784,11.3550842 L14.0329895,12.4988664 L16.0140784,13.6426486 L15.3140784,14.8550842 L13.3329895,13.711302 L13.3329895,15.9988664 L11.9329895,15.9988664 L11.9329895,13.711302 L9.95190061,14.8550842 L9.25190061,13.6426486 L11.2329895,12.4988664 L9.25190061,11.3550842 L9.95190061,10.1426486 L11.9329895,11.2864308 L11.9329895,8.99886641 L13.3329895,8.99886641 L13.3329895,11.2864308 Z"/>
+  </g>
+</svg>

platform/util/src/com/intellij/icons/AllIcons.java

@@ -796,6 +796,7 @@ public class AllIcons {
     public static final Icon Jspx = IconLoader.getIcon("/fileTypes/jspx.svg"); // 16x16
     public static final Icon Manifest = IconLoader.getIcon("/fileTypes/manifest.svg"); // 16x16
     public static final Icon Properties = IconLoader.getIcon("/fileTypes/properties.svg"); // 16x16
+    public static final Icon Regexp = IconLoader.getIcon("/fileTypes/regexp.svg"); // 16x16
     public static final Icon Text = IconLoader.getIcon("/fileTypes/text.svg"); // 16x16
     public static final Icon UiForm = IconLoader.getIcon("/fileTypes/uiForm.svg"); // 16x16
     public static final Icon Unknown = IconLoader.getIcon("/fileTypes/unknown.svg"); // 16x16
@@ -1859,6 +1860,7 @@ public class AllIcons {
     public static final Icon DataView = IconLoader.getIcon("/nodes/dataView.svg"); // 16x16
     public static final Icon Deploy = IconLoader.getIcon("/nodes/deploy.svg"); // 16x16
     public static final Icon Desktop = IconLoader.getIcon("/nodes/desktop.svg"); // 16x16
+    public static final Icon Editorconfig = IconLoader.getIcon("/nodes/editorconfig.svg"); // 16x16
     public static final Icon Ejb = IconLoader.getIcon("/nodes/ejb.svg"); // 16x16
     public static final Icon EjbBusinessMethod = IconLoader.getIcon("/nodes/ejbBusinessMethod.svg"); // 16x16
     public static final Icon EjbCmpField = IconLoader.getIcon("/nodes/ejbCmpField.svg"); // 16x16

plugins/editorconfig/src/icons/EditorconfigIcons.java

@@ -14,7 +14,6 @@ public final class EditorconfigIcons {
     return IconLoader.getIcon(path, EditorconfigIcons.class);
   }
 
-  public static final Icon Editorconfig = load("/icons/editorconfig.svg"); // 16x16
   public static final Icon PartiallyOverridden = load("/icons/partiallyOverridden.svg"); // 12x12
   public static final Icon PartiallyOverriding = load("/icons/partiallyOverriding.svg"); // 12x12
 }

plugins/editorconfig/src/org/editorconfig/language/codeinsight/actions/CreateEditorConfigFileAction.kt

@@ -1,20 +1,20 @@
 // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.editorconfig.language.codeinsight.actions
 
+import com.intellij.icons.AllIcons
 import com.intellij.ide.actions.CreateInDirectoryActionBase
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.LangDataKeys
 import com.intellij.openapi.application.runWriteAction
 import com.intellij.psi.PsiDirectory
 import com.intellij.psi.PsiFile
-import icons.EditorconfigIcons
 import org.editorconfig.language.filetype.EditorConfigFileConstants
 import org.editorconfig.language.messages.EditorConfigBundle
 
 class CreateEditorConfigFileAction : CreateInDirectoryActionBase(
   EditorConfigBundle["create.file.title"],
   EditorConfigBundle["create.file.description"],
-  EditorconfigIcons.Editorconfig
+  AllIcons.Nodes.Editorconfig
 ) {
   @Suppress("UsePropertyAccessSyntax")
   override fun actionPerformed(event: AnActionEvent) {

plugins/editorconfig/src/org/editorconfig/language/filetype/EditorConfigFileType.kt

@@ -1,8 +1,8 @@
 // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.editorconfig.language.filetype
 
+import com.intellij.icons.AllIcons
 import com.intellij.openapi.fileTypes.LanguageFileType
-import icons.EditorconfigIcons
 import org.editorconfig.language.EditorConfigLanguage
 import org.editorconfig.language.messages.EditorConfigBundle
 import javax.swing.Icon
@@ -11,5 +11,5 @@ object EditorConfigFileType : LanguageFileType(EditorConfigLanguage) {
   override fun getName() = EditorConfigFileConstants.FILETYPE_NAME
   override fun getDescription() = EditorConfigBundle["file.type.description"]
   override fun getDefaultExtension() = EditorConfigFileConstants.FILE_EXTENSION
-  override fun getIcon(): Icon? = EditorconfigIcons.Editorconfig
+  override fun getIcon(): Icon? = AllIcons.Nodes.Editorconfig
 }

plugins/editorconfig/src/org/editorconfig/language/highlighting/EditorConfigColorSettingsPage.kt

@@ -1,6 +1,7 @@
 // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.editorconfig.language.highlighting
 
+import com.intellij.icons.AllIcons
 import com.intellij.openapi.editor.colors.TextAttributesKey
 import com.intellij.openapi.fileTypes.SyntaxHighlighter
 import com.intellij.openapi.options.colors.AttributesDescriptor
@@ -8,13 +9,12 @@ import com.intellij.openapi.options.colors.ColorDescriptor
 import com.intellij.openapi.options.colors.ColorSettingsPage
 import com.intellij.psi.codeStyle.DisplayPriority
 import com.intellij.psi.codeStyle.DisplayPrioritySortable
-import icons.EditorconfigIcons
 import org.editorconfig.language.filetype.EditorConfigFileConstants
 import org.editorconfig.language.messages.EditorConfigBundle.get
 import javax.swing.Icon
 
 class EditorConfigColorSettingsPage : ColorSettingsPage, DisplayPrioritySortable {
-  override fun getIcon(): Icon = EditorconfigIcons.Editorconfig
+  override fun getIcon(): Icon = AllIcons.Nodes.Editorconfig
   override fun getHighlighter(): SyntaxHighlighter = EditorConfigSyntaxHighlighter
   override fun getDemoText() =
     """<propertyKey>root</propertyKey> = <propertyValue>true</propertyValue>

plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java

@@ -25,7 +25,6 @@ import com.intellij.psi.PsiFile;
 import com.intellij.psi.impl.PsiFileEx;
 import com.intellij.psi.util.*;
 import com.intellij.psi.xml.*;
-import com.intellij.ui.LayeredIcon;
 import com.intellij.util.SmartList;
 import com.intellij.util.xml.NanoXmlUtil;
 import gnu.trove.THashMap;
@@ -349,7 +348,7 @@ public class XsltSupport {
   }
 
   public static Icon createXsltIcon(Icon icon) {
-    return LayeredIcon.create(icon, XpathIcons.Xslt_filetype_overlay);
+    return XpathIcons.Xslt_filetype_overlay;
   }
 
   private static class XsltSupportProvider implements ParameterizedCachedValueProvider<XsltChecker.LanguageLevel, PsiFile> {