DeprecatedSymbolUsageFix: initial implementation

idea/testData/quickfix/deprecatedSymbolUsage/addImportFromSamePackage.after.kt

@@ -0,0 +1,8 @@
+// "Replace with 's.newFun()'" "true"
+
+import dependency.newFun
+import dependency.oldFun
+
+fun foo() {
+    "a".<caret>newFun()
+}

idea/testData/quickfix/deprecatedSymbolUsage/addImportFromSamePackage.before.Declaration.kt

@@ -0,0 +1,6 @@
+package dependency
+
+@deprecated("", ReplaceWith("s.newFun()"))
+fun oldFun(s: String) {}
+
+fun String.newFun() {}

idea/testData/quickfix/deprecatedSymbolUsage/addImportFromSamePackage.before.Main.kt

@@ -0,0 +1,7 @@
+// "Replace with 's.newFun()'" "true"
+
+import dependency.oldFun
+
+fun foo() {
+    <caret>oldFun("a")
+}

idea/testData/quickfix/deprecatedSymbolUsage/addImportFromSamePackage2.after.kt

@@ -0,0 +1,9 @@
+// "Replace with 's.extension().newFun()'" "true"
+
+import dependency.newFun
+import dependency.oldFun
+import dependency2.extension
+
+fun foo() {
+    "a".extension().<caret>newFun()
+}

idea/testData/quickfix/deprecatedSymbolUsage/addImportFromSamePackage2.before.Declaration.kt

@@ -0,0 +1,6 @@
+package dependency
+
+@deprecated("", ReplaceWith("s.extension().newFun()", "dependency2.extension"))
+fun oldFun(s: String) {}
+
+fun String.newFun() {}

idea/testData/quickfix/deprecatedSymbolUsage/addImportFromSamePackage2.before.Dependency2.kt

@@ -0,0 +1,3 @@
+package dependency2
+
+fun String.extension(): String = this

idea/testData/quickfix/deprecatedSymbolUsage/addImportFromSamePackage2.before.Main.kt

@@ -0,0 +1,7 @@
+// "Replace with 's.extension().newFun()'" "true"
+
+import dependency.oldFun
+
+fun foo() {
+    <caret>oldFun("a")
+}

idea/testData/quickfix/deprecatedSymbolUsage/addImportFromSamePackage3.after.kt

@@ -0,0 +1,8 @@
+// "Replace with 'newFun()'" "true"
+
+import dependency.newFun
+import dependency.oldFun
+
+fun foo() {
+    <caret>newFun()
+}

idea/testData/quickfix/deprecatedSymbolUsage/addImportFromSamePackage3.before.Declaration.kt

@@ -0,0 +1,6 @@
+package dependency
+
+@deprecated("", ReplaceWith("newFun()"))
+fun oldFun() {}
+
+fun newFun() {}

idea/testData/quickfix/deprecatedSymbolUsage/addImportFromSamePackage3.before.Main.kt

@@ -0,0 +1,7 @@
+// "Replace with 'newFun()'" "true"
+
+import dependency.oldFun
+
+fun foo() {
+    <caret>oldFun()
+}

idea/testData/quickfix/deprecatedSymbolUsage/addImportRuntime.kt

@@ -0,0 +1,12 @@
+// "Replace with 'newFun(n + java.math.BigInteger(s))'" "true"
+
+import java.math.BigInteger
+
+@deprecated("", ReplaceWith("newFun(n + java.math.BigInteger(s))", "kotlin.math.plus"))
+fun oldFun(n: BigInteger, s: String) {}
+
+fun newFun(n: BigInteger) {}
+
+fun foo() {
+    <caret>oldFun(BigInteger("2"), "1")
+}

idea/testData/quickfix/deprecatedSymbolUsage/addImportRuntime.kt.after

@@ -0,0 +1,13 @@
+// "Replace with 'newFun(n + java.math.BigInteger(s))'" "true"
+
+import java.math.BigInteger
+import kotlin.math.plus
+
+@deprecated("", ReplaceWith("newFun(n + java.math.BigInteger(s))", "kotlin.math.plus"))
+fun oldFun(n: BigInteger, s: String) {}
+
+fun newFun(n: BigInteger) {}
+
+fun foo() {
+    <caret>newFun(BigInteger("2") + BigInteger("1"))
+}

idea/testData/quickfix/deprecatedSymbolUsage/addImports.after.kt

