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

KotlinMavenPluginPhaseInspection: cleanup code

Browse Source
This commit is contained in:
Dmitry Gridin
2019-10-10 21:26:05 +07:00
parent a652a0f6b3
commit 1e81f9499a
1 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/KotlinMavenPluginPhaseInspection.kt
+24 -14
View File
@@ -39,7 +39,8 @@ import org.jetbrains.idea.maven.utils.MavenArtifactScope
import org.jetbrains.kotlin.idea.maven.PomFile import org.jetbrains.kotlin.idea.maven.PomFile
import org.jetbrains.kotlin.idea.maven.configuration.KotlinMavenConfigurator import org.jetbrains.kotlin.idea.maven.configuration.KotlinMavenConfigurator
import org.jetbrains.kotlin.idea.platform.tooling import org.jetbrains.kotlin.idea.platform.tooling
import org.jetbrains.kotlin.idea.versions.* import org.jetbrains.kotlin.idea.versions.MAVEN_JS_STDLIB_ID
import org.jetbrains.kotlin.idea.versions.MAVEN_STDLIB_ID
import org.jetbrains.kotlin.platform.impl.JvmIdePlatformKind import org.jetbrains.kotlin.platform.impl.JvmIdePlatformKind
import java.util.* import java.util.*
@@ -107,7 +108,8 @@ class KotlinMavenPluginPhaseInspection : DomElementsInspection<MavenDomProjectMo
|| pom.isExecutionEnabled(javacPlugin, "default-compile") || pom.isExecutionEnabled(javacPlugin, "default-compile")
|| pom.isExecutionEnabled(javacPlugin, "default-testCompile") || pom.isExecutionEnabled(javacPlugin, "default-testCompile")
|| pom.isPluginExecutionMissing(javacPlugin, "default-compile", "compile") || pom.isPluginExecutionMissing(javacPlugin, "default-compile", "compile")
|| pom.isPluginExecutionMissing(javacPlugin, "default-testCompile", "testCompile")) { || pom.isPluginExecutionMissing(javacPlugin, "default-testCompile", "testCompile")
) {
holder.createProblem( holder.createProblem(
badExecution.phase.createStableCopy(), badExecution.phase.createStableCopy(),
@@ -179,19 +181,23 @@ class KotlinMavenPluginPhaseInspection : DomElementsInspection<MavenDomProjectMo
} }
pom.findKotlinExecutions().filter { pom.findKotlinExecutions().filter {
it.goals.goals.any { it.rawText == PomFile.KotlinGoals.Compile || it.rawText == PomFile.KotlinGoals.Js } it.goals.goals.any { goal -> goal.rawText == PomFile.KotlinGoals.Compile || goal.rawText == PomFile.KotlinGoals.Js }
&& it.goals.goals.any { it.rawText == PomFile.KotlinGoals.TestCompile || it.rawText == PomFile.KotlinGoals.TestJs } && it.goals.goals.any { goal -> goal.rawText == PomFile.KotlinGoals.TestCompile || goal.rawText == PomFile.KotlinGoals.TestJs }
}.forEach { badExecution -> }.forEach { badExecution ->
holder.createProblem( holder.createProblem(
badExecution.goals.createStableCopy(), badExecution.goals.createStableCopy(),
HighlightSeverity.WEAK_WARNING, HighlightSeverity.WEAK_WARNING,
"It is not recommended to have both test and compile goals in the same execution" "It is not recommended to have both test and compile goals in the same execution"
) )
} }
} }
private class AddExecutionLocalFix(val file: XmlFile, val module: Module, val kotlinPlugin: MavenDomPlugin, val goal: String) : private class AddExecutionLocalFix(
LocalQuickFix { val file: XmlFile,
val module: Module,
val kotlinPlugin: MavenDomPlugin,
val goal: String
) : LocalQuickFix {
override fun getName() = "Create $goal execution" override fun getName() = "Create $goal execution"
override fun getFamilyName() = "Create kotlin execution" override fun getFamilyName() = "Create kotlin execution"
@@ -231,8 +237,12 @@ class KotlinMavenPluginPhaseInspection : DomElementsInspection<MavenDomProjectMo
} }
} }
private class ConfigurePluginExecutionLocalFix(val module: Module, val xmlFile: XmlFile, val goal: String, val version: String?) : private class ConfigurePluginExecutionLocalFix(
LocalQuickFix { val module: Module,
val xmlFile: XmlFile,
val goal: String,
val version: String?
) : LocalQuickFix {
override fun getName() = "Create $goal execution of kotlin-maven-compiler" override fun getName() = "Create $goal execution of kotlin-maven-compiler"
override fun getFamilyName() = "Create kotlin execution" override fun getFamilyName() = "Create kotlin execution"