azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR-PLUGIN] Enable lib with annotation in plugin tests

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-04-29 12:17:41 +03:00
parent 7e5024fb88
commit 17434c34b4
4 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/plugins/allopen-plugin/src/org/jetbrains/kotlin/fir/allopen/AllOpenStatusTransformer.kt
+1 -1
View File
@@ -23,7 +23,7 @@ class AllOpenStatusTransformer(session: FirSession) : FirStatusTransformerExtens
override val mode: Mode override val mode: Mode
get() = Mode.ALL_IN_ANNOTATED_ELEMENT get() = Mode.ALL_IN_ANNOTATED_ELEMENT
override val annotations: Set<AnnotationFqn> = setOf(FqName.fromSegments(listOf("allopen", "Open"))) override val annotations: Set<AnnotationFqn> = setOf(FqName.fromSegments(listOf("org", "jetbrains", "kotlin", "fir", "allopen", "AllOpen")))
override val metaAnnotations: Set<AnnotationFqn> override val metaAnnotations: Set<AnnotationFqn>
get() = emptySet() get() = emptySet()
compiler/fir/plugins/allopen-plugin/testData/simple.kt
Vendored
+3 -11
View File
@@ -1,21 +1,13 @@
// FILE: annotations.kt import org.jetbrains.kotlin.fir.allopen.AllOpen
package allopen @AllOpen
annotation class Open
// FILE: main.kt
import allopen.Open
@Open
class A { class A {
fun foo() { fun foo() {
} }
} }
@Open @AllOpen
class B : A() { class B : A() {
override fun foo() { override fun foo() {
compiler/fir/plugins/allopen-plugin/testData/simple.txt
Vendored
+3 -10
View File
@@ -1,12 +1,5 @@
FILE: annotations.kt FILE: simple.kt
public final annotation class Open : R|kotlin/Annotation| { @R|org/jetbrains/kotlin/fir/allopen/AllOpen|() public open class A : R|kotlin/Any| {
public constructor(): R|allopen/Open| {
super<R|kotlin/Any|>()
}
}
FILE: main.kt
@R|allopen/Open|() public open class A : R|kotlin/Any| {
public constructor(): R|A| { public constructor(): R|A| {
super<R|kotlin/Any|>() super<R|kotlin/Any|>()
} }
@@ -15,7 +8,7 @@ FILE: main.kt
} }
} }
@R|allopen/Open|() public open class B : R|A| { @R|org/jetbrains/kotlin/fir/allopen/AllOpen|() public open class B : R|A| {
public constructor(): R|B| { public constructor(): R|B| {
super<R|A|>() super<R|A|>()
} }
compiler/fir/plugins/allopen-plugin/tests/org/jetbrains/kotlin/fir/allopen/AbstractFirAllOpenDiagnosticTest.kt
+8
View File
@@ -5,12 +5,20 @@
package org.jetbrains.kotlin.fir.allopen package org.jetbrains.kotlin.fir.allopen
import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoot
import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.fir.AbstractFirDiagnosticsTest import org.jetbrains.kotlin.fir.AbstractFirDiagnosticsTest
import org.jetbrains.kotlin.fir.extensions.FirExtensionPointService import org.jetbrains.kotlin.fir.extensions.FirExtensionPointService
import org.jetbrains.kotlin.fir.extensions.registerExtensions import org.jetbrains.kotlin.fir.extensions.registerExtensions
import java.io.File
abstract class AbstractFirAllOpenDiagnosticTest : AbstractFirDiagnosticsTest() { abstract class AbstractFirAllOpenDiagnosticTest : AbstractFirDiagnosticsTest() {
override fun registerFirExtensions(service: FirExtensionPointService) { override fun registerFirExtensions(service: FirExtensionPointService) {
service.registerExtensions(FirAllOpenComponentRegistrar().configure()) service.registerExtensions(FirAllOpenComponentRegistrar().configure())
} }
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"))
}
} }