From 5bfb35c8aa6e9f5ac05d950250a65230d1605cb3 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Thu, 12 Jul 2018 13:27:47 +0300
Subject: [PATCH] Revert "Add knowledge about eap-1.3 channel to plugin
 (KT-25414)"

It's decided to migrate to scheme with two predefined channels:
`eap` and `eap-next`.

This reverts commit 4f1f1e6
---
 .../configuration/KotlinLanguageConfiguration.kt | 16 +++++-----------
 .../ui/ConfigurePluginUpdatesForm.form           |  1 -
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinLanguageConfiguration.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinLanguageConfiguration.kt
index 2a1c4530ad4..efb8bc9812f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinLanguageConfiguration.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinLanguageConfiguration.kt
@@ -25,16 +25,15 @@ class KotlinUpdatesSettingsConfigurable : SearchableConfigurable, Configurable.N
                 it.startsWith("https://plugins.jetbrains.com/plugins/") &&
                         (it.endsWith("/6954") || it.endsWith(KotlinPluginUtil.KOTLIN_PLUGIN_ID.idString))
             }
-
-            EAPChannels.values().find { it.uiIndex == channel }?.let { eapChannel ->
-                hosts.add(eapChannel.url)
+            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)
             }
         }
 
         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-1.3/${KotlinPluginUtil.KOTLIN_PLUGIN_ID.idString}", 2),
-            EAP_NEXT("https://plugins.jetbrains.com/plugins/eap-next/${KotlinPluginUtil.KOTLIN_PLUGIN_ID.idString}", 3);
+            EAP_1_3("https://plugins.jetbrains.com/plugins/eap-next/${KotlinPluginUtil.KOTLIN_PLUGIN_ID.idString}", 2);
 
             private val hasChannel: Boolean get() = url in UpdateSettings.getInstance().pluginHosts
 
@@ -111,12 +110,7 @@ class KotlinUpdatesSettingsConfigurable : SearchableConfigurable, Configurable.N
             }
         }
 
-        savedChannel = EAPChannels.values().asSequence()
-            .map { eapChannel -> eapChannel.indexIfAvailable() }
-            .filterNotNull()
-            .firstOrNull()
-                ?: 0
-
+        savedChannel = EAPChannels.EAP_1_3.indexIfAvailable() ?: EAPChannels.EAP_1_2.indexIfAvailable() ?: 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 9f65c203df6..fea53a44be8 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/ui/ConfigurePluginUpdatesForm.form
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/ui/ConfigurePluginUpdatesForm.form
@@ -85,7 +85,6 @@
                 <item value="Stable"/>
                 <item value="Early Access Preview 1.2.x"/>
                 <item value="Early Access Preview 1.3"/>
-                <item value="Early Access Preview (Next)"/>
               </model>
             </properties>
           </component>