From fb076afc80c77bfe0d9e16f99cf5c5c84ce61de6 Mon Sep 17 00:00:00 2001 From: Nikita Iarychenko Date: Tue, 19 Nov 2024 14:49:07 +0400 Subject: [PATCH] OPENIDE #18 Removing Ultimate recommendations (cherry picked from commit 51b3d30ceafcc14c225dfef7710f6e6945f5c198) (cherry picked from commit 51c6120cfb6b07029a9d6ccb2a0a95056d6b080a) (cherry picked from commit 537434b1b559cc8a586806f5230a6c6980260b3e) (cherry picked from commit 672701e9a0e1f8f7989cc89022290a3bf065e535) (cherry picked from commit 558ce1c8067755cb18e509ad7c5996d3588af514) --- .../java-promo/resources/META-INF/community-integration.xml | 2 +- .../impl/pluginsAdvertisement/PluginAdvertiserService.kt | 2 +- .../impl/pluginsAdvertisement/PluginsAdvertiser.kt | 6 +----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/java/java-promo/resources/META-INF/community-integration.xml b/java/java-promo/resources/META-INF/community-integration.xml index 49be5a4fd05a..d2dc30e463c4 100644 --- a/java/java-promo/resources/META-INF/community-integration.xml +++ b/java/java-promo/resources/META-INF/community-integration.xml @@ -37,7 +37,7 @@ diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginAdvertiserService.kt b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginAdvertiserService.kt index 0ca5c3ae1bbd..2ed5816f5b02 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginAdvertiserService.kt +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginAdvertiserService.kt @@ -674,7 +674,7 @@ fun disableTryUltimate(project: Project) = setTryUltimateKey(project, true) fun enableTryUltimate(project: Project) = setTryUltimateKey(project, false) @ApiStatus.Internal -fun tryUltimateIsDisabled(): Boolean = PropertiesComponent.getInstance().getBoolean(TRY_ULTIMATE_DISABLED_KEY) +fun tryUltimateIsDisabled() : Boolean = true @ApiStatus.Internal fun tryUltimate( diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.kt b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.kt index a82f401793db..b464a7cb9efd 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.kt +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.kt @@ -18,11 +18,7 @@ import org.jetbrains.annotations.ApiStatus private const val IGNORE_ULTIMATE_EDITION = "promo.ignore.suggested.ide" -internal var isIgnoreIdeSuggestion: Boolean - get() = PropertiesComponent.getInstance().isTrueValue(IGNORE_ULTIMATE_EDITION) - || PlatformUtils.isJetBrainsClient() - || (!PlatformUtils.isCommunityEdition() && PluginManagerCore.isDisabled(PluginManagerCore.ULTIMATE_PLUGIN_ID)) - set(value) = PropertiesComponent.getInstance().setValue(IGNORE_ULTIMATE_EDITION, value) +internal var isIgnoreIdeSuggestion: Boolean = true @get:Deprecated("Use `getPluginSuggestionNotificationGroup()`") @get:ApiStatus.ScheduledForRemoval