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

Don't show "Configure Kotlin" notification with an empty list of configurators (context: KT-16070)

Browse Source
This commit is contained in:
Dmitry Jemerov
2017-03-10 19:24:00 +01:00
parent 9f8af1feea
commit 95bc0813f8
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinNotificationManager.kt
+4 -1
View File
@@ -24,7 +24,10 @@ import org.jetbrains.kotlin.idea.configuration.ui.notifications.ConfigureKotlinN
object ConfigureKotlinNotificationManager: KotlinSingleNotificationManager<ConfigureKotlinNotification> { object ConfigureKotlinNotificationManager: KotlinSingleNotificationManager<ConfigureKotlinNotification> {
fun notify(project: Project, excludeModules: List<Module> = emptyList()) { fun notify(project: Project, excludeModules: List<Module> = emptyList()) {
notify(project, ConfigureKotlinNotification(project, excludeModules)) val notificationString = ConfigureKotlinNotification.getNotificationString(project, excludeModules)
if (notificationString != null) {
notify(project, ConfigureKotlinNotification(project, excludeModules, notificationString))
}
} }
} }
idea/src/org/jetbrains/kotlin/idea/configuration/ui/notifications/ConfigureKotlinNotification.kt
+4 -5
View File
@@ -42,9 +42,6 @@ class ConfigureKotlinNotification(
} }
}) { }) {
constructor(project: Project, excludeModules: List<Module>)
: this(project, excludeModules, getNotificationString(project, excludeModules))
override fun equals(o: Any?): Boolean { override fun equals(o: Any?): Boolean {
if (this === o) return true if (this === o) return true
if (o !is ConfigureKotlinNotification) return false if (o !is ConfigureKotlinNotification) return false
@@ -59,13 +56,15 @@ class ConfigureKotlinNotification(
} }
companion object { companion object {
fun getNotificationString(project: Project, excludeModules: Collection<Module>): String { fun getNotificationString(project: Project, excludeModules: Collection<Module>): String? {
val modules = getNonConfiguredModulesWithKotlinFiles(project, excludeModules) val modules = getNonConfiguredModulesWithKotlinFiles(project, excludeModules)
val isOnlyOneModule = modules.size == 1 val isOnlyOneModule = modules.size == 1
val modulesString = if (isOnlyOneModule) "'${modules.first().name}' module" else "modules" val modulesString = if (isOnlyOneModule) "'${modules.first().name}' module" else "modules"
val links = getAbleToRunConfigurators(project).joinToString(separator = "<br/>") { val ableToRunConfigurators = getAbleToRunConfigurators(project)
if (ableToRunConfigurators.isEmpty()) return null
val links = ableToRunConfigurators.joinToString(separator = "<br/>") {
configurator -> getLink(configurator, isOnlyOneModule) configurator -> getLink(configurator, isOnlyOneModule)
} }