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

Revert "KTIJ-37329 [kotlin]: Post commits reverts"

Browse Source 
This reverts commit 51c750d7b08e305f645fa5d340b28c17e20a3dc6.

GitOrigin-RevId: 7286a0e82259688a4e64282e0fda367814b08383
This commit is contained in:
Vladimir Dolzhenko
2026-03-02 19:24:18 +00:00
committed by intellij-monorepo-bot
parent 6693158052
commit be443f9fa4
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin/compiler-plugins/allopen/maven/src/org/jetbrains/kotlin/idea/compilerPlugin/allopen/maven/AllOpenMavenProjectImportHandler.kt
+5 -5
View File
@@ -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,
plugins/kotlin/compiler-plugins/compiler-plugin-support/maven/src/org/jetbrains/kotlin/idea/maven/compilerPlugin/AbstractMavenImportHandler.kt
-1
View File
@@ -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
plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/importer/AllOpenKotlinMavenImporterTest.kt
+4 -4
View File
@@ -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(