@@ -0,0 +1,9 @@
+// "Replace with 's.extension1().extension2'" "true"
+
+import dependency.oldFun
+import dependency2.extension1
+import dependency2.extension2
+
+fun foo() {
+    "a".extension1().<caret>extension2
+}

idea/testData/quickfix/deprecatedSymbolUsage/addImports.before.Declaration.kt

@@ -0,0 +1,4 @@
+package dependency
+
+@deprecated("", ReplaceWith("s.extension1().extension2", "dependency2.extension1", "dependency2.extension2"))
+fun oldFun(s: String) {}

idea/testData/quickfix/deprecatedSymbolUsage/addImports.before.Dependency2.kt

@@ -0,0 +1,4 @@
+package dependency2
+
+fun String.extension1(): String = this
+val String.extension2: String get() = this

idea/testData/quickfix/deprecatedSymbolUsage/addImports.before.Main.kt

@@ -0,0 +1,7 @@
+// "Replace with 's.extension1().extension2'" "true"
+
+import dependency.oldFun
+
+fun foo() {
+    <caret>oldFun("a")
+}

idea/testData/quickfix/deprecatedSymbolUsage/callWithError.kt

@@ -0,0 +1,12 @@
+// "class org.jetbrains.kotlin.idea.quickfix.DeprecatedSymbolUsageFix" "false"
+// ERROR: Too many arguments for kotlin.deprecated internal fun oldFun(): kotlin.Unit defined in root package
+
+@deprecated("", ReplaceWith("newFun()"))
+fun oldFun() {
+}
+
+fun newFun(){}
+
+fun foo() {
+    <caret>oldFun(123)
+}

idea/testData/quickfix/deprecatedSymbolUsage/changeThis1.kt

@@ -0,0 +1,12 @@
+// "Replace with 's.newFun(this)'" "true"
+
+class X {
+    @deprecated("", ReplaceWith("s.newFun(this)"))
+    fun oldFun(s: String){}
+}
+
+fun String.newFun(x: X){}
+
+fun foo(x: X) {
+    x.<caret>oldFun("a")
+}

idea/testData/quickfix/deprecatedSymbolUsage/changeThis1.kt.after

@@ -0,0 +1,12 @@
+// "Replace with 's.newFun(this)'" "true"
+
+class X {
+    @deprecated("", ReplaceWith("s.newFun(this)"))
+    fun oldFun(s: String){}
+}
+
+fun String.newFun(x: X){}
+
+fun foo(x: X) {
+    "a".newFun(x)
+}

idea/testData/quickfix/deprecatedSymbolUsage/changeThis2.kt

@@ -0,0 +1,12 @@
+// "Replace with 's.newFun(this)'" "true"
+
+class X {
+    @deprecated("", ReplaceWith("s.newFun(this)"))
+    fun oldFun(s: String){}
+}
+
+fun String.newFun(x: X){}
+
+fun X.foo() {
+    <caret>oldFun("a")
+}

idea/testData/quickfix/deprecatedSymbolUsage/changeThis2.kt.after

@@ -0,0 +1,12 @@
+// "Replace with 's.newFun(this)'" "true"
+
+class X {
+    @deprecated("", ReplaceWith("s.newFun(this)"))
+    fun oldFun(s: String){}
+}
+
+fun String.newFun(x: X){}
+
+fun X.foo() {
+    "a".<caret>newFun(this)
+}

idea/testData/quickfix/deprecatedSymbolUsage/changeThisSafeCall.kt

@@ -0,0 +1,12 @@
+// "Replace with 's.newFun(this)'" "true"
+
+class X {
+    @deprecated("", ReplaceWith("s.newFun(this)"))
+    fun oldFun(s: String): String = s.newFun(this)
+}
+
+fun String.newFun(x: X): String = this
+
+fun foo(x: X?) {
+    x?.<caret>oldFun("a")
+}

idea/testData/quickfix/deprecatedSymbolUsage/changeThisSafeCall.kt.after

@@ -0,0 +1,14 @@
+// "Replace with 's.newFun(this)'" "true"
+
+class X {
+    @deprecated("", ReplaceWith("s.newFun(this)"))
+    fun oldFun(s: String): String = s.newFun(this)
+}
+
+fun String.newFun(x: X): String = this
+
+fun foo(x: X?) {
+    <caret>if (x != null) {
+        "a".newFun(x)
+    }
+}

idea/testData/quickfix/deprecatedSymbolUsage/changeThisSafeCallWithValueRuntime.kt

