KT-2190 Highlight usages invoked on "throw" or "return" should highlight all exit-points of function

#KT-2190 fixed
This commit is contained in:
Evgeny Gerashchenko
2015-04-02 22:38:12 +03:00
parent 86f91ade1a
commit 33e34c759d
17 changed files with 413 additions and 0 deletions
+15
View File
@@ -0,0 +1,15 @@
fun f(a: Int): Int {
if (a < 5) {
run {
<caret>return 1
}
}
else {
return 2
}
}
inline public fun <T> run(f: () -> T): T { }
//HIGHLIGHTED: return 1
//HIGHLIGHTED: return 2
+15
View File
@@ -0,0 +1,15 @@
fun f(a: Int): Int {
if (a < 5) {
run {
return 1
}
}
else {
<caret>return 2
}
}
inline public fun <T> run(f: () -> T): T { }
//HIGHLIGHTED: return 1
//HIGHLIGHTED: return 2
@@ -0,0 +1,14 @@
fun f(a: Int): Int {
if (a < 5) {
run {
<caret>return@run 1
}
}
else {
return 2
}
}
inline public fun <T> run(f: () -> T): T { }
//HIGHLIGHTED: return@run 1
@@ -0,0 +1,14 @@
fun f(a: Int): Int {
if (a < 5) {
run {
return@run 1
}
}
else {
<caret>return 2
}
}
inline public fun <T> run(f: () -> T): T { }
//HIGHLIGHTED: return 2
@@ -0,0 +1,14 @@
fun f(a: Int): Int {
fun localFun() {
<caret>return
}
if (a < 5) {
return 1
}
else {
return 2
}
}
//HIGHLIGHTED: return
@@ -0,0 +1,15 @@
fun f(a: Int): Int {
fun localFun() {
return
}
if (a < 5) {
return 1
}
else {
<caret>return 2
}
}
//HIGHLIGHTED: return 1
//HIGHLIGHTED: return 2
@@ -0,0 +1,18 @@
fun f(a: Int): Int {
fun localFun() {
if (a > 5) {
return
}
<caret>throw Error()
}
if (a < 5) {
return 1
}
else {
throw Exception()
}
}
//HIGHLIGHTED: return
//HIGHLIGHTED: throw Error()
+15
View File
@@ -0,0 +1,15 @@
import javax.swing.SwingUtilities
fun f(a: Int): Int {
if (a < 5) {
SwingUtilities.invokeLater(fun (): Unit {
<caret>return
})
return 1
}
else {
return 2
}
}
//HIGHLIGHTED: return
+16
View File
@@ -0,0 +1,16 @@
import javax.swing.SwingUtilities
fun f(a: Int): Int {
if (a < 5) {
SwingUtilities.invokeLater(fun (): Unit {
return
})
<caret>return 1
}
else {
return 2
}
}
//HIGHLIGHTED: return 1
//HIGHLIGHTED: return 2
+11
View File
@@ -0,0 +1,11 @@
fun f(a: Int): Int {
if (a < 5) {
<caret>return 1
}
else {
return 2
}
}
//HIGHLIGHTED: return 1
//HIGHLIGHTED: return 2
+11
View File
@@ -0,0 +1,11 @@
fun f(a: Int): Int {
if (a < 5) {
return 1
}
else {
<caret>throw Error()
}
}
//HIGHLIGHTED: return 1
//HIGHLIGHTED: throw Error()
+11
View File
@@ -0,0 +1,11 @@
fun f(a: Int): Int {
if (a < 5) {
<caret>return 1
}
else {
throw Error()
}
}
//HIGHLIGHTED: return 1
//HIGHLIGHTED: throw Error()