diff --git a/compiler/fir/tree/build.gradle.kts b/compiler/fir/tree/build.gradle.kts index a020291ecde..eb99997f2c0 100644 --- a/compiler/fir/tree/build.gradle.kts +++ b/compiler/fir/tree/build.gradle.kts @@ -18,10 +18,7 @@ dependencies { } sourceSets { - "main" { - projectDefault() - java.srcDir("visitors") - } + "main" { projectDefault() } } val generatorClasspath by configurations.creating diff --git a/compiler/fir/tree/visitors/org/jetbrains/kotlin/fir/visitors/CompositeTransformResult.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/visitors/CompositeTransformResult.kt similarity index 99% rename from compiler/fir/tree/visitors/org/jetbrains/kotlin/fir/visitors/CompositeTransformResult.kt rename to compiler/fir/tree/src/org/jetbrains/kotlin/fir/visitors/CompositeTransformResult.kt index 218043bca96..9277733739c 100644 --- a/compiler/fir/tree/visitors/org/jetbrains/kotlin/fir/visitors/CompositeTransformResult.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/visitors/CompositeTransformResult.kt @@ -13,16 +13,12 @@ sealed class CompositeTransformResult() { class Multiple(val _list: List) : CompositeTransformResult() - companion object { fun empty() = CompositeTransformResult.Multiple(emptyList()) fun single(t: T) = CompositeTransformResult.Single(t) fun many(l: List) = CompositeTransformResult.Multiple(l) - - } - val list: List get() = when (this) { is CompositeTransformResult.Multiple<*> -> _list as List @@ -41,8 +37,6 @@ sealed class CompositeTransformResult() { val isEmpty get() = this is CompositeTransformResult.Multiple<*> && this.list.isEmpty() - - } @Suppress("NOTHING_TO_INLINE") diff --git a/compiler/fir/tree/visitors/org/jetbrains/kotlin/fir/visitors/FirDefaultTransformer.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/visitors/FirDefaultTransformer.kt similarity index 100% rename from compiler/fir/tree/visitors/org/jetbrains/kotlin/fir/visitors/FirDefaultTransformer.kt rename to compiler/fir/tree/src/org/jetbrains/kotlin/fir/visitors/FirDefaultTransformer.kt diff --git a/compiler/fir/tree/visitors/org/jetbrains/kotlin/fir/visitors/FirDefaultVisitor.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/visitors/FirDefaultVisitor.kt similarity index 100% rename from compiler/fir/tree/visitors/org/jetbrains/kotlin/fir/visitors/FirDefaultVisitor.kt rename to compiler/fir/tree/src/org/jetbrains/kotlin/fir/visitors/FirDefaultVisitor.kt diff --git a/compiler/fir/tree/visitors/org/jetbrains/kotlin/fir/visitors/FirDefaultVisitorVoid.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/visitors/FirDefaultVisitorVoid.kt similarity index 100% rename from compiler/fir/tree/visitors/org/jetbrains/kotlin/fir/visitors/FirDefaultVisitorVoid.kt rename to compiler/fir/tree/src/org/jetbrains/kotlin/fir/visitors/FirDefaultVisitorVoid.kt