azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add knowledge about eap-1.3 channel to plugin (KT-25414)

Browse Source 
#KT-25414 Fixed
This commit is contained in:
Nikolay Krasko
2018-07-11 16:25:20 +03:00
parent d241c092e2
commit 4f1f1e66eb
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/configuration/KotlinLanguageConfiguration.kt
+11 -5
View File
@@ -25,15 +25,16 @@ 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_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);
private val hasChannel: Boolean get() = url in UpdateSettings.getInstance().pluginHosts
@@ -110,7 +111,12 @@ class KotlinUpdatesSettingsConfigurable : SearchableConfigurable, Configurable.N
}
}
savedChannel = EAPChannels.EAP_1_3.indexIfAvailable() ?: EAPChannels.EAP_1_2.indexIfAvailable() ?: 0
savedChannel = EAPChannels.values().asSequence()
.map { eapChannel -> eapChannel.indexIfAvailable() }
.filterNotNull()
.firstOrNull()
?: 0
form.channelCombo.selectedIndex = savedChannel
form.channelCombo.addActionListener {
idea/src/org/jetbrains/kotlin/idea/configuration/ui/ConfigurePluginUpdatesForm.form
+1
View File
@@ -85,6 +85,7 @@
<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>