From dc3eeaebb0c61c4f0f666c5a0f447a4039d3c657 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 4 Dec 2017 19:54:25 +0100
Subject: [PATCH] [tests] ensures exclusion of Groovy trait helpers from Java
 stubs

---
 .../testData/psi/cls/mirror/GrTrait.txt        |  17 +++++++++++++++++
 .../mirror/pkg/GrTrait$Trait$FieldHelper.class | Bin 0 -> 411 bytes
 .../cls/mirror/pkg/GrTrait$Trait$Helper.class  | Bin 0 -> 5096 bytes
 .../testData/psi/cls/mirror/pkg/GrTrait.class  | Bin 0 -> 498 bytes
 .../psi/cls/mirror/src/pkg/GrTrait.groovy      |   8 ++++++++
 .../java/psi/ClsMirrorBuildingTest.java        |  15 ++-------------
 6 files changed, 27 insertions(+), 13 deletions(-)
 create mode 100644 java/java-tests/testData/psi/cls/mirror/GrTrait.txt
 create mode 100644 java/java-tests/testData/psi/cls/mirror/pkg/GrTrait$Trait$FieldHelper.class
 create mode 100644 java/java-tests/testData/psi/cls/mirror/pkg/GrTrait$Trait$Helper.class
 create mode 100644 java/java-tests/testData/psi/cls/mirror/pkg/GrTrait.class
 create mode 100644 java/java-tests/testData/psi/cls/mirror/src/pkg/GrTrait.groovy

