azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename: Update filenames within expect/actual set (when necessary)

Browse Source 
#KT-23772 Fixed
This commit is contained in:
Alexey Sedunov
2018-07-10 21:05:46 +03:00
parent d586a84f31
commit 0406d61622
29 changed files with 396 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinClassifierProcessor.kt
+11 -9
View File
@@ -30,6 +30,7 @@ import org.jetbrains.kotlin.asJava.namedUnwrappedElement
import org.jetbrains.kotlin.descriptors.ClassifierDescriptor import org.jetbrains.kotlin.descriptors.ClassifierDescriptor
import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.caches.resolve.unsafeResolveToDescriptor import org.jetbrains.kotlin.idea.caches.resolve.unsafeResolveToDescriptor
import org.jetbrains.kotlin.idea.refactoring.withExpectedActuals
import org.jetbrains.kotlin.idea.references.KtSimpleNameReference import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
@@ -61,15 +62,16 @@ class RenameKotlinClassifierProcessor : RenameKotlinPsiProcessor() {
val classOrObject = getClassOrObject(element) as? KtClassOrObject ?: return val classOrObject = getClassOrObject(element) as? KtClassOrObject ?: return
val file = classOrObject.containingKtFile classOrObject.withExpectedActuals().forEach {
val file = it.containingKtFile
val virtualFile = file.virtualFile val virtualFile = file.virtualFile
if (virtualFile != null) { if (virtualFile != null) {
val nameWithoutExtensions = virtualFile.nameWithoutExtension val nameWithoutExtensions = virtualFile.nameWithoutExtension
if (nameWithoutExtensions == classOrObject.name) { if (nameWithoutExtensions == it.name) {
val newFileName = newName + "." + virtualFile.extension val newFileName = newName + "." + virtualFile.extension
allRenames.put(file, newFileName) allRenames.put(file, newFileName)
RenamePsiElementProcessor.forElement(file).prepareRenaming(file, newFileName, allRenames) RenamePsiElementProcessor.forElement(file).prepareRenaming(file, newFileName, allRenames)
}
} }
} }
} }
idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinClassifierProcessor.kt.173
+11 -9
View File
@@ -30,6 +30,7 @@ import org.jetbrains.kotlin.asJava.namedUnwrappedElement
import org.jetbrains.kotlin.descriptors.ClassifierDescriptor import org.jetbrains.kotlin.descriptors.ClassifierDescriptor
import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.caches.resolve.unsafeResolveToDescriptor import org.jetbrains.kotlin.idea.caches.resolve.unsafeResolveToDescriptor
import org.jetbrains.kotlin.idea.refactoring.withExpectedActuals
import org.jetbrains.kotlin.idea.references.KtSimpleNameReference import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
@@ -61,15 +62,16 @@ class RenameKotlinClassifierProcessor : RenameKotlinPsiProcessor() {
val classOrObject = getClassOrObject(element) as? KtClassOrObject ?: return val classOrObject = getClassOrObject(element) as? KtClassOrObject ?: return
val file = classOrObject.containingKtFile classOrObject.withExpectedActuals().forEach {
val file = it.containingKtFile
val virtualFile = file.virtualFile val virtualFile = file.virtualFile
if (virtualFile != null) { if (virtualFile != null) {
val nameWithoutExtensions = virtualFile.nameWithoutExtension val nameWithoutExtensions = virtualFile.nameWithoutExtension
if (nameWithoutExtensions == classOrObject.name) { if (nameWithoutExtensions == it.name) {
val newFileName = newName + "." + virtualFile.extension val newFileName = newName + "." + virtualFile.extension
allRenames.put(file, newFileName) allRenames.put(file, newFileName)
RenamePsiElementProcessor.forElement(file).prepareRenaming(file, newFileName, allRenames) RenamePsiElementProcessor.forElement(file).prepareRenaming(file, newFileName, allRenames)
}
} }
} }
} }
idea/testData/refactoring/renameMultiModule/headersAndImplsByHeaderClassWithFileNames/after/Common/Common.iml
Vendored
+19
View File
@@ -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>
idea/testData/refactoring/renameMultiModule/headersAndImplsByHeaderClassWithFileNames/after/Common/src/test/Baz.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
package test
expect class Baz
expect class Bar
fun test() {
val baz: Baz = Baz()
val bar: Bar = Bar()
}
idea/testData/refactoring/renameMultiModule/headersAndImplsByHeaderClassWithFileNames/after/JS/JS.iml
Vendored
+21
View File
@@ -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>
idea/testData/refactoring/renameMultiModule/headersAndImplsByHeaderClassWithFileNames/after/JS/src/test/test.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
package test
actual class Baz
actual class Bar
fun test() {
val baz: Baz = Baz()
val bar: Bar = Bar()
}
idea/testData/refactoring/renameMultiModule/headersAndImplsByHeaderClassWithFileNames/after/JVM/JVM.iml
Vendored
+21
View File
@@ -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>
idea/testData/refactoring/renameMultiModule/headersAndImplsByHeaderClassWithFileNames/after/JVM/src/test/Baz.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
package test
actual class Baz
actual class Bar
fun test() {
val baz: Baz = Baz()
val bar: Bar = Bar()
}
idea/testData/refactoring/renameMultiModule/headersAndImplsByHeaderClassWithFileNames/before/Common/Common.iml
Vendored
+19
View File
@@ -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>
idea/testData/refactoring/renameMultiModule/headersAndImplsByHeaderClassWithFileNames/before/Common/src/test/Foo.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
package test
expect class /*rename*/Foo
expect class Bar
fun test() {
val foo: Foo = Foo()
val bar: Bar = Bar()
}
idea/testData/refactoring/renameMultiModule/headersAndImplsByHeaderClassWithFileNames/before/JS/JS.iml
Vendored
+21
View File
@@ -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>
idea/testData/refactoring/renameMultiModule/headersAndImplsByHeaderClassWithFileNames/before/JS/src/test/test.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
package test
actual class Foo
actual class Bar
fun test() {
val foo: Foo = Foo()
val bar: Bar = Bar()
}
idea/testData/refactoring/renameMultiModule/headersAndImplsByHeaderClassWithFileNames/before/JVM/JVM.iml
Vendored
+21
View File
@@ -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>
idea/testData/refactoring/renameMultiModule/headersAndImplsByHeaderClassWithFileNames/before/JVM/src/test/Foo.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
package test
actual class Foo
actual class Bar
fun test() {
val foo: Foo = Foo()
val bar: Bar = Bar()
}
idea/testData/refactoring/renameMultiModule/headersAndImplsByHeaderClassWithFileNames/headersAndImplsByHeaderClassWithFileNames.test
Vendored
+6
View File
@@ -0,0 +1,6 @@
{
"type": "MARKED_ELEMENT",
"file": "Common/src/test/Foo.kt",
"newName": "Baz",
"isMultiModule": "true"
}
idea/testData/refactoring/renameMultiModule/headersAndImplsByImplClassWithFileNames/after/Common/Common.iml
Vendored
+19
View File
@@ -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>
idea/testData/refactoring/renameMultiModule/headersAndImplsByImplClassWithFileNames/after/Common/src/test/Baz.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
package test
expect class Baz
expect class Bar
fun test() {
val baz: Baz = Baz()
val bar: Bar = Bar()
}
idea/testData/refactoring/renameMultiModule/headersAndImplsByImplClassWithFileNames/after/JS/JS.iml
Vendored
+21
View File
@@ -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>
idea/testData/refactoring/renameMultiModule/headersAndImplsByImplClassWithFileNames/after/JS/src/test/Baz.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
package test
actual class Baz
actual class Bar
fun test() {
val baz: Baz = Baz()
val bar: Bar = Bar()
}
idea/testData/refactoring/renameMultiModule/headersAndImplsByImplClassWithFileNames/after/JVM/JVM.iml
Vendored
+21
View File
@@ -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>
idea/testData/refactoring/renameMultiModule/headersAndImplsByImplClassWithFileNames/after/JVM/src/test/test.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
package test
actual class Baz
actual class Bar
fun test() {
val baz: Baz = Baz()
val bar: Bar = Bar()
}
idea/testData/refactoring/renameMultiModule/headersAndImplsByImplClassWithFileNames/before/Common/Common.iml
Vendored
+19
View File
@@ -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>
idea/testData/refactoring/renameMultiModule/headersAndImplsByImplClassWithFileNames/before/Common/src/test/Foo.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
package test
expect class Foo
expect class Bar
fun test() {
val foo: Foo = Foo()
val bar: Bar = Bar()
}
idea/testData/refactoring/renameMultiModule/headersAndImplsByImplClassWithFileNames/before/JS/JS.iml
Vendored
+21
View File
@@ -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>
idea/testData/refactoring/renameMultiModule/headersAndImplsByImplClassWithFileNames/before/JS/src/test/Foo.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
package test
actual class /*rename*/Foo
actual class Bar
fun test() {
val foo: Foo = Foo()
val bar: Bar = Bar()
}
idea/testData/refactoring/renameMultiModule/headersAndImplsByImplClassWithFileNames/before/JVM/JVM.iml
Vendored
+21
View File
@@ -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>
idea/testData/refactoring/renameMultiModule/headersAndImplsByImplClassWithFileNames/before/JVM/src/test/test.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
package test
actual class Foo
actual class Bar
fun test() {
val foo: Foo = Foo()
val bar: Bar = Bar()
}
idea/testData/refactoring/renameMultiModule/headersAndImplsByImplClassWithFileNames/headersAndImplsByImplClassWithFileNames.test
Vendored
+6
View File
@@ -0,0 +1,6 @@
{
"type": "MARKED_ELEMENT",
"file": "JS/src/test/Foo.kt",
"newName": "Baz",
"isMultiModule": "true"
}
idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/MultiModuleRenameTestGenerated.java
Generated
+10
View File
@@ -74,6 +74,11 @@ public class MultiModuleRenameTestGenerated extends AbstractMultiModuleRenameTes
runTest("idea/testData/refactoring/renameMultiModule/headersAndImplsByHeaderClassSecondaryConstructorParameter/headersAndImplsByHeaderClassSecondaryConstructorParameter.test"); runTest("idea/testData/refactoring/renameMultiModule/headersAndImplsByHeaderClassSecondaryConstructorParameter/headersAndImplsByHeaderClassSecondaryConstructorParameter.test");
} }
@TestMetadata("headersAndImplsByHeaderClassWithFileNames/headersAndImplsByHeaderClassWithFileNames.test")
public void testHeadersAndImplsByHeaderClassWithFileNames_HeadersAndImplsByHeaderClassWithFileNames() throws Exception {
runTest("idea/testData/refactoring/renameMultiModule/headersAndImplsByHeaderClassWithFileNames/headersAndImplsByHeaderClassWithFileNames.test");
}
@TestMetadata("headersAndImplsByHeaderFun/headersAndImplsByHeaderFun.test") @TestMetadata("headersAndImplsByHeaderFun/headersAndImplsByHeaderFun.test")
public void testHeadersAndImplsByHeaderFun_HeadersAndImplsByHeaderFun() throws Exception { public void testHeadersAndImplsByHeaderFun_HeadersAndImplsByHeaderFun() throws Exception {
runTest("idea/testData/refactoring/renameMultiModule/headersAndImplsByHeaderFun/headersAndImplsByHeaderFun.test"); runTest("idea/testData/refactoring/renameMultiModule/headersAndImplsByHeaderFun/headersAndImplsByHeaderFun.test");
@@ -119,6 +124,11 @@ public class MultiModuleRenameTestGenerated extends AbstractMultiModuleRenameTes
runTest("idea/testData/refactoring/renameMultiModule/headersAndImplsByImplClassSecondaryConstructorParameter/headersAndImplsByImplClassSecondaryConstructorParameter.test"); runTest("idea/testData/refactoring/renameMultiModule/headersAndImplsByImplClassSecondaryConstructorParameter/headersAndImplsByImplClassSecondaryConstructorParameter.test");
} }
@TestMetadata("headersAndImplsByImplClassWithFileNames/headersAndImplsByImplClassWithFileNames.test")
public void testHeadersAndImplsByImplClassWithFileNames_HeadersAndImplsByImplClassWithFileNames() throws Exception {
runTest("idea/testData/refactoring/renameMultiModule/headersAndImplsByImplClassWithFileNames/headersAndImplsByImplClassWithFileNames.test");
}
@TestMetadata("headersAndImplsByImplFun/headersAndImplsByImplFun.test") @TestMetadata("headersAndImplsByImplFun/headersAndImplsByImplFun.test")
public void testHeadersAndImplsByImplFun_HeadersAndImplsByImplFun() throws Exception { public void testHeadersAndImplsByImplFun_HeadersAndImplsByImplFun() throws Exception {
runTest("idea/testData/refactoring/renameMultiModule/headersAndImplsByImplFun/headersAndImplsByImplFun.test"); runTest("idea/testData/refactoring/renameMultiModule/headersAndImplsByImplFun/headersAndImplsByImplFun.test");