From 75f7bbf5dad48b28f5103d4459fed9de0d76b628 Mon Sep 17 00:00:00 2001
From: Dmitry Kichinsky <dmitry.kichinsky@jetbrains.com>
Date: Wed, 22 Jan 2025 07:06:44 +0100
Subject: [PATCH] [maven] IDEA-255308
 MavenProject.compilerConfigsOrPluginConfig

GitOrigin-RevId: 7408397d68e48ee3763671ca19b4490a6196751f
---
 .../idea/maven/importing/MavenImportUtil.kt       | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenImportUtil.kt b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenImportUtil.kt
index 10d1cd3e84df..ed02b86cbc6c 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenImportUtil.kt
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenImportUtil.kt
@@ -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()