From 4f92e7c48c24bf60e42974a32e26aac85ce0e384 Mon Sep 17 00:00:00 2001
From: Ivan Kylchik <ivan.kylchik@jetbrains.com>
Date: Mon, 10 Jul 2023 14:48:44 +0200
Subject: [PATCH] [IR] Rename `IrTypeTransformerVoid` to `IrTypeTransformer`

This naming is more consistent with already existing
`IrElementTransformerVoid` and `IrElementTransformer`
---
 .../transformer/IrConstTypeAnnotationTransformer.kt       | 4 ++--
 .../{IrTypeTransformerVoid.kt => IrTypeTransformer.kt}    | 2 +-
 .../kotlin/ir/generator/print/VisitorsAndTransformers.kt  | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/visitors/{IrTypeTransformerVoid.kt => IrTypeTransformer.kt} (98%)

diff --git a/compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/transformer/IrConstTypeAnnotationTransformer.kt b/compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/transformer/IrConstTypeAnnotationTransformer.kt
index 44fecf7ee09..8b005e1eea1 100644
--- a/compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/transformer/IrConstTypeAnnotationTransformer.kt
+++ b/compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/transformer/IrConstTypeAnnotationTransformer.kt
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.ir.interpreter.checker.IrInterpreterChecker
 import org.jetbrains.kotlin.ir.types.IrSimpleType
 import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.ir.types.typeOrNull
-import org.jetbrains.kotlin.ir.visitors.IrTypeTransformerVoid
+import org.jetbrains.kotlin.ir.visitors.IrTypeTransformer
 
 internal class IrConstTypeAnnotationTransformer(
     interpreter: IrInterpreter,
@@ -30,7 +30,7 @@ internal class IrConstTypeAnnotationTransformer(
     suppressExceptions: Boolean,
 ) : IrConstAnnotationTransformer(
     interpreter, irFile, mode, checker, evaluatedConstTracker, inlineConstTracker, onWarning, onError, suppressExceptions
-), IrTypeTransformerVoid<IrConstTransformer.Data> {
+), IrTypeTransformer<IrConstTransformer.Data> {
 
     override fun <Type : IrType?> transformType(container: IrElement, type: Type, data: Data): Type {
         if (type == null) return type
diff --git a/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/visitors/IrTypeTransformerVoid.kt b/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/visitors/IrTypeTransformer.kt
similarity index 98%
rename from compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/visitors/IrTypeTransformerVoid.kt
rename to compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/visitors/IrTypeTransformer.kt
index f76ff1ed84a..226d8233f0a 100644
--- a/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/visitors/IrTypeTransformerVoid.kt
+++ b/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/visitors/IrTypeTransformer.kt
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.ir.expressions.IrTypeOperatorCall
 import org.jetbrains.kotlin.ir.expressions.IrVararg
 import org.jetbrains.kotlin.ir.types.IrType
 
-interface IrTypeTransformerVoid<in D> : IrElementTransformer<D> {
+interface IrTypeTransformer<in D> : IrElementTransformer<D> {
     fun <Type : IrType?> transformType(
         container: IrElement,
         type: Type,
diff --git a/compiler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/print/VisitorsAndTransformers.kt b/compiler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/print/VisitorsAndTransformers.kt
index 05fe4ad2c08..37e5616da94 100644
--- a/compiler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/print/VisitorsAndTransformers.kt
+++ b/compiler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/print/VisitorsAndTransformers.kt
@@ -18,7 +18,7 @@ import java.io.File
 private val visitorTypeName = ClassName(VISITOR_PACKAGE, "IrElementVisitor")
 private val visitorVoidTypeName = ClassName(VISITOR_PACKAGE, "IrElementVisitorVoid")
 private val transformerTypeName = ClassName(VISITOR_PACKAGE, "IrElementTransformer")
-private val typeTransformerVoidTypeName = ClassName(VISITOR_PACKAGE, "IrTypeTransformerVoid")
+private val typeTransformerTypeName = ClassName(VISITOR_PACKAGE, "IrTypeTransformer")
 
 fun printVisitor(generationPath: File, model: Model): GeneratedFile {
     val visitorType = TypeSpec.interfaceBuilder(visitorTypeName).apply {
@@ -153,7 +153,7 @@ fun printTypeVisitor(generationPath: File, model: Model): GeneratedFile {
         return irTypeFields + parentsFields
     }
 
-    val visitorType = TypeSpec.interfaceBuilder(typeTransformerVoidTypeName).apply {
+    val visitorType = TypeSpec.interfaceBuilder(typeTransformerTypeName).apply {
         val d = TypeVariableName("D", KModifier.IN)
         addTypeVariable(d)
         addSuperinterface(transformerTypeName.parameterizedBy(d))
@@ -190,7 +190,7 @@ fun printTypeVisitor(generationPath: File, model: Model): GeneratedFile {
                             if (irTypeFields.singleOrNull()?.name != "typeArguments") {
                                 error(
                                     """`Ir${IrTree.memberAccessExpression.name.capitalizeAsciiOnly()}` has unexpected fields with `IrType` type. 
-                                        |Please adjust logic of `${typeTransformerVoidTypeName.simpleName}`'s generation.""".trimMargin()
+                                        |Please adjust logic of `${typeTransformerTypeName.simpleName}`'s generation.""".trimMargin()
                                 )
                             }
                             beginControlFlow("(0 until $visitorParam.typeArgumentsCount).forEach {")
@@ -213,7 +213,7 @@ fun printTypeVisitor(generationPath: File, model: Model): GeneratedFile {
         }
     }.build()
 
-    return printTypeCommon(generationPath, typeTransformerVoidTypeName.packageName, visitorType)
+    return printTypeCommon(generationPath, typeTransformerTypeName.packageName, visitorType)
 }
 
 private fun Element.getTransformExplicitType(): Element {