[FIR-PLUGIN] Move fir plugin prototype out from :compiler module

build.gradle.kts

@@ -273,8 +273,7 @@ extra["compilerModules"] = arrayOf(
     ":compiler:fir:java",
     ":compiler:fir:jvm",
     ":compiler:fir:checkers",
-    ":compiler:fir:analysis-tests",
+    ":compiler:fir:analysis-tests"
-    ":compiler:fir:plugins:allopen-plugin"
 )
 
 val coreLibProjects = listOfNotNull(

compiler/build.gradle.kts

@@ -46,7 +46,6 @@ dependencies {
     testCompile(projectTests(":compiler:fir:raw-fir:light-tree2fir"))
     testCompile(projectTests(":compiler:fir:fir2ir"))
     testCompile(projectTests(":compiler:fir:analysis-tests"))
-    testCompile(projectTests(":compiler:fir:plugins:allopen-plugin"))
     testCompile(projectTests(":compiler:visualizer"))
     testCompile(projectTests(":generators:test-generator"))
     testCompile(project(":compiler:ir.ir2cfg"))

compiler/fir/plugins/allopen-plugin/testData/classGen/simple.kt

@@ -1,7 +0,0 @@
-import org.jetbrains.kotlin.fir.allopen.WithClass
-import org.jetbrains.kotlin.fir.allopen.AllOpen
-
-@WithClass
-class A {
-
-}

compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt

@@ -22,7 +22,6 @@ import org.jetbrains.kotlin.codegen.defaultConstructor.AbstractDefaultArgumentsR
 import org.jetbrains.kotlin.codegen.flags.AbstractWriteFlagsTest
 import org.jetbrains.kotlin.codegen.ir.*
 import org.jetbrains.kotlin.fir.*
-import org.jetbrains.kotlin.fir.allopen.AbstractFirAllOpenDiagnosticTest
 import org.jetbrains.kotlin.fir.builder.AbstractRawFirBuilderTestCase
 import org.jetbrains.kotlin.fir.lightTree.AbstractLightTree2FirConverterTestCase
 import org.jetbrains.kotlin.fir.java.AbstractFirOldFrontendLightClassesTest
@@ -629,10 +628,4 @@ fun main(args: Array<String>) {
             model("uncommonCases/testFiles", testMethod = "doUncommonCasesTest")
         }
     }
-    
-    testGroup("compiler/fir/plugins/allopen-plugin/tests", "compiler/fir/plugins/allopen-plugin/testData") {
-        testClass<AbstractFirAllOpenDiagnosticTest> {
-            model("")
-        }
-    }
 }

generators/build.gradle.kts

@@ -57,6 +57,7 @@ dependencies {
     testCompile(projectTests(":kotlin-noarg-compiler-plugin"))
     testCompile(projectTests(":kotlin-sam-with-receiver-compiler-plugin"))
     testCompile(projectTests(":kotlinx-serialization-compiler-plugin"))
+    testCompile(projectTests(":plugins:fir:fir-plugin-prototype"))
     testCompile(projectTests(":idea:jvm-debugger:jvm-debugger-test"))
     testCompile(projectTests(":generators:test-generator"))
     testCompile(projectTests(":idea"))

generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt

@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.copyright.AbstractUpdateKotlinCopyrightTest
 import org.jetbrains.kotlin.findUsages.AbstractFindUsagesTest
 import org.jetbrains.kotlin.findUsages.AbstractFindUsagesWithDisableComponentSearchTest
 import org.jetbrains.kotlin.findUsages.AbstractKotlinFindUsagesWithLibraryTest
+import org.jetbrains.kotlin.fir.plugin.AbstractFirAllOpenDiagnosticTest
 import org.jetbrains.kotlin.formatter.AbstractFormatterTest
 import org.jetbrains.kotlin.formatter.AbstractTypingIndentationTestBase
 import org.jetbrains.kotlin.generators.tests.generator.TestGroup
@@ -1446,6 +1447,12 @@ fun main(args: Array<String>) {
         }
     }
 
