DeprecatedCallableAddReplaceWithIntention

This commit is contained in:
Valentin Kipyatkov
2015-05-16 17:00:20 +03:00
parent ba3d5f944e
commit ec5256a0f0
44 changed files with 766 additions and 171 deletions
@@ -0,0 +1 @@
org.jetbrains.kotlin.idea.intentions.DeprecatedCallableAddReplaceWithIntention
@@ -0,0 +1,7 @@
// IS_APPLICABLE: false
<caret>@deprecated("", ReplaceWith("bar()"))
fun foo() {
bar()
}
fun bar(){}
@@ -0,0 +1,7 @@
<caret>@deprecated("")
fun foo() {
// invoke bar()
bar()
}
fun bar(){}
@@ -0,0 +1,7 @@
@deprecated("", <caret>ReplaceWith("bar()"))
fun foo() {
// invoke bar()
bar()
}
fun bar(){}
@@ -0,0 +1,10 @@
// IS_APPLICABLE: false
<caret>@deprecated("")
fun foo(p: Int) {
if (p > 0) {
val v = p + 1
bar(v)
}
}
fun bar(p: Int){}
@@ -0,0 +1,4 @@
<caret>@deprecated("")
fun foo(): String = bar()
fun bar(): String = ""
@@ -0,0 +1,4 @@
@deprecated("", <caret>ReplaceWith("bar()"))
fun foo(): String = bar()
fun bar(): String = ""
@@ -0,0 +1,10 @@
<caret>@deprecated("")
fun foo(p: Int) {
if (p > 0)
bar1(p)
else
bar2(p)
}
fun bar1(p: Int){}
fun bar2(p: Int){}
@@ -0,0 +1,10 @@
@deprecated("", ReplaceWith("if (p > 0) bar1(p) else bar2(p)"))
fun foo(p: Int) {
if (p > 0)
bar1(p)
else
bar2(p)
}
fun bar1(p: Int){}
fun bar2(p: Int){}
@@ -0,0 +1,3 @@
package dependency
val valueFromOtherPackage = 1
@@ -0,0 +1,3 @@
package dependency
val valueFromOtherPackage = 1
@@ -0,0 +1,10 @@
package pack
import dependency.valueFromOtherPackage
<caret>@deprecated("")
fun foo() {
bar(valueFromOtherPackage)
}
fun bar(p: Int){}
@@ -0,0 +1,10 @@
package pack
import dependency.valueFromOtherPackage
@deprecated("", ReplaceWith("bar(valueFromOtherPackage)", "dependency.valueFromOtherPackage"))
fun foo() {
bar(valueFromOtherPackage)
}
fun bar(p: Int){}
@@ -0,0 +1,7 @@
package dependency
class D {
companion object {
val value = 1
}
}
@@ -0,0 +1,7 @@
package dependency
class D {
companion object {
val value = 1
}
}
@@ -0,0 +1,10 @@
package pack
import dependency.D
<caret>@deprecated("")
fun foo() {
bar(D.value)
}
fun bar(p: Int){}
@@ -0,0 +1,10 @@
package pack
import dependency.D
@deprecated("", ReplaceWith("bar(D.value)", "dependency.D"))
fun foo() {
bar(D.value)
}
fun bar(p: Int){}
@@ -0,0 +1,5 @@
// WITH_RUNTIME
<caret>@deprecated("")
fun foo(s: String): String {
return s.substring(1) + Int.MAX_VALUE
}
@@ -0,0 +1,5 @@
// WITH_RUNTIME
@deprecated("", ReplaceWith("s.substring(1) + Int.MAX_VALUE"))
fun foo(s: String): String {
return s.substring(1) + Int.MAX_VALUE
}
@@ -0,0 +1,9 @@
// IS_APPLICABLE: false
// ERROR: A 'return' expression required in a function with a block body ('{...}')
<caret>@deprecated("")
fun foo(): String {
bar()
}
fun bar(): String = ""
@@ -0,0 +1,11 @@
// IS_APPLICABLE: false
class C {
private val v = 1
<caret>@deprecated("")
fun foo() {
bar(v)
}
fun bar(p: Int){}
}
@@ -0,0 +1,6 @@
<caret>@deprecated("")
fun foo(s: String) {
s.bar()
}
fun String.bar(){}
@@ -0,0 +1,6 @@
@deprecated("", <caret>ReplaceWith("s.bar()"))
fun foo(s: String) {
s.bar()
}
fun String.bar(){}
@@ -0,0 +1,6 @@
<caret>@deprecated("")
fun foo(): String {
return bar()
}
fun bar(): String = ""
@@ -0,0 +1,6 @@
@deprecated("", <caret>ReplaceWith("bar()"))
fun foo(): String {
return bar()
}
fun bar(): String = ""
@@ -0,0 +1,7 @@
// IS_APPLICABLE: false
<caret>@deprecated("")
fun foo() {
bar() ?: return
}
fun bar(): String? = null
@@ -0,0 +1,6 @@
<caret>@deprecated("")
fun foo() {
bar()
}
fun bar(){}
@@ -0,0 +1,6 @@
@deprecated("", <caret>ReplaceWith("bar()"))
fun foo() {
bar()
}
fun bar(){}
@@ -0,0 +1,6 @@
<caret>@deprecated("")
fun foo(p: Int) {
bar("\"$p\"\n1\r2\t3")
}
fun bar(s: String){}
@@ -0,0 +1,6 @@
@deprecated("", ReplaceWith("bar(\"\\\"$p\\\"\\n1\\r2\\t3\")"))
fun foo(p: Int) {
bar("\"$p\"\n1\r2\t3")
}
fun bar(s: String){}
@@ -0,0 +1,8 @@
// IS_APPLICABLE: false
<caret>@deprecated("")
fun foo() {
bar()
bar()
}
fun bar(){}
@@ -0,0 +1,7 @@
class C {
<caret>@deprecated("")
val foo: String
get() = bar()
fun bar(): String = ""
}
@@ -0,0 +1,7 @@
class C {
@deprecated("", ReplaceWith("bar()"))
val foo: String
get() = bar()
fun bar(): String = ""
}
@@ -0,0 +1,9 @@
class C {
<caret>@deprecated("")
val foo: String
get() {
return bar()
}
fun bar(): String = ""
}
@@ -0,0 +1,9 @@
class C {
@deprecated("", ReplaceWith("bar()"))
val foo: String
get() {
return bar()
}
fun bar(): String = ""
}