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

Move isEquivalentTo() from KtClass to KtClassOrObject

Browse Source 
This makes objects and companions with the same qualified name
compatible from find usages point of view
So #KT-25326 Fixed
So #KT-25438 Fixed
This commit is contained in:
Mikhail Glukhikh
2018-07-24 16:36:28 +03:00
parent a7d189cd1c
commit 48017a81ee
31 changed files with 380 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/refactoring/safeDeleteMultiModule/byExpectObject/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/safeDeleteMultiModule/byExpectObject/after/Common/src/test/test.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package test
fun barr() {}
idea/testData/refactoring/safeDeleteMultiModule/byExpectObject/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/safeDeleteMultiModule/byExpectObject/after/JS/src/test/test.kt
Vendored
+5
View File
@@ -0,0 +1,5 @@
package test
fun foo(o: Obj) {
o.hashCode()
}
idea/testData/refactoring/safeDeleteMultiModule/byExpectObject/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/safeDeleteMultiModule/byExpectObject/after/JVM/src/test/test.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package test
val o = Obj
idea/testData/refactoring/safeDeleteMultiModule/byExpectObject/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/safeDeleteMultiModule/byExpectObject/before/Common/src/test/test.kt
Vendored
+5
View File
@@ -0,0 +1,5 @@
package test
expect object <caret>Obj
fun barr() {}
idea/testData/refactoring/safeDeleteMultiModule/byExpectObject/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/safeDeleteMultiModule/byExpectObject/before/JS/src/test/test.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
package test
actual object Obj
fun foo(o: Obj) {
o.hashCode()
}
idea/testData/refactoring/safeDeleteMultiModule/byExpectObject/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/safeDeleteMultiModule/byExpectObject/before/JVM/src/test/test.kt
Vendored
+5
View File
@@ -0,0 +1,5 @@
package test
actual object Obj
val o = Obj
idea/testData/refactoring/safeDeleteMultiModule/byExpectObject/byExpectObject.test
Vendored
+4
View File
@@ -0,0 +1,4 @@
{
"mainFile": "Common/src/test/test.kt",
"elementClass": "org.jetbrains.kotlin.psi.KtClassOrObject"
}
idea/testData/refactoring/safeDeleteMultiModule/byExpectObject/conflicts.txt
Vendored
+1
View File
@@ -0,0 +1 @@
object test.Obj has 2 usages that are not safe to delete.