From c254ddd8f20164664a381ccf51c37145a9cd451f Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Fri, 16 Jan 2015 20:46:57 +0300
Subject: [PATCH] IDEA-130477 Instance creation of local inner class within
 static method is not decompiled correctly

---
 .../modules/decompiler/exps/NewExprent.java   |   5 +-
 .../java/decompiler/SingleClassesTest.java    |   3 +-
 .../classes/pkg/TestInnerLocal$1Inner.class   | Bin 0 -> 400 bytes
 .../classes/pkg/TestInnerLocal$2Inner.class   | Bin 0 -> 461 bytes
 .../classes/pkg/TestInnerLocal$Inner1.class   | Bin 0 -> 416 bytes
 ...InnerLocal$Inner1Static$Inner2Static.class | Bin 0 -> 430 bytes
 .../pkg/TestInnerLocal$Inner1Static.class     | Bin 0 -> 430 bytes
 testData/classes/pkg/TestInnerLocal.class     | Bin 0 -> 640 bytes
 testData/results/TestInnerLocal.dec           |  98 ++++++++++++++++++
 testData/src/pkg/TestInnerLocal.java          |  63 +++++++++++
 10 files changed, 166 insertions(+), 3 deletions(-)
 create mode 100644 testData/classes/pkg/TestInnerLocal$1Inner.class
 create mode 100644 testData/classes/pkg/TestInnerLocal$2Inner.class
 create mode 100644 testData/classes/pkg/TestInnerLocal$Inner1.class
 create mode 100644 testData/classes/pkg/TestInnerLocal$Inner1Static$Inner2Static.class
 create mode 100644 testData/classes/pkg/TestInnerLocal$Inner1Static.class
 create mode 100644 testData/classes/pkg/TestInnerLocal.class
 create mode 100644 testData/results/TestInnerLocal.dec
 create mode 100644 testData/src/pkg/TestInnerLocal.java

diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
index ba23463..a143828 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 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.
@@ -389,7 +389,8 @@ public class NewExprent extends Exprent {
   private static String getQualifiedNewInstance(String classname, List<Exprent> lstParams, int indent, BytecodeMappingTracer tracer) {
     ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(classname);
 
-    if (node != null && node.type != ClassNode.CLASS_ROOT && (node.access & CodeConstants.ACC_STATIC) == 0) {
+    if (node != null && node.type != ClassNode.CLASS_ROOT && node.type != ClassNode.CLASS_LOCAL
+        && (node.access & CodeConstants.ACC_STATIC) == 0) {
       if (!lstParams.isEmpty()) {
         Exprent enclosing = lstParams.get(0);
 
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index 8a51c72..62fef0a 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 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.
@@ -57,4 +57,5 @@ public class SingleClassesTest extends SingleClassesTestBase {
   @Test public void testLocalClass() { doTest("pkg/TestLocalClass"); }
   @Test public void testAnonymousClass() { doTest("pkg/TestAnonymousClass"); }
   @Test public void testThrowException() { doTest("pkg/TestThrowException"); }
+  @Test public void testInnerLocal() { doTest("pkg/TestInnerLocal"); }
 }
diff --git a/testData/classes/pkg/TestInnerLocal$1Inner.class b/testData/classes/pkg/TestInnerLocal$1Inner.class
new file mode 100644
index 0000000000000000000000000000000000000000..61aecb2cd131bd3b320f5a681ec63ca71c2dff03
GIT binary patch
literal 400
zcmZWlO-sW-5Pg%Tjg7Ibt!ee<!9yFtBJ`$sDGEZ=LrU+Pbg5h729mA#w>*f@gFnC@
zB~GFsMHc4sy?L|q`L+1~Fu{=v8=WR<*mux%;1lSD&<$7OS&UPmm*dFfN-r-6jZ3AK
zxgz+(|LxJ7U{AA!B(y`N<^B38mibJ?DOcPmTjz<qQDxGb$->-fE%Pu-M0!>#G3i<-
zX;!e(oivZx!a?7|0EZr&($vvl-EHQ{c{PPl|Mgzwr>Q6kSr9sZe|U&jGBJeK_5{Wl
zUM4casN_eNP#ccsIOdDkd?7}Z+Eqln$_`hWoCUD>0dDXP3Qpf(y;c~PZHu{p&-^}P
Z2b}G4Zo$JIdz<@h9B}0FtP<G+z5%!oR0RM4

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestInnerLocal$2Inner.class b/testData/classes/pkg/TestInnerLocal$2Inner.class
new file mode 100644
index 0000000000000000000000000000000000000000..87289e1956769d2d3031fe0e3bbfea11e958c39f
GIT binary patch
literal 461
zcmZWl%TB^j5IsW+m0F>K_%`u@37`>U+-ckpO-!mTAnZ%Ifs%Tgv=`%VxgaJk`~W}7
zIJcS@bTf12dCtto=i57gbL<phqG}_L6^&{ZRxNB0=$TOQCjOJ(j(j<4cU2O~(FLKP
z#$j4NCAeNsr0P~mk$7?7N4j<y%1~Vq4jX@q|5r8p1hW$l1)=PPQru4;2O{bDgNQSB
zH=ZVexCwPoohLfcs(9#H22q@{sym^^@zBDigDq@3SU}N%tx*9Mp*BBWKg%=|@;~0m
zd?)hLRHS^@@6iu~i3k*-G{1r6DL(z1mS8lReeCk{^8C>pT+Ir&uGYaB{w0f9Wb1I$
z<_?2>xpg!HwO)~H9nWCAWQ|K~OIdl3NB0>Ya8%-K4rN{pCRs)W>x^t(XtG}ez5u~I
BVetR}

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestInnerLocal$Inner1.class b/testData/classes/pkg/TestInnerLocal$Inner1.class
new file mode 100644
index 0000000000000000000000000000000000000000..145dc8921152824e2511bb4ca158d8be4c02c3e1
GIT binary patch
literal 416
zcmZWlO-sW-5Ph4Zjg2vht@Z2Vp+b$?D0ox66a*pYp~d?qE_F+~fg~0GmWLvE@CW##
z#MyvI^fL2i=FQBT`TTnS0C0i*4lD!?TG-U6Yh%mC4g-5(=*DyY%%hB}Sv08%sb-f9
z?dnOEgENL8o{F-%RZ0|bp7KoBuB4LHHN)ZXZ}I=AqX!0SoIeT%KbA_|Ef<L>raZ|g
z<4p2pk%}9sgI;sdNUL(OhK>sdyDr+WZR|1ho4i4-?VM!&0JjF?jF+V->4M+$?vuGl
zD+Y6@WqHj(IH1q8=v@W^y$lEfy`D1kDAKS_)}<&ShDqKJk5^#f8;tN|1@pBgZjklr
Y@+q~B2y41WSpz<{$vZU0LJxi58}`drh5!Hn

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestInnerLocal$Inner1Static$Inner2Static.class b/testData/classes/pkg/TestInnerLocal$Inner1Static$Inner2Static.class
new file mode 100644
index 0000000000000000000000000000000000000000..b2262f5d6be86dd25b5045a82610851c045a9288
GIT binary patch
literal 430
zcmaKo&q~8U5XQerVq;=VV`}|_C&5FSf<^IUi<g2R1U;nmzKKgoi3udB_*x!B@ZbaZ
zP~s$|Y7t~%cYZV9%<Rm^=i57g3mlrzux&tvt;5l=OQ0u$8_dO{7^EVb4Z^BOve}T(
z8YNj$T@kw8-*9hA(8l?_B(#Ghlede9NEQ<jrR*`od{M;mI;o*Ek!5w0WwHqJSfr<Q
zCkr~d7B<k*u}|>UB`1ygEUZM8#7j6|0>SznTj4krWhu)Qev6%-sqUh=j4Oib^`<%w
z2uJ_)B-raw9P`FB-XOuLf8AKbLu|6gVDh2x0ZjiD<o92oJU1GXZ<}+0OU@s%cEq|Z
VW(5{peqFZO*uxIjQrYUj_yU>AV50y4

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestInnerLocal$Inner1Static.class b/testData/classes/pkg/TestInnerLocal$Inner1Static.class
new file mode 100644
index 0000000000000000000000000000000000000000..f82d0eaadde560b79db1d24526dac28bd8608039
GIT binary patch
literal 430
zcmaJ-O-sW-6r4?B)5Mt8)cS!J4<2F)7Dc@%UJ8N`^pN6x6PL0jZXwx<f6Idi9{d6R
zDDfo{B?z*xJM(sCci#K>e0v9Qf*ltY)*YA#Y;4#VGI-ZYiQ*{HT+6JXlbn~OC~a&u
zmE%Uho*067&L8<W=V~@ibRpI3oS}0emDHCE!|?C*!5xD&S=<YTUM!WkSw5tqnDR8I
zikmE!MJBFfMFvw*>N-=r$asEO{p4X4TOJ&^Hntgd+miiu2mRk{x9MDDnj!qh@a_I-
z&kU=me%pXOnwUisWaw8ZYQ!j%N0l{V5e!;@8@+->qZb&@wZ^C2CvP=-3#a5gBVCWU
UK`(Xa3<#MRU<F;+gt~CP0L^h=kN^Mx

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestInnerLocal.class b/testData/classes/pkg/TestInnerLocal.class
new file mode 100644
index 0000000000000000000000000000000000000000..c939b5e2ed2b0c985c08fb8e7eefdfe64610f36d
GIT binary patch
literal 640
zcmZuvO;5r=5Pb`j@=*anR0Kajh`>Pt@rLn2Vq#MD0MT$PWrHQyChg+?@?;{3KfoVl
zoGpqexXJG9%)IwzGP|E&?;ijzaGF32dn)#0C?pWVfr?@R3Q8&tRUD}}X3%bIo4f74
zFob3Py1kj<dE8TR!Vp~o7!?0PflJG_#1%uh-gsb$^qetgNb8o(@8-`V?hcI6j3ODq
zJ+aii<>JX1GbCha<@BAoYw~MLf^!4P_yu&wG-l^h<HgXBMus6DOjX-IeMF>~#FRHN
z9Umi;6^2w$fI5@vt(jp@TKA(VHw8m6h^hMg)l}A7SZ1kgUH_Bn3)iwIT{)9lT@UJY
z|HGjSl^#g0Fld6v(78=snJgo#G~d8p>B5kuQ$8UG5J3lV<W}%AqRW+BAT-Q|-w=6R
zCl!cXBAJ~PsZKJohPHq*Y)V#igH=Nk4Jw)^TnM}50TtrKsc-qUG_qS1Q)s7rjBmdI
D&2585

literal 0
HcmV?d00001

diff --git a/testData/results/TestInnerLocal.dec b/testData/results/TestInnerLocal.dec
new file mode 100644
index 0000000..3ba0724
--- /dev/null
+++ b/testData/results/TestInnerLocal.dec
@@ -0,0 +1,98 @@
+public class TestInnerLocal {
+   public static void testStaticMethod() {
+      class Inner {
+         final String x;
+
+         public Inner(String var1) {
+            this.x = var1;// 22
+         }
+      }
+
+      new Inner("test");// 25
+   }
+
+   public void testMethod() {
+      class Inner {
+         final String x;
+
+         public Inner(String var2) {
+            this.x = var2;// 34
+         }
+      }
+
+      new Inner("test");// 37
+   }
+
+   static class Inner1Static {
+      final String x;
+
+      public Inner1Static(String var1) {
+         this.x = var1;// 53
+      }
+
+      public static class Inner2Static {
+         final String x;
+
+         public Inner2Static(String var1) {
+            this.x = var1;// 59
+         }
+      }
+   }
+
+   class Inner1 {
+      final String x;
+
+      public Inner1(String var2) {
+         this.x = var2;// 46
+      }
+   }
+}
+
+class 'TestInnerLocal$1Inner' {
+   method '<init> (Ljava/lang/String;)V' {
+      6      6
+   }
+}
+
+class 'TestInnerLocal' {
+   method 'testStaticMethod ()V' {
+      4      10
+   }
+
+   method 'testMethod ()V' {
+      5      22
+   }
+}
+
+class 'TestInnerLocal$2Inner' {
+   method '<init> (LTestInnerLocal;Ljava/lang/String;)V' {
+      b      18
+   }
+}
+
+class 'TestInnerLocal$Inner1Static' {
+   method '<init> (Ljava/lang/String;)V' {
+      6      29
+   }
+}
+
+class 'TestInnerLocal$Inner1Static$Inner2Static' {
+   method '<init> (Ljava/lang/String;)V' {
+      6      36
+   }
+}
+
+class 'TestInnerLocal$Inner1' {
+   method '<init> (LTestInnerLocal;Ljava/lang/String;)V' {
+      b      45
+   }
+}
+
+Lines mapping:
+22 <-> 7
+25 <-> 11
+34 <-> 19
+37 <-> 23
+46 <-> 46
+53 <-> 30
+59 <-> 37
diff --git a/testData/src/pkg/TestInnerLocal.java b/testData/src/pkg/TestInnerLocal.java
new file mode 100644
index 0000000..8eb8952
--- /dev/null
+++ b/testData/src/pkg/TestInnerLocal.java
@@ -0,0 +1,63 @@
+/*
+ * 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.
+ */
+
+public class TestInnerLocal {
+  public static void testStaticMethod() {
+    class Inner {
+      final String x;
+      public Inner(String x) {
+        this.x = x;
+      }
+    }
+    new Inner("test");
+    //new Inner1Static("test");
+    //new Inner1Static.Inner2Static("test");
+  }
+
+  public void testMethod() {
+    class Inner {
+      final String x;
+      public Inner(String x) {
+        this.x = x;
+      }
+    }
+    new Inner("test");
+    //new Inner1Static("test");
+    //new Inner1("test");
+    //new Inner1Static.Inner2Static("test");
+  }
+
+  class Inner1 {
+    final String x;
+    public Inner1(String x) {
+      this.x = x;
+    }
+  }
+
+  static class Inner1Static {
+    final String x;
+    public Inner1Static(String x) {
+      this.x = x;
+    }
+
+    public static class Inner2Static {
+      final String x;
+      public Inner2Static(String x) {
+        this.x = x;
+      }
+    }
+  }
+}
\ No newline at end of file