From b8a8a5575b61142ab33d99b390bf94d5c5b31e01 Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Thu, 10 Oct 2019 14:39:00 +0300
Subject: [PATCH] [FIR] Move default visitors from separate sourceset

---
 compiler/fir/tree/build.gradle.kts                          | 5 +----
 .../kotlin/fir/visitors/CompositeTransformResult.kt         | 6 ------
 .../jetbrains/kotlin/fir/visitors/FirDefaultTransformer.kt  | 0
 .../org/jetbrains/kotlin/fir/visitors/FirDefaultVisitor.kt  | 0
 .../jetbrains/kotlin/fir/visitors/FirDefaultVisitorVoid.kt  | 0
 5 files changed, 1 insertion(+), 10 deletions(-)
 rename compiler/fir/tree/{visitors => src}/org/jetbrains/kotlin/fir/visitors/CompositeTransformResult.kt (99%)
 rename compiler/fir/tree/{visitors => src}/org/jetbrains/kotlin/fir/visitors/FirDefaultTransformer.kt (100%)
 rename compiler/fir/tree/{visitors => src}/org/jetbrains/kotlin/fir/visitors/FirDefaultVisitor.kt (100%)
 rename compiler/fir/tree/{visitors => src}/org/jetbrains/kotlin/fir/visitors/FirDefaultVisitorVoid.kt (100%)

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<out T : Any>() {
 
     class Multiple<out T : Any>(val _list: List<T>) : CompositeTransformResult<T>()
 
-
     companion object {
         fun <T : Any> empty() = CompositeTransformResult.Multiple<T>(emptyList<T>())
         fun <T : Any> single(t: T) = CompositeTransformResult.Single(t)
         fun <T : Any> many(l: List<T>) = CompositeTransformResult.Multiple(l)
-
-
     }
 
-
     val list: List<T>
         get() = when (this) {
             is CompositeTransformResult.Multiple<*> -> _list as List<T>
@@ -41,8 +37,6 @@ sealed class CompositeTransformResult<out T : Any>() {
 
     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