@@ -0,0 +1,15 @@
+// "Replace with 's.newFun(this)'" "true"
+
+class X {
+    @deprecated("", ReplaceWith("s.newFun(this)"))
+    fun oldFun(s: String): String = s.newFun(this)
+}
+
+fun String.newFun(x: X): String = this
+
+fun foo(x: X?, p: Boolean) {
+    val v = if (p)
+        x?.<caret>oldFun("a")
+    else
+        null
+}

idea/testData/quickfix/deprecatedSymbolUsage/changeThisSafeCallWithValueRuntime.kt.after

@@ -0,0 +1,15 @@
+// "Replace with 's.newFun(this)'" "true"
+
+class X {
+    @deprecated("", ReplaceWith("s.newFun(this)"))
+    fun oldFun(s: String): String = s.newFun(this)
+}
+
+fun String.newFun(x: X): String = this
+
+fun foo(x: X?, p: Boolean) {
+    val v = if (p)
+        x?.<caret>let { "a".newFun(it) }
+    else
+        null
+}

idea/testData/quickfix/deprecatedSymbolUsage/changeThisToOuterThis.kt

@@ -0,0 +1,18 @@
+// "Replace with 's.newFun(this)'" "true"
+
+open class Base {
+    @deprecated("", ReplaceWith("s.newFun(this)"))
+    fun oldFun(s: String){}
+
+    open inner class Inner
+}
+
+class Derived : Base() {
+    inner class InnerDerived : Base.Inner() {
+        fun foo() {
+            <caret>oldFun("a")
+        }
+    }
+}
+
+fun String.newFun(x: Base){}

idea/testData/quickfix/deprecatedSymbolUsage/changeThisToOuterThis.kt.after

@@ -0,0 +1,18 @@
+// "Replace with 's.newFun(this)'" "true"
+
+open class Base {
+    @deprecated("", ReplaceWith("s.newFun(this)"))
+    fun oldFun(s: String){}
+
+    open inner class Inner
+}
+
+class Derived : Base() {
+    inner class InnerDerived : Base.Inner() {
+        fun foo() {
+            <caret>"a".newFun(this@Derived)
+        }
+    }
+}
+
+fun String.newFun(x: Base){}

idea/testData/quickfix/deprecatedSymbolUsage/doNotShortenUserReferences.kt

@@ -0,0 +1,10 @@
+// "Replace with 'newFun(c)'" "true"
+
+@deprecated("", ReplaceWith("newFun(c)"))
+fun oldFun(c: Char){}
+
+fun newFun(c: Char){}
+
+fun foo() {
+    <caret>oldFun(java.io.File.separatorChar)
+}

idea/testData/quickfix/deprecatedSymbolUsage/doNotShortenUserReferences.kt.after

@@ -0,0 +1,10 @@
+// "Replace with 'newFun(c)'" "true"
+
+@deprecated("", ReplaceWith("newFun(c)"))
+fun oldFun(c: Char){}
+
+fun newFun(c: Char){}
+
+fun foo() {
+    <caret>newFun(java.io.File.separatorChar)
+}

idea/testData/quickfix/deprecatedSymbolUsage/doNotShortenUsersExplicitThis.kt

@@ -0,0 +1,14 @@
+// "Replace with 'newFun(p)'" "true"
+
+class X {
+    @deprecated("", ReplaceWith("newFun(p)"))
+    fun oldFun(p: Any) {
+        newFun(p)
+    }
+
+    fun newFun(p: Any){}
+}
+
+fun X.foo() {
+    this.<caret>oldFun(this.toString())
+}

idea/testData/quickfix/deprecatedSymbolUsage/doNotShortenUsersExplicitThis.kt.after

@@ -0,0 +1,14 @@
+// "Replace with 'newFun(p)'" "true"
+
+class X {
+    @deprecated("", ReplaceWith("newFun(p)"))
+    fun oldFun(p: Any) {
+        newFun(p)
+    }
+
+    fun newFun(p: Any){}
+}
+
+fun X.foo() {
+    this.<caret>newFun(this.toString())
+}

idea/testData/quickfix/deprecatedSymbolUsage/dropReceiver.kt

@@ -0,0 +1,12 @@
+// "Replace with 'newFun()'" "true"
+
+class X {
+    @deprecated("", ReplaceWith("newFun()"))
+    fun oldFun(){}
+}
+
+fun newFun(){}
+
+fun foo(x: X) {
+    x.<caret>oldFun()
+}

idea/testData/quickfix/deprecatedSymbolUsage/dropReceiver.kt.after

