From e2816ffabb7550893eec80649e44dbf350a5ed1c Mon Sep 17 00:00:00 2001
From: "sebastian.sellmair" <sebastian.sellmair@jetbrains.com>
Date: Tue, 17 Aug 2021 17:28:16 +0200
Subject: [PATCH] [Commonizer] Rename CirTypeSubstitutor implementations

^KT-48287
^KT-48286
---
 .../src/org/jetbrains/kotlin/commonizer/facade.kt         | 8 ++++----
 ...rAliasTypeSubstitutor.kt => AliasedTypeSubstitutor.kt} | 2 +-
 ...stitutor.kt => UnderscoredTypeAliasTypeSubstitutor.kt} | 2 +-
 .../transformer/CirUnderscoredTypeAliasSubstitutorTest.kt | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename native/commonizer/src/org/jetbrains/kotlin/commonizer/transformer/{CirAliasTypeSubstitutor.kt => AliasedTypeSubstitutor.kt} (99%)
 rename native/commonizer/src/org/jetbrains/kotlin/commonizer/transformer/{CirUnderscoredTypeAliasSubstitutor.kt => UnderscoredTypeAliasTypeSubstitutor.kt} (98%)

diff --git a/native/commonizer/src/org/jetbrains/kotlin/commonizer/facade.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/facade.kt
index d38c6dece9f..0a56cb33383 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/commonizer/facade.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/commonizer/facade.kt
@@ -14,8 +14,8 @@ import org.jetbrains.kotlin.commonizer.mergedtree.CirKnownClassifiers
 import org.jetbrains.kotlin.commonizer.mergedtree.CirNode.Companion.indexOfCommon
 import org.jetbrains.kotlin.commonizer.mergedtree.CirRootNode
 import org.jetbrains.kotlin.commonizer.metadata.CirTreeSerializer
-import org.jetbrains.kotlin.commonizer.transformer.CirAliasTypeSubstitutor
-import org.jetbrains.kotlin.commonizer.transformer.CirUnderscoredTypeAliasSubstitutor
+import org.jetbrains.kotlin.commonizer.transformer.AliasedTypeSubstitutor
+import org.jetbrains.kotlin.commonizer.transformer.UnderscoredTypeAliasTypeSubstitutor
 import org.jetbrains.kotlin.commonizer.transformer.InlineTypeAliasCirNodeTransformer
 import org.jetbrains.kotlin.commonizer.transformer.TypeSubstitutionCirNodeTransformer
 import org.jetbrains.kotlin.commonizer.tree.CirTreeRoot
@@ -67,12 +67,12 @@ internal fun commonizeTarget(
 
         TypeSubstitutionCirNodeTransformer(
             parameters.storageManager, classifiers,
-            CirAliasTypeSubstitutor(classifiers.commonDependencies, classifiers.classifierIndices)
+            AliasedTypeSubstitutor(classifiers.commonDependencies, classifiers.classifierIndices)
         ).invoke(mergedTree)
 
         TypeSubstitutionCirNodeTransformer(
             parameters.storageManager, classifiers,
-            CirUnderscoredTypeAliasSubstitutor(classifiers.classifierIndices)
+            UnderscoredTypeAliasTypeSubstitutor(classifiers.classifierIndices)
         ).invoke(mergedTree)
 
         mergedTree.accept(CommonizationVisitor(classifiers, mergedTree), Unit)
diff --git a/native/commonizer/src/org/jetbrains/kotlin/commonizer/transformer/CirAliasTypeSubstitutor.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/transformer/AliasedTypeSubstitutor.kt
similarity index 99%
rename from native/commonizer/src/org/jetbrains/kotlin/commonizer/transformer/CirAliasTypeSubstitutor.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/transformer/AliasedTypeSubstitutor.kt
index 1febdd33eb8..d4ed25fa52e 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/commonizer/transformer/CirAliasTypeSubstitutor.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/commonizer/transformer/AliasedTypeSubstitutor.kt
@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.commonizer.mergedtree.CirProvidedClassifiers
 import org.jetbrains.kotlin.commonizer.mergedtree.CirTypeSubstitutor
 import org.jetbrains.kotlin.commonizer.tree.CirTreeTypeAlias
 
-internal class CirAliasTypeSubstitutor(
+internal class AliasedTypeSubstitutor(
     private val commonDependencies: CirProvidedClassifiers,
     private val classifierIndices: TargetDependent<CirClassifierIndex>
 ) : CirTypeSubstitutor {
diff --git a/native/commonizer/src/org/jetbrains/kotlin/commonizer/transformer/CirUnderscoredTypeAliasSubstitutor.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/transformer/UnderscoredTypeAliasTypeSubstitutor.kt
similarity index 98%
rename from native/commonizer/src/org/jetbrains/kotlin/commonizer/transformer/CirUnderscoredTypeAliasSubstitutor.kt
rename to native/commonizer/src/org/jetbrains/kotlin/commonizer/transformer/UnderscoredTypeAliasTypeSubstitutor.kt
index 42bd0d82e4f..b9fe5dabb55 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/commonizer/transformer/CirUnderscoredTypeAliasSubstitutor.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/commonizer/transformer/UnderscoredTypeAliasTypeSubstitutor.kt
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.commonizer.mergedtree.findTypeAlias
  * `platform/posix/mode_t -> platform/posix/__mode_t -> kotlin/UInt`
  * exists which is preferable
  */
-internal class CirUnderscoredTypeAliasSubstitutor(
+internal class UnderscoredTypeAliasTypeSubstitutor(
     private val classifierIndices: TargetDependent<CirClassifierIndex>
 ) : CirTypeSubstitutor {
 
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/commonizer/transformer/CirUnderscoredTypeAliasSubstitutorTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/transformer/CirUnderscoredTypeAliasSubstitutorTest.kt
index 928f0a38817..e2bb11b3c3c 100644
--- a/native/commonizer/tests/org/jetbrains/kotlin/commonizer/transformer/CirUnderscoredTypeAliasSubstitutorTest.kt
+++ b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/transformer/CirUnderscoredTypeAliasSubstitutorTest.kt
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.commonizer.transformer
 import org.jetbrains.kotlin.commonizer.AbstractInlineSourcesCommonizationTest
 import org.jetbrains.kotlin.commonizer.assertCommonized
 
-class CirUnderscoredTypeAliasSubstitutorTest : AbstractInlineSourcesCommonizationTest() {
+class UnderscoredTypeAliasTypeSubstitutorTest : AbstractInlineSourcesCommonizationTest() {
 
     fun `test inlined underscored typealias - single platform`() {
         val result = commonize {