Rename: Support KtTypeAlias in RenameKotlinClassProcessor

#KT-21719 Fixed
2018-01-29 17:20:24 +03:00
parent 90392a8d8a
commit 58bf42c1dd
43 changed files with 586 additions and 14 deletions
@@ -485,7 +485,7 @@
    <psi.treeChangePreprocessor implementation="org.jetbrains.kotlin.idea.caches.KotlinPackageStatementPsiTreeChangePreprocessor"/>

    <renamePsiElementProcessor id="KotlinClass"
-                               implementation="org.jetbrains.kotlin.idea.refactoring.rename.RenameKotlinClassProcessor"
+                               implementation="org.jetbrains.kotlin.idea.refactoring.rename.RenameKotlinClassifierProcessor"
                               order="first"/>
    <renamePsiElementProcessor implementation="org.jetbrains.kotlin.idea.refactoring.rename.RenameKotlinFunctionProcessor"
                               id="KotlinFunction"
@@ -140,7 +140,7 @@ private fun KotlinType.isCollectionLikeOf(classPsiElement: PsiNamedElement): Boo


 open class AutomaticVariableRenamerFactory: AutomaticRenamerFactory {
-    override fun isApplicable(element: PsiElement) = element is KtClass
+    override fun isApplicable(element: PsiElement) = element is KtClass || element is KtTypeAlias

    override fun createRenamer(element: PsiElement, newName: String, usages: Collection<UsageInfo>) =
            AutomaticVariableRenamer(element as PsiNamedElement, newName, usages)
@@ -17,10 +17,8 @@
 package org.jetbrains.kotlin.idea.refactoring.rename

 import com.intellij.openapi.editor.Editor
-import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiReference
-import com.intellij.psi.util.PsiUtilCore
 import com.intellij.refactoring.JavaRefactoringSettings
 import com.intellij.refactoring.listeners.RefactoringElementListener
 import com.intellij.refactoring.rename.RenamePsiElementProcessor
@@ -29,22 +27,19 @@ import org.jetbrains.kotlin.asJava.classes.KtLightClass
 import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade
 import org.jetbrains.kotlin.asJava.classes.KtLightClassForSourceDeclaration
 import org.jetbrains.kotlin.asJava.namedUnwrappedElement
-import org.jetbrains.kotlin.descriptors.ClassDescriptor
+import org.jetbrains.kotlin.descriptors.ClassifierDescriptor
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.caches.resolve.unsafeResolveToDescriptor
 import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
-import org.jetbrains.kotlin.psi.KtClassOrObject
-import org.jetbrains.kotlin.psi.KtConstructor
-import org.jetbrains.kotlin.psi.KtNamedDeclaration
-import org.jetbrains.kotlin.psi.KtObjectDeclaration
+import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import org.jetbrains.kotlin.utils.SmartList
 import java.util.*

-class RenameKotlinClassProcessor : RenameKotlinPsiProcessor() {
+class RenameKotlinClassifierProcessor : RenameKotlinPsiProcessor() {
    override fun canProcessElement(element: PsiElement): Boolean {
-        return element is KtClassOrObject || element is KtLightClass || element is KtConstructor<*>
+        return element is KtClassOrObject || element is KtLightClass || element is KtConstructor<*> || element is KtTypeAlias
    }

    override fun isToSearchInComments(psiElement: PsiElement) = JavaRefactoringSettings.getInstance().RENAME_SEARCH_IN_COMMENTS_FOR_CLASS
@@ -102,7 +97,7 @@ class RenameKotlinClassProcessor : RenameKotlinPsiProcessor() {
    ) {
        if (newName == null) return
        val declaration = element.namedUnwrappedElement as? KtNamedDeclaration ?: return
-        val descriptor = declaration.unsafeResolveToDescriptor() as ClassDescriptor
+        val descriptor = declaration.unsafeResolveToDescriptor() as ClassifierDescriptor

        val collisions = SmartList<UsageInfo>()
        checkRedeclarations(descriptor, newName, collisions)
@@ -122,8 +117,9 @@ class RenameKotlinClassProcessor : RenameKotlinPsiProcessor() {
        is KtConstructor<*> ->
            element.getContainingClassOrObject()

-        else ->
-            element as? KtClassOrObject
+        is KtClassOrObject, is KtTypeAlias -> element
+
+        else -> null
    }

    override fun renameElement(element: PsiElement, newName: String?, usages: Array<out UsageInfo>, listener: RefactoringElementListener?) {
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+      <facet type="kotlin-language" name="Kotlin">
+        <configuration version="2" platform="Common (experimental) " useProjectSettings="false">
+            <compilerSettings/>
+            <compilerArguments/>
+        </configuration>
+      </facet>
+    </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
@@ -0,0 +1,9 @@
+package test
+
+expect class Baz
+expect class Bar
+
+fun test() {
+    val baz: Baz = Baz()
+    val bar: Bar = Bar()
+}
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+      <facet type="kotlin-language" name="Kotlin">
+        <configuration version="2" platform="JavaScript " useProjectSettings="false">
+            <implements>Common</implements>
+            <compilerSettings/>
+            <compilerArguments/>
+        </configuration>
+      </facet>
+    </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="Common" />
+  </component>
+</module>
@@ -0,0 +1,11 @@
+package test
+
+class ZZZ
+
+actual typealias Baz = ZZZ
+actual class Bar
+
+fun test() {
+    val baz: Baz = Baz()
+    val bar: Bar = Bar()
+}
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+      <facet type="kotlin-language" name="Kotlin">
+        <configuration version="2" platform="JVM 1.6" useProjectSettings="false">
+            <implements>Common</implements>
+            <compilerSettings/>
+            <compilerArguments/>
+        </configuration>
+      </facet>
+    </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="Common" />
+  </component>
+</module>
@@ -0,0 +1,9 @@
+package test
+
+actual class Baz
+actual class Bar
+
+fun test() {
+    val baz: Baz = Baz()
+    val bar: Bar = Bar()
+}
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+      <facet type="kotlin-language" name="Kotlin">
+        <configuration version="2" platform="Common (experimental) " useProjectSettings="false">
+            <compilerSettings/>
+            <compilerArguments/>
+        </configuration>
+      </facet>
+    </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
@@ -0,0 +1,9 @@
+package test
+
+expect class Foo
+expect class Bar
+
+fun test() {
+    val foo: Foo = Foo()
+    val bar: Bar = Bar()
+}
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+      <facet type="kotlin-language" name="Kotlin">
+        <configuration version="2" platform="JavaScript " useProjectSettings="false">
+            <implements>Common</implements>
+            <compilerSettings/>
+            <compilerArguments/>
+        </configuration>
+      </facet>
+    </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="Common" />
+  </component>
+</module>
@@ -0,0 +1,11 @@
+package test
+
+class ZZZ
+
+actual typealias /*rename*/Foo = ZZZ
+actual class Bar
+
+fun test() {
+    val foo: Foo = Foo()
+    val bar: Bar = Bar()
+}
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+      <facet type="kotlin-language" name="Kotlin">
+        <configuration version="2" platform="JVM 1.6" useProjectSettings="false">
+            <implements>Common</implements>
+            <compilerSettings/>
+            <compilerArguments/>
+        </configuration>
+      </facet>
+    </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="Common" />
+  </component>
+</module>
@@ -0,0 +1,9 @@
+package test
+
+actual class Foo
+actual class Bar
+
+fun test() {
+    val foo: Foo = Foo()
+    val bar: Bar = Bar()
+}
@@ -0,0 +1,6 @@
+{
+  "type": "MARKED_ELEMENT",
+  "file": "JS/src/test/test.kt",
+  "newName": "Baz",
+  "isMultiModule": "true"
+}
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+      <facet type="kotlin-language" name="Kotlin">
+        <configuration version="2" platform="Common (experimental) " useProjectSettings="false">
+            <compilerSettings/>
+            <compilerArguments/>
+        </configuration>
+      </facet>
+    </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
@@ -0,0 +1,9 @@
+package test
+
+expect class Baz
+expect class Bar
+
+fun test() {
+    val baz: Baz = Baz()
+    val bar: Bar = Bar()
+}
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+      <facet type="kotlin-language" name="Kotlin">
+        <configuration version="2" platform="JavaScript " useProjectSettings="false">
+            <implements>Common</implements>
+            <compilerSettings/>
+            <compilerArguments/>
+        </configuration>
+      </facet>
+    </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="Common" />
+  </component>
+</module>
@@ -0,0 +1,9 @@
+package test
+
+actual class Baz
+actual class Bar
+
+fun test() {
+    val baz: Baz = Baz()
+    val bar: Bar = Bar()
+}
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+      <facet type="kotlin-language" name="Kotlin">
+        <configuration version="2" platform="JVM 1.6" useProjectSettings="false">
+            <implements>Common</implements>
+            <compilerSettings/>
+            <compilerArguments/>
+        </configuration>
+      </facet>
+    </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="Common" />
+  </component>
+</module>
@@ -0,0 +1,11 @@
+package test
+
+class ZZZ
+
+actual typealias Baz = ZZZ
+actual class Bar
+
+fun test() {
+    val baz: Baz = Baz()
+    val bar: Bar = Bar()
+}
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+      <facet type="kotlin-language" name="Kotlin">
+        <configuration version="2" platform="Common (experimental) " useProjectSettings="false">
+            <compilerSettings/>
+            <compilerArguments/>
+        </configuration>
+      </facet>
+    </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
@@ -0,0 +1,9 @@
+package test
+
+expect class Foo
+expect class Bar
+
+fun test() {
+    val foo: Foo = Foo()
+    val bar: Bar = Bar()
+}
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+      <facet type="kotlin-language" name="Kotlin">
+        <configuration version="2" platform="JavaScript " useProjectSettings="false">
+            <implements>Common</implements>
+            <compilerSettings/>
+            <compilerArguments/>
+        </configuration>
+      </facet>
+    </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="Common" />
+  </component>
+</module>
@@ -0,0 +1,9 @@
+package test
+
+actual class /*rename*/Foo
+actual class Bar
+
+fun test() {
+    val foo: Foo = Foo()
+    val bar: Bar = Bar()
+}
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+      <facet type="kotlin-language" name="Kotlin">
+        <configuration version="2" platform="JVM 1.6" useProjectSettings="false">
+            <implements>Common</implements>
+            <compilerSettings/>
+            <compilerArguments/>
+        </configuration>
+      </facet>
+    </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="Common" />
+  </component>
+</module>
@@ -0,0 +1,11 @@
+package test
+
+class ZZZ
+
+actual typealias Foo = ZZZ
+actual class Bar
+
+fun test() {
+    val foo: Foo = Foo()
+    val bar: Bar = Bar()
+}
@@ -0,0 +1,6 @@
+{
+  "type": "MARKED_ELEMENT",
+  "file": "JS/src/test/test.kt",
+  "newName": "Baz",
+  "isMultiModule": "true"
+}
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+      <facet type="kotlin-language" name="Kotlin">
+        <configuration version="2" platform="Common (experimental) " useProjectSettings="false">
+            <compilerSettings/>
+            <compilerArguments/>
+        </configuration>
+      </facet>
+    </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
@@ -0,0 +1,9 @@
+package test
+
+expect class Baz
+expect class Bar
+
+fun test() {
+    val baz: Baz = Baz()
+    val bar: Bar = Bar()
+}
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+      <facet type="kotlin-language" name="Kotlin">
+        <configuration version="2" platform="JavaScript " useProjectSettings="false">
+            <implements>Common</implements>
+            <compilerSettings/>
+            <compilerArguments/>
+        </configuration>
+      </facet>
+    </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="Common" />
+  </component>
+</module>
@@ -0,0 +1,11 @@
+package test
+
+class ZZZ
+
+actual typealias Baz = ZZZ
+actual class Bar
+
+fun test() {
+    val baz: Baz = Baz()
+    val bar: Bar = Bar()
+}
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+      <facet type="kotlin-language" name="Kotlin">
+        <configuration version="2" platform="JVM 1.6" useProjectSettings="false">
+            <implements>Common</implements>
+            <compilerSettings/>
+            <compilerArguments/>
+        </configuration>
+      </facet>
+    </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="Common" />
+  </component>
+</module>
@@ -0,0 +1,9 @@
+package test
+
+actual class Baz
+actual class Bar
+
+fun test() {
+    val baz: Baz = Baz()
+    val bar: Bar = Bar()
+}
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+      <facet type="kotlin-language" name="Kotlin">
+        <configuration version="2" platform="Common (experimental) " useProjectSettings="false">
+            <compilerSettings/>
+            <compilerArguments/>
+        </configuration>
+      </facet>
+    </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
@@ -0,0 +1,9 @@
+package test
+
+expect class /*rename*/Foo
+expect class Bar
+
+fun test() {
+    val foo: Foo = Foo()
+    val bar: Bar = Bar()
+}
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+      <facet type="kotlin-language" name="Kotlin">
+        <configuration version="2" platform="JavaScript " useProjectSettings="false">
+            <implements>Common</implements>
+            <compilerSettings/>
+            <compilerArguments/>
+        </configuration>
+      </facet>
+    </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="Common" />
+  </component>
+</module>
@@ -0,0 +1,11 @@
+package test
+
+class ZZZ
+
+actual typealias Foo = ZZZ
+actual class Bar
+
+fun test() {
+    val foo: Foo = Foo()
+    val bar: Bar = Bar()
+}
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+      <facet type="kotlin-language" name="Kotlin">
+        <configuration version="2" platform="JVM 1.6" useProjectSettings="false">
+            <implements>Common</implements>
+            <compilerSettings/>
+            <compilerArguments/>
+        </configuration>
+      </facet>
+    </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="Common" />
+  </component>
+</module>
@@ -0,0 +1,9 @@
+package test
+
+actual class Foo
+actual class Bar
+
+fun test() {
+    val foo: Foo = Foo()
+    val bar: Bar = Bar()
+}
@@ -0,0 +1,6 @@
+{
+  "type": "MARKED_ELEMENT",
+  "file": "Common/src/test/test.kt",
+  "newName": "Baz",
+  "isMultiModule": "true"
+}
@@ -31,6 +31,18 @@ public class MultiModuleRenameTestGenerated extends AbstractMultiModuleRenameTes
        doTest(fileName);
    }

+    @TestMetadata("headerAndImplClassByImplTypeAlias/headerAndImplClassByImplTypeAlias.test")
+    public void testHeaderAndImplClassByImplTypeAlias_HeaderAndImplClassByImplTypeAlias() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/renameMultiModule/headerAndImplClassByImplTypeAlias/headerAndImplClassByImplTypeAlias.test");
+        doTest(fileName);
+    }
+
+    @TestMetadata("headerAndImplTypeAliasByImplClass/headerAndImplTypeAliasByImplClass.test")
+    public void testHeaderAndImplTypeAliasByImplClass_HeaderAndImplTypeAliasByImplClass() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/renameMultiModule/headerAndImplTypeAliasByImplClass/headerAndImplTypeAliasByImplClass.test");
+        doTest(fileName);
+    }
+
    @TestMetadata("headersAndImplsByHeaderClass/headersAndImplsByHeaderClass.test")
    public void testHeadersAndImplsByHeaderClass_HeadersAndImplsByHeaderClass() throws Exception {
        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/renameMultiModule/headersAndImplsByHeaderClass/headersAndImplsByHeaderClass.test");
@@ -139,6 +151,12 @@ public class MultiModuleRenameTestGenerated extends AbstractMultiModuleRenameTes
        doTest(fileName);
    }

+    @TestMetadata("implClassAndTypeAliasByHeaderClass/implClassAndTypeAliasByHeaderClass.test")
+    public void testImplClassAndTypeAliasByHeaderClass_ImplClassAndTypeAliasByHeaderClass() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/renameMultiModule/implClassAndTypeAliasByHeaderClass/implClassAndTypeAliasByHeaderClass.test");
+        doTest(fileName);
+    }
+
    @TestMetadata("suspendFunImplInImplModule/suspendFunImplInImplModule.test")
    public void testSuspendFunImplInImplModule_SuspendFunImplInImplModule() throws Exception {
        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/renameMultiModule/suspendFunImplInImplModule/suspendFunImplInImplModule.test");