Rename: Implement Rename conflict analysis for properties. Qualify property references to resove rename conflicts when possible

#KT-8732 Fixed
 #KT-12543 Fixed
(cherry picked from commit e23029d)
This commit is contained in:
Alexey Sedunov
2016-06-14 15:07:52 +03:00
parent 43f5da0ece
commit 77b0bb9849
41 changed files with 878 additions and 9 deletions
@@ -0,0 +1,17 @@
package test
class X {
val x: Int get() = 1
inner class A {
val xx: Int get() = 1
inner class XX {
val xx: Int get() = 1
fun test() {
this@A.xx
}
}
}
}
@@ -0,0 +1,17 @@
package test
class X {
val x: Int get() = 1
inner class A {
val /*rename*/a: Int get() = 1
inner class XX {
val xx: Int get() = 1
fun test() {
a
}
}
}
}
@@ -0,0 +1,6 @@
{
"type": "MARKED_ELEMENT",
"mainFile": "test/test.kt",
"newName": "xx",
"withRuntime": "true"
}