From 0eb5934e09e8bd3321cfeb485401f89ac75cfa31 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Wed, 12 Sep 2018 11:49:31 +0300
Subject: [PATCH] Update channels list in update Kotlin dropdown (KT-25429)

 #KT-25429 Fixed
---
 .../configuration/KotlinLanguageConfiguration.kt | 16 +++++++---------
 .../ui/ConfigurePluginUpdatesForm.form           |  4 ++--
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinLanguageConfiguration.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinLanguageConfiguration.kt
index cd5fc9bc818..cc063609c6e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinLanguageConfiguration.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinLanguageConfiguration.kt
@@ -25,19 +25,17 @@ class KotlinUpdatesSettingsConfigurable : SearchableConfigurable, Configurable.N
                 it.startsWith("https://plugins.jetbrains.com/plugins/") &&
                         (it.endsWith("/6954") || it.endsWith(KotlinPluginUtil.KOTLIN_PLUGIN_ID.idString))
             }
-            when (channel) {
-                EAPChannels.EAP_1_3.uiIndex -> hosts.add(EAPChannels.EAP_1_3.url)
-                EAPChannels.EAP_1_2.uiIndex -> hosts.add(EAPChannels.EAP_1_2.url)
+
+            EAPChannels.values().find { it.uiIndex == channel }?.let { eapChannel ->
+                hosts.add(eapChannel.url)
             }
         }
 
         enum class EAPChannels(val url: String, val uiIndex: Int) {
-            EAP_1_2("https://plugins.jetbrains.com/plugins/eap-1.2/${KotlinPluginUtil.KOTLIN_PLUGIN_ID.idString}", 1),
-            EAP_1_3("https://plugins.jetbrains.com/plugins/eap-next/${KotlinPluginUtil.KOTLIN_PLUGIN_ID.idString}", 2);
+            EAP("https://plugins.jetbrains.com/plugins/eap/${KotlinPluginUtil.KOTLIN_PLUGIN_ID.idString}", 1),
+            EAP_NEXT("https://plugins.jetbrains.com/plugins/eap-next/${KotlinPluginUtil.KOTLIN_PLUGIN_ID.idString}", 2);
 
-            private val hasChannel: Boolean get() = url in UpdateSettings.getInstance().pluginHosts
-
-            fun indexIfAvailable() = if (hasChannel) uiIndex else null
+            fun isInHosts() = url in UpdateSettings.getInstance().pluginHosts
         }
     }
 
@@ -110,7 +108,7 @@ class KotlinUpdatesSettingsConfigurable : SearchableConfigurable, Configurable.N
             }
         }
 
-        savedChannel = EAPChannels.EAP_1_3.indexIfAvailable() ?: EAPChannels.EAP_1_2.indexIfAvailable() ?: 0
+        savedChannel = EAPChannels.values().find { it.isInHosts() }?.uiIndex ?: 0
         form.channelCombo.selectedIndex = savedChannel
 
         form.channelCombo.addActionListener {
diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/ui/ConfigurePluginUpdatesForm.form b/idea/src/org/jetbrains/kotlin/idea/configuration/ui/ConfigurePluginUpdatesForm.form
index 504337a19b1..48f2139219f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/ui/ConfigurePluginUpdatesForm.form
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/ui/ConfigurePluginUpdatesForm.form
@@ -83,8 +83,8 @@
             <properties>
               <model>
                 <item value="Stable"/>
-                <item value="Early Access Preview 1.2.x"/>
-                <item value="Early Access Preview 1.3"/>
+                <item value="Early Access Preview 1.3.x"/>
+                <item value="Early Access Preview 1.4.x"/>
               </model>
             </properties>
           </component>