[plugins] IJPL-217751 Incompatible plugins reported as installed and update checked on import settings

(cherry picked from commit 558825c720599440a8980f6a681c2cc724f822d7)
IJ-CR-182042

GitOrigin-RevId: 7dbcff0ad6c31ef998738d465d28ef3d3be5c608

Author: jreznot

platform/platform-impl/src/com/intellij/ide/plugins/marketplace/MarketplaceRequests.kt

@@ -156,6 +156,9 @@ class MarketplaceRequests(private val coroutineScope: CoroutineScope) : PluginIn
       throwExceptions: Boolean = false,
       updateCheck: Boolean = false
     ): List<IdeCompatibleUpdate> {
+      LOG.info("Looking for the last compatible plugin updates for:\n$allIds\n" +
+               "Is update check: $updateCheck")
+
       val chunks = mutableListOf<MutableList<PluginId>>()
       chunks.add(ArrayList(100))
 
@@ -188,8 +191,9 @@ class MarketplaceRequests(private val coroutineScope: CoroutineScope) : PluginIn
       allIds: Set<PluginId>,
       buildNumber: BuildNumber? = null,
       throwExceptions: Boolean = false,
+      updateCheck: Boolean = false,
     ): List<IdeCompatibleUpdate> {
-      return loadLastCompatiblePluginUpdate(allIds, buildNumber, throwExceptions, updateCheck = true)
+      return loadLastCompatiblePluginUpdate(allIds, buildNumber, throwExceptions, updateCheck)
     }
 
     @RequiresBackgroundThread

platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.kt

@@ -276,7 +276,9 @@ object UpdateChecker {
     for (host in RepositoryHelper.getPluginHosts()) {
       try {
         if (host == null && ApplicationInfoEx.getInstanceEx().usesJetBrainsPluginRepository()) {
-          findUpdatesInJetBrainsRepository(updateable, toUpdate, toUpdateDisabled, buildNumber, state, indicator)
+          // consider it as updateCheck only if we collected plugins here, and they are not passed from outside
+          findUpdatesInJetBrainsRepository(updateable, toUpdate, toUpdateDisabled, buildNumber, state, indicator,
+                                           updateCheck = updateablePluginsMap == null)
         }
         else {
           RepositoryHelper.loadPluginModels(host, buildNumber, indicator).forEach { model ->
@@ -374,10 +376,11 @@ object UpdateChecker {
     buildNumber: BuildNumber?,
     state: InstalledPluginsState,
     indicator: ProgressIndicator?,
+    updateCheck: Boolean = false,
   ) {
     val marketplacePluginIds = MarketplaceRequests.getInstance().getMarketplacePlugins(indicator)
     val idsToUpdate = updateable.keys.filter { it in marketplacePluginIds }.toSet()
-    val updates = MarketplaceRequests.checkLastCompatiblePluginUpdate(idsToUpdate, buildNumber)
+    val updates = MarketplaceRequests.checkLastCompatiblePluginUpdate(idsToUpdate, buildNumber, false, updateCheck)
     for ((id, descriptor) in updateable) {
       val lastUpdate = updates.find { it.pluginId == id.idString }
       if (lastUpdate != null &&