MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-21 22:11:40 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-175026 fix project required plugins installation from custom repo

Browse Source 
(cherry picked from commit bfbd1849a3a2e8d08128dddc24d1ec7b1ad1ef84)

GitOrigin-RevId: 5b795b7cdd14415275957a09939acc3046c049d7
This commit is contained in:
Vadim Salavatov
2025-01-29 16:00:27 +01:00
committed by intellij-monorepo-bot
parent 231d7f56aa
commit 93244f5424
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/InstallAndEnableTask.java
View File

@@ -53,8 +53,8 @@ public final class InstallAndEnableTask extends Task.Modal {
List<PluginNode> marketplacePlugins = MarketplaceRequests.loadLastCompatiblePluginDescriptors(myPluginIds);
myCustomPlugins = RepositoryHelper.loadPluginsFromCustomRepositories(indicator);
List<IdeaPluginDescriptor> descriptors =
new ArrayList<>(RepositoryHelper.mergePluginsFromRepositories(marketplacePlugins, myCustomPlugins, false));
List<IdeaPluginDescriptor> descriptors = new ArrayList<>(RepositoryHelper.mergePluginsFromRepositories(marketplacePlugins, myCustomPlugins, true));
descriptors.removeIf(descriptor -> !myPluginIds.contains(descriptor.getPluginId()));
if (myShowDialog) {
MarketplaceRequests marketplace = MarketplaceRequests.getInstance();