From d00bc545fe981d624f4b3d8b3b3fbbfaf0d2345b Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Tue, 21 Oct 2014 18:06:04 +0400
Subject: [PATCH] IDEA-131658 try-catch-finally is not supported

---
 .../decompiler/stats/CatchAllStatement.java   |   2 +-
 .../java/decompiler/SingleClassesTest.java    |   1 +
 .../classes/pkg/TestTryCatchFinally.class     | Bin 0 -> 890 bytes
 testData/results/TestTryCatchFinally.dec      |  16 ++++++++++
 testData/src/pkg/TestTryCatchFinally.java     |  29 ++++++++++++++++++
 5 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 testData/classes/pkg/TestTryCatchFinally.class
 create mode 100644 testData/results/TestTryCatchFinally.dec
 create mode 100644 testData/src/pkg/TestTryCatchFinally.java

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
index 2e4ab82..f2321ac 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
@@ -132,7 +132,7 @@ public class CatchAllStatement extends Statement {
     if (first.type == TYPE_TRYCATCH && first.varDefinitions.isEmpty() && isFinally &&
         !labeled && !first.isLabeled() && (lstSuccs.isEmpty() || !lstSuccs.get(0).explicit)) {
       TextBuffer content = ExprProcessor.jmpWrapper(first, indent, true, tracer);
-      content.setStart(content.length() - new_line_separator.length());
+      content.setLength(content.length() - new_line_separator.length());
       buf.append(content);
     }
     else {
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index f0de32d..20d4fa8 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -36,4 +36,5 @@ public class SingleClassesTest extends SingleClassesTestBase {
   @Test public void testInvalidMethodSignature() { doTest("InvalidMethodSignature"); }
   @Test public void testInnerClassConstructor() { doTest("pkg/TestInnerClassConstructor"); }
   @Test public void testInnerClassConstructor11() { doTest("v11/TestInnerClassConstructor"); }
+  @Test public void testTryCatchFinally() { doTest("pkg/TestTryCatchFinally"); }
 }
diff --git a/testData/classes/pkg/TestTryCatchFinally.class b/testData/classes/pkg/TestTryCatchFinally.class
new file mode 100644
index 0000000000000000000000000000000000000000..16dc30dc15fb6b2ac725db6c2c0b506e0cbf9540
GIT binary patch
literal 890
zcmaJ=TTdE67(K&n)^!y`5TV*udjl2eg<cYRNi~|7cxeJ@(#HWNxVr3amZ2?wrmubR
zrG3DrP1^VVsHWe5gc42n;e0dSoc+!>XJ&r?`Ti3?8P812B4^?nmZq?b>jrL^xQP{x
zRgPOGIC2JV>v%`QT@Cj*@*D+**mK*p)k}tOzVMbIvh6h`Lww(M<zcs7mqAU`9m+(M
z>?nqGe*Z+g7bQoytx{D5w%e){_84ZWN;FOngg>AUl-C%{s@Dw~a@W=s7Hd?Y7WB4-
zY8>y{u5g^*rY>e7js(ZLg$<-QiWW9eV&E4Xj{6oK;332OSbFDUL;A}0T!zdzJ8WpH
zYdcLDFhqBPzzZxqLRrIO3s3Nre(+CQr7N0YNQ_Gz)lX!DHvErf?Ktp04BeO;6Zc#t
zTUyQVMbMEnov2gob(CzAy<S(_H+0YTN^i(IMg2<Au8dSB)8v4!Ne=DtO55qUV#4>O
z+hizSbuO2V>cSZkoZt`lS}FX8ZzykQE<-ARnOMOJX6P2`F9f<jND$7^Y?&gX7+pID
z`$7YTBw=ijOcKr`MX0Ht5JrUJ>-BF4z4(f7GSWwM>Fj`pKfvFe!$?l`VQ%y>-G@bM
zBhF{c9*)MvU!gN9M2gf!Y!J(YaTMsO=<c-qDh$Fjak8|sK;33&JxkXtN31Mf(PK&z
UV;bQjj)f*i#-uJ62L-Z!0m7imbpQYW

literal 0
HcmV?d00001

diff --git a/testData/results/TestTryCatchFinally.dec b/testData/results/TestTryCatchFinally.dec
new file mode 100644
index 0000000..1524da8
--- /dev/null
+++ b/testData/results/TestTryCatchFinally.dec
@@ -0,0 +1,16 @@
+package pkg;
+
+public class TestTryCatchFinally {
+   public int test(String var1) {
+      try {
+         int var2 = Integer.parseInt(var1);
+         return var2;
+      } catch (Exception var6) {
+         System.out.println("Error" + var6);
+      } finally {
+         System.out.println("Finally");
+      }
+
+      return -1;
+   }
+}
diff --git a/testData/src/pkg/TestTryCatchFinally.java b/testData/src/pkg/TestTryCatchFinally.java
new file mode 100644
index 0000000..2e244be
--- /dev/null
+++ b/testData/src/pkg/TestTryCatchFinally.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package pkg;
+
+public class TestTryCatchFinally {
+  public int test(String a) {
+    try {
+      return Integer.parseInt(a);
+    } catch (Exception e) {
+      System.out.println("Error" + e);
+    } finally {
+      System.out.println("Finally");
+    }
+    return -1;
+  }
+}
\ No newline at end of file