diff --git a/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/IntellijIconClassGeneratorConfig.kt b/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/IntellijIconClassGeneratorConfig.kt
index 7a933e13a180..831caf896a2a 100644
--- a/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/IntellijIconClassGeneratorConfig.kt
+++ b/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/IntellijIconClassGeneratorConfig.kt
@@ -36,6 +36,25 @@ class IntellijIconClassGeneratorConfig : IconClasses() {
packageName = "com.intellij.spring",
)
+ "intellij.python.parser" -> IntellijIconClassGeneratorModuleConfig(
+ className = "PythonParserIcons",
+ packageName = "com.jetbrains.python.parser.icons",
+ iconDirectory = "icons/com/jetbrains/python/parser",
+ )
+
+ "intellij.python.psi" -> IntellijIconClassGeneratorModuleConfig(
+ className = "PythonPsiApiIcons",
+ packageName = "com.jetbrains.python.psi.icons",
+ iconDirectory = "icons/com/jetbrains/python/psi",
+ )
+
+ "intellij.python.community.impl"-> IntellijIconClassGeneratorModuleConfig(
+ className = "PythonIcons",
+ packageName = "com.jetbrains.python.icons",
+ iconDirectory = "icons/com/jetbrains/pythonCore",
+ )
+
+
"intellij.spring.mvc.core" -> IntellijIconClassGeneratorModuleConfig(
className = "SpringMvcApiIcons",
packageName = "com.intellij.spring.mvc",
diff --git a/python/gen/com/jetbrains/python/icons/PythonIcons.java b/python/gen/com/jetbrains/python/icons/PythonIcons.java
index 5185b94a9455..9e6c36eec082 100644
--- a/python/gen/com/jetbrains/python/icons/PythonIcons.java
+++ b/python/gen/com/jetbrains/python/icons/PythonIcons.java
@@ -16,67 +16,67 @@ public final class PythonIcons {
}
public static final class Appengine {
- /** 16x16 */ public static final @NotNull Icon AppEngine = load("icons/com/jetbrains/appengine/appEngine.svg", 1881327878, 0);
- /** 13x13 */ public static final @NotNull Icon AppEngineToolWindow = load("icons/com/jetbrains/appengine/appEngineToolWindow.svg", -527211811, 2);
- /** 16x16 */ public static final @NotNull Icon Required = load("icons/com/jetbrains/appengine/required.svg", -1582376496, 0);
+ /** 16x16 */ public static final @NotNull Icon AppEngine = load("icons/com/jetbrains/pythonCore/appengine/appEngine.svg", 1881327878, 0);
+ /** 13x13 */ public static final @NotNull Icon AppEngineToolWindow = load("icons/com/jetbrains/pythonCore/appengine/appEngineToolWindow.svg", -527211811, 2);
+ /** 16x16 */ public static final @NotNull Icon Required = load("icons/com/jetbrains/pythonCore/appengine/required.svg", -1582376496, 0);
}
public static final class Chameleon {
- /** 16x16 */ public static final @NotNull Icon Chameleon = load("icons/com/jetbrains/chameleon/chameleon.svg", 1927144371, 0);
+ /** 16x16 */ public static final @NotNull Icon Chameleon = load("icons/com/jetbrains/pythonCore/chameleon/chameleon.svg", 1927144371, 0);
}
public static final class Cython {
- /** 16x16 */ public static final @NotNull Icon CythonFile = load("icons/com/jetbrains/cython/cythonFile.svg", -1709759022, 0);
+ /** 16x16 */ public static final @NotNull Icon CythonFile = load("icons/com/jetbrains/pythonCore/cython/cythonFile.svg", -1709759022, 0);
}
public static final class Django {
- /** 13x13 */ public static final @NotNull Icon DjangoLogo = load("icons/com/jetbrains/django/django-logo.svg", -403444033, 2);
+ /** 13x13 */ public static final @NotNull Icon DjangoLogo = load("icons/com/jetbrains/pythonCore/django/django-logo.svg", -403444033, 2);
}
public static final class Fastapi {
- /** 16x16 */ public static final @NotNull Icon FastapiLogo = load("icons/com/jetbrains/fastapi/fastapi-logo.svg", -1790650098, 0);
+ /** 16x16 */ public static final @NotNull Icon FastapiLogo = load("icons/com/jetbrains/pythonCore/fastapi/fastapi-logo.svg", -1790650098, 0);
}
public static final class Flask {
- /** 16x16 */ public static final @NotNull Icon FlaskLogo = load("icons/com/jetbrains/flask/flask-logo.svg", -1772027362, 2);
+ /** 16x16 */ public static final @NotNull Icon FlaskLogo = load("icons/com/jetbrains/pythonCore/flask/flask-logo.svg", -1772027362, 2);
}
public static final class Pyramid {
- /** 16x16 */ public static final @NotNull Icon PyramidLogo = load("icons/com/jetbrains/pyramid/pyramid-logo.svg", 323505170, 0);
+ /** 16x16 */ public static final @NotNull Icon PyramidLogo = load("icons/com/jetbrains/pythonCore/pyramid/pyramid-logo.svg", 323505170, 0);
}
public static final class Python {
- /** 16x16 */ public static final @NotNull Icon Anaconda = load("icons/com/jetbrains/python/anaconda.svg", -520915032, 0);
- /** 16x16 */ public static final @NotNull Icon AttachDebugger = load("icons/com/jetbrains/python/attachDebugger.svg", 1845469384, 2);
- /** 16x16 */ public static final @NotNull Icon CommandQueue = load("icons/com/jetbrains/python/commandQueue.svg", -183748339, 2);
- /** 16x16 */ public static final @NotNull Icon Condaenv = load("icons/com/jetbrains/python/condaenv.svg", -1473092825, 0);
- /** 13x13 */ public static final @NotNull Icon DataView = load("icons/com/jetbrains/python/DataView.svg", 1534347386, 2);
+ /** 16x16 */ public static final @NotNull Icon Anaconda = load("icons/com/jetbrains/pythonCore/python/anaconda.svg", -520915032, 0);
+ /** 16x16 */ public static final @NotNull Icon AttachDebugger = load("icons/com/jetbrains/pythonCore/python/attachDebugger.svg", 1845469384, 2);
+ /** 16x16 */ public static final @NotNull Icon CommandQueue = load("icons/com/jetbrains/pythonCore/python/commandQueue.svg", -183748339, 2);
+ /** 16x16 */ public static final @NotNull Icon Condaenv = load("icons/com/jetbrains/pythonCore/python/condaenv.svg", -1473092825, 0);
+ /** 13x13 */ public static final @NotNull Icon DataView = load("icons/com/jetbrains/pythonCore/python/DataView.svg", 1534347386, 2);
public static final class Debug {
- /** 16x16 */ public static final @NotNull Icon SpecialVar = load("icons/com/jetbrains/python/debug/specialVar.svg", 670495800, 0);
- /** 16x16 */ public static final @NotNull Icon StepIntoMyCode = load("icons/com/jetbrains/python/debug/StepIntoMyCode.svg", -1301661836, 2);
+ /** 16x16 */ public static final @NotNull Icon SpecialVar = load("icons/com/jetbrains/pythonCore/python/debug/specialVar.svg", 670495800, 0);
+ /** 16x16 */ public static final @NotNull Icon StepIntoMyCode = load("icons/com/jetbrains/pythonCore/python/debug/StepIntoMyCode.svg", -1301661836, 2);
}
- /** 16x16 */ public static final @NotNull Icon Dotnet = load("icons/com/jetbrains/python/dotnet.svg", -927339199, 0);
- /** 16x16 */ public static final @NotNull Icon ExecuteCurrentStatement = load("icons/com/jetbrains/python/executeCurrentStatement.svg", -43244894, 2);
- /** 16x16 */ public static final @NotNull Icon Function = load("icons/com/jetbrains/python/function.svg", 1027695397, 0);
- /** 16x16 */ public static final @NotNull Icon Jython = load("icons/com/jetbrains/python/jython.svg", -359107473, 0);
- /** 16x16 */ public static final @NotNull Icon NumPy = load("icons/com/jetbrains/python/numPy.svg", 205590373, 2);
- /** 16x16 */ public static final @NotNull Icon Pandas = load("icons/com/jetbrains/python/pandas.svg", -1188443833, 2);
- /** 16x16 */ public static final @NotNull Icon Polars = load("icons/com/jetbrains/python/polars.svg", 1700660876, 2);
- /** 16x16 */ public static final @NotNull Icon Pycharm = load("icons/com/jetbrains/python/pycharm.svg", -2022691497, 0);
- /** 16x16 */ public static final @NotNull Icon Pypy = load("icons/com/jetbrains/python/pypy.svg", 186053200, 0);
- /** 16x16 */ public static final @NotNull Icon Python = load("icons/com/jetbrains/python/python.svg", 1245484644, 8);
- /** 16x16 */ public static final @NotNull Icon PythonClosed = load("icons/com/jetbrains/python/pythonClosed.svg", -663368800, 0);
- /** 16x16 */ public static final @NotNull Icon PythonConsole = load("icons/com/jetbrains/python/pythonConsole.svg", 2125468440, 0);
- /** 13x13 */ public static final @NotNull Icon PythonConsoleToolWindow = load("icons/com/jetbrains/python/pythonConsoleToolWindow.svg", 1833337589, 2);
- /** 13x13 */ public static final @NotNull Icon PythonPackages = load("icons/com/jetbrains/python/pythonPackages.svg", 272044150, 2);
- /** 16x16 */ public static final @NotNull Icon PythonTests = load("icons/com/jetbrains/python/pythonTests.svg", 1252990498, 0);
- /** 16x16 */ public static final @NotNull Icon RemoteInterpreter = load("icons/com/jetbrains/python/RemoteInterpreter.svg", 60369309, 0);
- /** 16x16 */ public static final @NotNull Icon Ssh = load("icons/com/jetbrains/python/ssh.svg", 1941773502, 0);
- /** 16x16 */ public static final @NotNull Icon TemplateRoot = load("icons/com/jetbrains/python/templateRoot.svg", 6261950, 0);
- /** 16x16 */ public static final @NotNull Icon TensorFlow = load("icons/com/jetbrains/python/tensorFlow.svg", 1673568687, 2);
- /** 16x16 */ public static final @NotNull Icon Vagrant = load("icons/com/jetbrains/python/vagrant.svg", -820295927, 0);
- /** 16x16 */ public static final @NotNull Icon Virtualenv = load("icons/com/jetbrains/python/virtualenv.svg", 758230626, 0);
+ /** 16x16 */ public static final @NotNull Icon Dotnet = load("icons/com/jetbrains/pythonCore/python/dotnet.svg", -927339199, 0);
+ /** 16x16 */ public static final @NotNull Icon ExecuteCurrentStatement = load("icons/com/jetbrains/pythonCore/python/executeCurrentStatement.svg", -43244894, 2);
+ /** 16x16 */ public static final @NotNull Icon Function = load("icons/com/jetbrains/pythonCore/python/function.svg", 1027695397, 0);
+ /** 16x16 */ public static final @NotNull Icon Jython = load("icons/com/jetbrains/pythonCore/python/jython.svg", -359107473, 0);
+ /** 16x16 */ public static final @NotNull Icon NumPy = load("icons/com/jetbrains/pythonCore/python/numPy.svg", 205590373, 2);
+ /** 16x16 */ public static final @NotNull Icon Pandas = load("icons/com/jetbrains/pythonCore/python/pandas.svg", -1188443833, 2);
+ /** 16x16 */ public static final @NotNull Icon Polars = load("icons/com/jetbrains/pythonCore/python/polars.svg", 1700660876, 2);
+ /** 16x16 */ public static final @NotNull Icon Pycharm = load("icons/com/jetbrains/pythonCore/python/pycharm.svg", -2022691497, 0);
+ /** 16x16 */ public static final @NotNull Icon Pypy = load("icons/com/jetbrains/pythonCore/python/pypy.svg", 186053200, 0);
+ /** 16x16 */ public static final @NotNull Icon Python = load("icons/com/jetbrains/pythonCore/python/python.svg", 1245484644, 8);
+ /** 16x16 */ public static final @NotNull Icon PythonClosed = load("icons/com/jetbrains/pythonCore/python/pythonClosed.svg", -663368800, 0);
+ /** 16x16 */ public static final @NotNull Icon PythonConsole = load("icons/com/jetbrains/pythonCore/python/pythonConsole.svg", 2125468440, 0);
+ /** 13x13 */ public static final @NotNull Icon PythonConsoleToolWindow = load("icons/com/jetbrains/pythonCore/python/pythonConsoleToolWindow.svg", 1833337589, 2);
+ /** 13x13 */ public static final @NotNull Icon PythonPackages = load("icons/com/jetbrains/pythonCore/python/pythonPackages.svg", 272044150, 2);
+ /** 16x16 */ public static final @NotNull Icon PythonTests = load("icons/com/jetbrains/pythonCore/python/pythonTests.svg", 1252990498, 0);
+ /** 16x16 */ public static final @NotNull Icon RemoteInterpreter = load("icons/com/jetbrains/pythonCore/python/RemoteInterpreter.svg", 60369309, 0);
+ /** 16x16 */ public static final @NotNull Icon Ssh = load("icons/com/jetbrains/pythonCore/python/ssh.svg", 1941773502, 0);
+ /** 16x16 */ public static final @NotNull Icon TemplateRoot = load("icons/com/jetbrains/pythonCore/python/templateRoot.svg", 6261950, 0);
+ /** 16x16 */ public static final @NotNull Icon TensorFlow = load("icons/com/jetbrains/pythonCore/python/tensorFlow.svg", 1673568687, 2);
+ /** 16x16 */ public static final @NotNull Icon Vagrant = load("icons/com/jetbrains/pythonCore/python/vagrant.svg", -820295927, 0);
+ /** 16x16 */ public static final @NotNull Icon Virtualenv = load("icons/com/jetbrains/pythonCore/python/virtualenv.svg", 758230626, 0);
}
}
diff --git a/python/gen/icons/PythonIcons.java b/python/gen/icons/PythonIcons.java
index 9d3b8a0468e4..e203f45ca9f1 100644
--- a/python/gen/icons/PythonIcons.java
+++ b/python/gen/icons/PythonIcons.java
@@ -2,90 +2,59 @@
package icons;
import com.intellij.ui.IconManager;
+import com.jetbrains.python.parser.icons.PythonParserIcons;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
/**
- * This class is here only for old external plugins.
- * @deprecated Use {@link com.jetbrains.python.icons.PythonIcons}
+ * @deprecated moved to {@link com.jetbrains.python.icons.PythonIcons}
*/
-@Deprecated
@ApiStatus.ScheduledForRemoval
+@Deprecated(forRemoval = true)
public final class PythonIcons {
private static @NotNull Icon load(@NotNull String path, int cacheKey, int flags) {
return IconManager.getInstance().loadRasterizedIcon(path, PythonIcons.class.getClassLoader(), cacheKey, flags);
}
-
/**
- * @deprecated Use {@link com.jetbrains.python.icons.PythonIcons}
+ * @deprecated moved to {@link com.jetbrains.python.icons.PythonIcons}
*/
@ApiStatus.ScheduledForRemoval
- @Deprecated
+ @Deprecated(forRemoval = true)
public static final class Python {
- /** 16x16 */
- public static final @NotNull Icon Anaconda = load("icons/com/jetbrains/python/anaconda.svg", -520915032, 0);
- /** 16x16 */
- public static final @NotNull Icon AttachDebugger = load("icons/com/jetbrains/python/attachDebugger.svg", 1845469384, 2);
- /** 16x16 */
- public static final @NotNull Icon CommandQueue = load("icons/com/jetbrains/python/commandQueue.svg", -183748339, 2);
- /** 16x16 */
- public static final @NotNull Icon Condaenv = load("icons/com/jetbrains/python/condaenv.svg", -1473092825, 0);
- /** 13x13 */
- public static final @NotNull Icon DataView = load("icons/com/jetbrains/python/DataView.svg", 1534347386, 2);
-
/**
- * @deprecated Use {@link com.jetbrains.python.icons.PythonIcons}
+ * @deprecated moved to {@link com.jetbrains.python.icons.PythonIcons}
*/
- @Deprecated
@ApiStatus.ScheduledForRemoval
+ @Deprecated(forRemoval = true)
public static final class Debug {
- //
- /** 16x16 */
- public static final @NotNull Icon SpecialVar = load("icons/com/jetbrains/python/debug/specialVar.svg", 670495800, 0);
- /** 16x16 */
- public static final @NotNull Icon StepIntoMyCode = load("icons/com/jetbrains/python/debug/StepIntoMyCode.svg", -1301661836, 2);
+ /**
+ * @deprecated moved to {@link com.jetbrains.python.icons.PythonIcons}
+ */
+ @ApiStatus.ScheduledForRemoval
+ @Deprecated(forRemoval = true) public static final @NotNull Icon SpecialVar =
+ com.jetbrains.python.icons.PythonIcons.Python.Debug.SpecialVar;
}
- /** 16x16 */
- public static final @NotNull Icon Dotnet = load("icons/com/jetbrains/python/dotnet.svg", -927339199, 0);
- /** 16x16 */
- public static final @NotNull Icon ExecuteCurrentStatement =
- load("icons/com/jetbrains/python/executeCurrentStatement.svg", -43244894, 2);
- /** 16x16 */
- public static final @NotNull Icon Function = load("icons/com/jetbrains/python/function.svg", 1027695397, 0);
- /** 16x16 */
- public static final @NotNull Icon Jython = load("icons/com/jetbrains/python/jython.svg", -359107473, 0);
- /** 16x16 */
- public static final @NotNull Icon NumPy = load("icons/com/jetbrains/python/numPy.svg", 205590373, 2);
- /** 16x16 */
- public static final @NotNull Icon Pandas = load("icons/com/jetbrains/python/pandas.svg", -1188443833, 2);
- /** 16x16 */
- public static final @NotNull Icon Polars = load("icons/com/jetbrains/python/polars.svg", 1700660876, 2);
- /** 16x16 */
- public static final @NotNull Icon Pycharm = load("icons/com/jetbrains/python/pycharm.svg", -2022691497, 0);
- /** 16x16 */
- public static final @NotNull Icon Pypy = load("icons/com/jetbrains/python/pypy.svg", 186053200, 0);
- /** 16x16 */
- public static final @NotNull Icon Python = load("icons/com/jetbrains/python/python.svg", 1245484644, 8);
- /** 16x16 */
- public static final @NotNull Icon PythonClosed = load("icons/com/jetbrains/python/pythonClosed.svg", -663368800, 0);
- /** 16x16 */
- public static final @NotNull Icon PythonConsole = load("icons/com/jetbrains/python/pythonConsole.svg", 2125468440, 0);
- /** 13x13 */
- public static final @NotNull Icon PythonConsoleToolWindow =
- load("icons/com/jetbrains/python/pythonConsoleToolWindow.svg", 1833337589, 2);
- /** 13x13 */
- public static final @NotNull Icon PythonPackages = load("icons/com/jetbrains/python/pythonPackages.svg", 272044150, 2);
- /** 16x16 */
- public static final @NotNull Icon PythonTests = load("icons/com/jetbrains/python/pythonTests.svg", 1252990498, 0);
- /** 16x16 */
- public static final @NotNull Icon TemplateRoot = load("icons/com/jetbrains/python/templateRoot.svg", 6261950, 0);
- /** 16x16 */
- public static final @NotNull Icon TensorFlow = load("icons/com/jetbrains/python/tensorFlow.svg", 1673568687, 2);
- /** 16x16 */
- public static final @NotNull Icon Virtualenv = load("icons/com/jetbrains/python/virtualenv.svg", 758230626, 0);
+ /**
+ * @deprecated moved to {@link com.jetbrains.python.icons.PythonIcons}
+ */
+ @ApiStatus.ScheduledForRemoval
+ @Deprecated(forRemoval = true) public static final @NotNull Icon Python = com.jetbrains.python.icons.PythonIcons.Python.Python;
+
+ /**
+ * @deprecated moved to {@link com.jetbrains.python.icons.PythonIcons}
+ */
+ @ApiStatus.ScheduledForRemoval
+ @Deprecated(forRemoval = true) public static final @NotNull Icon PythonTests =
+ com.jetbrains.python.icons.PythonIcons.Python.PythonTests;
+
+ /**
+ * @deprecated moved to {@link com.jetbrains.python.icons.PythonIcons}
+ */
+ @ApiStatus.ScheduledForRemoval
+ @Deprecated(forRemoval = true) public static final @NotNull Icon Virtualenv = com.jetbrains.python.icons.PythonIcons.Python.Virtualenv;
}
}
diff --git a/python/pluginResources/icons/com/jetbrains/appengine/appEngine.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/appengine/appEngine.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/appengine/appEngine.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/appengine/appEngine.svg
diff --git a/python/pluginResources/icons/com/jetbrains/appengine/appEngineToolWindow.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/appengine/appEngineToolWindow.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/appengine/appEngineToolWindow.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/appengine/appEngineToolWindow.svg
diff --git a/python/pluginResources/icons/com/jetbrains/appengine/appEngineToolWindow_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/appengine/appEngineToolWindow_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/appengine/appEngineToolWindow_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/appengine/appEngineToolWindow_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/appengine/required.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/appengine/required.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/appengine/required.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/appengine/required.svg
diff --git a/python/pluginResources/icons/com/jetbrains/chameleon/chameleon.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/chameleon/chameleon.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/chameleon/chameleon.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/chameleon/chameleon.svg
diff --git a/python/pluginResources/icons/com/jetbrains/cython/cythonFile.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/cython/cythonFile.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/cython/cythonFile.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/cython/cythonFile.svg
diff --git a/python/pluginResources/icons/com/jetbrains/django/django-logo.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/django/django-logo.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/django/django-logo.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/django/django-logo.svg
diff --git a/python/pluginResources/icons/com/jetbrains/django/django-logo_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/django/django-logo_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/django/django-logo_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/django/django-logo_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/expui/appEngineToolWindow.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/expui/appEngineToolWindow.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/expui/appEngineToolWindow.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/expui/appEngineToolWindow.svg
diff --git a/python/pluginResources/icons/com/jetbrains/expui/appEngineToolWindow@20x20.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/expui/appEngineToolWindow@20x20.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/expui/appEngineToolWindow@20x20.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/expui/appEngineToolWindow@20x20.svg
diff --git a/python/pluginResources/icons/com/jetbrains/expui/appEngineToolWindow@20x20_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/expui/appEngineToolWindow@20x20_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/expui/appEngineToolWindow@20x20_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/expui/appEngineToolWindow@20x20_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/expui/appEngineToolWindow_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/expui/appEngineToolWindow_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/expui/appEngineToolWindow_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/expui/appEngineToolWindow_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/expui/fastAPI.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/expui/fastAPI.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/expui/fastAPI.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/expui/fastAPI.svg
diff --git a/python/pluginResources/icons/com/jetbrains/expui/fastAPI_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/expui/fastAPI_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/expui/fastAPI_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/expui/fastAPI_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/expui/flask.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/expui/flask.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/expui/flask.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/expui/flask.svg
diff --git a/python/pluginResources/icons/com/jetbrains/expui/flask_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/expui/flask_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/expui/flask_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/expui/flask_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/expui/icon-robots.txt b/python/pluginResources/icons/com/jetbrains/pythonCore/expui/icon-robots.txt
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/expui/icon-robots.txt
rename to python/pluginResources/icons/com/jetbrains/pythonCore/expui/icon-robots.txt
diff --git a/python/pluginResources/icons/com/jetbrains/expui/toolWindowDjango.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/expui/toolWindowDjango.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/expui/toolWindowDjango.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/expui/toolWindowDjango.svg
diff --git a/python/pluginResources/icons/com/jetbrains/expui/toolWindowDjango@20x20.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/expui/toolWindowDjango@20x20.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/expui/toolWindowDjango@20x20.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/expui/toolWindowDjango@20x20.svg
diff --git a/python/pluginResources/icons/com/jetbrains/expui/toolWindowDjango@20x20_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/expui/toolWindowDjango@20x20_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/expui/toolWindowDjango@20x20_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/expui/toolWindowDjango@20x20_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/expui/toolWindowDjango_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/expui/toolWindowDjango_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/expui/toolWindowDjango_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/expui/toolWindowDjango_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/fastapi/fastapi-logo.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/fastapi/fastapi-logo.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/fastapi/fastapi-logo.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/fastapi/fastapi-logo.svg
diff --git a/python/pluginResources/icons/com/jetbrains/flask/flask-logo.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/flask/flask-logo.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/flask/flask-logo.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/flask/flask-logo.svg
diff --git a/python/pluginResources/icons/com/jetbrains/flask/flask-logo_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/flask/flask-logo_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/flask/flask-logo_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/flask/flask-logo_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/pyramid/pyramid-logo.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/pyramid/pyramid-logo.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/pyramid/pyramid-logo.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/pyramid/pyramid-logo.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/DataView.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/DataView.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/DataView.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/DataView.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/DataView_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/DataView_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/DataView_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/DataView_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/RemoteInterpreter.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/RemoteInterpreter.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/RemoteInterpreter.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/RemoteInterpreter.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/anaconda.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/anaconda.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/anaconda.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/anaconda.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/attachDebugger.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/attachDebugger.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/attachDebugger.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/attachDebugger.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/attachDebugger_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/attachDebugger_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/attachDebugger_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/attachDebugger_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/commandQueue.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/commandQueue.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/commandQueue.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/commandQueue.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/commandQueue_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/commandQueue_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/commandQueue_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/commandQueue_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/condaenv.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/condaenv.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/condaenv.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/condaenv.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/debug/StepIntoMyCode.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/debug/StepIntoMyCode.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/debug/StepIntoMyCode.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/debug/StepIntoMyCode.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/debug/StepIntoMyCode_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/debug/StepIntoMyCode_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/debug/StepIntoMyCode_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/debug/StepIntoMyCode_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/debug/specialVar.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/debug/specialVar.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/debug/specialVar.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/debug/specialVar.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/dotnet.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/dotnet.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/dotnet.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/dotnet.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/executeCurrentStatement.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/executeCurrentStatement.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/executeCurrentStatement.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/executeCurrentStatement.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/executeCurrentStatement_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/executeCurrentStatement_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/executeCurrentStatement_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/executeCurrentStatement_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/anaconda.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/anaconda.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/anaconda.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/anaconda.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/anaconda_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/anaconda_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/anaconda_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/anaconda_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/attachDebugger.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/attachDebugger.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/attachDebugger.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/attachDebugger.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/attachDebugger_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/attachDebugger_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/attachDebugger_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/attachDebugger_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/commandQueue.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/commandQueue.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/commandQueue.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/commandQueue.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/commandQueue_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/commandQueue_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/commandQueue_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/commandQueue_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/condaEnv.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/condaEnv.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/condaEnv.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/condaEnv.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/condaEnv_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/condaEnv_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/condaEnv_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/condaEnv_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/debug/specialVar.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/debug/specialVar.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/debug/specialVar.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/debug/specialVar.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/debug/specialVar_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/debug/specialVar_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/debug/specialVar_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/debug/specialVar_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/debug/stepIntoMyCode.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/debug/stepIntoMyCode.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/debug/stepIntoMyCode.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/debug/stepIntoMyCode.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/debug/stepIntoMyCode_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/debug/stepIntoMyCode_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/debug/stepIntoMyCode_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/debug/stepIntoMyCode_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/executeCurrentStatement.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/executeCurrentStatement.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/executeCurrentStatement.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/executeCurrentStatement.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/executeCurrentStatement_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/executeCurrentStatement_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/executeCurrentStatement_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/executeCurrentStatement_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/function.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/function.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/function.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/function.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/function_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/function_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/function_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/function_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/icon-robots.txt b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/icon-robots.txt
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/icon-robots.txt
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/icon-robots.txt
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/python.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/python.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/python.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/python.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/pythonClosed.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/pythonClosed.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/pythonClosed.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/pythonClosed.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/pythonClosed_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/pythonClosed_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/pythonClosed_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/pythonClosed_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/pythonConsole.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/pythonConsole.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/pythonConsole.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/pythonConsole.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/pythonConsoleToolWindow.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/pythonConsoleToolWindow.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/pythonConsoleToolWindow.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/pythonConsoleToolWindow.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/pythonConsoleToolWindow@20x20.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/pythonConsoleToolWindow@20x20.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/pythonConsoleToolWindow@20x20.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/pythonConsoleToolWindow@20x20.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/pythonConsoleToolWindow@20x20_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/pythonConsoleToolWindow@20x20_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/pythonConsoleToolWindow@20x20_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/pythonConsoleToolWindow@20x20_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/pythonConsoleToolWindow_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/pythonConsoleToolWindow_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/pythonConsoleToolWindow_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/pythonConsoleToolWindow_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/pythonConsole_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/pythonConsole_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/pythonConsole_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/pythonConsole_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/pythonPackages.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/pythonPackages.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/pythonPackages.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/pythonPackages.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/pythonPackages@20x20.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/pythonPackages@20x20.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/pythonPackages@20x20.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/pythonPackages@20x20.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/pythonPackages@20x20_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/pythonPackages@20x20_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/pythonPackages@20x20_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/pythonPackages@20x20_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/pythonPackages_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/pythonPackages_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/pythonPackages_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/pythonPackages_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/pythonTests.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/pythonTests.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/pythonTests.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/pythonTests.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/pythonTests_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/pythonTests_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/pythonTests_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/pythonTests_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/python_stroke.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/python_stroke.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/python_stroke.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/python_stroke.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/remoteInterpreter.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/remoteInterpreter.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/remoteInterpreter.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/remoteInterpreter.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/remoteInterpreter_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/remoteInterpreter_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/remoteInterpreter_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/remoteInterpreter_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/sciView.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/sciView.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/sciView.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/sciView.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/sciView@20x20.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/sciView@20x20.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/sciView@20x20.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/sciView@20x20.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/sciView@20x20_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/sciView@20x20_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/sciView@20x20_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/sciView@20x20_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/sciView_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/sciView_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/sciView_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/sciView_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/ssh.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/ssh.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/ssh.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/ssh.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/ssh_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/ssh_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/ssh_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/ssh_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/templateRoot.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/templateRoot.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/templateRoot.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/templateRoot.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/templateRoot_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/templateRoot_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/templateRoot_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/templateRoot_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/virtualEnv.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/virtualEnv.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/virtualEnv.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/virtualEnv.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/expui/virtualEnv_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/virtualEnv_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/expui/virtualEnv_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/virtualEnv_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/function.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/function.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/function.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/function.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/jython.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/jython.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/jython.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/jython.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/numPy.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/numPy.svg
old mode 100755
new mode 100644
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/numPy.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/numPy.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/numPy_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/numPy_dark.svg
old mode 100755
new mode 100644
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/numPy_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/numPy_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/pandas.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/pandas.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/pandas.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/pandas.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/pandas_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/pandas_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/pandas_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/pandas_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/polars.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/polars.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/polars.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/polars.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/polars_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/polars_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/polars_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/polars_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/pycharm.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/pycharm.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/pycharm.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/pycharm.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/pypy.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/pypy.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/pypy.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/pypy.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/python.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/python.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/python.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/python.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/pythonClosed.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/pythonClosed.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/pythonClosed.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/pythonClosed.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/pythonConsole.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/pythonConsole.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/pythonConsole.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/pythonConsole.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/pythonConsoleToolWindow.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/pythonConsoleToolWindow.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/pythonConsoleToolWindow.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/pythonConsoleToolWindow.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/pythonConsoleToolWindow_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/pythonConsoleToolWindow_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/pythonConsoleToolWindow_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/pythonConsoleToolWindow_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/pythonPackages.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/pythonPackages.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/pythonPackages.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/pythonPackages.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/pythonPackages_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/pythonPackages_dark.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/pythonPackages_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/pythonPackages_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/pythonTests.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/pythonTests.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/pythonTests.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/pythonTests.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/python_stroke.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/python_stroke.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/python_stroke.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/python_stroke.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/ssh.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/ssh.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/ssh.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/ssh.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/templateRoot.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/templateRoot.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/templateRoot.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/templateRoot.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/tensorFlow.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/tensorFlow.svg
old mode 100755
new mode 100644
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/tensorFlow.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/tensorFlow.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/tensorFlow_dark.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/tensorFlow_dark.svg
old mode 100755
new mode 100644
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/tensorFlow_dark.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/tensorFlow_dark.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/vagrant.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/vagrant.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/vagrant.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/vagrant.svg
diff --git a/python/pluginResources/icons/com/jetbrains/python/virtualenv.svg b/python/pluginResources/icons/com/jetbrains/pythonCore/python/virtualenv.svg
similarity index 100%
rename from python/pluginResources/icons/com/jetbrains/python/virtualenv.svg
rename to python/pluginResources/icons/com/jetbrains/pythonCore/python/virtualenv.svg
diff --git a/python/python-parser/gen/com/jetbrains/python/parser/icons/PythonParserIcons.java b/python/python-parser/gen/com/jetbrains/python/parser/icons/PythonParserIcons.java
new file mode 100644
index 000000000000..fc912c1e2702
--- /dev/null
+++ b/python/python-parser/gen/com/jetbrains/python/parser/icons/PythonParserIcons.java
@@ -0,0 +1,18 @@
+// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.jetbrains.python.parser.icons;
+
+import com.intellij.ui.IconManager;
+import org.jetbrains.annotations.NotNull;
+
+import javax.swing.*;
+
+/**
+ * NOTE THIS FILE IS AUTO-GENERATED
+ * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
+ */
+public final class PythonParserIcons {
+ private static @NotNull Icon load(@NotNull String path, int cacheKey, int flags) {
+ return IconManager.getInstance().loadRasterizedIcon(path, PythonParserIcons.class.getClassLoader(), cacheKey, flags);
+ }
+ /** 16x16 */ public static final @NotNull Icon PythonFile = load("icons/com/jetbrains/python/parser/pythonFile.svg", -1892316725, 0);
+}
diff --git a/python/python-psi-api/resources/icons/com/jetbrains/python/pythonFile.svg b/python/python-parser/resources/icons/com/jetbrains/python/parser/pythonFile.svg
similarity index 100%
rename from python/python-psi-api/resources/icons/com/jetbrains/python/pythonFile.svg
rename to python/python-parser/resources/icons/com/jetbrains/python/parser/pythonFile.svg
diff --git a/python/python-parser/src/com/jetbrains/python/PythonFileType.java b/python/python-parser/src/com/jetbrains/python/PythonFileType.java
index c108966fda4f..992cada502ce 100644
--- a/python/python-parser/src/com/jetbrains/python/PythonFileType.java
+++ b/python/python-parser/src/com/jetbrains/python/PythonFileType.java
@@ -13,7 +13,7 @@ import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiFile;
import com.intellij.util.text.CharSequenceReader;
-import icons.PythonPsiApiIcons;
+import com.jetbrains.python.parser.icons.PythonParserIcons;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -66,7 +66,7 @@ public class PythonFileType extends LanguageFileType {
@Override
public Icon getIcon() {
- return PythonPsiApiIcons.PythonFile;
+ return PythonParserIcons.PythonFile;
}
@Override
diff --git a/python/python-parser/src/icons/PythonPsiApiIcons.java b/python/python-psi-api/gen/com/jetbrains/python/psi/icons/PythonPsiApiIcons.java
similarity index 60%
rename from python/python-parser/src/icons/PythonPsiApiIcons.java
rename to python/python-psi-api/gen/com/jetbrains/python/psi/icons/PythonPsiApiIcons.java
index 9fbdb36842d3..9b74e293e348 100644
--- a/python/python-parser/src/icons/PythonPsiApiIcons.java
+++ b/python/python-psi-api/gen/com/jetbrains/python/psi/icons/PythonPsiApiIcons.java
@@ -1,5 +1,5 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package icons;
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.jetbrains.python.psi.icons;
import com.intellij.ui.IconManager;
import org.jetbrains.annotations.NotNull;
@@ -14,16 +14,16 @@ public final class PythonPsiApiIcons {
private static @NotNull Icon load(@NotNull String path, int cacheKey, int flags) {
return IconManager.getInstance().loadRasterizedIcon(path, PythonPsiApiIcons.class.getClassLoader(), cacheKey, flags);
}
- /** 16x16 */ public static final @NotNull Icon IPythonNotebook = load("icons/com/jetbrains/python/iPythonNotebook.svg", 610765917, 0);
+ /** 16x16 */ public static final @NotNull Icon IPythonNotebook = load("icons/com/jetbrains/python/psi/iPythonNotebook.svg", 610765917, 0);
public static final class Nodes {
- /** 16x16 */ public static final @NotNull Icon CyanDot = load("icons/com/jetbrains/python/nodes/cyan-dot.svg", -182142090, 0);
- /** 16x16 */ public static final @NotNull Icon Lock = load("icons/com/jetbrains/python/nodes/lock.svg", 1450341891, 0);
- /** 16x16 */ public static final @NotNull Icon RedInvTriangle = load("icons/com/jetbrains/python/nodes/red-inv-triangle.svg", -1698695951, 0);
+ /** 16x16 */ public static final @NotNull Icon CyanDot = load("icons/com/jetbrains/python/psi/nodes/cyan-dot.svg", -182142090, 0);
+ /** 16x16 */ public static final @NotNull Icon Lock = load("icons/com/jetbrains/python/psi/nodes/lock.svg", 1450341891, 0);
+ /** 16x16 */ public static final @NotNull Icon RedInvTriangle = load("icons/com/jetbrains/python/psi/nodes/red-inv-triangle.svg", -1698695951, 0);
}
- /** 16x16 */ public static final @NotNull Icon PropertyDeleter = load("icons/com/jetbrains/python/propertyDeleter.svg", 474832287, 2);
- /** 16x16 */ public static final @NotNull Icon PropertyGetter = load("icons/com/jetbrains/python/propertyGetter.svg", 1495604199, 2);
- /** 16x16 */ public static final @NotNull Icon PropertySetter = load("icons/com/jetbrains/python/propertySetter.svg", -1451064081, 2);
- /** 16x16 */ public static final @NotNull Icon PythonFile = load("icons/com/jetbrains/python/pythonFile.svg", -1892316725, 0);
+ /** 16x16 */ public static final @NotNull Icon PropertyDeleter = load("icons/com/jetbrains/python/psi/propertyDeleter.svg", 474832287, 2);
+ /** 16x16 */ public static final @NotNull Icon PropertyGetter = load("icons/com/jetbrains/python/psi/propertyGetter.svg", 1495604199, 2);
+ /** 16x16 */ public static final @NotNull Icon PropertySetter = load("icons/com/jetbrains/python/psi/propertySetter.svg", -1451064081, 2);
+ /** 16x16 */ public static final @NotNull Icon PythonFile = load("icons/com/jetbrains/python/psi/pythonFile.svg", -1892316725, 0);
}
diff --git a/python/python-psi-api/gen/icons/PythonPsiApiIcons.java b/python/python-psi-api/gen/icons/PythonPsiApiIcons.java
new file mode 100644
index 000000000000..8f31798462f4
--- /dev/null
+++ b/python/python-psi-api/gen/icons/PythonPsiApiIcons.java
@@ -0,0 +1,28 @@
+// 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;
+import com.jetbrains.python.parser.icons.PythonParserIcons;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+
+import javax.swing.*;
+
+
+/**
+ * @deprecated moved to {@link PythonParserIcons}
+ */
+@ApiStatus.ScheduledForRemoval
+@Deprecated(forRemoval = true)
+public final class PythonPsiApiIcons {
+ private static @NotNull Icon load(@NotNull String path, int cacheKey, int flags) {
+ return IconManager.getInstance().loadRasterizedIcon(path, PythonPsiApiIcons.class.getClassLoader(), cacheKey, flags);
+ }
+
+ /**
+ * @deprecated moved to {@link PythonParserIcons}
+ */
+ @ApiStatus.ScheduledForRemoval
+ @Deprecated(forRemoval = true)
+ /** 16x16 */ public static final @NotNull Icon PythonFile = PythonParserIcons.PythonFile;
+}
diff --git a/python/python-psi-api/intellij.python.psi.iml b/python/python-psi-api/intellij.python.psi.iml
index 675bc6263406..308a7d3919c9 100644
--- a/python/python-psi-api/intellij.python.psi.iml
+++ b/python/python-psi-api/intellij.python.psi.iml
@@ -5,6 +5,7 @@
+
diff --git a/python/python-psi-api/resources/PythonPsiApiIconMappings.json b/python/python-psi-api/resources/PythonPsiApiIconMappings.json
index 1a36192caa3f..1d045baab85e 100644
--- a/python/python-psi-api/resources/PythonPsiApiIconMappings.json
+++ b/python/python-psi-api/resources/PythonPsiApiIconMappings.json
@@ -3,8 +3,10 @@
"com": {
"jetbrains": {
"python": {
- "expui": {
- "python.svg": "icons/com/jetbrains/python/pythonFile.svg"
+ "psi": {
+ "expui": {
+ "python.svg": "icons/com/jetbrains/python/psi/pythonFile.svg"
+ }
}
}
}
diff --git a/python/python-psi-api/resources/icons/com/jetbrains/python/expui/icon-robots.txt b/python/python-psi-api/resources/icons/com/jetbrains/python/psi/expui/icon-robots.txt
similarity index 100%
rename from python/python-psi-api/resources/icons/com/jetbrains/python/expui/icon-robots.txt
rename to python/python-psi-api/resources/icons/com/jetbrains/python/psi/expui/icon-robots.txt
diff --git a/python/python-psi-api/resources/icons/com/jetbrains/python/expui/python.svg b/python/python-psi-api/resources/icons/com/jetbrains/python/psi/expui/python.svg
similarity index 100%
rename from python/python-psi-api/resources/icons/com/jetbrains/python/expui/python.svg
rename to python/python-psi-api/resources/icons/com/jetbrains/python/psi/expui/python.svg
diff --git a/python/python-psi-api/resources/icons/com/jetbrains/python/iPythonNotebook.svg b/python/python-psi-api/resources/icons/com/jetbrains/python/psi/iPythonNotebook.svg
similarity index 100%
rename from python/python-psi-api/resources/icons/com/jetbrains/python/iPythonNotebook.svg
rename to python/python-psi-api/resources/icons/com/jetbrains/python/psi/iPythonNotebook.svg
diff --git a/python/python-psi-api/resources/icons/com/jetbrains/python/nodes/cyan-dot.svg b/python/python-psi-api/resources/icons/com/jetbrains/python/psi/nodes/cyan-dot.svg
similarity index 100%
rename from python/python-psi-api/resources/icons/com/jetbrains/python/nodes/cyan-dot.svg
rename to python/python-psi-api/resources/icons/com/jetbrains/python/psi/nodes/cyan-dot.svg
diff --git a/python/python-psi-api/resources/icons/com/jetbrains/python/nodes/lock.svg b/python/python-psi-api/resources/icons/com/jetbrains/python/psi/nodes/lock.svg
similarity index 100%
rename from python/python-psi-api/resources/icons/com/jetbrains/python/nodes/lock.svg
rename to python/python-psi-api/resources/icons/com/jetbrains/python/psi/nodes/lock.svg
diff --git a/python/python-psi-api/resources/icons/com/jetbrains/python/nodes/red-inv-triangle.svg b/python/python-psi-api/resources/icons/com/jetbrains/python/psi/nodes/red-inv-triangle.svg
similarity index 100%
rename from python/python-psi-api/resources/icons/com/jetbrains/python/nodes/red-inv-triangle.svg
rename to python/python-psi-api/resources/icons/com/jetbrains/python/psi/nodes/red-inv-triangle.svg
diff --git a/python/python-psi-api/resources/icons/com/jetbrains/python/propertyDeleter.svg b/python/python-psi-api/resources/icons/com/jetbrains/python/psi/propertyDeleter.svg
similarity index 100%
rename from python/python-psi-api/resources/icons/com/jetbrains/python/propertyDeleter.svg
rename to python/python-psi-api/resources/icons/com/jetbrains/python/psi/propertyDeleter.svg
diff --git a/python/python-psi-api/resources/icons/com/jetbrains/python/propertyDeleter_dark.svg b/python/python-psi-api/resources/icons/com/jetbrains/python/psi/propertyDeleter_dark.svg
similarity index 100%
rename from python/python-psi-api/resources/icons/com/jetbrains/python/propertyDeleter_dark.svg
rename to python/python-psi-api/resources/icons/com/jetbrains/python/psi/propertyDeleter_dark.svg
diff --git a/python/python-psi-api/resources/icons/com/jetbrains/python/propertyGetter.svg b/python/python-psi-api/resources/icons/com/jetbrains/python/psi/propertyGetter.svg
similarity index 100%
rename from python/python-psi-api/resources/icons/com/jetbrains/python/propertyGetter.svg
rename to python/python-psi-api/resources/icons/com/jetbrains/python/psi/propertyGetter.svg
diff --git a/python/python-psi-api/resources/icons/com/jetbrains/python/propertyGetter_dark.svg b/python/python-psi-api/resources/icons/com/jetbrains/python/psi/propertyGetter_dark.svg
similarity index 100%
rename from python/python-psi-api/resources/icons/com/jetbrains/python/propertyGetter_dark.svg
rename to python/python-psi-api/resources/icons/com/jetbrains/python/psi/propertyGetter_dark.svg
diff --git a/python/python-psi-api/resources/icons/com/jetbrains/python/propertySetter.svg b/python/python-psi-api/resources/icons/com/jetbrains/python/psi/propertySetter.svg
similarity index 100%
rename from python/python-psi-api/resources/icons/com/jetbrains/python/propertySetter.svg
rename to python/python-psi-api/resources/icons/com/jetbrains/python/psi/propertySetter.svg
diff --git a/python/python-psi-api/resources/icons/com/jetbrains/python/propertySetter_dark.svg b/python/python-psi-api/resources/icons/com/jetbrains/python/psi/propertySetter_dark.svg
similarity index 100%
rename from python/python-psi-api/resources/icons/com/jetbrains/python/propertySetter_dark.svg
rename to python/python-psi-api/resources/icons/com/jetbrains/python/psi/propertySetter_dark.svg
diff --git a/python/python-psi-api/resources/icons/com/jetbrains/python/psi/pythonFile.svg b/python/python-psi-api/resources/icons/com/jetbrains/python/psi/pythonFile.svg
new file mode 100644
index 000000000000..9764eaff07ee
--- /dev/null
+++ b/python/python-psi-api/resources/icons/com/jetbrains/python/psi/pythonFile.svg
@@ -0,0 +1,8 @@
+
diff --git a/python/python-psi-api/src/icons/PythonPsiApiIcons.java b/python/python-psi-api/src/icons/PythonPsiApiIcons.java
deleted file mode 100644
index 9fbdb36842d3..000000000000
--- a/python/python-psi-api/src/icons/PythonPsiApiIcons.java
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2000-2023 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;
-import org.jetbrains.annotations.NotNull;
-
-import javax.swing.*;
-
-/**
- * NOTE THIS FILE IS AUTO-GENERATED
- * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead
- */
-public final class PythonPsiApiIcons {
- private static @NotNull Icon load(@NotNull String path, int cacheKey, int flags) {
- return IconManager.getInstance().loadRasterizedIcon(path, PythonPsiApiIcons.class.getClassLoader(), cacheKey, flags);
- }
- /** 16x16 */ public static final @NotNull Icon IPythonNotebook = load("icons/com/jetbrains/python/iPythonNotebook.svg", 610765917, 0);
-
- public static final class Nodes {
- /** 16x16 */ public static final @NotNull Icon CyanDot = load("icons/com/jetbrains/python/nodes/cyan-dot.svg", -182142090, 0);
- /** 16x16 */ public static final @NotNull Icon Lock = load("icons/com/jetbrains/python/nodes/lock.svg", 1450341891, 0);
- /** 16x16 */ public static final @NotNull Icon RedInvTriangle = load("icons/com/jetbrains/python/nodes/red-inv-triangle.svg", -1698695951, 0);
- }
-
- /** 16x16 */ public static final @NotNull Icon PropertyDeleter = load("icons/com/jetbrains/python/propertyDeleter.svg", 474832287, 2);
- /** 16x16 */ public static final @NotNull Icon PropertyGetter = load("icons/com/jetbrains/python/propertyGetter.svg", 1495604199, 2);
- /** 16x16 */ public static final @NotNull Icon PropertySetter = load("icons/com/jetbrains/python/propertySetter.svg", -1451064081, 2);
- /** 16x16 */ public static final @NotNull Icon PythonFile = load("icons/com/jetbrains/python/pythonFile.svg", -1892316725, 0);
-}
diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/completion/PyCompletionUtils.kt b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/completion/PyCompletionUtils.kt
index 2a0f9d9bd8c3..ed625f3fde59 100644
--- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/completion/PyCompletionUtils.kt
+++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/completion/PyCompletionUtils.kt
@@ -25,7 +25,8 @@ import com.jetbrains.python.psi.PyFunction
import com.jetbrains.python.psi.resolve.QualifiedNameFinder
import com.jetbrains.python.psi.types.TypeEvalContext
import com.jetbrains.python.sdk.PythonSdkUtil
-import icons.PythonPsiApiIcons
+import com.jetbrains.python.parser.icons.PythonParserIcons
+import com.jetbrains.python.psi.icons.PythonPsiApiIcons
import one.util.streamex.StreamEx
/**
@@ -67,7 +68,8 @@ fun addMethodToResult(result: CompletionResultSet,
builderPostprocessor: ((LookupElementBuilder) -> LookupElementBuilder)? = null) {
if (pyClass?.findMethodByName(methodName, false, typeEvalContext) != null) return
- val item = LookupElementBuilder.create(methodName + methodParentheses).withIcon(PythonPsiApiIcons.Nodes.CyanDot)
+ val item = LookupElementBuilder.create(methodName + methodParentheses).withIcon(
+ PythonPsiApiIcons.Nodes.CyanDot)
result.addElement(TailTypeDecorator.withTail(builderPostprocessor?.invoke(item) ?: item, TailTypes.caseColonType()))
}
@@ -84,7 +86,8 @@ fun addFunctionToResult(result: CompletionResultSet,
builderPostprocessor: ((LookupElementBuilder) -> LookupElementBuilder)? = null) {
if (pyFile?.findTopLevelFunction(functionName) != null) return
- val item = LookupElementBuilder.create(functionName + functionParentheses).withIcon(PythonPsiApiIcons.Nodes.CyanDot)
+ val item = LookupElementBuilder.create(functionName + functionParentheses).withIcon(
+ PythonPsiApiIcons.Nodes.CyanDot)
result.addElement(TailTypeDecorator.withTail(builderPostprocessor?.invoke(item) ?: item, TailTypes.caseColonType()))
}
diff --git a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java
index 7ed61f27bdfc..de4d898a5913 100644
--- a/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java
+++ b/python/python-psi-impl/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java
@@ -24,14 +24,15 @@ import com.jetbrains.python.codeInsight.controlflow.ScopeOwner;
import com.jetbrains.python.codeInsight.dataflow.scope.ScopeUtil;
import com.jetbrains.python.codeInsight.typing.PyTypingTypeProvider;
import com.jetbrains.python.documentation.docstrings.DocStringUtil;
+import com.jetbrains.python.parser.icons.PythonParserIcons;
import com.jetbrains.python.psi.*;
+import com.jetbrains.python.psi.icons.PythonPsiApiIcons;
import com.jetbrains.python.psi.resolve.QualifiedNameFinder;
import com.jetbrains.python.psi.stubs.PyClassStub;
import com.jetbrains.python.psi.stubs.PyFunctionStub;
import com.jetbrains.python.psi.stubs.PyTargetExpressionStub;
import com.jetbrains.python.psi.types.*;
import com.jetbrains.python.sdk.PythonSdkUtil;
-import icons.PythonPsiApiIcons;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
diff --git a/python/src/com/jetbrains/python/structureView/PyStructureViewElement.java b/python/src/com/jetbrains/python/structureView/PyStructureViewElement.java
index 19225efd3a5a..5c2893aa4408 100644
--- a/python/src/com/jetbrains/python/structureView/PyStructureViewElement.java
+++ b/python/src/com/jetbrains/python/structureView/PyStructureViewElement.java
@@ -11,9 +11,9 @@ import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.ui.LayeredIcon;
import com.jetbrains.python.PyNames;
import com.jetbrains.python.psi.*;
+import com.jetbrains.python.psi.icons.PythonPsiApiIcons;
import com.jetbrains.python.psi.impl.PyPsiUtils;
import com.jetbrains.python.psi.types.TypeEvalContext;
-import icons.PythonPsiApiIcons;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -123,7 +123,7 @@ public class PyStructureViewElement implements StructureViewTreeElement {
if (element instanceof PyClass) {
final TypeEvalContext context = TypeEvalContext.codeAnalysis(element.getProject(), element.getContainingFile());
for (PyClass c : ((PyClass)element).getAncestorClasses(context)) {
- for (PyElement e: getElementChildren(c)) {
+ for (PyElement e : getElementChildren(c)) {
final StructureViewTreeElement inherited = createChild(e, getElementVisibility(e), true, elementIsField(e));
if (!children.contains(inherited)) {
children.add(inherited);