Rename: Do not silently rename all parameters in function hierarchy

#KT-18325 Fixed
This commit is contained in:
Alexey Sedunov
2017-06-13 18:09:15 +03:00
parent 31d21a14f2
commit 895407f5e3
21 changed files with 311 additions and 33 deletions
@@ -1,12 +1,12 @@
package testing
interface Trait {
open fun foo(aa: Int, b: String) {
open fun foo(a: Int, b: String) {
}
}
open class Super {
open fun foo(aa: Int, b: String) {
open fun foo(a: Int, b: String) {
}
}
@@ -1,12 +1,12 @@
package testing
interface Trait {
open fun Int.foo(aa: Int, b: String) {
open fun Int.foo(a: Int, b: String) {
}
}
open class Super {
open fun Int.foo(aa: Int, b: String) {
open fun Int.foo(a: Int, b: String) {
}
}
@@ -0,0 +1,17 @@
class J1 implements Foo {
public void foo(String s) {
}
}
class J2 extends J1 {
public void foo(String s) {
}
}
class J3 extends Foo1 {
public void foo(String s) {
}
}
@@ -0,0 +1,15 @@
interface Foo {
fun foo(s: String)
}
open class Foo1 : Foo {
override fun foo(s: String) { }
}
class Foo2 : Foo {
override fun foo(x: String) { }
}
class Foo3 : Foo1() {
override fun foo(s: String) { }
}
@@ -0,0 +1,17 @@
class J1 implements Foo {
public void foo(String s) {
}
}
class J2 extends J1 {
public void foo(String s) {
}
}
class J3 extends Foo1 {
public void foo(String s) {
}
}
@@ -0,0 +1,15 @@
interface Foo {
fun foo(s: String)
}
open class Foo1 : Foo {
override fun foo(s: String) { }
}
class Foo2 : Foo {
override fun foo(/*rename*/s: String) { }
}
class Foo3 : Foo1() {
override fun foo(s: String) { }
}
@@ -0,0 +1,5 @@
{
"type": "MARKED_ELEMENT",
"mainFile": "test.kt",
"newName": "x"
}
@@ -0,0 +1,17 @@
class J1 implements Foo {
public void foo(String s) {
}
}
class J2 extends J1 {
public void foo(String s) {
}
}
class J3 extends Foo1 {
public void foo(String x) {
}
}
@@ -0,0 +1,15 @@
interface Foo {
fun foo(s: String)
}
open class Foo1 : Foo {
override fun foo(x: String) { }
}
class Foo2 : Foo {
override fun foo(s: String) { }
}
class Foo3 : Foo1() {
override fun foo(x: String) { }
}
@@ -0,0 +1,17 @@
class J1 implements Foo {
public void foo(String s) {
}
}
class J2 extends J1 {
public void foo(String s) {
}
}
class J3 extends Foo1 {
public void foo(String s) {
}
}
@@ -0,0 +1,15 @@
interface Foo {
fun foo(s: String)
}
open class Foo1 : Foo {
override fun foo(/*rename*/s: String) { }
}
class Foo2 : Foo {
override fun foo(s: String) { }
}
class Foo3 : Foo1() {
override fun foo(s: String) { }
}
@@ -0,0 +1,5 @@
{
"type": "MARKED_ELEMENT",
"mainFile": "test.kt",
"newName": "x"
}
@@ -0,0 +1,17 @@
class J1 implements Foo {
public void foo(String x) {
}
}
class J2 extends J1 {
public void foo(String x) {
}
}
class J3 extends Foo1 {
public void foo(String x) {
}
}
@@ -0,0 +1,15 @@
interface Foo {
fun foo(x: String)
}
open class Foo1 : Foo {
override fun foo(x: String) { }
}
class Foo2 : Foo {
override fun foo(x: String) { }
}
class Foo3 : Foo1() {
override fun foo(x: String) { }
}
@@ -0,0 +1,17 @@
class J1 implements Foo {
public void foo(String s) {
}
}
class J2 extends J1 {
public void foo(String s) {
}
}
class J3 extends Foo1 {
public void foo(String s) {
}
}
@@ -0,0 +1,15 @@
interface Foo {
fun foo(/*rename*/s: String)
}
open class Foo1 : Foo {
override fun foo(s: String) { }
}
class Foo2 : Foo {
override fun foo(s: String) { }
}
class Foo3 : Foo1() {
override fun foo(s: String) { }
}
@@ -0,0 +1,5 @@
{
"type": "MARKED_ELEMENT",
"mainFile": "test.kt",
"newName": "x"
}