From fb6bb0c8b7f34543b560d81e4df289808949c3e8 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 25 Jul 2018 14:59:52 +0300 Subject: [PATCH] Need to check compatibility when checking plugin from custom repository (KT-25714) There's no no range check is done on the server side for custom urls not from IntelliJ plugins repository. #KT-25714 Fixed --- idea/src/org/jetbrains/kotlin/idea/KotlinPluginUpdater.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/KotlinPluginUpdater.kt b/idea/src/org/jetbrains/kotlin/idea/KotlinPluginUpdater.kt index 23da58da36d..df552290445 100644 --- a/idea/src/org/jetbrains/kotlin/idea/KotlinPluginUpdater.kt +++ b/idea/src/org/jetbrains/kotlin/idea/KotlinPluginUpdater.kt @@ -212,8 +212,10 @@ class KotlinPluginUpdater(val propertiesComponent: PropertiesComponent) : Dispos return PluginUpdateStatus.fromException("Checking custom plugin repository $host failed", e) } - val kotlinPlugin = - plugins.find { it.pluginId == KotlinPluginUtil.KOTLIN_PLUGIN_ID } ?: return PluginUpdateStatus.LatestVersionInstalled + val kotlinPlugin = plugins.find { pluginDescriptor -> + pluginDescriptor.pluginId == KotlinPluginUtil.KOTLIN_PLUGIN_ID && PluginManagerCore.isCompatible(pluginDescriptor) + } ?: return PluginUpdateStatus.LatestVersionInstalled + return updateIfNotLatest(kotlinPlugin, host) }