Remove duplicated code in annotation-based-compiler-plugins-ide-support

plugins/annotation-based-compiler-plugins-ide-support/src/AbstractAnnotationPluginGradleImportHandler.kt

@@ -10,13 +10,15 @@ import com.intellij.openapi.externalSystem.model.ProjectKeys
 import com.intellij.openapi.externalSystem.model.project.ModuleData
 import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
 import com.intellij.openapi.util.Key
-import org.jetbrains.kotlin.annotation.plugin.ide.AnnotationBasedCompilerPluginSetup.PluginOption
+import org.jetbrains.kotlin.plugin.ide.CompilerPluginSetup.PluginOption
 import org.jetbrains.kotlin.idea.configuration.GradleProjectImportHandler
 import org.jetbrains.kotlin.idea.facet.KotlinFacet
+import org.jetbrains.kotlin.plugin.ide.CompilerPluginSetup
+import org.jetbrains.kotlin.plugin.ide.modifyCompilerArgumentsForPlugin
 import org.jetbrains.plugins.gradle.model.data.GradleSourceSetData
 import java.io.File
 
-abstract class AbstractGradleImportHandler<T : AnnotationBasedPluginModel> : GradleProjectImportHandler {
+abstract class AbstractAnnotationPluginGradleImportHandler<T : AnnotationBasedPluginModel> : GradleProjectImportHandler {
     abstract val compilerPluginId: String
     abstract val pluginName: String
     abstract val annotationOptionName: String
@@ -42,7 +44,7 @@ abstract class AbstractGradleImportHandler<T : AnnotationBasedPluginModel> : Gra
 
     private fun getPluginSetupByModule(
             moduleNode: DataNode<ModuleData>
-    ): AnnotationBasedCompilerPluginSetup? {
+    ): CompilerPluginSetup? {
         val pluginModel = moduleNode.getCopyableUserData(modelKey)?.takeIf { it.isEnabled } ?: return null
         val annotations = pluginModel.annotations
         val presets = pluginModel.presets
@@ -54,7 +56,7 @@ abstract class AbstractGradleImportHandler<T : AnnotationBasedPluginModel> : Gra
         // So we use ones from the IDEA plugin.
         val classpath = listOf(pluginJarFileFromIdea.absolutePath)
 
-        return AnnotationBasedCompilerPluginSetup(options, classpath)
+        return CompilerPluginSetup(options, classpath)
     }
 
     private fun getPluginSetupBySourceSet(sourceSetNode: DataNode<GradleSourceSetData>) =

plugins/annotation-based-compiler-plugins-ide-support/src/AbstractMavenImportHandler.kt

@@ -1,72 +0,0 @@
-/*
- * Copyright 2010-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.annotation.plugin.ide
-
-import org.jdom.Element
-import org.jdom.Text
-import org.jetbrains.idea.maven.project.MavenProject
-import org.jetbrains.kotlin.annotation.plugin.ide.AnnotationBasedCompilerPluginSetup.PluginOption
-import org.jetbrains.kotlin.idea.facet.KotlinFacet
-import org.jetbrains.kotlin.idea.maven.MavenProjectImportHandler
-import org.jetbrains.kotlin.idea.maven.KotlinMavenImporter.Companion.KOTLIN_PLUGIN_GROUP_ID
-import org.jetbrains.kotlin.idea.maven.KotlinMavenImporter.Companion.KOTLIN_PLUGIN_ARTIFACT_ID
-import java.io.File
-
-abstract class AbstractMavenImportHandler : MavenProjectImportHandler {
-    abstract val compilerPluginId: String
-    abstract val pluginName: String
-    abstract val mavenPluginArtifactName: String
-    abstract val pluginJarFileFromIdea: File
-
-    override fun invoke(facet: KotlinFacet, mavenProject: MavenProject) {
-        modifyCompilerArgumentsForPlugin(facet, getPluginSetup(mavenProject),
-                                         compilerPluginId = compilerPluginId,
-                                         pluginName = pluginName)
-    }
-
-    abstract fun getOptions(enabledCompilerPlugins: List<String>, compilerPluginOptions: List<String>): List<PluginOption>?
-
-    private fun getPluginSetup(mavenProject: MavenProject): AnnotationBasedCompilerPluginSetup? {
-        val kotlinPlugin = mavenProject.plugins.firstOrNull {
-            it.groupId == KOTLIN_PLUGIN_GROUP_ID && it.artifactId == KOTLIN_PLUGIN_ARTIFACT_ID
-        } ?: return null
-
-        val configuration = kotlinPlugin.configurationElement ?: return null
-
-        val enabledCompilerPlugins = configuration.getElement("compilerPlugins")
-                ?.getElements()
-                ?.flatMap { plugin -> plugin.content.mapNotNull { (it as? Text)?.text } }
-                ?: emptyList()
-
-        val compilerPluginOptions = configuration.getElement("pluginOptions")
-                ?.getElements()
-                ?.flatMap { it.content }
-                ?.mapTo(mutableListOf()) { (it as Text).text }
-                ?: mutableListOf<String>()
-
-        // We can't use the plugin from Gradle as it may have the incompatible version
-        val classpath = listOf(pluginJarFileFromIdea.absolutePath)
-
-        val options = getOptions(enabledCompilerPlugins, compilerPluginOptions) ?: return null
-        return AnnotationBasedCompilerPluginSetup(options, classpath)
-    }
-
-    private fun Element.getElement(name: String) = content.firstOrNull { it is Element && it.name == name } as? Element
-
-    @Suppress("UNCHECKED_CAST")
-    private fun Element.getElements() = content.filterIsInstance<Element>()
-}

plugins/annotation-based-compiler-plugins-ide-support/src/idePluginUtils.kt

@@ -17,12 +17,6 @@
 package org.jetbrains.kotlin.annotation.plugin.ide
 
 import com.intellij.openapi.module.Module
-import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
-import org.jetbrains.kotlin.idea.facet.KotlinFacet
-import org.jetbrains.kotlin.lexer.KtTokens
-import org.jetbrains.kotlin.psi.KtClass
-import org.jetbrains.kotlin.psi.KtDeclaration
-import java.io.File
 
 fun Module.getSpecialAnnotations(prefix: String): List<String> {
     val kotlinFacet = org.jetbrains.kotlin.idea.facet.KotlinFacet.get(this) ?: return emptyList()
@@ -32,42 +26,4 @@ fun Module.getSpecialAnnotations(prefix: String): List<String> {
         ?.filter { it.startsWith(prefix) }
         ?.map { it.substring(prefix.length) }
         ?: emptyList()
-}
-
-class AnnotationBasedCompilerPluginSetup(val options: List<PluginOption>, val classpath: List<String>) {
-    class PluginOption(val key: String, val value: String)
-}
-
-internal fun modifyCompilerArgumentsForPlugin(
-    facet: KotlinFacet,
-    setup: AnnotationBasedCompilerPluginSetup?,
-    compilerPluginId: String,
-    pluginName: String
-) {
-    val facetSettings = facet.configuration.settings
-
-    // investigate why copyBean() sometimes throws exceptions
-    val commonArguments = facetSettings.compilerArguments ?: CommonCompilerArguments.DummyImpl()
-
-    /** See [CommonCompilerArguments.PLUGIN_OPTION_FORMAT] **/
-    val newOptionsForPlugin = setup?.options?.map { "plugin:$compilerPluginId:${it.key}=${it.value}" } ?: emptyList()
-
-    val oldAllPluginOptions =
-        (commonArguments.pluginOptions ?: emptyArray()).filterTo(mutableListOf()) { !it.startsWith("plugin:$compilerPluginId:") }
-    val newAllPluginOptions = oldAllPluginOptions + newOptionsForPlugin
-
-    val oldPluginClasspaths = (commonArguments.pluginClasspaths ?: emptyArray()).filterTo(mutableListOf()) {
-        val lastIndexOfFile = it.lastIndexOfAny(charArrayOf('/', File.separatorChar))
-        if (lastIndexOfFile < 0) {
-            return@filterTo true
-        }
-        !it.drop(lastIndexOfFile + 1).matches("(kotlin-)?(maven-)?$pluginName-.*\\.jar".toRegex())
-    }
-
-    val newPluginClasspaths = oldPluginClasspaths + (setup?.classpath ?: emptyList())
-
-    commonArguments.pluginOptions = newAllPluginOptions.toTypedArray()
-    commonArguments.pluginClasspaths = newPluginClasspaths.toTypedArray()
-
-    facetSettings.compilerArguments = commonArguments
 }