@@ -0,0 +1,12 @@
+// "Replace with 'newFun()'" "true"
+
+class X {
+    @deprecated("", ReplaceWith("newFun()"))
+    fun oldFun(){}
+}
+
+fun newFun(){}
+
+fun foo(x: X) {
+    newFun()
+}

idea/testData/quickfix/deprecatedSymbolUsage/dropReceiverSafeCall.kt

@@ -0,0 +1,12 @@
+// "Replace with 'newFun()'" "true"
+
+class X {
+    @deprecated("", ReplaceWith("newFun()"))
+    fun oldFun(){}
+}
+
+fun newFun(){}
+
+fun foo(x: X) {
+    x?.<caret>oldFun()
+}

idea/testData/quickfix/deprecatedSymbolUsage/dropReceiverSafeCall.kt.after

@@ -0,0 +1,14 @@
+// "Replace with 'newFun()'" "true"
+
+class X {
+    @deprecated("", ReplaceWith("newFun()"))
+    fun oldFun(){}
+}
+
+fun newFun(){}
+
+fun foo(x: X) {
+    <caret>if (x != null) {
+        newFun()
+    }
+}

idea/testData/quickfix/deprecatedSymbolUsage/extensionForGenericClass.kt

@@ -0,0 +1,12 @@
+// "Replace with 'newFun(t)'" "true"
+
+class C<T>
+
+@deprecated("", ReplaceWith("newFun(t)"))
+fun <T> C<T>.oldFun(t: T){}
+
+fun <T> C<T>.newFun(t: T){}
+
+fun foo(x: C<String>) {
+    x.<caret>oldFun("a")
+}

idea/testData/quickfix/deprecatedSymbolUsage/extensionForGenericClass.kt.after

@@ -0,0 +1,12 @@
+// "Replace with 'newFun(t)'" "true"
+
+class C<T>
+
+@deprecated("", ReplaceWith("newFun(t)"))
+fun <T> C<T>.oldFun(t: T){}
+
+fun <T> C<T>.newFun(t: T){}
+
+fun foo(x: C<String>) {
+    x.<caret>newFun("a")
+}

idea/testData/quickfix/deprecatedSymbolUsage/incorrectReplacement.kt

@@ -0,0 +1,9 @@
+// "class org.jetbrains.kotlin.idea.quickfix.DeprecatedSymbolUsageFix" "false"
+
+@deprecated("", ReplaceWith("="))
+fun oldFun() {
+}
+
+fun foo() {
+    <caret>oldFun()
+}

idea/testData/quickfix/deprecatedSymbolUsage/memberFunction.kt

@@ -0,0 +1,14 @@
+// "Replace with 'newFun()'" "true"
+
+class X {
+    @deprecated("", ReplaceWith("newFun()"))
+    fun oldFun() {
+        newFun()
+    }
+
+    fun newFun(){}
+}
+
+fun foo(x: X) {
+    x.<caret>oldFun()
+}

idea/testData/quickfix/deprecatedSymbolUsage/memberFunction.kt.after

@@ -0,0 +1,14 @@
+// "Replace with 'newFun()'" "true"
+
+class X {
+    @deprecated("", ReplaceWith("newFun()"))
+    fun oldFun() {
+        newFun()
+    }
+
+    fun newFun(){}
+}
+
+fun foo(x: X) {
+    x.newFun()
+}

idea/testData/quickfix/deprecatedSymbolUsage/memberFunctionImplicitReceiver.kt

@@ -0,0 +1,14 @@
+// "Replace with 'newFun()'" "true"
+
+class X {
+    @deprecated("", ReplaceWith("newFun()"))
+    fun oldFun() {
+        newFun()
+    }
+
+    fun newFun(){}
+}
+
+fun X.foo() {
+    <caret>oldFun()
+}

idea/testData/quickfix/deprecatedSymbolUsage/memberFunctionImplicitReceiver.kt.after

@@ -0,0 +1,14 @@
+// "Replace with 'newFun()'" "true"
+
+class X {
+    @deprecated("", ReplaceWith("newFun()"))
+    fun oldFun() {
+        newFun()
+    }
+
+    fun newFun(){}
+}
+
+fun X.foo() {
+    <caret>newFun()
+}

idea/testData/quickfix/deprecatedSymbolUsage/memberFunctionInGenericClass.kt