+    testGroup("plugins/fir/fir-plugin-prototype/tests", "plugins/fir/fir-plugin-prototype/testData") {
+        testClass<AbstractFirAllOpenDiagnosticTest> {
+            model("")
+        }
+    }
+
     testGroup("idea/performanceTests/test", "idea/testData") {
         testClass<AbstractPerformanceJavaToKotlinCopyPasteConversionTest> {
             model("copyPaste/conversion", testMethod = "doPerfTest", pattern = """^([^\.]+)\.java$""")

plugins/fir/fir-plugin-prototype/build.gradle.kts

@@ -41,7 +41,7 @@ projectTest(parallel = true) {
     workingDir = rootDir
     jvmArgs!!.removeIf { it.contains("-Xmx") }
     maxHeapSize = "3g"
-    dependsOn(":compiler:fir:plugins:allopen-plugin:allopen-annotations:jar")
+    dependsOn(":plugins:fir:fir-plugin-prototype:plugin-annotations:jar")
 }
 
 testsJar()

plugins/fir/fir-plugin-prototype/plugin-annotations/src/org/jetbrains/kotlin/fir/plugin/AllOpen.kt

@@ -3,6 +3,6 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.fir.allopen
+package org.jetbrains.kotlin.fir.plugin
 
 annotation class AllOpen

plugins/fir/fir-plugin-prototype/plugin-annotations/src/org/jetbrains/kotlin/fir/plugin/WithClass.kt

@@ -3,6 +3,6 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.fir.allopen
+package org.jetbrains.kotlin.fir.plugin
 
 annotation class WithClass

plugins/fir/fir-plugin-prototype/resources/META-INF/services/org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar

@@ -3,4 +3,4 @@
 # Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
 #
 
-org.jetbrains.kotlin.fir.allopen.FirAllOpenComponentRegistrar
+org.jetbrains.kotlin.fir.plugin.FirAllOpenComponentRegistrar

plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/AllOpenClassGenerator.kt

@@ -3,13 +3,12 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.fir.allopen
+package org.jetbrains.kotlin.fir.plugin
 
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.Visibilities
 import org.jetbrains.kotlin.fir.FirAnnotationContainer
-import org.jetbrains.kotlin.fir.FirEffectiveVisibility
 import org.jetbrains.kotlin.fir.FirEffectiveVisibilityImpl
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.declarations.*
@@ -43,7 +42,7 @@ class AllOpenClassGenerator(session: FirSession) : FirClassGenerationExtension(s
         return listOf(GeneratedClass(klass, containingFile))
     }
 
-    override val directlyApplicableAnnotations: Set<AnnotationFqn> = setOf(FqName("org.jetbrains.kotlin.fir.allopen.WithClass"))
+    override val directlyApplicableAnnotations: Set<AnnotationFqn> = setOf(FqName("org.jetbrains.kotlin.fir.plugin.WithClass"))
 
     override val childrenApplicableAnnotations: Set<AnnotationFqn>
         get() = emptySet()

plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/AllOpenPluginKey.kt

@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.fir.allopen
+package org.jetbrains.kotlin.fir.plugin
 
 import org.jetbrains.kotlin.fir.declarations.FirPluginKey
 

plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/AllOpenStatusTransformer.kt

@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.fir.allopen
+package org.jetbrains.kotlin.fir.plugin
 
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.fir.FirSession
@@ -17,7 +17,7 @@ import org.jetbrains.kotlin.name.FqName
 
 class AllOpenStatusTransformer(session: FirSession) : FirStatusTransformerExtension(session) {
     companion object {
-        private val ALL_OPEN = FqName("org.jetbrains.kotlin.fir.allopen.AllOpen")
+        private val ALL_OPEN = FqName("org.jetbrains.kotlin.fir.plugin.AllOpen")
     }
 
     override fun transformStatus(declaration: FirDeclaration, status: FirDeclarationStatus): FirDeclarationStatus {

plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/FirAllOpenComponentRegistrar.kt

@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.fir.allopen
+package org.jetbrains.kotlin.fir.plugin
 
 import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar
 

plugins/fir/fir-plugin-prototype/testData/classGen/simple.kt

@@ -0,0 +1,7 @@
+import org.jetbrains.kotlin.fir.plugin.WithClass
+import org.jetbrains.kotlin.fir.plugin.AllOpen
+
+@WithClass
+class A {
+
+}

plugins/fir/fir-plugin-prototype/testData/classGen/simple.txt

@@ -1,5 +1,5 @@
 FILE: simple.kt
-    @R|org/jetbrains/kotlin/fir/allopen/WithClass|() public final class A : R|kotlin/Any| {
+    @R|org/jetbrains/kotlin/fir/plugin/WithClass|() public final class A : R|kotlin/Any| {
         public constructor(): R|A| {
             super<R|kotlin/Any|>()
         }

plugins/fir/fir-plugin-prototype/testData/status/metaAnnotation.kt

@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.fir.allopen.AllOpen
+import org.jetbrains.kotlin.fir.plugin.AllOpen
 
 @Open
 class A {

plugins/fir/fir-plugin-prototype/testData/status/metaAnnotation.txt

@@ -17,7 +17,7 @@ FILE: metaAnnotation.kt
         }
 
     }
-    @R|org/jetbrains/kotlin/fir/allopen/AllOpen|() public open annotation class Open : R|kotlin/Annotation| {
+    @R|org/jetbrains/kotlin/fir/plugin/AllOpen|() public open annotation class Open : R|kotlin/Annotation| {
         public constructor(): R|Open| {
             super<R|kotlin/Any|>()
         }

plugins/fir/fir-plugin-prototype/testData/status/simpleAnnotation.kt

@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.fir.allopen.AllOpen
+import org.jetbrains.kotlin.fir.plugin.AllOpen
 
 @AllOpen
 class A {

plugins/fir/fir-plugin-prototype/testData/status/simpleAnnotation.txt

@@ -1,5 +1,5 @@
 FILE: simpleAnnotation.kt
-    @R|org/jetbrains/kotlin/fir/allopen/AllOpen|() public open class A : R|kotlin/Any| {
+    @R|org/jetbrains/kotlin/fir/plugin/AllOpen|() public open class A : R|kotlin/Any| {
         public constructor(): R|A| {
             super<R|kotlin/Any|>()
         }
@@ -8,7 +8,7 @@ FILE: simpleAnnotation.kt
         }
 
     }
-    @R|org/jetbrains/kotlin/fir/allopen/AllOpen|() public open class B : R|A| {
+    @R|org/jetbrains/kotlin/fir/plugin/AllOpen|() public open class B : R|A| {
         public constructor(): R|B| {
             super<R|A|>()
         }

plugins/fir/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/AbstractFirAllOpenDiagnosticTest.kt

@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.fir.allopen
+package org.jetbrains.kotlin.fir.plugin
 
 import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoot
 import org.jetbrains.kotlin.config.CompilerConfiguration
@@ -19,6 +19,6 @@ abstract class AbstractFirAllOpenDiagnosticTest : AbstractFirDiagnosticsTest() {
 
     override fun performCustomConfiguration(configuration: CompilerConfiguration) {
         super.performCustomConfiguration(configuration)
-        configuration.addJvmClasspathRoot(File("compiler/fir/plugins/allopen-plugin/allopen-annotations/build/libs/allopen-annotations-1.4.255-SNAPSHOT.jar"))
+        configuration.addJvmClasspathRoot(File("plugins/fir/fir-plugin-prototype/plugin-annotations/build/libs/plugin-annotations-1.4.255-SNAPSHOT.jar"))
     }
 }

plugins/fir/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/FirAllOpenDiagnosticTestGenerated.java

@@ -3,7 +3,7 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.fir.allopen;
+package org.jetbrains.kotlin.fir.plugin;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
@@ -16,7 +16,7 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("compiler/fir/plugins/allopen-plugin/testData")
+@TestMetadata("plugins/fir/fir-plugin-prototype/testData")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class FirAllOpenDiagnosticTestGenerated extends AbstractFirAllOpenDiagnosticTest {
@@ -25,10 +25,10 @@ public class FirAllOpenDiagnosticTestGenerated extends AbstractFirAllOpenDiagnos
     }
 
     public void testAllFilesPresentInTestData() throws Exception {
-        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/plugins/allopen-plugin/testData"), Pattern.compile("^(.+)\\.kt$"), null, true);
+        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/fir/fir-plugin-prototype/testData"), Pattern.compile("^(.+)\\.kt$"), null, true);
     }
 
-    @TestMetadata("compiler/fir/plugins/allopen-plugin/testData/classGen")
+    @TestMetadata("plugins/fir/fir-plugin-prototype/testData/classGen")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class ClassGen extends AbstractFirAllOpenDiagnosticTest {
@@ -37,16 +37,16 @@ public class FirAllOpenDiagnosticTestGenerated extends AbstractFirAllOpenDiagnos
         }
 
         public void testAllFilesPresentInClassGen() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/plugins/allopen-plugin/testData/classGen"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/fir/fir-plugin-prototype/testData/classGen"), Pattern.compile("^(.+)\\.kt$"), null, true);
         }
 
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
-            runTest("compiler/fir/plugins/allopen-plugin/testData/classGen/simple.kt");
+            runTest("plugins/fir/fir-plugin-prototype/testData/classGen/simple.kt");
         }
     }
 
-    @TestMetadata("compiler/fir/plugins/allopen-plugin/testData/status")
+    @TestMetadata("plugins/fir/fir-plugin-prototype/testData/status")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
     public static class Status extends AbstractFirAllOpenDiagnosticTest {
@@ -55,17 +55,17 @@ public class FirAllOpenDiagnosticTestGenerated extends AbstractFirAllOpenDiagnos
         }
 
         public void testAllFilesPresentInStatus() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/fir/plugins/allopen-plugin/testData/status"), Pattern.compile("^(.+)\\.kt$"), null, true);
+            KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/fir/fir-plugin-prototype/testData/status"), Pattern.compile("^(.+)\\.kt$"), null, true);
         }
 
         @TestMetadata("metaAnnotation.kt")
         public void testMetaAnnotation() throws Exception {
-            runTest("compiler/fir/plugins/allopen-plugin/testData/status/metaAnnotation.kt");
+            runTest("plugins/fir/fir-plugin-prototype/testData/status/metaAnnotation.kt");
         }
 
         @TestMetadata("simpleAnnotation.kt")
         public void testSimpleAnnotation() throws Exception {
-            runTest("compiler/fir/plugins/allopen-plugin/testData/status/simpleAnnotation.kt");
+            runTest("plugins/fir/fir-plugin-prototype/testData/status/simpleAnnotation.kt");
         }
     }
 }

settings.gradle

@@ -96,8 +96,6 @@ include ":kotlin-build-common",
         ":compiler:fir:jvm",
         ":compiler:fir:checkers",
         ":compiler:fir:analysis-tests",
-        ":compiler:fir:plugins:allopen-plugin",
-        ":compiler:fir:plugins:allopen-plugin:allopen-annotations",
         ":compiler:frontend",
         ":compiler:frontend.common",
         ":compiler:frontend.java",
@@ -205,6 +203,8 @@ include ":kotlin-build-common",
         ":plugins:annotation-based-compiler-plugins-ide-support",
         ":kotlin-script-runtime",
         ":kotlin-coroutines-experimental-compat",
+        ":plugins:fir:fir-plugin-prototype",
+        ":plugins:fir:fir-plugin-prototype:plugin-annotations",
         ":kotlin-test",
         ":kotlin-test:kotlin-test-common",
         ":kotlin-test:kotlin-test-annotations-common",