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

ConfigureKotlinInProjectUtils: minor cleanup

Browse Source
This commit is contained in:
Dmitry Gridin
2019-07-17 16:22:34 +03:00
parent 3ea195e1a2
commit c88d4f43d3
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt
+2 -6
View File
@@ -5,11 +5,9 @@
package org.jetbrains.kotlin.idea.configuration
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.command.WriteCommandAction
import com.intellij.openapi.extensions.Extensions
import com.intellij.openapi.module.Module
import com.intellij.openapi.project.DumbService
import com.intellij.openapi.project.Project
import com.intellij.openapi.projectRoots.JavaSdkVersion
import com.intellij.openapi.roots.DependencyScope
@@ -25,7 +23,6 @@ import com.intellij.psi.search.FileTypeIndex
import com.intellij.psi.search.GlobalSearchScope
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.idea.KotlinFileType
import org.jetbrains.kotlin.idea.configuration.ui.notifications.ConfigureKotlinNotification
import org.jetbrains.kotlin.idea.core.util.getKotlinJvmRuntimeMarkerClass
import org.jetbrains.kotlin.idea.framework.JSLibraryKind
import org.jetbrains.kotlin.idea.framework.effectiveKind
@@ -221,15 +218,14 @@ fun getConfigurationPossibilitiesForConfigureNotification(
var moduleAlreadyConfigured = false
for (configurator in configurators) {
if (moduleCanBeConfigured && configurator in runnableConfigurators) continue
val status = configurator.getStatus(moduleSourceRootGroup)
when (status) {
when (configurator.getStatus(moduleSourceRootGroup)) {
ConfigureKotlinStatus.CAN_BE_CONFIGURED -> {
moduleCanBeConfigured = true
runnableConfigurators.add(configurator)
}
ConfigureKotlinStatus.CONFIGURED -> moduleAlreadyConfigured = true
}
}
}
if (moduleCanBeConfigured && !moduleAlreadyConfigured && !SuppressNotificationState.isKotlinNotConfiguredSuppressed(
moduleSourceRootGroup
)