@@ -0,0 +1,12 @@
+// "Replace with 'newFun(t)'" "true"
+
+interface X<T> {
+    @deprecated("", ReplaceWith("newFun(t)"))
+    fun oldFun(t: T)
+
+    fun newFun(t: T)
+}
+
+fun foo(x: X<String>) {
+    x.<caret>oldFun("a")
+}

idea/testData/quickfix/deprecatedSymbolUsage/memberFunctionInGenericClass.kt.after

@@ -0,0 +1,12 @@
+// "Replace with 'newFun(t)'" "true"
+
+interface X<T> {
+    @deprecated("", ReplaceWith("newFun(t)"))
+    fun oldFun(t: T)
+
+    fun newFun(t: T)
+}
+
+fun foo(x: X<String>) {
+    x.<caret>newFun("a")
+}

idea/testData/quickfix/deprecatedSymbolUsage/methodToProperty.kt

@@ -0,0 +1,12 @@
+// "Replace with 'x'" "true"
+
+trait X {
+    @deprecated("", ReplaceWith("x"))
+    fun getX(): String
+
+    val x: String
+}
+
+fun foo(x: X): String {
+    return x.<caret>getX()
+}

idea/testData/quickfix/deprecatedSymbolUsage/methodToProperty.kt.after

@@ -0,0 +1,12 @@
+// "Replace with 'x'" "true"
+
+trait X {
+    @deprecated("", ReplaceWith("x"))
+    fun getX(): String
+
+    val x: String
+}
+
+fun foo(x: X): String {
+    return x.<caret>x
+}

idea/testData/quickfix/deprecatedSymbolUsage/noReplacement.kt

@@ -0,0 +1,9 @@
+// "class org.jetbrains.kotlin.idea.quickfix.DeprecatedSymbolUsageFix" "false"
+
+@deprecated("")
+fun oldFun() {
+}
+
+fun foo() {
+    <caret>oldFun()
+}

idea/testData/quickfix/deprecatedSymbolUsage/parameters.kt

@@ -0,0 +1,11 @@
+// "Replace with 'newFun(b, a, null)'" "true"
+
+@deprecated("", ReplaceWith("newFun(b, a, null)"))
+fun oldFun(a: Int, b: String) {
+}
+
+fun newFun(b: String, a: Int, x: Any?){}
+
+fun foo() {
+    <caret>oldFun(1, "x")
+}

idea/testData/quickfix/deprecatedSymbolUsage/parameters.kt.after

@@ -0,0 +1,11 @@
+// "Replace with 'newFun(b, a, null)'" "true"
+
+@deprecated("", ReplaceWith("newFun(b, a, null)"))
+fun oldFun(a: Int, b: String) {
+}
+
+fun newFun(b: String, a: Int, x: Any?){}
+
+fun foo() {
+    <caret>newFun("x", 1, null)
+}

idea/testData/quickfix/deprecatedSymbolUsage/propertyToMethod.kt

@@ -0,0 +1,12 @@
+// "Replace with 'getX()'" "true"
+
+trait X {
+    @deprecated("", ReplaceWith("getX()"))
+    val x: String
+
+    fun getX(): String
+}
+
+fun foo(x: X): String {
+    return x.<caret>x
+}

idea/testData/quickfix/deprecatedSymbolUsage/propertyToMethod.kt.after

@@ -0,0 +1,12 @@
+// "Replace with 'getX()'" "true"
+
+trait X {
+    @deprecated("", ReplaceWith("getX()"))
+    val x: String
+
+    fun getX(): String
+}
+
+fun foo(x: X): String {
+    return x.<caret>getX()
+}

idea/testData/quickfix/deprecatedSymbolUsage/safeCall.kt

@@ -0,0 +1,12 @@
+// "Replace with 'newFun()'" "true"
+
+class X {
+    @deprecated("", ReplaceWith("newFun()"))
+    fun oldFun(){}
+
+    fun newFun(){}
+}
+
+fun foo(x: X?) {
+    x?.<caret>oldFun()
+}

idea/testData/quickfix/deprecatedSymbolUsage/safeCall.kt.after

@@ -0,0 +1,12 @@
+// "Replace with 'newFun()'" "true"
+
+class X {
+    @deprecated("", ReplaceWith("newFun()"))
+    fun oldFun(){}
+
+    fun newFun(){}
+}
+
+fun foo(x: X?) {
+    x?.<caret>newFun()
+}

idea/testData/quickfix/deprecatedSymbolUsage/shortenReferences.kt

