From a74f586e348022f3af0c0600e58eb08253c7b317 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Wed, 21 Jan 2015 21:21:43 +0300
Subject: [PATCH] decompiler: fixed anonymous class line numbers

---
 .../modules/decompiler/exps/NewExprent.java   |  12 +-
 .../classes/pkg/TestAnonymousClass$5.class    | Bin 0 -> 586 bytes
 .../classes/pkg/TestAnonymousClass$6.class    | Bin 0 -> 645 bytes
 .../classes/pkg/TestAnonymousClass$7.class    | Bin 0 -> 586 bytes
 .../classes/pkg/TestAnonymousClass$8.class    | Bin 0 -> 645 bytes
 .../pkg/TestAnonymousClass$Inner.class        | Bin 443 -> 443 bytes
 .../TestAnonymousClass$InnerRecursive.class   | Bin 0 -> 472 bytes
 testData/classes/pkg/TestAnonymousClass.class | Bin 1113 -> 1563 bytes
 testData/results/TestAnonymousClass.dec       | 128 ++++++++++++++----
 testData/src/pkg/TestAnonymousClass.java      |  41 ++++++
 10 files changed, 148 insertions(+), 33 deletions(-)
 create mode 100644 testData/classes/pkg/TestAnonymousClass$5.class
 create mode 100644 testData/classes/pkg/TestAnonymousClass$6.class
 create mode 100644 testData/classes/pkg/TestAnonymousClass$7.class
 create mode 100644 testData/classes/pkg/TestAnonymousClass$8.class
 create mode 100644 testData/classes/pkg/TestAnonymousClass$InnerRecursive.class

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 a143828..960f26b 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
@@ -252,12 +252,16 @@ public class NewExprent extends Exprent {
           buf.setLength(0);  // remove the usual 'new <class>()', it will be replaced with lambda style '() ->'
         }
         Exprent methodObject = constructor == null ? null : constructor.getInstance();
