KT-12100 convert try / finally to use: safe close() is allowed in finally + correct new lines

This commit is contained in:
Mikhail Glukhikh
2016-12-01 19:23:18 +03:00
parent 0ac443066e
commit 0cc52e2ff8
9 changed files with 37 additions and 11 deletions
@@ -3,5 +3,7 @@ import java.io.File
fun main(args: Array<String>) {
val reader = File("hello-world.txt").bufferedReader()
reader.use { reader -> // do stuff with reader }
reader.use { reader ->
// do stuff with reader
}
}
@@ -3,5 +3,7 @@ import java.io.File
import java.io.BufferedReader
fun BufferedReader.foo() {
use { readLine() }
use {
readLine()
}
}
@@ -3,5 +3,7 @@ import java.io.File
import java.io.BufferedReader
fun foo(reader: BufferedReader) {
reader.use { reader -> reader.readLine() }
reader.use { reader ->
reader.readLine()
}
}
@@ -1,11 +1,13 @@
// IS_APPLICABLE: false
// WITH_RUNTIME
import java.io.File
import java.io.BufferedReader
fun bar() {}
fun foo(reader: BufferedReader?) {
try {
reader?.readLine()
bar()
}
<caret>finally {
reader?.close()
@@ -0,0 +1,12 @@
// WITH_RUNTIME
import java.io.File
import java.io.BufferedReader
fun bar() {}
fun foo(reader: BufferedReader?) {
reader.use { reader ->
reader?.readLine()
bar()
}
}
@@ -3,5 +3,7 @@ import java.io.File
fun main(args: Array<String>) {
val reader = File("hello-world.txt").bufferedReader()
reader.use { reader -> reader.readLine() }
reader.use { reader ->
reader.readLine()
}
}
@@ -3,5 +3,7 @@ import java.io.File
import java.io.BufferedReader
fun BufferedReader.foo() {
this.use { this.readLine() }
this.use {
this.readLine()
}
}
@@ -8,6 +8,8 @@ class MyCloseable : Closeable {
fun process(x: Int) = x
fun Int.foo() {
this@MyCloseable.use { this@MyCloseable.process(this) }
this@MyCloseable.use {
this@MyCloseable.process(this)
}
}
}