@@ -0,0 +1,10 @@
+// "Replace with 'newFun(java.io.File.separatorChar)'" "true"
+
+@deprecated("", ReplaceWith("newFun(java.io.File.separatorChar)"))
+fun oldFun() { }
+
+fun newFun(separator: Char){}
+
+fun foo() {
+    <caret>oldFun()
+}

idea/testData/quickfix/deprecatedSymbolUsage/shortenReferences.kt.after

@@ -0,0 +1,12 @@
+// "Replace with 'newFun(java.io.File.separatorChar)'" "true"
+
+import java.io.File
+
+@deprecated("", ReplaceWith("newFun(java.io.File.separatorChar)"))
+fun oldFun() { }
+
+fun newFun(separator: Char){}
+
+fun foo() {
+    <caret>newFun(File.separatorChar)
+}

idea/testData/quickfix/deprecatedSymbolUsage/simple.kt

@@ -0,0 +1,12 @@
+// "Replace with 'newFun()'" "true"
+
+@deprecated("", ReplaceWith("newFun()"))
+fun oldFun() {
+    newFun()
+}
+
+fun newFun(){}
+
+fun foo() {
+    <caret>oldFun()
+}

idea/testData/quickfix/deprecatedSymbolUsage/simple.kt.after

@@ -0,0 +1,12 @@
+// "Replace with 'newFun()'" "true"
+
+@deprecated("", ReplaceWith("newFun()"))
+fun oldFun() {
+    newFun()
+}
+
+fun newFun(){}
+
+fun foo() {
+    <caret>newFun()
+}

idea/testData/quickfix/deprecatedSymbolUsage/toMethodFromCompanionObject.after.kt

@@ -0,0 +1,7 @@
+// "Replace with 'newFun(this)'" "true"
+
+import dependency.C
+
+fun foo(c: dependency.C) {
+    C.<caret>newFun(c)
+}

idea/testData/quickfix/deprecatedSymbolUsage/toMethodFromCompanionObject.before.Declaration.kt

@@ -0,0 +1,11 @@
+package dependency
+
+class C {
+    @deprecated("", ReplaceWith("newFun(this)"))
+    fun oldFun() {}
+
+    companion object {
+        fun newFun(c: C) {}
+    }
+}
+

idea/testData/quickfix/deprecatedSymbolUsage/toMethodFromCompanionObject.before.Main.kt

@@ -0,0 +1,5 @@
+// "Replace with 'newFun(this)'" "true"
+
+fun foo(c: dependency.C) {
+    c.<caret>oldFun()
+}

idea/testData/quickfix/deprecatedSymbolUsage/toOuterClassMethod.kt

@@ -0,0 +1,15 @@
+// "Replace with 'newFun(this)'" "true"
+// ERROR: Unresolved reference: newFun
+
+class Outer {
+    inner class Inner {
+        @deprecated("", ReplaceWith("newFun(this)"))
+        fun oldFun() {}
+    }
+
+    fun newFun(inner: Inner) {}
+}
+
+fun foo(inner: Outer.Inner) {
+    inner.<caret>oldFun()
+}

idea/testData/quickfix/deprecatedSymbolUsage/toOuterClassMethod.kt.after

@@ -0,0 +1,15 @@
+// "Replace with 'newFun(this)'" "true"
+// ERROR: Unresolved reference: newFun
+
+class Outer {
+    inner class Inner {
+        @deprecated("", ReplaceWith("newFun(this)"))
+        fun oldFun() {}
+    }
+
+    fun newFun(inner: Inner) {}
+}
+
+fun foo(inner: Outer.Inner) {
+    <caret>newFun(inner)
+}

idea/testData/quickfix/deprecatedSymbolUsage/twoValuesCombined.kt

@@ -0,0 +1,10 @@
+// "Replace with 'newFun(p1 + p2)'" "true"
+
+@deprecated("", ReplaceWith("newFun(p1 + p2)"))
+fun oldFun(p1: Int, p2: Int) {}
+
+fun newFun(n: Int) {}
+
+fun foo() {
+    <caret>oldFun(1, 2)
+}

idea/testData/quickfix/deprecatedSymbolUsage/twoValuesCombined.kt.after

@@ -0,0 +1,10 @@
+// "Replace with 'newFun(p1 + p2)'" "true"
+
+@deprecated("", ReplaceWith("newFun(p1 + p2)"))
+fun oldFun(p1: Int, p2: Int) {}
+
+fun newFun(n: Int) {}
+
+fun foo() {
+    <caret>newFun(1 + 2)
+}