MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
GitOrigin-RevId: 558825c720599440a8980f6a681c2cc724f822d7
This commit is contained in:
Yuriy Artamonov
2025-11-10 23:07:38 +00:00
committed by intellij-monorepo-bot
parent f4cadab06c
commit efcfd55f1f
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/plugins/marketplace/MarketplaceRequests.kt
+5 -1
View File
@@ -158,6 +158,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))
@@ -190,8 +193,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/update-checker/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.kt
+6 -8
View File
@@ -19,12 +19,7 @@ import com.intellij.openapi.components.service
import com.intellij.openapi.diagnostic.debug
import com.intellij.openapi.diagnostic.logger
import com.intellij.openapi.extensions.PluginId
import com.intellij.openapi.progress.EmptyProgressIndicator
import com.intellij.openapi.progress.ProgressIndicator
import com.intellij.openapi.progress.ProgressManager
import com.intellij.openapi.progress.Task
import com.intellij.openapi.progress.runBlockingCancellable
import com.intellij.openapi.progress.runBlockingMaybeCancellable
import com.intellij.openapi.progress.*
import com.intellij.openapi.project.Project
import com.intellij.openapi.ui.Messages
import com.intellij.openapi.util.*
@@ -369,7 +364,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 ->
@@ -468,10 +465,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 &&