diff --git a/java/java-tests/testData/psi/cls/mirror/GrTrait.txt b/java/java-tests/testData/psi/cls/mirror/GrTrait.txt
new file mode 100644
index 000000000000..cde49246d284
--- /dev/null
+++ b/java/java-tests/testData/psi/cls/mirror/GrTrait.txt
@@ -0,0 +1,17 @@
+
+  // IntelliJ API Decompiler stub source generated from a class file
+  // Implementation of methods is not available
+
+package pkg;
+
+@groovy.transform.Trait
+public interface GrTrait {
+    @org.codehaus.groovy.transform.trait.Traits.Implemented
+    java.lang.Object myMethod();
+
+    @org.codehaus.groovy.transform.trait.Traits.Implemented
+    java.lang.Object getMyField();
+
+    @org.codehaus.groovy.transform.trait.Traits.Implemented
+    void setMyField(java.lang.Object o);
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/cls/mirror/pkg/GrTrait$Trait$FieldHelper.class b/java/java-tests/testData/psi/cls/mirror/pkg/GrTrait$Trait$FieldHelper.class
new file mode 100644
index 0000000000000000000000000000000000000000..85992893bbcbc883d57d6bedde84bc634a28381a
GIT binary patch
literal 411
zcmZvY%}&BV6ot>N*h-67i3@+?Zenmli(8f?sELUS-8UoNG{vzcGljsbvG4(WD8dw3
z5b5TA$+<b-;{2{xKLGmZ5N@YmY4oVywaiNKcSjkk&nH$>)*gruPUKuhO6F<w`Z3{g
z>EVdb-j#Z(E{ge*a3kVH9LEn<nCyN@^1a;J2%VSzmI2{fWVsRj`o?8lEDV=~yY8Xw
z{xBlcJJQN=(XDL+dwX~|B?NnO5d61drpG+W6cbv{dCq#Mq%mw<f`f*g)d{cQ!UHT%
cD#B?Hn(zV30Ie!PxV^_XxAakU+c<NZ8!yFex&QzG

literal 0
HcmV?d00001

diff --git a/java/java-tests/testData/psi/cls/mirror/pkg/GrTrait$Trait$Helper.class b/java/java-tests/testData/psi/cls/mirror/pkg/GrTrait$Trait$Helper.class
new file mode 100644
index 0000000000000000000000000000000000000000..cacdbef7b18ad230c6bcfd9b4989e464b314ebfe
GIT binary patch
literal 5096
zcmb7I`Fj)B6+KTHTed8MEo@^$X)w4!mP{1PmSCU-7mR~!Q{+Mwr*#K;EDK~w8I7H~
zYf9I&>Avr4nl5STKmu|IEnU9k`}#-q>v=Ozqmd;U_`#C==Du^!z4yHPuJqskz4dnh
z2k;+(zT&k^eB7Kd^{h4Myq+_1MZ*k02y|Z6SM+#J&u8M(SFRdqD*!+DWXwWgWz|_9
zw?9{&wg^0;&>nZJ2r^i*bSs-4%ju=kM1G+l5KR=!OgvqfHx~8fQe5Gg#zKxhvW0xy
zwH*}*%*_#Da!f!xBhbENSi1dKV0*&LWU}&rds>fY^I7YpfIl*HDTGI`H3$uz0$qa{
z!y40bxn$NdPMM~@Dlifmnr%#IId5f`jCh*%CECX;8%IM3V_OhDbPH^gkV!j4mx4fl
zWT*+d5PGp)?(GX9ge~p-v_n9%7PBRR9f@WIkx>oGs0NwRh}Ud%=#roHgut%)&1bVl
zZoX2|0f7SzGp_<orp;{8I=yNcvNosY^`a$}uvZ|M)=Sn*VP>^x2po+hHVR|Zvtn0g
zbjY*f$b(sXA07*05c^n&D#AqGGBVQ75R1K{=a!A>1%ckkgcm{?5hI4-Afnh$jI?R!
zmT{qQwQ$+gi&U*Z^1--mmWAgXtWsQo(q|k`NZtno_HVYcPACB!WNGEHz>}LZQ#ta+
z?56E7j&$G<jtaC4mW&*;v!zA={9hfiibA@*&Qw7z34|(U4oa7&Mvjp{+tMm!yjYkQ
z7}y{)kF}ykVNm>&tG3Fd2-!3q^Sa(VsxcYW2MJPgK?L^HdaZZr$lb?e*kTa~*V`~7
zY!r-QGFvKT^O+6lPg*7yy`pVSRG`CitOA%6*teMo#vSm9rD86C>6#|$JPF`K0%${0
zU??(M&)vJEh&oN|!$DjCt9WcP_ZE-nqMo16F~E3ov0z&A(4JE(0eplia1OJBegA?f
z4k0{)*&tGQmI(7ksmQ}OpU9RhffM%&LuGe%f}OT{@YQMvAH$qHULR-GviX(5HN#Qh
zl)$rIF*y>g2k@*Yt_{32JXlwdmX4`)Ew3-JwRxqau=q?jGwjVh>hR2MP}bI>Szzz6
zR$Z;_^RiYj9+DNUv6LND{spyN;A!tZW#!rT;PFen<gg@T%kvWCIpJ+tp<hS0=EN$x
z4bnxnJnU7r6JE9t!OatqtAG+LNp_k2M_$l!RN&3ZJG816$3qCu;}h~S=fzF2WGzai
zG7rSOgepmHdJBIFpO!8^6XH>9m$&fe1R@PjR)e`DfY0+3RH!;r%?Yo2hwV_~xuO9e
zFPSgki$Pq+mmFX>t`NQ==Y{L|Dj&#3Sq*qcq)Bu`ve$c$lAJfVzo+5A6u>v{tG(tb
z_LRsi=S%o@2fl^xY-qdnl5VcH5K8!-1o^(eQ{K!r1*s?E9D^T9lpk?29h4WbXYkwQ
z*}>s6o-8a_7mWqOH1cVK^H%SmGhkH4K6_rA;}FnW)9)%VFz0fdo>K$x+}x6LFY?N^
z+VG2JPbs1{{7Rs^kvD-OJOm9@*=#tqS&quf*dM~r@N-%E-*d`+c#r`8z`M?ydq>sY
z?&=0Fr|drl@e2MF!cXv1d7%Cxu(Nu8>oOd`U)h@&K4Y&r>8_0ahP5DG!|NgZ2EUbY
z+@yrPe3YegJ-#VzZ*eTpow@#rho9=pSZ`+tZ*kUkW@a}3F^<CWVkl5Omvl3$U&$FW
z@<m{4BAYj+mY1#=rdnxFW;1!+S~mG~ua~Kvx#Klc+er@YoPCmoWixG@%}T(~L_Tkr
zwyja>9$>^8$NE-iok7{9fX){YL<irm%kK_+56Wb-);+Z2*Brjy<$s5`Q!1c0dK+D3
z^dzFU&_6jGoqH2IhcCa*Cj#<2V2JM;y6_(CB33)zi$@hgg6lq7?2)@;;oT$AFh54_
zVNYkYjK{-T86)d>(hnQW=b`}vcnZh3^B??cwed9~kK#D-B)7d>lgKR+xt0p(^aM`w
z;XVHO@K1*PetbYtI-)j)<VKstnpm^#DxrYM+338L7^hr}qfCo*-tUBUx*FCx&iLQ}
zR&xVvSAgv}i*ZHd6hUNmCCKD(_*@kvR!xZm(rbI`Qy@SeCh#-_zloklLcy()p+>lI
z!cB#J;i)^gkkal#OZj8Tmb<u^@`q=VDUC0;ak-3--or&dA3G+)N$u@m%I}{pLodVd
zMzGsvdB&+O9h|`eGIT0GEs}<hb;-Ik3Zx;Uk~Ai3X+-Z&Bi5XTlLN;&@s)F#gR8iv
za<ItCweZ;ynS<eDTE8Y9C=X>6`ZbTBosbW^As==_K8&IY`8n6?EWOIiACw`-ruNtP
zY#KCu?)SKK!W*$2$?!&OM^1RA3NNK{d!RnIO-o$Hino}Ko46ZU+=+}Od=3>i({v-%
zE!`v@u!I}j$c_Mh-<3*1rzU@^P%#`Nv;^PBUh>JX?`5>H5qx&-23|<S-o;kATE>@C
ziJN#Kb_*}clPTK_hZhB~m)j-y_UIefnR*A>+U019eTh9uu2eRB4PRFq!pdW7G)5cQ
zDkR`bu44OHJgL|%^!<%!Y<L~t)lh*cxmoF>kt7~+%+~P(ziX9qwNMZCV-2=X_E=t{
ziqoS6lR<2YhIfa5nT&={hkwo2bNpN}=3S+X2S`vF_k@4PV|<?Zdif4sNrioE%YU|s
z5}UsyDf2@LJ8}cBzJo5l-olN0+;IL~gv)s2{2jcO;?~<Y@hUTR#|hPkf6;{x0sNcq
NL1OtZg}1xg{}0^QODO;V

literal 0
HcmV?d00001

diff --git a/java/java-tests/testData/psi/cls/mirror/pkg/GrTrait.class b/java/java-tests/testData/psi/cls/mirror/pkg/GrTrait.class
new file mode 100644
index 0000000000000000000000000000000000000000..27d8cfa2da0a2f24959b9d3fca12533856c0ab7e
GIT binary patch
literal 498
zcmZvY%}zow5QR?xFTWxp7+tty0UH~4Ca#PLN&+!a!@j_HDc;+Xwvg~@E_?tV$~XZv
zC@z|rIXUyqblyK+-vC_TSfD(AiRG<(a!Q9hgg|YkmP#hd#PWVLqcN*lf$Ep#Ja*PD
zR{|&fO(ug=#y?w^$~EIkppdQx6sC3}&}eu1e|hY<>{}Phv7OLVExg<zF;j;P&$oK%
zJfW0Kpb58@VhV#*S5w0HlHV$t?cGtGA#b|%!`6Do)*U5ta(V0vM4MdTY}dA)^6jnh
zt+oV#(}#r#I;ElZdX&($F*c~6t?|6rqg}W$b#+1lm7X!=ZW84^`A8sx9A6*E<^=L6
sK;Ve0h+`38t@MvpM&-8;Sv0sSgFQ4k);X*4J7^Sf$gv(3f2a}g36EWS*8l(j

literal 0
HcmV?d00001

diff --git a/java/java-tests/testData/psi/cls/mirror/src/pkg/GrTrait.groovy b/java/java-tests/testData/psi/cls/mirror/src/pkg/GrTrait.groovy
new file mode 100644
index 000000000000..bec2b8d19e9f
--- /dev/null
+++ b/java/java-tests/testData/psi/cls/mirror/src/pkg/GrTrait.groovy
@@ -0,0 +1,8 @@
+package pkg
+
+trait GrTrait {
+  def myField = 42
+  def myMethod() {
+    42
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/java/psi/ClsMirrorBuildingTest.java b/java/java-tests/testSrc/com/intellij/java/psi/ClsMirrorBuildingTest.java
index 45f973149d45..060dd7570af7 100644
--- a/java/java-tests/testSrc/com/intellij/java/psi/ClsMirrorBuildingTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/psi/ClsMirrorBuildingTest.java
@@ -1,17 +1,5 @@
 /*
- * Copyright 2000-2017 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.
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 package com.intellij.java.psi;
 
@@ -64,6 +52,7 @@ public class ClsMirrorBuildingTest extends LightIdeaTestCase {
   public void testLocalClass() { doTest(); }
   public void testBounds() { doTest(); }
   public void testGrEnum() { doTest(); }
+  public void testGrTrait() { doTest(); }
   public void testSuspiciousParameterNames() { doTest(); }
   public void testTypeAnnotations() { doTest(); }