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

Don't call an additional update check when selecting channel with enter

Browse Source
This commit is contained in:
Nikolay Krasko
2018-05-23 18:22:28 +03:00
parent 468f7f234f
commit 6c56a7949c
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/configuration/KotlinLanguageConfiguration.kt
+10 -4
View File
@@ -44,6 +44,8 @@ class KotlinUpdatesSettingsConfigurable : SearchableConfigurable, Configurable.N
private val form = ConfigurePluginUpdatesForm() private val form = ConfigurePluginUpdatesForm()
private var update: PluginUpdateStatus.Update? = null private var update: PluginUpdateStatus.Update? = null
private var savedChannel = -1
private var versionForInstallation: String? = null private var versionForInstallation: String? = null
private var installedVersion: String? = null private var installedVersion: String? = null
@@ -108,11 +110,15 @@ class KotlinUpdatesSettingsConfigurable : SearchableConfigurable, Configurable.N
} }
} }
val savedChannel: Int = EAPChannels.EAP_1_3.indexIfAvailable() ?: EAPChannels.EAP_1_2.indexIfAvailable() ?: 0 savedChannel = EAPChannels.EAP_1_3.indexIfAvailable() ?: EAPChannels.EAP_1_2.indexIfAvailable() ?: 0
form.channelCombo.selectedIndex = savedChannel form.channelCombo.selectedIndex = savedChannel
form.channelCombo.addActionListener { form.channelCombo.addActionListener {
checkForUpdates() val newChannel = form.channelCombo.selectedIndex
if (newChannel != savedChannel) {
savedChannel = newChannel
checkForUpdates()
}
} }
checkForUpdates() checkForUpdates()
@@ -121,7 +127,7 @@ class KotlinUpdatesSettingsConfigurable : SearchableConfigurable, Configurable.N
} }
private fun checkForUpdates() { private fun checkForUpdates() {
saveSettings() saveChannelSettings()
form.updateCheckProgressIcon.resume() form.updateCheckProgressIcon.resume()
form.resetUpdateStatus() form.resetUpdateStatus()
KotlinPluginUpdater.getInstance().runUpdateCheck{ pluginUpdateStatus -> KotlinPluginUpdater.getInstance().runUpdateCheck{ pluginUpdateStatus ->
@@ -156,7 +162,7 @@ class KotlinUpdatesSettingsConfigurable : SearchableConfigurable, Configurable.N
} }
} }
private fun saveSettings() { private fun saveChannelSettings() {
saveSelectedChannel(form.channelCombo.selectedIndex) saveSelectedChannel(form.channelCombo.selectedIndex)
} }
} }