KT-12100 convert try / finally to use: report intention only at try {

This commit is contained in:
Mikhail Glukhikh
2016-12-01 19:36:53 +03:00
parent 0cc52e2ff8
commit 9ea326870d
14 changed files with 63 additions and 40 deletions
@@ -5,13 +5,13 @@ import java.io.IOException
fun main(args: Array<String>) {
val reader = File("hello-world.txt").bufferedReader()
try {
<caret>try {
reader.readLine()
}
catch (e: IOException) {
}
<caret>finally {
finally {
reader.close()
}
}
@@ -3,10 +3,10 @@ import java.io.File
fun main(args: Array<String>) {
val reader = File("hello-world.txt").bufferedReader()
try {
<caret>try {
// do stuff with reader
}
<caret>finally {
finally {
reader.close()
}
}
@@ -3,10 +3,10 @@ import java.io.File
import java.io.BufferedReader
fun BufferedReader.foo() {
try {
try <caret>{
readLine()
}
<caret>finally {
finally {
close()
}
}
@@ -4,10 +4,10 @@ import java.io.File
fun main(args: Array<String>) {
val reader = File("hello-world.txt").bufferedReader()
try {
<caret>try {
reader.readLine()
}
<caret>finally {
finally {
reader.readLine()
}
}
@@ -4,10 +4,10 @@ import java.io.File
fun main(args: Array<String>) {
val reader = File("hello-world.txt").bufferedReader()
try {
try<caret> {
reader.readLine()
}
<caret>finally {
finally {
reader.readLine()
reader.close()
}
@@ -3,10 +3,10 @@ import java.io.File
import java.io.BufferedReader
fun foo(reader: BufferedReader) {
try {
try <caret>{
reader.readLine()
}
<caret>finally {
finally {
reader.close()
}
}
@@ -5,11 +5,11 @@ import java.io.BufferedReader
fun bar() {}
fun foo(reader: BufferedReader?) {
try {
<caret>try {
reader?.readLine()
bar()
}
<caret>finally {
finally {
reader?.close()
}
}
@@ -3,10 +3,10 @@ import java.io.File
fun main(args: Array<String>) {
val reader = File("hello-world.txt").bufferedReader()
try {
try <caret>{
reader.readLine()
}
<caret>finally {
finally {
reader.close()
}
}
@@ -3,10 +3,10 @@ import java.io.File
import java.io.BufferedReader
fun BufferedReader.foo() {
try {
<caret>try {
this.readLine()
}
<caret>finally {
finally {
this.close()
}
}
@@ -8,10 +8,10 @@ class MyCloseable : Closeable {
fun process(x: Int) = x
fun Int.foo() {
try {
<caret>try {
this@MyCloseable.process(this)
}
<caret>finally {
finally {
this@MyCloseable.close()
}
}
@@ -3,12 +3,12 @@ import java.io.File
fun main(args: Array<String>) {
val writer = File("hello-world.txt").bufferedWriter()
try {
try <caret>{
writer.write("123")
writer.newLine()
writer.write("456")
}
<caret>finally {
finally {
writer.close()
}
}
@@ -0,0 +1,13 @@
// IS_APPLICABLE: false
// WITH_RUNTIME
import java.io.File
fun main(args: Array<String>) {
val reader = File("hello-world.txt").bufferedReader()
try {
reader.readLine()
}
finally {
<caret>reader.close()
}
}