From 40ee9543abb3a6a02b41aa1634c4bbb023d6e685 Mon Sep 17 00:00:00 2001 From: Yuriy Artamonov Date: Fri, 2 Aug 2024 22:02:38 +0200 Subject: [PATCH] [icons] Eliminate CrossModuleIcons.json All icons reside in the corresponding modules now GitOrigin-RevId: c5fe0b11a37256d1cae4d2067f17c6802a7721b8 --- .../icons/ExternalSystemIcons.java | 8 +++---- .../intellij.platform.externalSystem.impl.iml | 1 + .../resources/ExternalSystemIconMappings.json | 7 ++++++ .../resources/icons/newui/icon-robots.txt | 1 + .../resources/icons/newui}/task.svg | 2 +- .../resources/icons/newui}/task_dark.svg | 2 +- platform/icons/src/CrossModuleIcons.json | 23 ------------------- platform/icons/src/PlatformIconMappings.json | 16 ++++--------- .../src/debugger/forceRunToCursor.svg} | 0 .../src/debugger/forceRunToCursor_dark.svg} | 0 .../src/debugger/forceStepInto.svg} | 0 .../src/debugger/forceStepInto_dark.svg} | 0 .../src/debugger/forceStepOver.svg} | 0 .../src/debugger/forceStepOver_dark.svg} | 0 .../src/expui/build/toggleSkipTestsMode.svg | 5 ---- .../expui/build/toggleSkipTestsMode_dark.svg | 5 ---- .../icons/src/expui/fileTypes/cucumber.svg | 4 ---- platform/icons/src/expui/fileTypes/vueJs.svg | 5 ---- platform/icons/src/expui/fileTypes/yarn.svg | 4 ---- .../src/META-INF/PlatformExtensions.xml | 2 -- .../src/idea/LangActions.xml | 6 ++--- platform/util/ui/api-dump.txt | 13 +++-------- .../ui/src/com/intellij/icons/AllIcons.java | 14 +++-------- .../src/icons/PlatformDebuggerImplIcons.java | 3 --- .../resources/icons/{task.svg => antTask.svg} | 0 .../config/execution/MessageTreeRenderer.java | 2 +- plugins/ant/src/icons/AntIcons.java | 2 +- .../src/service/resolve/GradleTaskProperty.kt | 1 - .../groovy/gant/ant/AntBuilderMethod.java | 2 +- .../pluginCore/resources/META-INF/plugin.xml | 2 +- 30 files changed, 32 insertions(+), 98 deletions(-) rename platform/external-system-impl/{src => gen}/icons/ExternalSystemIcons.java (52%) create mode 100644 platform/external-system-impl/resources/ExternalSystemIconMappings.json create mode 100644 platform/external-system-impl/resources/icons/newui/icon-robots.txt rename platform/{icons/src/expui/build => external-system-impl/resources/icons/newui}/task.svg (97%) rename platform/{icons/src/expui/build => external-system-impl/resources/icons/newui}/task_dark.svg (97%) delete mode 100644 platform/icons/src/CrossModuleIcons.json rename platform/{xdebugger-impl/resources/icons/actions/force_run_to_cursor.svg => icons/src/debugger/forceRunToCursor.svg} (100%) rename platform/{xdebugger-impl/resources/icons/actions/force_run_to_cursor_dark.svg => icons/src/debugger/forceRunToCursor_dark.svg} (100%) rename platform/{xdebugger-impl/resources/icons/actions/force_step_into.svg => icons/src/debugger/forceStepInto.svg} (100%) rename platform/{xdebugger-impl/resources/icons/actions/force_step_into_dark.svg => icons/src/debugger/forceStepInto_dark.svg} (100%) rename platform/{xdebugger-impl/resources/icons/actions/force_step_over.svg => icons/src/debugger/forceStepOver.svg} (100%) rename platform/{xdebugger-impl/resources/icons/actions/force_step_over_dark.svg => icons/src/debugger/forceStepOver_dark.svg} (100%) delete mode 100644 platform/icons/src/expui/build/toggleSkipTestsMode.svg delete mode 100644 platform/icons/src/expui/build/toggleSkipTestsMode_dark.svg delete mode 100644 platform/icons/src/expui/fileTypes/cucumber.svg delete mode 100644 platform/icons/src/expui/fileTypes/vueJs.svg delete mode 100644 platform/icons/src/expui/fileTypes/yarn.svg rename plugins/ant/resources/icons/{task.svg => antTask.svg} (100%) diff --git a/platform/external-system-impl/src/icons/ExternalSystemIcons.java b/platform/external-system-impl/gen/icons/ExternalSystemIcons.java similarity index 52% rename from platform/external-system-impl/src/icons/ExternalSystemIcons.java rename to platform/external-system-impl/gen/icons/ExternalSystemIcons.java index 77540364aa05..c86a40370559 100644 --- a/platform/external-system-impl/src/icons/ExternalSystemIcons.java +++ b/platform/external-system-impl/gen/icons/ExternalSystemIcons.java @@ -1,4 +1,4 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package icons; import com.intellij.ui.IconManager; @@ -11,8 +11,8 @@ import javax.swing.*; * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead */ public final class ExternalSystemIcons { - private static @NotNull Icon load(@NotNull String path, int cacheKey, int flags) { - return IconManager.getInstance().loadRasterizedIcon(path, ExternalSystemIcons.class.getClassLoader(), cacheKey, flags); + private static @NotNull Icon load(@NotNull String expUIPath, @NotNull String path, int cacheKey, int flags) { + return IconManager.getInstance().loadRasterizedIcon(path, expUIPath, ExternalSystemIcons.class.getClassLoader(), cacheKey, flags); } - /** 16x16 */ public static final @NotNull Icon Task = load("icons/task.svg", -1107166924, 0); + /** 16x16 */ public static final @NotNull Icon Task = load("icons/newui/task.svg", "icons/task.svg", -1107166924, 0); } diff --git a/platform/external-system-impl/intellij.platform.externalSystem.impl.iml b/platform/external-system-impl/intellij.platform.externalSystem.impl.iml index be7fe4a7fc74..e96e10ca6b4d 100644 --- a/platform/external-system-impl/intellij.platform.externalSystem.impl.iml +++ b/platform/external-system-impl/intellij.platform.externalSystem.impl.iml @@ -27,6 +27,7 @@ + diff --git a/platform/external-system-impl/resources/ExternalSystemIconMappings.json b/platform/external-system-impl/resources/ExternalSystemIconMappings.json new file mode 100644 index 000000000000..cafc19403ab1 --- /dev/null +++ b/platform/external-system-impl/resources/ExternalSystemIconMappings.json @@ -0,0 +1,7 @@ +{ + "icons": { + "newui": { + "task.svg": "icons/task.svg" + } + } +} \ No newline at end of file diff --git a/platform/external-system-impl/resources/icons/newui/icon-robots.txt b/platform/external-system-impl/resources/icons/newui/icon-robots.txt new file mode 100644 index 000000000000..53c8664db3f1 --- /dev/null +++ b/platform/external-system-impl/resources/icons/newui/icon-robots.txt @@ -0,0 +1 @@ +merge \ No newline at end of file diff --git a/platform/icons/src/expui/build/task.svg b/platform/external-system-impl/resources/icons/newui/task.svg similarity index 97% rename from platform/icons/src/expui/build/task.svg rename to platform/external-system-impl/resources/icons/newui/task.svg index 55fcf712900c..c1676b9eebde 100644 --- a/platform/icons/src/expui/build/task.svg +++ b/platform/external-system-impl/resources/icons/newui/task.svg @@ -1,4 +1,4 @@ - + diff --git a/platform/icons/src/expui/build/task_dark.svg b/platform/external-system-impl/resources/icons/newui/task_dark.svg similarity index 97% rename from platform/icons/src/expui/build/task_dark.svg rename to platform/external-system-impl/resources/icons/newui/task_dark.svg index 64f09d927c86..e07345b4992b 100644 --- a/platform/icons/src/expui/build/task_dark.svg +++ b/platform/external-system-impl/resources/icons/newui/task_dark.svg @@ -1,4 +1,4 @@ - + diff --git a/platform/icons/src/CrossModuleIcons.json b/platform/icons/src/CrossModuleIcons.json deleted file mode 100644 index 77ca3e08e15d..000000000000 --- a/platform/icons/src/CrossModuleIcons.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "expui": { - "build": { - "task.svg": "icons/task.svg" - }, - "fileTypes": { - "cucumber.svg": "org/jetbrains/plugins/cucumber/icons/cucumber.svg", - "vueJs.svg": "icons/vue.svg", - "yarn.svg": "icons/nodejs/yarn.svg" - }, - "run": { - "forceRunToCursor.svg": "icons/actions/force_run_to_cursor.svg", - "forceStepInto.svg": "icons/actions/force_step_into.svg", - "forceStepOver.svg": "icons/actions/force_step_over.svg" - }, - "toolwindows": { - "dependencies.svg": [ - "icons/artifact.svg", - "icons/artifactSmall.svg" - ] - } - } -} \ No newline at end of file diff --git a/platform/icons/src/PlatformIconMappings.json b/platform/icons/src/PlatformIconMappings.json index 4333a12e25d3..61bf889a4855 100644 --- a/platform/icons/src/PlatformIconMappings.json +++ b/platform/icons/src/PlatformIconMappings.json @@ -101,7 +101,6 @@ "build.svg": "actions/compile.svg", "dependencyAnalyzer.svg": "actions/dependencyAnalyzer.svg", "rebuild.svg": "actions/rebuild.svg", - "task.svg": "icons/task.svg", "taskGroup.svg": "nodes/configFolder.svg", "toggleOfflineMode.svg": "actions/offlineMode.svg" }, @@ -217,7 +216,6 @@ "contexts.svg": "fileTypes/contexts.svg", "contextsModifier.svg": "fileTypes/contextsModifier.svg", "css.svg": "fileTypes/css.svg", - "cucumber.svg": "org/jetbrains/plugins/cucumber/icons/cucumber.svg", "eclipse.svg": "providers/eclipse.svg", "editorConfig.svg": "nodes/editorconfig.svg", "diagram.svg": "fileTypes/diagram.svg", @@ -255,7 +253,6 @@ "uiForm.svg": "fileTypes/uiForm.svg", "image.svg": "fileTypes/image.svg", "unknown.svg": "fileTypes/unknown.svg", - "vueJs.svg": "icons/vue.svg", "wsdl.svg": "fileTypes/wsdlFile.svg", "xhtml.svg": "fileTypes/xhtml.svg", "xml.svg": [ @@ -263,8 +260,7 @@ "fileTypes/xml.svg" ], "xsd.svg": "fileTypes/xsdFile.svg", - "yaml.svg": "fileTypes/yaml.svg", - "yarn.svg": "icons/nodejs/yarn.svg" + "yaml.svg": "fileTypes/yaml.svg" }, "general": { "inspections": { @@ -728,9 +724,9 @@ "debug.svg": "actions/startDebugger.svg", "dumpThreads.svg": "actions/dump.svg", "evaluateExpression.svg": "debugger/evaluateExpression.svg", - "forceRunToCursor.svg": "icons/actions/force_run_to_cursor.svg", - "forceStepInto.svg": "icons/actions/force_step_into.svg", - "forceStepOver.svg": "icons/actions/force_step_over.svg", + "forceRunToCursor.svg": "debugger/forceRunToCursor.svg", + "forceStepInto.svg": "debugger/forceStepInto.svg", + "forceStepOver.svg": "debugger/forceStepOver.svg", "killProcess.svg": "debugger/killProcess.svg", "muteBreakpoints.svg": "debugger/muteBreakpoints.svg", "pause.svg": "actions/pause.svg", @@ -834,10 +830,6 @@ "commit.svg": "toolwindows/toolWindowCommit.svg", "coverage.svg": "toolwindows/toolWindowCoverage.svg", "debug.svg": "toolwindows/toolWindowDebugger.svg", - "dependencies.svg": [ - "icons/artifact.svg", - "icons/artifactSmall.svg" - ], "documentation.svg": "toolwindows/documentation.svg", "find.svg": "toolwindows/toolWindowFind.svg", "hierarchy.svg": "toolwindows/toolWindowHierarchy.svg", diff --git a/platform/xdebugger-impl/resources/icons/actions/force_run_to_cursor.svg b/platform/icons/src/debugger/forceRunToCursor.svg similarity index 100% rename from platform/xdebugger-impl/resources/icons/actions/force_run_to_cursor.svg rename to platform/icons/src/debugger/forceRunToCursor.svg diff --git a/platform/xdebugger-impl/resources/icons/actions/force_run_to_cursor_dark.svg b/platform/icons/src/debugger/forceRunToCursor_dark.svg similarity index 100% rename from platform/xdebugger-impl/resources/icons/actions/force_run_to_cursor_dark.svg rename to platform/icons/src/debugger/forceRunToCursor_dark.svg diff --git a/platform/xdebugger-impl/resources/icons/actions/force_step_into.svg b/platform/icons/src/debugger/forceStepInto.svg similarity index 100% rename from platform/xdebugger-impl/resources/icons/actions/force_step_into.svg rename to platform/icons/src/debugger/forceStepInto.svg diff --git a/platform/xdebugger-impl/resources/icons/actions/force_step_into_dark.svg b/platform/icons/src/debugger/forceStepInto_dark.svg similarity index 100% rename from platform/xdebugger-impl/resources/icons/actions/force_step_into_dark.svg rename to platform/icons/src/debugger/forceStepInto_dark.svg diff --git a/platform/xdebugger-impl/resources/icons/actions/force_step_over.svg b/platform/icons/src/debugger/forceStepOver.svg similarity index 100% rename from platform/xdebugger-impl/resources/icons/actions/force_step_over.svg rename to platform/icons/src/debugger/forceStepOver.svg diff --git a/platform/xdebugger-impl/resources/icons/actions/force_step_over_dark.svg b/platform/icons/src/debugger/forceStepOver_dark.svg similarity index 100% rename from platform/xdebugger-impl/resources/icons/actions/force_step_over_dark.svg rename to platform/icons/src/debugger/forceStepOver_dark.svg diff --git a/platform/icons/src/expui/build/toggleSkipTestsMode.svg b/platform/icons/src/expui/build/toggleSkipTestsMode.svg deleted file mode 100644 index e446c2e260fd..000000000000 --- a/platform/icons/src/expui/build/toggleSkipTestsMode.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/platform/icons/src/expui/build/toggleSkipTestsMode_dark.svg b/platform/icons/src/expui/build/toggleSkipTestsMode_dark.svg deleted file mode 100644 index a76ff08a36e8..000000000000 --- a/platform/icons/src/expui/build/toggleSkipTestsMode_dark.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/platform/icons/src/expui/fileTypes/cucumber.svg b/platform/icons/src/expui/fileTypes/cucumber.svg deleted file mode 100644 index 1070a11d2358..000000000000 --- a/platform/icons/src/expui/fileTypes/cucumber.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/platform/icons/src/expui/fileTypes/vueJs.svg b/platform/icons/src/expui/fileTypes/vueJs.svg deleted file mode 100644 index fb1f7dde0523..000000000000 --- a/platform/icons/src/expui/fileTypes/vueJs.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/platform/icons/src/expui/fileTypes/yarn.svg b/platform/icons/src/expui/fileTypes/yarn.svg deleted file mode 100644 index 182a23de7fb6..000000000000 --- a/platform/icons/src/expui/fileTypes/yarn.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/platform/platform-resources/src/META-INF/PlatformExtensions.xml b/platform/platform-resources/src/META-INF/PlatformExtensions.xml index c6deb5ba1f4e..dd05d38caa27 100644 --- a/platform/platform-resources/src/META-INF/PlatformExtensions.xml +++ b/platform/platform-resources/src/META-INF/PlatformExtensions.xml @@ -659,8 +659,6 @@ - - diff --git a/platform/platform-resources/src/idea/LangActions.xml b/platform/platform-resources/src/idea/LangActions.xml index 3c0a680e18b9..744d26b6f73d 100644 --- a/platform/platform-resources/src/idea/LangActions.xml +++ b/platform/platform-resources/src/idea/LangActions.xml @@ -1171,13 +1171,13 @@ - + - + - + diff --git a/platform/util/ui/api-dump.txt b/platform/util/ui/api-dump.txt index a672f2d9d31e..89f3b9f2bf65 100644 --- a/platform/util/ui/api-dump.txt +++ b/platform/util/ui/api-dump.txt @@ -221,10 +221,6 @@ f:com.intellij.icons.AllIcons$Breakpoints - sf:MultipleBreakpointsDisabled:javax.swing.Icon - sf:MultipleBreakpointsMuted:javax.swing.Icon - ():V -f:com.intellij.icons.AllIcons$Build -- sf:Task:javax.swing.Icon -- sf:ToggleSkipTestsMode:javax.swing.Icon -- ():V f:com.intellij.icons.AllIcons$Chooser - sf:Bottom:javax.swing.Icon - sf:Left:javax.swing.Icon @@ -322,6 +318,9 @@ f:com.intellij.icons.AllIcons$Debugger - sf:Db_watch:javax.swing.Icon - sf:EvaluateExpression:javax.swing.Icon - sf:EvaluationResult:javax.swing.Icon +- sf:ForceRunToCursor:javax.swing.Icon +- sf:ForceStepInto:javax.swing.Icon +- sf:ForceStepOver:javax.swing.Icon - sf:Frame:javax.swing.Icon - sf:KillProcess:javax.swing.Icon - sf:LambdaBreakpoint:javax.swing.Icon @@ -422,7 +421,6 @@ f:com.intellij.icons.AllIcons$FileTypes - sf:ContextsModifier:javax.swing.Icon - sf:Css:javax.swing.Icon - sf:Csv:javax.swing.Icon -- sf:Cucumber:javax.swing.Icon - sf:Custom:javax.swing.Icon - sf:Diagram:javax.swing.Icon - sf:Dtd:javax.swing.Icon @@ -451,13 +449,11 @@ f:com.intellij.icons.AllIcons$FileTypes - sf:Text:javax.swing.Icon - sf:UiForm:javax.swing.Icon - sf:Unknown:javax.swing.Icon -- sf:VueJs:javax.swing.Icon - sf:WsdlFile:javax.swing.Icon - sf:Xhtml:javax.swing.Icon - sf:Xml:javax.swing.Icon - sf:XsdFile:javax.swing.Icon - sf:Yaml:javax.swing.Icon -- sf:Yarn:javax.swing.Icon - ():V f:com.intellij.icons.AllIcons$General - sf:ActualZoom:javax.swing.Icon @@ -1152,9 +1148,6 @@ f:com.intellij.icons.AllIcons$Providers - sf:Yugabyte:javax.swing.Icon - ():V f:com.intellij.icons.AllIcons$Run -- sf:ForceRunToCursor:javax.swing.Icon -- sf:ForceStepInto:javax.swing.Icon -- sf:ForceStepOver:javax.swing.Icon - sf:Restart:javax.swing.Icon - sf:ShowIgnored:javax.swing.Icon - sf:Stop:javax.swing.Icon diff --git a/platform/util/ui/src/com/intellij/icons/AllIcons.java b/platform/util/ui/src/com/intellij/icons/AllIcons.java index c649725e5763..a2cd215618ea 100644 --- a/platform/util/ui/src/com/intellij/icons/AllIcons.java +++ b/platform/util/ui/src/com/intellij/icons/AllIcons.java @@ -244,11 +244,6 @@ public class AllIcons { /** 14x14 */ public static final @NotNull Icon MultipleBreakpointsMuted = load("expui/breakpoints/multipleBreakpointsMuted.svg", -1544664600, 2); } - public static final class Build { - /** 16x16 */ public static final @NotNull Icon Task = load("expui/build/task.svg", 374995429, 2); - /** 16x16 */ public static final @NotNull Icon ToggleSkipTestsMode = load("expui/build/toggleSkipTestsMode.svg", 1263415235, 2); - } - public static final class Chooser { /** 16x16 */ public static final @NotNull Icon Bottom = load("chooser/bottom.svg", -411920834, 2); /** 16x16 */ public static final @NotNull Icon Left = load("chooser/left.svg", 277946192, 2); @@ -349,6 +344,9 @@ public class AllIcons { /** 16x16 */ public static final @NotNull Icon Db_watch = load("debugger/db_watch.svg", -1666860072, 0); /** 16x16 */ public static final @NotNull Icon EvaluateExpression = load("expui/run/evaluateExpression.svg", "debugger/evaluateExpression.svg", -1762455063, 2); /** 16x16 */ public static final @NotNull Icon EvaluationResult = load("debugger/evaluationResult.svg", 1466088690, 2); + /** 16x16 */ public static final @NotNull Icon ForceRunToCursor = load("expui/run/forceRunToCursor.svg", "debugger/forceRunToCursor.svg", 1765887966, 2); + /** 16x16 */ public static final @NotNull Icon ForceStepInto = load("expui/run/forceStepInto.svg", "debugger/forceStepInto.svg", -897444087, 2); + /** 16x16 */ public static final @NotNull Icon ForceStepOver = load("expui/run/forceStepOver.svg", "debugger/forceStepOver.svg", 1412423475, 2); /** 16x16 */ public static final @NotNull Icon Frame = load("expui/debugger/frame.svg", "debugger/frame.svg", -388104166, 2); /** 16x16 */ public static final @NotNull Icon KillProcess = load("expui/run/killProcess.svg", "debugger/killProcess.svg", 1100470732, 2); /** 12x12 */ public static final @NotNull Icon LambdaBreakpoint = load("expui/breakpoints/breakpointLambda.svg", "debugger/LambdaBreakpoint.svg", -2130747183, 2); @@ -460,7 +458,6 @@ public class AllIcons { /** 16x16 */ public static final @NotNull Icon ContextsModifier = load("expui/fileTypes/contextsModifier.svg", "fileTypes/contextsModifier.svg", 11227132, 0); /** 16x16 */ public static final @NotNull Icon Css = load("expui/fileTypes/css.svg", "fileTypes/css.svg", -1827987051, 0); /** 16x16 */ public static final @NotNull Icon Csv = load("expui/fileTypes/csv.svg", -1498141192, 2); - /** 16x16 */ public static final @NotNull Icon Cucumber = load("expui/fileTypes/cucumber.svg", -374073568, 0); /** 16x16 */ public static final @NotNull Icon Custom = load("expui/fileTypes/text.svg", "fileTypes/custom.svg", 1692794144, 0); /** 16x16 */ public static final @NotNull Icon Diagram = load("expui/fileTypes/diagram.svg", "fileTypes/diagram.svg", 692669001, 0); /** 16x16 */ public static final @NotNull Icon Dtd = load("expui/fileTypes/xml.svg", "fileTypes/dtd.svg", -1804958231, 0); @@ -489,13 +486,11 @@ public class AllIcons { /** 16x16 */ public static final @NotNull Icon Text = load("expui/fileTypes/text.svg", "fileTypes/text.svg", -444897274, 0); /** 16x16 */ public static final @NotNull Icon UiForm = load("expui/fileTypes/uiForm.svg", "fileTypes/uiForm.svg", -734581860, 0); /** 16x16 */ public static final @NotNull Icon Unknown = load("expui/fileTypes/unknown.svg", "fileTypes/unknown.svg", 1094896438, 0); - /** 16x16 */ public static final @NotNull Icon VueJs = load("expui/fileTypes/vueJs.svg", -334694159, 0); /** 16x16 */ public static final @NotNull Icon WsdlFile = load("expui/fileTypes/wsdl.svg", "fileTypes/wsdlFile.svg", 85447754, 0); /** 16x16 */ public static final @NotNull Icon Xhtml = load("expui/fileTypes/xhtml.svg", "fileTypes/xhtml.svg", -2145170158, 0); /** 16x16 */ public static final @NotNull Icon Xml = load("expui/fileTypes/xml.svg", "fileTypes/xml.svg", 280641247, 0); /** 16x16 */ public static final @NotNull Icon XsdFile = load("expui/fileTypes/xsd.svg", "fileTypes/xsdFile.svg", -786038641, 0); /** 16x16 */ public static final @NotNull Icon Yaml = load("expui/fileTypes/yaml.svg", "fileTypes/yaml.svg", 118579768, 0); - /** 16x16 */ public static final @NotNull Icon Yarn = load("expui/fileTypes/yarn.svg", 364692861, 0); } public static final class General { @@ -1228,9 +1223,6 @@ public class AllIcons { } public static final class Run { - /** 16x16 */ public static final @NotNull Icon ForceRunToCursor = load("expui/run/forceRunToCursor.svg", -180106702, 2); - /** 16x16 */ public static final @NotNull Icon ForceStepInto = load("expui/run/forceStepInto.svg", 1159944545, 2); - /** 16x16 */ public static final @NotNull Icon ForceStepOver = load("expui/run/forceStepOver.svg", 1517782167, 2); /** 16x16 */ public static final @NotNull Icon Restart = load("expui/run/restart.svg", -275136128, 2); /** 16x16 */ public static final @NotNull Icon ShowIgnored = load("expui/run/showIgnored.svg", 766664095, 2); /** 16x16 */ public static final @NotNull Icon Stop = load("expui/run/stop.svg", 1749021823, 10); diff --git a/platform/xdebugger-impl/src/icons/PlatformDebuggerImplIcons.java b/platform/xdebugger-impl/src/icons/PlatformDebuggerImplIcons.java index 9a9fe26ab86a..62cc510a0598 100644 --- a/platform/xdebugger-impl/src/icons/PlatformDebuggerImplIcons.java +++ b/platform/xdebugger-impl/src/icons/PlatformDebuggerImplIcons.java @@ -17,9 +17,6 @@ public final class PlatformDebuggerImplIcons { } public static final class Actions { - /** 16x16 */ public static final @NotNull Icon Force_run_to_cursor = load("icons/actions/force_run_to_cursor.svg", -1320997109, 2); - /** 16x16 */ public static final @NotNull Icon Force_step_into = load("icons/actions/force_step_into.svg", 155614706, 2); - /** 16x16 */ public static final @NotNull Icon Force_step_over = load("icons/actions/force_step_over.svg", 795507244, 2); /** 16x16 */ public static final @NotNull Icon Hot_swap = load("icons/actions/hot_swap.svg", -216570490, 2); } diff --git a/plugins/ant/resources/icons/task.svg b/plugins/ant/resources/icons/antTask.svg similarity index 100% rename from plugins/ant/resources/icons/task.svg rename to plugins/ant/resources/icons/antTask.svg diff --git a/plugins/ant/src/com/intellij/lang/ant/config/execution/MessageTreeRenderer.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/MessageTreeRenderer.java index 365594afdd9d..cfae90b01381 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/execution/MessageTreeRenderer.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/MessageTreeRenderer.java @@ -56,7 +56,7 @@ final class MessageTreeRenderer extends MultilineTreeCellRenderer { icon = AllIcons.Nodes.Target; } else if (type == AntBuildMessageView.MessageType.TASK) { - icon = AntIcons.Task; + icon = AntIcons.AntTask; } else if (type == AntBuildMessageView.MessageType.MESSAGE) { if (node.getPriority() == AntBuildMessageView.PRIORITY_WARN) { diff --git a/plugins/ant/src/icons/AntIcons.java b/plugins/ant/src/icons/AntIcons.java index ba99652e6fa9..4fea6c42cd80 100644 --- a/plugins/ant/src/icons/AntIcons.java +++ b/plugins/ant/src/icons/AntIcons.java @@ -18,10 +18,10 @@ public final class AntIcons { return IconManager.getInstance().loadRasterizedIcon(path, expUIPath, AntIcons.class.getClassLoader(), cacheKey, flags); } /** 16x16 */ public static final @NotNull Icon AntBuildXml = load("icons/expui/ant.svg", "icons/AntBuildXml.svg", 1994930586, 2); + /** 16x16 */ public static final @NotNull Icon AntTask = load("icons/antTask.svg", 1295125394, 0); /** 16x16 */ public static final @NotNull Icon Build = load("icons/expui/ant.svg", "icons/build.svg", 2113580401, 0); /** 16x16 */ public static final @NotNull Icon LogDebug = load("icons/logDebug.svg", 1226967148, 0); /** 16x16 */ public static final @NotNull Icon LogVerbose = load("icons/logVerbose.svg", -1085984365, 0); /** 16x16 */ public static final @NotNull Icon MetaTarget = load("icons/metaTarget.svg", 1565197878, 0); - /** 16x16 */ public static final @NotNull Icon Task = load("icons/task.svg", 1155392147, 0); /** 16x16 */ public static final @NotNull Icon Verbose = load("icons/verbose.svg", -124247784, 2); } diff --git a/plugins/gradle/java/src/service/resolve/GradleTaskProperty.kt b/plugins/gradle/java/src/service/resolve/GradleTaskProperty.kt index 66a567433786..9d6b438c3bbe 100644 --- a/plugins/gradle/java/src/service/resolve/GradleTaskProperty.kt +++ b/plugins/gradle/java/src/service/resolve/GradleTaskProperty.kt @@ -5,7 +5,6 @@ import com.intellij.codeInsight.javadoc.JavaDocInfoGeneratorFactory import com.intellij.ide.presentation.Presentation import com.intellij.openapi.util.Key import com.intellij.psi.OriginInfoAwareElement -import com.intellij.psi.PsiClassType import com.intellij.psi.PsiElement import com.intellij.util.lazyPub import icons.ExternalSystemIcons diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/ant/AntBuilderMethod.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/ant/AntBuilderMethod.java index 1d64c8d721e8..8b0365baeb88 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/ant/AntBuilderMethod.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/ant/AntBuilderMethod.java @@ -29,7 +29,7 @@ final class AntBuilderMethod extends LightMethodBuilder { myFile = file; myAntClass = antClass; setModifiers(PsiModifier.PUBLIC); - setBaseIcon(AntIcons.Task); + setBaseIcon(AntIcons.AntTask); setMethodReturnType(() -> PsiType.getJavaLangObject(getManager(), getResolveScope())); } diff --git a/python/pluginCore/resources/META-INF/plugin.xml b/python/pluginCore/resources/META-INF/plugin.xml index 47499cc9531c..b0a4288c756e 100644 --- a/python/pluginCore/resources/META-INF/plugin.xml +++ b/python/pluginCore/resources/META-INF/plugin.xml @@ -854,7 +854,7 @@ The Python plug-in provides smart editing for Python scripts. The feature set of + icon="AllIcons.Debugger.ForceStepInto"/>