From c2ca7adc05aba700967825d8078b792abd1c7a27 Mon Sep 17 00:00:00 2001 From: Denis Zaichenko Date: Mon, 17 Nov 2025 12:55:30 +0100 Subject: [PATCH] [plugins] IJPL-217184 Pass updates instead of installed plugins during platform update (cherry picked from commit ce7f4d0aa2fe9178ba807f8db0bc9f89a3ca323c) IJ-MR-182603 GitOrigin-RevId: a3f9aea9c1bcb78e5a7868a7fcbf3f227d596b6f --- .../openapi/updateSettings/impl/PluginUpdateDialog.java | 4 ++-- .../openapi/updateSettings/impl/PlatformUpdateDialog.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/PluginUpdateDialog.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/PluginUpdateDialog.java index adb3b20c456b..aa8cdc48f4bb 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/PluginUpdateDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/PluginUpdateDialog.java @@ -66,10 +66,10 @@ public class PluginUpdateDialog extends DialogWrapper { private @Nullable Runnable myFinishCallback; public PluginUpdateDialog(@Nullable Project project, - @NotNull Collection plugins, + @NotNull Collection updates, @Nullable Collection customRepositoryPlugins, Map installedPlugins) { - this(project, plugins, customRepositoryPlugins, installedPlugins, false); + this(project, updates, customRepositoryPlugins, installedPlugins, false); setTitle(IdeBundle.message("dialog.title.plugin.updates")); } diff --git a/platform/platform-impl/update-checker/src/com/intellij/openapi/updateSettings/impl/PlatformUpdateDialog.java b/platform/platform-impl/update-checker/src/com/intellij/openapi/updateSettings/impl/PlatformUpdateDialog.java index 0d191bdf03eb..d9abe7267d7f 100644 --- a/platform/platform-impl/update-checker/src/com/intellij/openapi/updateSettings/impl/PlatformUpdateDialog.java +++ b/platform/platform-impl/update-checker/src/com/intellij/openapi/updateSettings/impl/PlatformUpdateDialog.java @@ -216,7 +216,7 @@ public final class PlatformUpdateDialog extends AbstractUpdateDialog { private void downloadPatchAndRestart(Map installedPlugins) { if (myUpdatesForPlugins != null && !installedPlugins.isEmpty()) { - var dialog = new PluginUpdateDialog(myProject, installedPlugins.values(), null, installedPlugins); + var dialog = new PluginUpdateDialog(myProject, ContainerUtil.map(myUpdatesForPlugins, it -> it.getUiModel()), null, installedPlugins); if (!PluginUpdateDialog.showDialogAndUpdate(myUpdatesForPlugins, dialog)) { return; // update cancelled }