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

Extract shouldConfigureInProject to AbstractChangeFeatureSupportLevelFix

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-09-20 14:47:47 +03:00
parent 7030a485be
commit c5a81c4e8b
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jvm/src/org/jetbrains/kotlin/idea/quickfix/ChangeCoroutineSupportFix.kt
+1 -7
View File
@@ -64,15 +64,9 @@ sealed class ChangeCoroutineSupportFix(
override fun doCreateActions(diagnostic: Diagnostic): List<IntentionAction> {
val module = ModuleUtilCore.findModuleForPsiElement(diagnostic.psiElement) ?: return emptyList()
fun shouldConfigureInProject(): Boolean {
val facetSettings = KotlinFacet.get(module)?.configuration?.settings
return (facetSettings == null || facetSettings.useProjectSettings) &&
module.getBuildSystemType() == BuildSystemType.JPS
}
return doCreateActions(
diagnostic, LanguageFeature.Coroutines, allowWarningAndErrorMode = true,
quickFixConstructor = if (shouldConfigureInProject()) { element, _, coroutineSupport ->
quickFixConstructor = if (shouldConfigureInProject(module)) { element, _, coroutineSupport ->
InProject(
element,
coroutineSupport
idea/idea-jvm/src/org/jetbrains/kotlin/idea/quickfix/ChangeGeneralLanguageFeatureSupportFix.kt
+1 -7
View File
@@ -71,16 +71,10 @@ sealed class ChangeGeneralLanguageFeatureSupportFix(
override fun doCreateActions(diagnostic: Diagnostic): List<IntentionAction> {
val module = ModuleUtilCore.findModuleForPsiElement(diagnostic.psiElement) ?: return emptyList()
fun shouldConfigureInProject(): Boolean {
val facetSettings = KotlinFacet.get(module)?.configuration?.settings
return (facetSettings == null || facetSettings.useProjectSettings) &&
module.getBuildSystemType() == BuildSystemType.JPS
}
return supportedFeatures.flatMap { feature ->
doCreateActions(
diagnostic, feature, allowWarningAndErrorMode = false,
quickFixConstructor = if (shouldConfigureInProject()) ::InProject else ::InModule
quickFixConstructor = if (shouldConfigureInProject(module)) ::InProject else ::InModule
)
}
}
idea/src/org/jetbrains/kotlin/idea/quickfix/AbstractChangeFeatureSupportLevelFix.kt
+10
View File
@@ -6,10 +6,14 @@
package org.jetbrains.kotlin.idea.quickfix
import com.intellij.codeInsight.intention.IntentionAction
import com.intellij.openapi.module.Module
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.config.LanguageFeature
import org.jetbrains.kotlin.diagnostics.Diagnostic
import org.jetbrains.kotlin.diagnostics.Errors
import org.jetbrains.kotlin.idea.configuration.BuildSystemType
import org.jetbrains.kotlin.idea.configuration.getBuildSystemType
import org.jetbrains.kotlin.idea.facet.KotlinFacet
abstract class AbstractChangeFeatureSupportLevelFix(
element: PsiElement,
@@ -35,6 +39,12 @@ abstract class AbstractChangeFeatureSupportLevelFix(
}
abstract class FeatureSupportIntentionActionsFactory : KotlinIntentionActionsFactory() {
protected fun shouldConfigureInProject(module: Module): Boolean {
val facetSettings = KotlinFacet.get(module)?.configuration?.settings
return (facetSettings == null || facetSettings.useProjectSettings) &&
module.getBuildSystemType() == BuildSystemType.JPS
}
protected fun doCreateActions(
diagnostic: Diagnostic,
feature: LanguageFeature,