From 826e4783352f05e472d63631d43f01f2378d4580 Mon Sep 17 00:00:00 2001 From: "Ilya.Kazakevich" Date: Thu, 11 Jan 2024 22:31:13 +0100 Subject: [PATCH] [python] Move icons in SDK in the right package GitOrigin-RevId: fcd5331038928a183665a4869c7ea4e34502f1fb --- .../IntellijIconClassGeneratorConfig.kt | 6 +++ .../jetbrains/python/icons/PythonIcons.java | 1 - python/gen/icons/PythonIcons.java | 3 +- .../steps/PythonBaseProjectGenerator.java | 3 +- .../python/facet/PythonFacetType.java | 3 +- .../facet/PythonFrameworkSupportProvider.java | 3 +- .../python/minor/facet/PythonFacetType.java | 3 +- .../pluginResources/PythonIconMappings.json | 52 +++++++++++-------- .../jetbrains/pythonCore/python/python.svg | 7 --- .../python/sdk/icons/PythonSdkIcons.java | 18 +++++++ python/python-sdk/intellij.python.sdk.iml | 1 + .../python/sdk/expui/icon-robots.txt | 1 + .../jetbrains/python/sdk}/expui/python.svg | 0 .../python/sdk}/expui/python_stroke.svg | 0 .../com/jetbrains/{ => python/sdk}/python.svg | 0 .../jetbrains/python/sdk}/python_stroke.svg | 0 .../python/sdk/flavors/PythonSdkFlavor.java | 2 +- .../python-sdk/src/icons/PythonSdkIcons.java | 15 ++++-- .../actions/PyRunFileInConsoleAction.java | 3 +- .../console/PydevConsoleRunnerImpl.java | 3 +- .../newProject/PythonNewProjectWizard.kt | 4 +- .../PyprojectMetadataCompletionContributor.kt | 4 +- .../PyprojectPackageCompletionContributor.kt | 4 +- .../RequirementsCompletionUtil.kt | 4 +- .../python/run/PythonConfigurationType.java | 3 +- .../runAnything/PyRunAnythingPipProvider.kt | 6 +-- .../jetbrains/python/sdk/PythonSdkType.java | 3 +- .../jetbrains/python/sdk/add/PyAddSdkPanel.kt | 4 +- .../com/jetbrains/python/sdk/add/v2/common.kt | 2 +- .../jetbrains/python/sdk/add/v2/uiUtils.kt | 16 +++--- .../target/PythonLanguageRuntimeType.kt | 4 +- 31 files changed, 113 insertions(+), 65 deletions(-) delete mode 100644 python/pluginResources/icons/com/jetbrains/pythonCore/python/python.svg create mode 100644 python/python-sdk/gen/com/jetbrains/python/sdk/icons/PythonSdkIcons.java create mode 100644 python/python-sdk/resources/icons/com/jetbrains/python/sdk/expui/icon-robots.txt rename python/{pluginResources/icons/com/jetbrains/pythonCore/python => python-sdk/resources/icons/com/jetbrains/python/sdk}/expui/python.svg (100%) rename python/{pluginResources/icons/com/jetbrains/pythonCore/python => python-sdk/resources/icons/com/jetbrains/python/sdk}/expui/python_stroke.svg (100%) rename python/python-sdk/resources/icons/com/jetbrains/{ => python/sdk}/python.svg (100%) rename python/{pluginResources/icons/com/jetbrains/pythonCore/python => python-sdk/resources/icons/com/jetbrains/python/sdk}/python_stroke.svg (100%) 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 831caf896a2a..f341ec7b7d57 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 @@ -42,6 +42,12 @@ class IntellijIconClassGeneratorConfig : IconClasses() { iconDirectory = "icons/com/jetbrains/python/parser", ) + "intellij.python.sdk" -> IntellijIconClassGeneratorModuleConfig( + className = "PythonSdkIcons", + packageName = "com.jetbrains.python.sdk.icons", + iconDirectory = "icons/com/jetbrains/python/sdk", + ) + "intellij.python.psi" -> IntellijIconClassGeneratorModuleConfig( className = "PythonPsiApiIcons", packageName = "com.jetbrains.python.psi.icons", diff --git a/python/gen/com/jetbrains/python/icons/PythonIcons.java b/python/gen/com/jetbrains/python/icons/PythonIcons.java index 0d48fbdc7245..ca62eba9cc04 100644 --- a/python/gen/com/jetbrains/python/icons/PythonIcons.java +++ b/python/gen/com/jetbrains/python/icons/PythonIcons.java @@ -60,7 +60,6 @@ public final class PythonIcons { /** 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); diff --git a/python/gen/icons/PythonIcons.java b/python/gen/icons/PythonIcons.java index e203f45ca9f1..fbec9a7c7f0a 100644 --- a/python/gen/icons/PythonIcons.java +++ b/python/gen/icons/PythonIcons.java @@ -3,6 +3,7 @@ package icons; import com.intellij.ui.IconManager; import com.jetbrains.python.parser.icons.PythonParserIcons; +import com.jetbrains.python.sdk.icons.PythonSdkIcons; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -42,7 +43,7 @@ public final class PythonIcons { * @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(forRemoval = true) public static final @NotNull Icon Python = PythonSdkIcons.Python; /** * @deprecated moved to {@link com.jetbrains.python.icons.PythonIcons} diff --git a/python/ide/impl/src/com/jetbrains/python/newProject/steps/PythonBaseProjectGenerator.java b/python/ide/impl/src/com/jetbrains/python/newProject/steps/PythonBaseProjectGenerator.java index 7e7f45862a22..8baf7d3f6713 100644 --- a/python/ide/impl/src/com/jetbrains/python/newProject/steps/PythonBaseProjectGenerator.java +++ b/python/ide/impl/src/com/jetbrains/python/newProject/steps/PythonBaseProjectGenerator.java @@ -13,6 +13,7 @@ import com.jetbrains.python.newProject.welcome.PyWelcomeGenerator; import com.jetbrains.python.remote.PyProjectSynchronizer; import com.jetbrains.python.sdk.PySdkExtKt; import com.jetbrains.python.icons.PythonIcons; +import com.jetbrains.python.sdk.icons.PythonSdkIcons; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -41,7 +42,7 @@ public final class PythonBaseProjectGenerator extends PythonProjectGenerator - - - - - - diff --git a/python/python-sdk/gen/com/jetbrains/python/sdk/icons/PythonSdkIcons.java b/python/python-sdk/gen/com/jetbrains/python/sdk/icons/PythonSdkIcons.java new file mode 100644 index 000000000000..5ef9573f7dbe --- /dev/null +++ b/python/python-sdk/gen/com/jetbrains/python/sdk/icons/PythonSdkIcons.java @@ -0,0 +1,18 @@ +// 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.sdk.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 PythonSdkIcons { + private static @NotNull Icon load(@NotNull String path, int cacheKey, int flags) { + return IconManager.getInstance().loadRasterizedIcon(path, PythonSdkIcons.class.getClassLoader(), cacheKey, flags); + } + /** 16x16 */ public static final @NotNull Icon Python = load("icons/com/jetbrains/python/sdk/python.svg", 2008591516, 8); +} diff --git a/python/python-sdk/intellij.python.sdk.iml b/python/python-sdk/intellij.python.sdk.iml index aa39752eb56c..225ea60c16ad 100644 --- a/python/python-sdk/intellij.python.sdk.iml +++ b/python/python-sdk/intellij.python.sdk.iml @@ -6,6 +6,7 @@ + diff --git a/python/python-sdk/resources/icons/com/jetbrains/python/sdk/expui/icon-robots.txt b/python/python-sdk/resources/icons/com/jetbrains/python/sdk/expui/icon-robots.txt new file mode 100644 index 000000000000..f21601437b7f --- /dev/null +++ b/python/python-sdk/resources/icons/com/jetbrains/python/sdk/expui/icon-robots.txt @@ -0,0 +1 @@ +skip: * \ No newline at end of file diff --git a/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/python.svg b/python/python-sdk/resources/icons/com/jetbrains/python/sdk/expui/python.svg similarity index 100% rename from python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/python.svg rename to python/python-sdk/resources/icons/com/jetbrains/python/sdk/expui/python.svg diff --git a/python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/python_stroke.svg b/python/python-sdk/resources/icons/com/jetbrains/python/sdk/expui/python_stroke.svg similarity index 100% rename from python/pluginResources/icons/com/jetbrains/pythonCore/python/expui/python_stroke.svg rename to python/python-sdk/resources/icons/com/jetbrains/python/sdk/expui/python_stroke.svg diff --git a/python/python-sdk/resources/icons/com/jetbrains/python.svg b/python/python-sdk/resources/icons/com/jetbrains/python/sdk/python.svg similarity index 100% rename from python/python-sdk/resources/icons/com/jetbrains/python.svg rename to python/python-sdk/resources/icons/com/jetbrains/python/sdk/python.svg diff --git a/python/pluginResources/icons/com/jetbrains/pythonCore/python/python_stroke.svg b/python/python-sdk/resources/icons/com/jetbrains/python/sdk/python_stroke.svg similarity index 100% rename from python/pluginResources/icons/com/jetbrains/pythonCore/python/python_stroke.svg rename to python/python-sdk/resources/icons/com/jetbrains/python/sdk/python_stroke.svg diff --git a/python/python-sdk/src/com/jetbrains/python/sdk/flavors/PythonSdkFlavor.java b/python/python-sdk/src/com/jetbrains/python/sdk/flavors/PythonSdkFlavor.java index 9c609c601155..42663e86162d 100644 --- a/python/python-sdk/src/com/jetbrains/python/sdk/flavors/PythonSdkFlavor.java +++ b/python/python-sdk/src/com/jetbrains/python/sdk/flavors/PythonSdkFlavor.java @@ -28,7 +28,7 @@ import com.jetbrains.python.sdk.PyRemoteSdkAdditionalDataMarker; import com.jetbrains.python.sdk.PySdkUtil; import com.jetbrains.python.sdk.PythonEnvUtil; import com.jetbrains.python.sdk.PythonSdkAdditionalData; -import icons.PythonSdkIcons; +import com.jetbrains.python.sdk.icons.PythonSdkIcons; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/python/python-sdk/src/icons/PythonSdkIcons.java b/python/python-sdk/src/icons/PythonSdkIcons.java index 2fcbda909fe3..42f66db8ad84 100644 --- a/python/python-sdk/src/icons/PythonSdkIcons.java +++ b/python/python-sdk/src/icons/PythonSdkIcons.java @@ -1,17 +1,26 @@ +// 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 org.jetbrains.annotations.ApiStatus; 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 + * @deprecated moved to {@link com.jetbrains.python.sdk.icons.PythonSdkIcons} */ +@ApiStatus.ScheduledForRemoval +@Deprecated(forRemoval = true) public final class PythonSdkIcons { private static @NotNull Icon load(@NotNull String path, int cacheKey, int flags) { return IconManager.getInstance().loadRasterizedIcon(path, PythonSdkIcons.class.getClassLoader(), cacheKey, flags); } - /** 16x16 */ public static final @NotNull Icon Python = load("icons/com/jetbrains/python.svg", 2008591516, 0); + + /** + * @deprecated moved to {@link com.jetbrains.python.sdk.icons.PythonSdkIcons} + */ + @ApiStatus.ScheduledForRemoval + @Deprecated(forRemoval = true) + public static final @NotNull Icon Python = com.jetbrains.python.sdk.icons.PythonSdkIcons.Python; } diff --git a/python/src/com/jetbrains/python/actions/PyRunFileInConsoleAction.java b/python/src/com/jetbrains/python/actions/PyRunFileInConsoleAction.java index 5042f114f16c..06903fc5b9e5 100644 --- a/python/src/com/jetbrains/python/actions/PyRunFileInConsoleAction.java +++ b/python/src/com/jetbrains/python/actions/PyRunFileInConsoleAction.java @@ -18,6 +18,7 @@ import com.jetbrains.python.psi.PyFile; import com.jetbrains.python.run.PythonRunConfiguration; import com.jetbrains.python.run.PythonRunConfigurationProducer; import com.jetbrains.python.icons.PythonIcons; +import com.jetbrains.python.sdk.icons.PythonSdkIcons; import org.jetbrains.annotations.NotNull; import java.util.HashMap; @@ -27,7 +28,7 @@ public class PyRunFileInConsoleAction extends AnAction implements DumbAware { public PyRunFileInConsoleAction() { super(PyBundle.messagePointer("acton.run.file.in.python.console.title"), - PyBundle.messagePointer("action.run.file.in.python.console.description"), PythonIcons.Python.Python); + PyBundle.messagePointer("action.run.file.in.python.console.description"), PythonSdkIcons.Python); } @Override diff --git a/python/src/com/jetbrains/python/console/PydevConsoleRunnerImpl.java b/python/src/com/jetbrains/python/console/PydevConsoleRunnerImpl.java index 8e66e9570e27..cbc117189bab 100644 --- a/python/src/com/jetbrains/python/console/PydevConsoleRunnerImpl.java +++ b/python/src/com/jetbrains/python/console/PydevConsoleRunnerImpl.java @@ -87,6 +87,7 @@ import com.jetbrains.python.run.target.HelpersAwareTargetEnvironmentRequest; import com.jetbrains.python.sdk.PythonEnvUtil; import com.jetbrains.python.sdk.flavors.PythonSdkFlavor; import com.jetbrains.python.icons.PythonIcons; +import com.jetbrains.python.sdk.icons.PythonSdkIcons; import org.jetbrains.annotations.*; import javax.swing.*; @@ -1274,7 +1275,7 @@ public class PydevConsoleRunnerImpl implements PydevConsoleRunner { final ServerSocket serverSocket = PythonCommandLineState.createServerSocket(); return XDebuggerManager.getInstance(myProject). - startSessionAndShowTab(PyBundle.message("pydev.console.runner.python.console.debugger"), PythonIcons.Python.Python, null, true, + startSessionAndShowTab(PyBundle.message("pydev.console.runner.python.console.debugger"), PythonSdkIcons.Python, null, true, new XDebugProcessStarter() { @Override @NotNull diff --git a/python/src/com/jetbrains/python/newProject/PythonNewProjectWizard.kt b/python/src/com/jetbrains/python/newProject/PythonNewProjectWizard.kt index 84a63f346367..889a01040015 100644 --- a/python/src/com/jetbrains/python/newProject/PythonNewProjectWizard.kt +++ b/python/src/com/jetbrains/python/newProject/PythonNewProjectWizard.kt @@ -29,8 +29,8 @@ import com.jetbrains.python.sdk.PySdkSettings import com.jetbrains.python.sdk.add.PyAddNewCondaEnvPanel import com.jetbrains.python.sdk.add.PyAddNewVirtualEnvPanel import com.jetbrains.python.sdk.add.PyAddSdkPanel +import com.jetbrains.python.sdk.icons.PythonSdkIcons import com.jetbrains.python.sdk.pythonSdk -import com.jetbrains.python.icons.PythonIcons import java.nio.file.Path /** @@ -42,7 +42,7 @@ class PythonNewProjectWizard : LanguageGeneratorNewProjectWizard { override val name = PYTHON - override val icon = PythonIcons.Python.Python + override val icon = PythonSdkIcons.Python override val ordinal = 600 diff --git a/python/src/com/jetbrains/python/packaging/pyproject/PyprojectMetadataCompletionContributor.kt b/python/src/com/jetbrains/python/packaging/pyproject/PyprojectMetadataCompletionContributor.kt index 2eae4e082d40..f95b5e1c340c 100644 --- a/python/src/com/jetbrains/python/packaging/pyproject/PyprojectMetadataCompletionContributor.kt +++ b/python/src/com/jetbrains/python/packaging/pyproject/PyprojectMetadataCompletionContributor.kt @@ -7,7 +7,7 @@ import com.intellij.codeInsight.completion.CompletionResultSet import com.intellij.codeInsight.lookup.LookupElementBuilder import com.intellij.psi.util.elementType import com.intellij.psi.util.parentOfType -import com.jetbrains.python.icons.PythonIcons +import com.jetbrains.python.sdk.icons.PythonSdkIcons import org.toml.lang.psi.TOML_STRING_LITERALS import org.toml.lang.psi.TomlKeyValue import org.toml.lang.psi.ext.name @@ -29,7 +29,7 @@ class PyprojectMetadataCompletionContributor : CompletionContributor() { if (TOML_STRING_LITERALS.contains(parent.elementType) && parent.parentOfType()?.key?.name == "build-backend") { knownBackends.map { - LookupElementBuilder.create(it).withIcon(PythonIcons.Python.Python) + LookupElementBuilder.create(it).withIcon(PythonSdkIcons.Python) } .forEach { result.addElement(it) } } diff --git a/python/src/com/jetbrains/python/packaging/pyproject/PyprojectPackageCompletionContributor.kt b/python/src/com/jetbrains/python/packaging/pyproject/PyprojectPackageCompletionContributor.kt index f839eebe7d0b..a3ac1aa9d156 100644 --- a/python/src/com/jetbrains/python/packaging/pyproject/PyprojectPackageCompletionContributor.kt +++ b/python/src/com/jetbrains/python/packaging/pyproject/PyprojectPackageCompletionContributor.kt @@ -11,7 +11,7 @@ import com.intellij.psi.util.elementType import com.intellij.psi.util.parentOfType import com.jetbrains.python.PyBundle import com.jetbrains.python.packaging.pip.PypiPackageCache -import com.jetbrains.python.icons.PythonIcons +import com.jetbrains.python.sdk.icons.PythonSdkIcons import org.toml.lang.psi.TOML_STRING_LITERALS import org.toml.lang.psi.TomlArray import org.toml.lang.psi.TomlKeyValue @@ -33,7 +33,7 @@ class PyprojectPackageCompletionContributor : CompletionContributor() { val maxPriority = cache.packages.size cache.packages.asSequence() .map { LookupElementBuilder.create(it.lowercase()).withTypeText(PyBundle.message("python.pyproject.package.completion.tail")).withIcon( - PythonIcons.Python.Python) } + PythonSdkIcons.Python) } .mapIndexed { index, lookupElementBuilder -> PrioritizedLookupElement.withPriority(lookupElementBuilder, (maxPriority - index).toDouble()) } diff --git a/python/src/com/jetbrains/python/requirements/RequirementsCompletionUtil.kt b/python/src/com/jetbrains/python/requirements/RequirementsCompletionUtil.kt index 1e467610f850..fbd4dde15508 100644 --- a/python/src/com/jetbrains/python/requirements/RequirementsCompletionUtil.kt +++ b/python/src/com/jetbrains/python/requirements/RequirementsCompletionUtil.kt @@ -11,15 +11,15 @@ import com.intellij.openapi.progress.runBlockingCancellable import com.intellij.openapi.project.Project import com.jetbrains.python.packaging.management.PythonPackageManager import com.jetbrains.python.packaging.management.createSpecification +import com.jetbrains.python.sdk.icons.PythonSdkIcons import com.jetbrains.python.sdk.pythonSdk -import com.jetbrains.python.icons.PythonIcons fun completePackageNames(project: Project, result: CompletionResultSet) { val repositoryManager = PythonPackageManager.forSdk(project, project.pythonSdk ?: return).repositoryManager val packages = repositoryManager.allPackages() val maxPriority = packages.size packages.asSequence().map { - LookupElementBuilder.create(it.lowercase()).withIcon(PythonIcons.Python.Python) + LookupElementBuilder.create(it.lowercase()).withIcon(PythonSdkIcons.Python) }.mapIndexed { index, lookupElementBuilder -> PrioritizedLookupElement.withPriority(lookupElementBuilder, (maxPriority - index).toDouble()) }.forEach { result.addElement(it) } diff --git a/python/src/com/jetbrains/python/run/PythonConfigurationType.java b/python/src/com/jetbrains/python/run/PythonConfigurationType.java index a126bf5d02ea..f33211b615b6 100644 --- a/python/src/com/jetbrains/python/run/PythonConfigurationType.java +++ b/python/src/com/jetbrains/python/run/PythonConfigurationType.java @@ -8,6 +8,7 @@ import com.intellij.execution.configurations.RunConfiguration; import com.intellij.openapi.project.Project; import com.jetbrains.python.PyBundle; import com.jetbrains.python.icons.PythonIcons; +import com.jetbrains.python.sdk.icons.PythonSdkIcons; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -52,7 +53,7 @@ public final class PythonConfigurationType implements ConfigurationType { @Override public Icon getIcon() { - return PythonIcons.Python.Python; + return PythonSdkIcons.Python; } @Override diff --git a/python/src/com/jetbrains/python/run/runAnything/PyRunAnythingPipProvider.kt b/python/src/com/jetbrains/python/run/runAnything/PyRunAnythingPipProvider.kt index 771e67dfe349..1e36120b64a1 100644 --- a/python/src/com/jetbrains/python/run/runAnything/PyRunAnythingPipProvider.kt +++ b/python/src/com/jetbrains/python/run/runAnything/PyRunAnythingPipProvider.kt @@ -7,7 +7,7 @@ import com.jetbrains.python.packaging.management.PythonPackageManager import com.jetbrains.python.packaging.pip.PipBasedPackageManager import com.jetbrains.python.packaging.repository.PyPIPackageRepository import com.jetbrains.python.packaging.repository.PyPackageRepository -import com.jetbrains.python.icons.PythonIcons +import com.jetbrains.python.sdk.icons.PythonSdkIcons import javax.swing.Icon class PyRunAnythingPipProvider : PyRunAnythingPackageProvider() { @@ -20,11 +20,11 @@ class PyRunAnythingPipProvider : PyRunAnythingPackageProvider() { override fun getCompletionGroupTitle() = PyBundle.message("python.run.anything.pip.provider") override fun getIcon(value: String): Icon { - return PythonIcons.Python.Python + return PythonSdkIcons.Python } override fun getHelpIcon(): Icon { - return PythonIcons.Python.Python + return PythonSdkIcons.Python } override fun getDefaultCommands(): Sequence { diff --git a/python/src/com/jetbrains/python/sdk/PythonSdkType.java b/python/src/com/jetbrains/python/sdk/PythonSdkType.java index 0547b2b77cfb..7609bf29782f 100644 --- a/python/src/com/jetbrains/python/sdk/PythonSdkType.java +++ b/python/src/com/jetbrains/python/sdk/PythonSdkType.java @@ -43,6 +43,7 @@ import com.jetbrains.python.remote.PythonRemoteInterpreterManager; import com.jetbrains.python.sdk.add.PyAddSdkDialog; import com.jetbrains.python.sdk.flavors.CPythonSdkFlavor; import com.jetbrains.python.sdk.flavors.PythonSdkFlavor; +import com.jetbrains.python.sdk.icons.PythonSdkIcons; import com.jetbrains.python.target.PyInterpreterVersionUtil; import com.jetbrains.python.target.PyTargetAwareAdditionalData; import com.jetbrains.python.icons.PythonIcons; @@ -107,7 +108,7 @@ public final class PythonSdkType extends SdkType { @Override public Icon getIcon() { - return PythonIcons.Python.Python; + return PythonSdkIcons.Python; } @NotNull diff --git a/python/src/com/jetbrains/python/sdk/add/PyAddSdkPanel.kt b/python/src/com/jetbrains/python/sdk/add/PyAddSdkPanel.kt index 9097ce4011d6..dd4c74917c54 100644 --- a/python/src/com/jetbrains/python/sdk/add/PyAddSdkPanel.kt +++ b/python/src/com/jetbrains/python/sdk/add/PyAddSdkPanel.kt @@ -39,8 +39,8 @@ import com.jetbrains.python.sdk.* import com.jetbrains.python.sdk.add.PyAddSdkDialogFlowAction.OK import com.jetbrains.python.sdk.configuration.findPreferredVirtualEnvBaseSdk import com.jetbrains.python.sdk.flavors.MacPythonSdkFlavor +import com.jetbrains.python.sdk.icons.PythonSdkIcons import com.jetbrains.python.ui.pyModalBlocking -import com.jetbrains.python.icons.PythonIcons import java.awt.Component import javax.swing.Icon import javax.swing.JComponent @@ -66,7 +66,7 @@ abstract class PyAddSdkPanel : JPanel(), PyAddSdkView { override fun complete(): Unit = Unit abstract override val panelName: String - override val icon: Icon = PythonIcons.Python.Python + override val icon: Icon = PythonSdkIcons.Python open val sdk: Sdk? = null open val nameExtensionComponent: JComponent? = null open var newProjectPath: String? = null diff --git a/python/src/com/jetbrains/python/sdk/add/v2/common.kt b/python/src/com/jetbrains/python/sdk/add/v2/common.kt index bf1aa7cd7e83..28f4501bde4b 100644 --- a/python/src/com/jetbrains/python/sdk/add/v2/common.kt +++ b/python/src/com/jetbrains/python/sdk/add/v2/common.kt @@ -22,7 +22,7 @@ import com.jetbrains.python.sdk.poetry.POETRY_ICON import com.jetbrains.python.sdk.setup import com.jetbrains.python.statistics.InterpreterTarget import com.jetbrains.python.icons.PythonIcons -import icons.PythonSdkIcons +import com.jetbrains.python.sdk.icons.PythonSdkIcons import kotlinx.coroutines.CoroutineScope import javax.swing.Icon diff --git a/python/src/com/jetbrains/python/sdk/add/v2/uiUtils.kt b/python/src/com/jetbrains/python/sdk/add/v2/uiUtils.kt index 2a4764042598..b207c7fc6d66 100644 --- a/python/src/com/jetbrains/python/sdk/add/v2/uiUtils.kt +++ b/python/src/com/jetbrains/python/sdk/add/v2/uiUtils.kt @@ -21,12 +21,14 @@ import com.intellij.openapi.ui.validation.and import com.intellij.openapi.util.IconLoader import com.intellij.openapi.util.Key import com.intellij.openapi.util.NlsSafe -import com.intellij.ui.* +import com.intellij.ui.AnimatedIcon +import com.intellij.ui.ColoredListCellRenderer +import com.intellij.ui.SimpleColoredComponent +import com.intellij.ui.SimpleTextAttributes import com.intellij.ui.components.ActionLink import com.intellij.ui.components.fields.ExtendableTextComponent import com.intellij.ui.components.fields.ExtendableTextField import com.intellij.ui.dsl.builder.* -import com.intellij.ui.dsl.builder.Cell import com.intellij.ui.dsl.builder.components.ValidationType import com.intellij.ui.dsl.builder.components.validationTooltip import com.intellij.ui.util.preferredHeight @@ -39,7 +41,7 @@ import com.jetbrains.python.sdk.add.v2.PythonInterpreterSelectionMode.CUSTOM import com.jetbrains.python.sdk.add.v2.PythonSupportedEnvironmentManagers.VIRTUALENV import com.jetbrains.python.sdk.flavors.conda.PyCondaEnv import com.jetbrains.python.sdk.flavors.conda.PyCondaEnvIdentity -import com.jetbrains.python.icons.PythonIcons +import com.jetbrains.python.sdk.icons.PythonSdkIcons import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineStart import kotlinx.coroutines.flow.SharedFlow @@ -49,7 +51,9 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import org.jetbrains.annotations.Nls import java.nio.file.Paths -import javax.swing.* +import javax.swing.JList +import javax.swing.JPanel +import javax.swing.JTextField import javax.swing.plaf.basic.BasicComboBoxEditor import kotlin.coroutines.CoroutineContext import kotlin.io.path.exists @@ -126,7 +130,7 @@ class PythonNewEnvironmentDialogNavigator { internal fun SimpleColoredComponent.customizeForPythonSdk(sdk: Sdk) { when (sdk) { is PyDetectedSdk -> { - icon = IconLoader.getTransparentIcon(PythonIcons.Python.Python) + icon = IconLoader.getTransparentIcon(PythonSdkIcons.Python) append(sdk.homePath!!) append(" " + message("sdk.rendering.detected.grey.text"), SimpleTextAttributes.GRAYED_SMALL_ATTRIBUTES) } @@ -136,7 +140,7 @@ internal fun SimpleColoredComponent.customizeForPythonSdk(sdk: Sdk) { append(" " + message("sdk.rendering.installable.grey.text"), SimpleTextAttributes.GRAYED_SMALL_ATTRIBUTES) } else -> { - icon = PythonIcons.Python.Python + icon = PythonSdkIcons.Python append(sdk.versionString!!) append(" " + sdk.homePath!!, SimpleTextAttributes.GRAYED_SMALL_ATTRIBUTES) } diff --git a/python/src/com/jetbrains/python/target/PythonLanguageRuntimeType.kt b/python/src/com/jetbrains/python/target/PythonLanguageRuntimeType.kt index e4e2e1af7739..71945a90859f 100644 --- a/python/src/com/jetbrains/python/target/PythonLanguageRuntimeType.kt +++ b/python/src/com/jetbrains/python/target/PythonLanguageRuntimeType.kt @@ -11,7 +11,7 @@ import com.intellij.openapi.options.Configurable import com.intellij.openapi.project.Project import com.intellij.openapi.util.NlsSafe import com.jetbrains.python.PyBundle -import com.jetbrains.python.icons.PythonIcons +import com.jetbrains.python.sdk.icons.PythonSdkIcons import org.jetbrains.annotations.Nls import java.util.function.Supplier import javax.swing.Icon @@ -20,7 +20,7 @@ class PythonLanguageRuntimeType : LanguageRuntimeType