From be443f9fa4e2bc359f77f8a99e3587b13fd2bbe3 Mon Sep 17 00:00:00 2001
From: Vladimir Dolzhenko <Vladimir.Dolzhenko@jetbrains.com>
Date: Wed, 25 Feb 2026 15:16:54 +0000
Subject: [PATCH] Revert "KTIJ-37329 [kotlin]: Post commits reverts"

This reverts commit 51c750d7b08e305f645fa5d340b28c17e20a3dc6.

GitOrigin-RevId: 7286a0e82259688a4e64282e0fda367814b08383
---
 .../allopen/maven/AllOpenMavenProjectImportHandler.kt  | 10 +++++-----
 .../maven/compilerPlugin/AbstractMavenImportHandler.kt |  1 -
 .../maven/importer/AllOpenKotlinMavenImporterTest.kt   |  8 ++++----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/plugins/kotlin/compiler-plugins/allopen/maven/src/org/jetbrains/kotlin/idea/compilerPlugin/allopen/maven/AllOpenMavenProjectImportHandler.kt b/plugins/kotlin/compiler-plugins/allopen/maven/src/org/jetbrains/kotlin/idea/compilerPlugin/allopen/maven/AllOpenMavenProjectImportHandler.kt
index 798f44a9fb30..52e25409ea93 100644
--- a/plugins/kotlin/compiler-plugins/allopen/maven/src/org/jetbrains/kotlin/idea/compilerPlugin/allopen/maven/AllOpenMavenProjectImportHandler.kt
+++ b/plugins/kotlin/compiler-plugins/allopen/maven/src/org/jetbrains/kotlin/idea/compilerPlugin/allopen/maven/AllOpenMavenProjectImportHandler.kt
@@ -2,6 +2,7 @@
 
 package org.jetbrains.kotlin.idea.compilerPlugin.allopen.maven
 
+import com.intellij.openapi.project.Project
 import com.intellij.util.text.VersionComparatorUtil
 import org.jetbrains.idea.maven.project.MavenProject
 import org.jetbrains.kotlin.allopen.AllOpenPluginNames.ANNOTATION_OPTION_NAME
@@ -11,13 +12,12 @@ import org.jetbrains.kotlin.idea.base.plugin.artifacts.KotlinArtifacts
 import org.jetbrains.kotlin.idea.compilerPlugin.CompilerPluginSetup.PluginOption
 import org.jetbrains.kotlin.idea.jps.toJpsVersionAgnosticKotlinBundledPath
 import org.jetbrains.kotlin.idea.maven.compilerPlugin.AbstractMavenImportHandler
-import org.jetbrains.kotlin.idea.maven.getKotlinPlugin
 
 class AllOpenMavenProjectImportHandler : AbstractMavenImportHandler() {
-    override val compilerPluginId: String = PLUGIN_ID
-    override val pluginName: String = "allopen"
-    override val mavenPluginArtifactName: String = "kotlin-maven-allopen"
-    override val pluginJarFileFromIdea: String = KotlinArtifacts.allopenCompilerPlugin.toJpsVersionAgnosticKotlinBundledPath()
+    override val compilerPluginId = PLUGIN_ID
+    override val pluginName = "allopen"
+    override val mavenPluginArtifactName = "kotlin-maven-allopen"
+    override val pluginJarFileFromIdea = KotlinArtifacts.allopenCompilerPlugin.toJpsVersionAgnosticKotlinBundledPath()
 
     override fun getOptions(
         mavenProject: MavenProject,
diff --git a/plugins/kotlin/compiler-plugins/compiler-plugin-support/maven/src/org/jetbrains/kotlin/idea/maven/compilerPlugin/AbstractMavenImportHandler.kt b/plugins/kotlin/compiler-plugins/compiler-plugin-support/maven/src/org/jetbrains/kotlin/idea/maven/compilerPlugin/AbstractMavenImportHandler.kt
index d0577d2ab524..c88bd63ea64d 100644
--- a/plugins/kotlin/compiler-plugins/compiler-plugin-support/maven/src/org/jetbrains/kotlin/idea/maven/compilerPlugin/AbstractMavenImportHandler.kt
+++ b/plugins/kotlin/compiler-plugins/compiler-plugin-support/maven/src/org/jetbrains/kotlin/idea/maven/compilerPlugin/AbstractMavenImportHandler.kt
@@ -10,7 +10,6 @@ import org.jetbrains.kotlin.idea.compilerPlugin.CompilerPluginSetup
 import org.jetbrains.kotlin.idea.compilerPlugin.CompilerPluginSetup.PluginOption
 import org.jetbrains.kotlin.idea.compilerPlugin.modifyCompilerArgumentsForPluginWithFacetSettings
 import org.jetbrains.kotlin.idea.maven.MavenProjectImportHandler
-import org.jetbrains.kotlin.idea.maven.findKotlinPlugin
 
 abstract class AbstractMavenImportHandler : MavenProjectImportHandler {
     abstract val compilerPluginId: String
diff --git a/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/importer/AllOpenKotlinMavenImporterTest.kt b/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/importer/AllOpenKotlinMavenImporterTest.kt
index 88bb488826a7..2b9cbb368b90 100644
--- a/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/importer/AllOpenKotlinMavenImporterTest.kt
+++ b/plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/importer/AllOpenKotlinMavenImporterTest.kt
@@ -19,8 +19,8 @@ class AllOpenKotlinMavenImporterTest : AbstractKotlinMavenImporterTest() {
 
         with(facetSettings) {
             assertNotNull(compilerArguments?.pluginClasspaths)
-            assertFalse(compilerArguments!!.pluginClasspaths!!.any { it.endsWith(KotlinArtifacts.allopenCompilerPlugin.name) })
-            assertTrue(compilerArguments!!.pluginClasspaths!!.any { it.endsWith(KotlinArtifacts.noargCompilerPlugin.name) })
+            assertFalse(compilerArguments!!.pluginClasspaths!!.any { it.endsWith(KotlinArtifacts.allopenCompilerPluginPath.fileName.toString()) })
+            assertTrue(compilerArguments!!.pluginClasspaths!!.any { it.endsWith(KotlinArtifacts.noargCompilerPluginPath.fileName.toString()) })
         }
     }
 
@@ -34,8 +34,8 @@ class AllOpenKotlinMavenImporterTest : AbstractKotlinMavenImporterTest() {
 
         with(facetSettings) {
             assertNotNull(compilerArguments?.pluginClasspaths)
-            assertTrue(compilerArguments!!.pluginClasspaths!!.any { it.endsWith(KotlinArtifacts.allopenCompilerPlugin.name) })
-            assertTrue(compilerArguments!!.pluginClasspaths!!.any { it.endsWith(KotlinArtifacts.noargCompilerPlugin.name) })
+            assertTrue(compilerArguments!!.pluginClasspaths!!.any { it.endsWith(KotlinArtifacts.allopenCompilerPluginPath.fileName.toString()) })
+            assertTrue(compilerArguments!!.pluginClasspaths!!.any { it.endsWith(KotlinArtifacts.noargCompilerPluginPath.fileName.toString()) })
             assertArrayEquals(
                 compilerArguments!!.pluginOptions!!,
                 arrayOf(