-        new ClassWriter().classLambdaToJava(child, buf, methodObject, indent);
-        tracer.incrementCurrentSourceLine(buf.countLines());
+        TextBuffer clsBuf = new TextBuffer();
+        new ClassWriter().classLambdaToJava(child, clsBuf, methodObject, indent);
+        buf.append(clsBuf);
+        tracer.incrementCurrentSourceLine(clsBuf.countLines());
       }
       else {
-        new ClassWriter().classToJava(child, buf, indent, tracer);
-        tracer.incrementCurrentSourceLine(buf.countLines());
+        TextBuffer clsBuf = new TextBuffer();
+        new ClassWriter().classToJava(child, clsBuf, indent, tracer);
+        buf.append(clsBuf);
+        tracer.incrementCurrentSourceLine(clsBuf.countLines());
       }
     }
     else if (directArrayInit) {
diff --git a/testData/classes/pkg/TestAnonymousClass$5.class b/testData/classes/pkg/TestAnonymousClass$5.class
new file mode 100644
index 0000000000000000000000000000000000000000..e3df9c842f74ec0afdee4cb773d25e85f0d5c0c7
GIT binary patch
literal 586
zcmZ`$%TB^T6g>l#mWP0-fIAa0Q84O4S0ITJjYeRh#66D@sxUR3mc-9;VN6{30e+P6
zl$aO-?c~1BoH@OB=KJUK3&07s;)r5B0RtN*HcjLOV&2HsrDK6&^W}MX)REddSB`p}
zIKFO-yINPtsoBc*>H_H-rKEc&`@XB~sT4@ffEiC}fs4H`kr2EzFIe4w5HK3ffYO<!
ztz_Gu^rYMA_Qph_kB&pX7myP7j_>y6l^tvp7P~%t>Q1{9xm5kJqir>8NpIu~OcYXB
zK`aFmMb5l@<kG3YZphYr!vgu`Jb`l9T`bOwZ9a>^7ZTZQ&>gb~%|rqMNoG5&qm0RN
z<sG7Y@PWu1OWr?yj1jn|ts?z*pu!jknpVv^v+Dok+zh^@UXxjihuc)nkQzZ2Ym5eR
Q^l@5_SWsD9!Qc7)0&7i+Z~y=R

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestAnonymousClass$6.class b/testData/classes/pkg/TestAnonymousClass$6.class
new file mode 100644
index 0000000000000000000000000000000000000000..6aa009846f4fe4bbf2551ad2b850fa43c22a1f85
GIT binary patch
literal 645
zcmZ`$$xZ@66s%?&z!Aoc#SK(U6peZ?UN9y~)R5o?#5+p|24Ti91BsvIftYyk1N<ms
z_1p+BN!9E3`gL`^>EFNa9{}gbMWA6liZC|RYE#jcqHRSP4OtC40%Amz2$$#*wm``3
zm`?6YAXR>UYoFGn<6c{~_0hM7PO(>aoC13;P0Mtz1Y#x2l7otD4hN1ok^;I{@cN`9
zaC0zEWKKOdDOfms6$ljV7Nz55(~^(FenSpw^+u1CXw@DLn)1$6NpjlhNw+?#^Wd%3
z?AeZKwI8J0v0EB;b;J<YVPH>31W_FeigZPbh;sJXqvtLJ_UCL(8W%{+?i0w*`zO=0
zBg@wc^F@OMeUhQ9dXa9uNW*|(sEL>h!oUjSDp&XL!Oxh<AB`dM$6xT}!(;dr1r!Ap
tg+9H5YvhD?)e|M3DfdE=3eu=jB*9%Dl1MQISOb<l_-HVVC9=kx-#_bRkXQf!

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestAnonymousClass$7.class b/testData/classes/pkg/TestAnonymousClass$7.class
new file mode 100644
index 0000000000000000000000000000000000000000..f51ac750590092b82c2785cdc35fc0a3a8086e21
GIT binary patch
literal 586
zcmZ`$TT22#7(Jt#yIxYWQhN(BFpcUV=s^=o3Igk)q@c^gs*`T%ZtUy|{j44$=%F9b
zkBZJp5Td)ocRO?D?Dx%l|9pM{*vDENQ7k8*VMWKPj=Vt38(6BeCs1s?Jok6oQh7(V
zW513ZUp0rOQZ;hwmTh?rf%KVeOZQTCeOFmyDUg}~6P{E8$K^1Q5WF-kSlhZ5(3(z<
z(wUZJ%L{+hk#5`U42eV^9f!UgkP=sp?{?*>6>Jn{yWV*+$0kKi?C#J}mfb&>-oWYU
zD5S7}SPD9doO%Apr2~P@kge&41@iNG0+q14n4KBxd=`x_B(m9{J7y7@jsygf%r;m@
z8IzUjJ49vs1CckDynp%_BXC1oMEdVQl`#<1jk<AYH2%rC34BYvJ7)Jh{6OUlsS#wc
T#Hb-hAE)Jr1(m@S{GHz~e{GAs

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestAnonymousClass$8.class b/testData/classes/pkg/TestAnonymousClass$8.class
new file mode 100644
index 0000000000000000000000000000000000000000..5d7a83b1c805f68bb8c4ae09849e9b6420959b5f
GIT binary patch
literal 645
zcmZ`$%TB^T6g|VMfEDn?!xyNSXf^7>g$c$)i5e1gp~R(HU;;&G4J{;omJ4Fy!VmDH
zjAyzdK$COs+&g#9oZI>R`~CrNied~JR^y0bO|8}yZ7AAQl-E$uuq7adM1}B(4&ewy
zytd^QPXw~n_qWz@O}gHt?bshZXW*8*rt6m2b8gv|cOj6d*tYCH$i|@WT0<$I`vt#G
zx&l{wvqWapi{pZ&{U?D?*=bTbS+#6=Kj_tEzh>6Eti&IkLBAnyER|#?ogQ_}p~-{S
zcBAXKmfgCOUfXGE*w&FiQb!6qI%0_Hm{X)Hnn#?oPanN_Ca^nWYuva%dU~ILG3%d9
z&W-|KE6NuQ6ZA=jvg${=^&<@fsg#<Cxgb(lVqE6x76Akq^Txpl!Z`dwz=)0zR1{Ja
uRuuX453Z2Y{#DPEe4*ScMNH&Sr%0N+0c4P646z0*`Uucq4hv+BIlq7XG?1kL

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestAnonymousClass$Inner.class b/testData/classes/pkg/TestAnonymousClass$Inner.class
index 2b3d4639c26b5f597bf6a7def53c5cc4736b7c80..86ffed91e9547075093e467d37c5dd9b26da365c 100644
GIT binary patch
delta 13
UcmdnZyqkH02_qxdWK+gA03BHayZ`_I

delta 13
UcmdnZyqkH02_vJ_WK+gA03E3V%m4rY

diff --git a/testData/classes/pkg/TestAnonymousClass$InnerRecursive.class b/testData/classes/pkg/TestAnonymousClass$InnerRecursive.class
new file mode 100644
index 0000000000000000000000000000000000000000..511979c5ed12e46cb45b5446ecb37d9484057328
GIT binary patch
literal 472
zcma)&%}T>S6ot=CW7EXi*1r~aE);77yK$!oQV@iqpv8S!$2u{cluT3bv0RAY!Uyo7
z#FM%Z(M1<?f6q7faz8%b-T@q;6~M)+j}q2AY<SodNG7OV7^AXlHOw=sXG&0=7rIGg
zt+Il>-sExA=_@-uGpTtRr@5W?c7Aimg7S$rdU`4d+Y2)Lw*t4D-f?QZr;WPI#{-r1
zqd~$-={`+q+l45&N%L%|&UMjf{axlTj%HC6K5A7gq2i$_*j;FEL8D+hNn}Qyt3j-W
zQ$h286x%$W%VP>3$Iv>AeFU`2%tGc4eGtAv!h;t$&&+sI+8SBlfxIRWGhSiso7<YJ
ZsQi(a*#Zo|tJ6DZz@sk)m9UO7DqoKNYqS6W

literal 0
HcmV?d00001

diff --git a/testData/classes/pkg/TestAnonymousClass.class b/testData/classes/pkg/TestAnonymousClass.class
index a849cd60ab4c3e4a3bfc6044c2675e3d5666be3d..602dd53c73f408f1358f0ab31d9203103c3e1c73 100644
GIT binary patch
literal 1563
zcma)6>r)a@6#rdbcU{-FfQXMQO+=G?Tac!vN#P?P4Zi_x4hp*rEROca^tI3B7*ovj
z2lPiZox3=a<~rRE=bU@q=iGD8uirm@0+_{t3_lh*o^U*sVMkbo4dEvABEs>EV@ZZ2
zn7qzh=6Ehc!AdiRu-b$*ypXYu4UU&GI<P1VH#wp*y6cx$9Is_~>z5eE7RNTn4nu2H
z)6`O2%~nd~+=<Gdn2fc2x?EPv9J>rolf&_bfkhc?@fn8h*irf<9m=P*!%)1UY3WQ}
z4U;@B<WoePF^tBF$A_V$S~gZRT{|o2m9pt}_<BfTcFN$2<g}cz#9$AM?J+pk^!Joa
zTP&xk+m%8_EhR+^5`WNj5(lC}t0iHiv&UQM;-yetKh3H|Bd2SWI^|-|2xa?60i{Sb
ze;Gnf=#^4d-N*@t-hVTk6vZhBVw|DJqKJ8G(VQ?%C>TY+T4~W*w4h+@F4HODKdE36
z;~Z}l>|vkdoq`lX)=sAtJixHEd`7{@UGiB44~5)wdp{W38xygUIa0F*!^rKrHwJ*A
z?=C&-lxY~d8bPm~o?$g$F?wMO{*8>nVz&I2PK5NYY7=K=LoLvl=@qKkUH=(5J+xcO
zX-2{*sp$gEcs<kWYzAHwN_ovOL_gL~tH24LcqgKK;yp}EeJ9*0=E=k~9E6=<VnPW{
z&@Dmxfe{V`t6;$zY$*cvRFGBSsKR*x7u~sFN+z?Z3i$%fU&w^v5y4J42y%j(6ndYA
zOQriHLbQlPfFx}tJK+KUC%9`+QWU6VYvMav89qb)iZ<yR+J!%x>8}?qqGj^ej27BS
zT@=9sH~MJ{Jtm0*HjfKaCdDvKc;>2@LCVQS9J>^0Bq%l_s5dsV8?*nTJW9#|YRue~
z^0Mg!7_6ZqRYm7Hx@zbq%6$$`4PK&p&f#lBZ8eMbQ6WLvrPE|SPg&TofC0h>R9qju
qTt5XFBz%wb#7o|HNz}^vkuI^wUL4Uxal9s!$g4OKwWy926XOp~&riev

delta 581
zcmYL`%T5zf7{`BSrqeT>4vN}>Wu`5c%1uO}c)t{Mg@Fac#IPY@!NwR8>;v!&<Sb1z
zu3TfIL>qkopFnp$iSa)SvF9Y`_g&6+JLhfuJ3RXN_uCI(g{Kjhn6u1Bcw8@2Wue3k
z79(zQ%d!+<nJY2OvZWmn<;sfXcEnJw+_BuX+_T&_1nUO}`)>^K8K1r0>vs3MmIns2
zZt%9-hRVjPz2onxE1PZe(CwO4KOuD=%viD%lkg~}Nosi<^MsCNHD--*x8>FSQLef}
zu_hjiW8#UoXj1pbOI^!vd&#Uj^he!i|K-uJ<^rD@3X@dR&Z#iz0Y=qQoposwqRFiD
zr<fB7hKA1UQP2w%)C=lsTzYo>g%bN>BY8))kGG>Re{<n01;a<8PXy)g3&kvvN5lOp
zH0u+R3wR?%CeI|pl-SBUaBD%OHYhlysFu9f2Hxib?~J^&giQbMz9UPvntklfDPfON
zpGZ=<N8D#f(uE!u&*yUQgKB3+*RwPgahW2Q^~F~-Z&e&AhWguVg|g(d=gbT74@8SZ
A>Hq)$

diff --git a/testData/results/TestAnonymousClass.dec b/testData/results/TestAnonymousClass.dec
index 18cfaef..d0ae4ec 100644
--- a/testData/results/TestAnonymousClass.dec
+++ b/testData/results/TestAnonymousClass.dec
@@ -19,6 +19,30 @@ public abstract class TestAnonymousClass {
          boolean var2 = true;// 54
       }
    };
+   private final TestAnonymousClass.InnerRecursive y = new TestAnonymousClass.InnerRecursive(new TestAnonymousClass.InnerRecursive((TestAnonymousClass.InnerRecursive)null) {
+      void foo() {
+         boolean var1 = true;// 75
+         boolean var2 = true;// 76
+         boolean var3 = true;// 77
+      }
+   }) {
+      int v = 5;
+      int t = 5;
+      int j = 5;
+      int o = 5;
+   };
+   private final TestAnonymousClass.InnerRecursive x = new TestAnonymousClass.InnerRecursive(new TestAnonymousClass.InnerRecursive((TestAnonymousClass.InnerRecursive)null) {
+      void foo() {
+         boolean var1 = true;// 90
+         boolean var2 = true;// 91
+         boolean var3 = true;// 92
+      }
+   }) {
+      int v = 5;
+      int t = 5;
+      int j = 5;
+      int o = 5;
+   };
 
    void foo(int var1) throws Exception {
       if(var1 > 0) {// 10
@@ -43,8 +67,19 @@ public abstract class TestAnonymousClass {
       boolean var1 = true;// 39
    }
 
+   static class InnerRecursive {
+      TestAnonymousClass.InnerRecursive r;
+
+      public InnerRecursive(TestAnonymousClass.InnerRecursive var1) {
+         this.r = var1;// 105
+      }
+
+      void foo() {
+      }
+   }
+
    private static class Inner {
-      private static final Runnable R_I = new Runnable() {
+      private static Runnable R_I = new Runnable() {
          public void run() {
             boolean var1 = true;// 66
             boolean var2 = true;// 67
@@ -84,59 +119,94 @@ class 'pkg/TestAnonymousClass$4' {
    }
 }
 
+class 'pkg/TestAnonymousClass$5' {
+   method 'foo ()V' {
+      0      23
+      1      23
+      2      24
+      3      24
+      4      25
+      5      25
+   }
+}
+
+class 'pkg/TestAnonymousClass$7' {
+   method 'foo ()V' {
+      0      35
+      1      35
+      2      36
+      3      36
+      4      37
+      5      37
+   }
+}
+
 class 'pkg/TestAnonymousClass$1' {
    method 'foo ()V' {
-      0      26
-      1      26
-      2      27
-      3      27
+      0      50
+      1      50
+      2      51
+      3      51
    }
 }
 
 class 'pkg/TestAnonymousClass' {
    method 'foo (I)V' {
-      1      23
-      c      29
-      e      30
-      16      32
-      19      32
-      1a      32
+      1      47
+      c      53
+      e      54
+      16      56
+      19      56
+      1a      56
    }
 
    method 'boo ()V' {
-      0      38
-      1      38
+      0      62
+      1      62
    }
 
    method 'zoo ()V' {
-      0      42
-      1      42
+      0      66
+      1      66
+   }
+}
+
+class 'pkg/TestAnonymousClass$InnerRecursive' {
+   method '<init> (Lpkg/TestAnonymousClass$InnerRecursive;)V' {
+      6      73
    }
 }
 
 class 'pkg/TestAnonymousClass$Inner$1' {
    method 'run ()V' {
-      0      48
-      1      48
-      2      49
-      3      49
+      0      83
+      1      83
+      2      84
+      3      84
    }
 }
 
 Lines mapping:
-10 <-> 24
-11 <-> 30
-13 <-> 27
-14 <-> 28
-17 <-> 31
-21 <-> 33
+10 <-> 48
+11 <-> 54
+13 <-> 51
+14 <-> 52
+17 <-> 55
+21 <-> 57
 28 <-> 6
 29 <-> 7
-35 <-> 39
-39 <-> 43
+35 <-> 63
+39 <-> 67
 45 <-> 12
 46 <-> 13
 53 <-> 18
 54 <-> 19
-66 <-> 49
-67 <-> 50
+66 <-> 84
+67 <-> 85
+75 <-> 24
+76 <-> 25
+77 <-> 26
+90 <-> 36
+91 <-> 37
+92 <-> 38
+105 <-> 74
diff --git a/testData/src/pkg/TestAnonymousClass.java b/testData/src/pkg/TestAnonymousClass.java
index 3c2e3b0..3683338 100644
--- a/testData/src/pkg/TestAnonymousClass.java
+++ b/testData/src/pkg/TestAnonymousClass.java
@@ -68,4 +68,45 @@ public abstract class TestAnonymousClass {
       }
     };
   }
+
+  private final InnerRecursive y = new InnerRecursive(new InnerRecursive(null) {
+    @Override
+    void foo() {
+      int a =5;
+      int b =5;
+      int g =5;
+    }
+  }) {
+    int v =5;
+    int t =5;
+    int j =5;
+    int o =5;
+  };
+
+
+  private final InnerRecursive x = new InnerRecursive(new InnerRecursive(null) {
+    @Override
+    void foo() {
+      int a =5;
+      int b =5;
+      int g =5;
+    }
+  }) {
+    int v =5;
+    int t =5;
+    int j =5;
+    int o =5;
+  };
+
+  static class InnerRecursive {
+    InnerRecursive r;
+
+    public InnerRecursive(InnerRecursive r) {
+      this.r = r;
+    }
+
+    void foo() {
+
+    }
+  }
 }