diff --git a/platform/platform-impl/api-dump-unreviewed.txt b/platform/platform-impl/api-dump-unreviewed.txt index 7c47e2448490..16d8f9187a3e 100644 --- a/platform/platform-impl/api-dump-unreviewed.txt +++ b/platform/platform-impl/api-dump-unreviewed.txt @@ -11065,6 +11065,7 @@ f:com.intellij.openapi.updateSettings.impl.pluginsAdvertisement.PluginsAdvertise - sf:setIgnoreIdeSuggestion(Z):V f:com.intellij.openapi.updateSettings.impl.pluginsAdvertisement.PluginsAdvertiserDialog - com.intellij.openapi.ui.DialogWrapper +- (com.intellij.openapi.project.Project,java.util.Collection):V - (com.intellij.openapi.project.Project,java.util.Collection,java.util.List):V - doInstallPlugins(Z,com.intellij.openapi.application.ModalityState):V - getPreferredFocusedComponent():javax.swing.JComponent diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/InstallAndEnableTask.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/InstallAndEnableTask.java index 4bc65503cb54..c9be0cd767f6 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/InstallAndEnableTask.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/InstallAndEnableTask.java @@ -1,8 +1,11 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.openapi.updateSettings.impl.pluginsAdvertisement; import com.intellij.ide.IdeBundle; -import com.intellij.ide.plugins.*; +import com.intellij.ide.plugins.IdeaPluginDescriptor; +import com.intellij.ide.plugins.PluginManagementPolicy; +import com.intellij.ide.plugins.PluginManagerCore; +import com.intellij.ide.plugins.PluginNode; import com.intellij.ide.plugins.marketplace.IdeCompatibleUpdate; import com.intellij.ide.plugins.marketplace.MarketplaceRequests; import com.intellij.ide.plugins.newui.PluginDetailsPageComponent; @@ -19,7 +22,6 @@ import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.HashSet; -import java.util.List; import java.util.Set; @ApiStatus.Internal @@ -31,7 +33,6 @@ public final class InstallAndEnableTask extends Task.Modal { private final Runnable myOnSuccess; private final Set myPlugins = new HashSet<>(); - private @Nullable List myCustomPlugins; InstallAndEnableTask(@Nullable Project project, @NotNull Set pluginIds, @@ -50,11 +51,7 @@ public final class InstallAndEnableTask extends Task.Modal { @Override public void run(@NotNull ProgressIndicator indicator) { try { - List marketplacePlugins = MarketplaceRequests.loadLastCompatiblePluginDescriptors(myPluginIds); - myCustomPlugins = RepositoryHelper.loadPluginsFromCustomRepositories(indicator); - - List descriptors = - new ArrayList<>(RepositoryHelper.mergePluginsFromRepositories(marketplacePlugins, myCustomPlugins, true)); + var descriptors = new ArrayList(MarketplaceRequests.loadLastCompatiblePluginDescriptors(myPluginIds)); if (myShowDialog) { MarketplaceRequests marketplace = MarketplaceRequests.getInstance(); @@ -99,15 +96,7 @@ public final class InstallAndEnableTask extends Task.Modal { @Override public void onSuccess() { - if (myCustomPlugins == null) { - return; - } - - new PluginsAdvertiserDialog(myProject, - myPlugins, - myCustomPlugins, - mySelectAllInDialog, - this::runOnSuccess) + new PluginsAdvertiserDialog(myProject, myPlugins, mySelectAllInDialog, this::runOnSuccess) .doInstallPlugins(myShowDialog, myModalityState); } @@ -117,6 +106,5 @@ public final class InstallAndEnableTask extends Task.Modal { } } - public Set getPlugins() { return myPlugins; } - public @Nullable List getCustomPlugins() { return myCustomPlugins; } + public @NotNull Set getPlugins() { return myPlugins; } } diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiserDialog.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiserDialog.java index 6fcf63d6a8ca..f489a218013d 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiserDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiserDialog.java @@ -1,4 +1,4 @@ -// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.openapi.updateSettings.impl.pluginsAdvertisement; import com.intellij.ide.IdeBundle; @@ -21,20 +21,19 @@ import java.util.function.Predicate; public final class PluginsAdvertiserDialog extends DialogWrapper { private final Collection myPluginToInstall; private final @Nullable Project myProject; - private final @NotNull List myCustomPlugins; private final @Nullable Consumer myFinishFunction; private final boolean mySelectAllSuggestions; private @Nullable DetectedPluginsPanel myPanel; - PluginsAdvertiserDialog(@Nullable Project project, - @NotNull Collection pluginsToInstall, - @NotNull List customPlugins, - boolean selectAllSuggestions, - @Nullable Consumer finishFunction) { + PluginsAdvertiserDialog( + @Nullable Project project, + @NotNull Collection pluginsToInstall, + boolean selectAllSuggestions, + @Nullable Consumer finishFunction + ) { super(project); myProject = project; myPluginToInstall = pluginsToInstall; - myCustomPlugins = customPlugins; myFinishFunction = finishFunction; mySelectAllSuggestions = selectAllSuggestions; setTitle(IdeBundle.message("dialog.title.choose.plugins.to.install.or.enable")); @@ -46,10 +45,17 @@ public final class PluginsAdvertiserDialog extends DialogWrapper { } } - public PluginsAdvertiserDialog(@Nullable Project project, - @NotNull Collection pluginsToInstall, - @NotNull List customPlugins) { - this(project, pluginsToInstall, customPlugins, false, null); + public PluginsAdvertiserDialog(@Nullable Project project, @NotNull Collection pluginsToInstall) { + this(project, pluginsToInstall, false, null); + } + + /** + * @deprecated custom repositories are no longer supported by the plugin advertiser; + * use {@link #PluginsAdvertiserDialog(Project, Collection)} instead. + */ + @Deprecated(forRemoval = true) + public PluginsAdvertiserDialog(@Nullable Project project, @NotNull Collection pluginsToInstall, @NotNull List ignored) { + this(project, pluginsToInstall, false, null); } @Override @@ -96,7 +102,7 @@ public final class PluginsAdvertiserDialog extends DialogWrapper { } private boolean doInstallPlugins(@NotNull Predicate predicate, @NotNull ModalityState modalityState) { - return new PluginsAdvertiserDialogPluginInstaller(myProject, myPluginToInstall, myCustomPlugins, myFinishFunction) + return new PluginsAdvertiserDialogPluginInstaller(myProject, myPluginToInstall, List.of(), myFinishFunction) .doInstallPlugins(predicate, modalityState); } } diff --git a/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/ImportPerformer.kt b/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/ImportPerformer.kt index 46ec93be16c8..d12c930d0a28 100644 --- a/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/ImportPerformer.kt +++ b/plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/transfer/backend/providers/ImportPerformer.kt @@ -77,9 +77,8 @@ class DefaultImportPerformer(private val partials: Collection 0) PluginInstallationState.RestartRequired else PluginInstallationState.Done @@ -116,13 +115,12 @@ class DefaultImportPerformer(private val partials: Collection, - customPlugins: List, pi: ProgressIndicator, restartRequiringPlugins: AtomicInteger): Boolean = coroutineScope { val scope = this fun createInstaller(finished: CompletableDeferred) = - object : PluginsAdvertiserDialogPluginInstaller(project, plugins, customPlugins, finished::complete) { + object : PluginsAdvertiserDialogPluginInstaller(project, plugins, emptyList(), finished::complete) { override fun downloadPlugins(plugins: MutableList, customPlugins: MutableCollection, onSuccess: Runnable?, @@ -183,4 +181,4 @@ private suspend fun doDownloadPlugins( } return success -} \ No newline at end of file +}