MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[maven] IDEA-255308 MavenProject.compilerConfigsOrPluginConfig

Browse Source 
GitOrigin-RevId: 7408397d68e48ee3763671ca19b4490a6196751f
This commit is contained in:
Dmitry Kichinsky
2025-01-22 10:10:50 +00:00
committed by intellij-monorepo-bot
parent eadb03d861
commit 75f7bbf5da
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenImportUtil.kt
+10 -5
View File
@@ -230,7 +230,7 @@ object MavenImportUtil {
}
private fun getCompilerLevel(level: String): LanguageLevel? {
val configs = if (isTest) mavenProject.testCompilerConfigs else mavenProject.compilerConfigs
val configs = if (isTest) mavenProject.testCompilerConfigs else mavenProject.compilerConfigs + mavenProject.pluginConfig
val fallbackProperty = "maven.compiler.$level"
val levels = configs.mapNotNull { LanguageLevel.parse(findChildValueByPath(it, level)) }
val maxLevel = levels.maxWithOrNull(Comparator.naturalOrder())?.toJavaVersion()?.toFeatureString()
@@ -380,18 +380,23 @@ object MavenImportUtil {
internal val MavenProject.declaredAnnotationProcessors: List<String>
get() {
return compilerConfigs.flatMap { getDeclaredAnnotationProcessors(it) }
return compilerConfigsOrPluginConfig.flatMap { getDeclaredAnnotationProcessors(it) }
}
private val MavenProject.compilerConfigs: List<Element>
private val MavenProject.compilerConfigsOrPluginConfig: List<Element>
get() {
val configurations: List<Element> = compileExecutionConfigurations
val configurations: List<Element> = compilerConfigs
if (!configurations.isEmpty()) return configurations
return pluginConfig
}
private val MavenProject.pluginConfig: List<Element>
get() {
val configuration: Element? = getPluginConfiguration(COMPILER_PLUGIN_GROUP_ID, COMPILER_PLUGIN_ARTIFACT_ID)
return ContainerUtil.createMaybeSingletonList(configuration)
}
private val MavenProject.compileExecutionConfigurations: List<Element>
private val MavenProject.compilerConfigs: List<Element>
get() {
val plugin = findCompilerPlugin()
if (plugin == null) return emptyList()