jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-03-10 08:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update lightclass tests renderer

Browse Source 
+mute invalid old light classes tests
This commit is contained in:
Igor Yakovlev
2020-05-20 13:49:24 +03:00
parent c70383cc70
commit 309bf49a83
140 changed files with 1314 additions and 1191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
compiler/testData/asJava/lightClasses/AnnotatedParameterInEnumConstructor.java vendored
View File

@@ -1,5 +1,6 @@
public enum AnnotatedParameterInEnumConstructor {
A;
public enum AnnotatedParameterInEnumConstructor /* test.AnnotatedParameterInEnumConstructor*/ {
A;
private AnnotatedParameterInEnumConstructor(@test.Anno(x = "a") java.lang.String, @test.Anno(x = "b") java.lang.String);// .ctor(java.lang.String, java.lang.String)
private AnnotatedParameterInEnumConstructor(@test.Anno(x = "a") java.lang.String a, @test.Anno(x = "b") java.lang.String b) { /* compiled code */ }
}

19
compiler/testData/asJava/lightClasses/AnnotatedParameterInInnerClassConstructor.java vendored
View File

@@ -1,11 +1,12 @@
public final class AnnotatedParameterInInnerClassConstructor {
public AnnotatedParameterInInnerClassConstructor() { /* compiled code */ }
public final class AnnotatedParameterInInnerClassConstructor /* test.AnnotatedParameterInInnerClassConstructor*/ {
public AnnotatedParameterInInnerClassConstructor();// .ctor()
public final class Inner {
public Inner(@test.Anno(x = "a") @org.jetbrains.annotations.NotNull java.lang.String a, @test.Anno(x = "b") @org.jetbrains.annotations.NotNull java.lang.String b) { /* compiled code */ }
}
public final class InnerGeneric <T> {
public InnerGeneric(@test.Anno(x = "a") T a, @test.Anno(x = "b") @org.jetbrains.annotations.NotNull java.lang.String b) { /* compiled code */ }
}
}
public final class Inner /* test.AnnotatedParameterInInnerClassConstructor.Inner*/ {
public Inner(@org.jetbrains.annotations.NotNull() @test.Anno(x = "a") java.lang.String, @org.jetbrains.annotations.NotNull() @test.Anno(x = "b") java.lang.String);// .ctor(java.lang.String, java.lang.String)
}public final class InnerGeneric /* test.AnnotatedParameterInInnerClassConstructor.InnerGeneric*/<T> {
public InnerGeneric(@test.Anno(x = "a") T, @org.jetbrains.annotations.NotNull() @test.Anno(x = "b") java.lang.String);// .ctor(T, java.lang.String)
}}

10
compiler/testData/asJava/lightClasses/AnnotatedPropertyWithSites.java vendored
View File

@@ -1,5 +1,6 @@
public final class Test /* Test*/ {
@MyAnnotation5()
@org.jetbrains.annotations.NotNull()
private java.lang.String bar;
@MyAnnotation()
@@ -9,6 +10,13 @@ public final class Test /* Test*/ {
@MyAnnotation2()
public final void setBar(@MyAnnotation3() @org.jetbrains.annotations.NotNull() java.lang.String);// setBar(java.lang.String)
@org.jetbrains.annotations.NotNull()
public final kotlin.Unit getFooP(@MyAnnotation7() int);// getFooP(int)
public Test(@MyAnnotation6() @org.jetbrains.annotations.NotNull() java.lang.String);// .ctor(java.lang.String)
}
public final void fooF(@MyAnnotation7() int);// fooF(int)
public final void setFooP(@MyAnnotation7() int, @org.jetbrains.annotations.NotNull() kotlin.Unit);// setFooP(int, kotlin.Unit)
}

10
compiler/testData/asJava/lightClasses/AnnotatedPropertyWithSites.kt vendored
View File

@@ -5,5 +5,13 @@ annotation class MyAnnotation3
annotation class MyAnnotation4
annotation class MyAnnotation5
annotation class MyAnnotation6
@Target(AnnotationTarget.VALUE_PARAMETER)
@Retention(AnnotationRetention.RUNTIME)
annotation class MyAnnotation7
class Test(@get:MyAnnotation @set:MyAnnotation2 @setparam:MyAnnotation3 @property:MyAnnotation4 @field:MyAnnotation5 @param:MyAnnotation6 var bar: String)
class Test(@get:MyAnnotation @set:MyAnnotation2 @setparam:MyAnnotation3 @property:MyAnnotation4 @field:MyAnnotation5 @param:MyAnnotation6 var bar: String) {
fun @receiver:MyAnnotation7 Int.fooF() = Unit
var @receiver:MyAnnotation7 Int.fooP
get() = Unit
set(value) {}
}

17
compiler/testData/asJava/lightClasses/AnnotationClass.java vendored
View File

@@ -1,14 +1,15 @@
@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
public @interface Anno {
int i();
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
public abstract @interface Anno /* Anno*/ {
public abstract double d() default 0.0;// d()
int j() default 5;
public abstract int i();// i()
java.lang.String value() default "a";
public abstract int j() default 5;// j()
double d() default 0.0;
public abstract int[] ia();// ia()
int[] ia();
public abstract int[] ia2() default {1, 2, 3};// ia2()
public abstract java.lang.String value() default "a";// value()
int[] ia2() default {1, 2, 3};
}

97
compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.java vendored
View File

@@ -1,72 +1,73 @@
public final class Wrapper {
public Wrapper() { /* compiled code */ }
public final class Wrapper /* p.Wrapper*/ {
public Wrapper();// .ctor()
public static final class Equals {
@org.jetbrains.annotations.NotNull
private final p.G code;
public boolean equals(@org.jetbrains.annotations.Nullable java.lang.Object other) { /* compiled code */ }
@org.jetbrains.annotations.NotNull
public final p.G getCode() { /* compiled code */ }
public Equals(@org.jetbrains.annotations.NotNull p.G code) { /* compiled code */ }
public static final class Equals /* p.Wrapper.Equals*/ {
@org.jetbrains.annotations.NotNull()
private final p.G code;
@org.jetbrains.annotations.NotNull
public final p.G component1() { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
public final p.G component1();// component1()
@org.jetbrains.annotations.NotNull
public final p.Wrapper.Equals copy(@org.jetbrains.annotations.NotNull p.G code) { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
public final p.G getCode();// getCode()
@org.jetbrains.annotations.NotNull
public java.lang.String toString() { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
public final p.Wrapper.Equals copy(@org.jetbrains.annotations.NotNull() p.G);// copy(p.G)
public int hashCode() { /* compiled code */ }
}
@org.jetbrains.annotations.NotNull()
public java.lang.String toString();// toString()
public static final class HashCode {
@org.jetbrains.annotations.NotNull
private final p.G code;
public Equals(@org.jetbrains.annotations.NotNull() p.G);// .ctor(p.G)
public int hashCode() { /* compiled code */ }
public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object)
@org.jetbrains.annotations.NotNull
public final p.G getCode() { /* compiled code */ }
public int hashCode();// hashCode()
public HashCode(@org.jetbrains.annotations.NotNull p.G code) { /* compiled code */ }
}public static final class HashCode /* p.Wrapper.HashCode*/ {
@org.jetbrains.annotations.NotNull()
private final p.G code;
@org.jetbrains.annotations.NotNull
public final p.G component1() { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
public final p.G component1();// component1()
@org.jetbrains.annotations.NotNull
public final p.Wrapper.HashCode copy(@org.jetbrains.annotations.NotNull p.G code) { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
public final p.G getCode();// getCode()
@org.jetbrains.annotations.NotNull
public java.lang.String toString() { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
public final p.Wrapper.HashCode copy(@org.jetbrains.annotations.NotNull() p.G);// copy(p.G)
public boolean equals(@org.jetbrains.annotations.Nullable java.lang.Object p) { /* compiled code */ }
}
@org.jetbrains.annotations.NotNull()
public java.lang.String toString();// toString()
public static final class ToString {
@org.jetbrains.annotations.NotNull
private final p.G code;
public HashCode(@org.jetbrains.annotations.NotNull() p.G);// .ctor(p.G)
@org.jetbrains.annotations.NotNull
public java.lang.String toString() { /* compiled code */ }
public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object)
@org.jetbrains.annotations.NotNull
public final p.G getCode() { /* compiled code */ }
public int hashCode();// hashCode()
public ToString(@org.jetbrains.annotations.NotNull p.G code) { /* compiled code */ }
}public static final class ToString /* p.Wrapper.ToString*/ {
@org.jetbrains.annotations.NotNull()
private final p.G code;
@org.jetbrains.annotations.NotNull
public final p.G component1() { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
public final p.G component1();// component1()
@org.jetbrains.annotations.NotNull
public final p.Wrapper.ToString copy(@org.jetbrains.annotations.NotNull p.G code) { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
public final p.G getCode();// getCode()
public int hashCode() { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
public final p.Wrapper.ToString copy(@org.jetbrains.annotations.NotNull() p.G);// copy(p.G)
public boolean equals(@org.jetbrains.annotations.Nullable java.lang.Object p) { /* compiled code */ }
}
}
@org.jetbrains.annotations.NotNull()
public java.lang.String toString();// toString()
public ToString(@org.jetbrains.annotations.NotNull() p.G);// .ctor(p.G)
public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object)
public int hashCode();// hashCode()
}}

19
compiler/testData/asJava/lightClasses/DelegatedNested.java vendored
View File

@@ -1,13 +1,14 @@
public final class B {
public B() { /* compiled code */ }
public final class B /* p.B*/ {
public B();// .ctor()
public static final class A implements p.I {
private final p.I f;
public A(@org.jetbrains.annotations.NotNull p.I f) { /* compiled code */ }
public static final class A /* p.B.A*/ implements p.I {
private final p.I f;
public void f() { /* compiled code */ }
public A(@org.jetbrains.annotations.NotNull() p.I);// .ctor(p.I)
public void g() { /* compiled code */ }
}
}
public void f();// f()
public void g();// g()
}}

11
compiler/testData/asJava/lightClasses/Delegation.java vendored
View File

@@ -1,9 +1,10 @@
public final class B implements p.I {
private final p.I f;
public final class B /* p.B*/ implements p.I {
private final p.I f;
public B(@org.jetbrains.annotations.NotNull p.I f) { /* compiled code */ }
public B(@org.jetbrains.annotations.NotNull() p.I);// .ctor(p.I)
public void f() { /* compiled code */ }
public void f();// f()
public void g();// g()
public void g() { /* compiled code */ }
}

19
compiler/testData/asJava/lightClasses/DeprecatedEnumEntry.java vendored
View File

@@ -1,13 +1,8 @@
public enum E {
/**
* @deprecated
*/
@kotlin.Deprecated(message = "a")
Entry1, Entry2, /**
* @deprecated
*/
@kotlin.Deprecated(message = "b")
Entry3;
public enum E /* p.E*/ {
Entry1,
Entry2,
Entry3;
private E() { /* compiled code */ }
}
private E();// .ctor()
}

14
compiler/testData/asJava/lightClasses/DeprecatedNotHiddenInClass.java vendored
View File

@@ -1,9 +1,7 @@
public final class A {
/**
* @deprecated
*/
@kotlin.Deprecated(message = "f")
public final void f() { /* compiled code */ }
public final class A /* a.A*/ {
@kotlin.Deprecated(message = "f")
public final void f();// f()
public A() { /* compiled code */ }
}
public A();// .ctor()
}

25
compiler/testData/asJava/lightClasses/DollarsInName.java vendored
View File

@@ -1,15 +1,16 @@
public final class A$B {
public A$B() { /* compiled code */ }
public final class A$B /* c.b.a.A$B*/ {
public A$B();// .ctor()
public final class C$D {
public C$D() { /* compiled code */ }
}
public static final class $$$$$$$ {
public $$$$$$$() { /* compiled code */ }
public final class G$G$ {
public G$G$() { /* compiled code */ }
}
}
}
public final class C$D /* c.b.a.A$B.C$D*/ {
public C$D();// .ctor()
}public static final class $$$$$$$ /* c.b.a.A$B.$$$$$$$*/ {
public $$$$$$$();// .ctor()
public final class G$G$ /* c.b.a.A$B.$$$$$$$.G$G$*/ {
public G$G$();// .ctor()
}}}

25
compiler/testData/asJava/lightClasses/DollarsInNameNoPackage.java vendored
View File

@@ -1,15 +1,16 @@
public final class A$B {
public A$B() { /* compiled code */ }
public final class A$B /* A$B*/ {
public A$B();// .ctor()
public final class C$D {
public C$D() { /* compiled code */ }
}
public static final class $$$$$$$ {
public $$$$$$$() { /* compiled code */ }
public final class G$G$ {
public G$G$() { /* compiled code */ }
}
}
}
public final class C$D /* A$B.C$D*/ {
public C$D();// .ctor()
}public static final class $$$$$$$ /* A$B.$$$$$$$*/ {
public $$$$$$$();// .ctor()
public final class G$G$ /* A$B.$$$$$$$.G$G$*/ {
public G$G$();// .ctor()
}}}

21
compiler/testData/asJava/lightClasses/ExtendingInterfaceWithDefaultImpls.java vendored
View File

@@ -1,12 +1,13 @@
public interface B extends p.A {
@org.jetbrains.annotations.NotNull
java.lang.String b();
public abstract interface B /* p.B*/ extends p.A {
@org.jetbrains.annotations.NotNull()
public abstract java.lang.String b();// b()
static final class DefaultImpls {
@org.jetbrains.annotations.NotNull
public static java.lang.String b(@org.jetbrains.annotations.NotNull p.B $this) { /* compiled code */ }
@org.jetbrains.annotations.NotNull
public static java.lang.String a(@org.jetbrains.annotations.NotNull p.B $this) { /* compiled code */ }
}
}
public static final class DefaultImpls /* p.B.DefaultImpls*/ {
@org.jetbrains.annotations.NotNull()
public static java.lang.String a(@org.jetbrains.annotations.NotNull() p.B);// a(p.B)
@org.jetbrains.annotations.NotNull()
public static java.lang.String b(@org.jetbrains.annotations.NotNull() p.B);// b(p.B)
}}

4
compiler/testData/asJava/lightClasses/HiddenDeprecated.java vendored
View File

@@ -1,2 +1,2 @@
public final class HiddenDeprecatedKt {
}
public final class HiddenDeprecatedKt /* a.HiddenDeprecatedKt*/ {
}

7
compiler/testData/asJava/lightClasses/HiddenDeprecatedInClass.java vendored
View File

@@ -1,3 +1,4 @@
public final class A {
public A() { /* compiled code */ }
}
public final class A /* a.A*/ {
public A();// .ctor()
}

17
compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.compiled.java vendored
View File

@@ -1,13 +1,14 @@
public final class Inheritor implements p.I, p.I2 {
public final void f() { /* compiled code */ }
public final class Inheritor /* p.Inheritor*/ implements p.I, p.I2 {
@org.jetbrains.annotations.NotNull()
public java.lang.String bar();// bar()
public void g() { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
public java.lang.String foo();// foo()
public Inheritor() { /* compiled code */ }
public Inheritor();// .ctor()
@org.jetbrains.annotations.NotNull
public java.lang.String foo() { /* compiled code */ }
public final void f();// f()
public void g();// g()
@org.jetbrains.annotations.NotNull
public java.lang.String bar() { /* compiled code */ }
}

9
compiler/testData/asJava/lightClasses/InheritingInterfaceDefaultImpls.java vendored
View File

@@ -1,7 +1,8 @@
public final class Inheritor implements p.I, p.I2 {
public final void f() { /* compiled code */ }
public final class Inheritor /* p.Inheritor*/ implements p.I, p.I2 {
public Inheritor();// .ctor()
public void g() { /* compiled code */ }
public final void f();// f()
public void g();// g()
public Inheritor() { /* compiled code */ }
}

7
compiler/testData/asJava/lightClasses/InlineReified.java vendored
View File

@@ -1,3 +1,4 @@
public final class InlineReified {
public InlineReified() { /* compiled code */ }
}
public final class InlineReified /* a.InlineReified*/ {
public InlineReified();// .ctor()
}

15
compiler/testData/asJava/lightClasses/JvmNameOnMember.java vendored
View File

@@ -1,9 +1,10 @@
public final class C {
@kotlin.jvm.JvmName(name = "myFun")
public final void myFun(@org.jetbrains.annotations.NotNull C c) { /* compiled code */ }
public final class C /* C*/ {
@kotlin.jvm.JvmName(name = "myFun")
public final void myFun(@org.jetbrains.annotations.NotNull() C);// myFun(C)
@kotlin.jvm.JvmName(name = "myFun")
public final void myFun(@org.jetbrains.annotations.NotNull C c, @org.jetbrains.annotations.NotNull C c2) { /* compiled code */ }
@kotlin.jvm.JvmName(name = "myFun")
public final void myFun(@org.jetbrains.annotations.NotNull() C, @org.jetbrains.annotations.NotNull() C);// myFun(C, C)
public C() { /* compiled code */ }
}
public C();// .ctor()
}

39
compiler/testData/asJava/lightClasses/JvmStatic.java vendored
View File

@@ -1,26 +1,27 @@
public final class A {
@org.jetbrains.annotations.NotNull
public static final A.Companion Companion;
public final class A /* A*/ {
@org.jetbrains.annotations.NotNull()
public static final A.Companion Companion;
public A() { /* compiled code */ }
@kotlin.jvm.JvmStatic()
public static final void f();// f()
@kotlin.jvm.JvmStatic
public static final void f() { /* compiled code */ }
public A();// .ctor()
public static final class B {
@org.jetbrains.annotations.NotNull
public static final A.B INSTANCE;
@kotlin.jvm.JvmStatic
public static final void g() { /* compiled code */ }
private B() { /* compiled code */ }
}
public static final class B /* A.B*/ {
@org.jetbrains.annotations.NotNull()
public static final A.B INSTANCE;
public static final class Companion {
@kotlin.jvm.JvmStatic
public final void f() { /* compiled code */ }
@kotlin.jvm.JvmStatic()
public static final void g();// g()
private Companion() { /* compiled code */ }
}
}
private B();// .ctor()
}public static final class Companion /* A.Companion*/ {
@kotlin.jvm.JvmStatic()
public final void f();// f()
private Companion();// .ctor()
}}

63
compiler/testData/asJava/lightClasses/NestedObjects.java vendored
View File

@@ -1,42 +1,43 @@
public final class A {
public A() { /* compiled code */ }
public final class A /* A*/ {
public A();// .ctor()
public static final class B {
public B() { /* compiled code */ }
public static final class I {
@org.jetbrains.annotations.NotNull
public static final A.B.I INSTANCE;
private I() { /* compiled code */ }
}
public static final class B /* A.B*/ {
public B();// .ctor()
public static final class II {
@org.jetbrains.annotations.NotNull
public static final A.B.II INSTANCE;
private II() { /* compiled code */ }
}
}
public static final class C {
@org.jetbrains.annotations.NotNull
public static final A.C INSTANCE;
public static final class I /* A.B.I*/ {
@org.jetbrains.annotations.NotNull()
public static final A.B.I INSTANCE;
private C() { /* compiled code */ }
private I();// .ctor()
public static final class D {
@org.jetbrains.annotations.NotNull
public static final A.C.D INSTANCE;
}public static final class II /* A.B.II*/ {
@org.jetbrains.annotations.NotNull()
public static final A.B.II INSTANCE;
private D() { /* compiled code */ }
private II();// .ctor()
public static final class G {
@org.jetbrains.annotations.NotNull
public static final A.C.D.G INSTANCE;
}}public static final class C /* A.C*/ {
@org.jetbrains.annotations.NotNull()
public static final A.C INSTANCE;
private G() { /* compiled code */ }
}
}
}
}
private C();// .ctor()
public static final class D /* A.C.D*/ {
@org.jetbrains.annotations.NotNull()
public static final A.C.D INSTANCE;
private D();// .ctor()
public static final class G /* A.C.D.G*/ {
@org.jetbrains.annotations.NotNull()
public static final A.C.D.G INSTANCE;
private G();// .ctor()
}}}}

21
compiler/testData/asJava/lightClasses/NonDataClassWithComponentFunctions.java vendored
View File

@@ -1,16 +1,17 @@
public final class A {
private final int y;
public final class A /* p.A*/ {
private final int y;
public boolean equals(@org.jetbrains.annotations.Nullable java.lang.Object other) { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
public java.lang.String toString();// toString()
public int hashCode() { /* compiled code */ }
public A(int);// .ctor(int)
@org.jetbrains.annotations.NotNull
public java.lang.String toString() { /* compiled code */ }
public boolean equals(@org.jetbrains.annotations.Nullable() java.lang.Object);// equals(java.lang.Object)
public final int component1() { /* compiled code */ }
public final int component1();// component1()
public final int getY() { /* compiled code */ }
public final int getY();// getY()
public A(int y) { /* compiled code */ }
}
public int hashCode();// hashCode()
}

13
compiler/testData/asJava/lightClasses/PublishedApi.java vendored
View File

@@ -1,8 +1,9 @@
public final class A {
public final void test() { /* compiled code */ }
public final class A /* A*/ {
@kotlin.PublishedApi()
public final int access$test(int);// access$test(int)
@kotlin.PublishedApi
public final int access$test(int p) { /* compiled code */ }
public A();// .ctor()
public A() { /* compiled code */ }
}
public final void test();// test()
}

19
compiler/testData/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass.java vendored
View File

@@ -1,10 +1,11 @@
@kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.SOURCE)
@java.lang.annotation.Documented()
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.SOURCE)
@java.lang.annotation.Target(value = {})
@kotlin.annotation.MustBeDocumented()
@kotlin.annotation.Repeatable()
@kotlin.annotation.Retention(value = kotlin.annotation.AnnotationRetention.SOURCE)
@kotlin.annotation.Target(allowedTargets = {kotlin.annotation.AnnotationTarget.TYPE_PARAMETER})
@kotlin.annotation.MustBeDocumented
@kotlin.annotation.Repeatable
@java.lang.annotation.Documented
@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE)
@java.lang.annotation.Target({})
public @interface Anno {
int i();
}
public abstract @interface Anno /* Anno*/ {
public abstract int i();// i()
}

9
compiler/testData/asJava/lightClasses/StubOrderForOverloads.java vendored
View File

@@ -1,7 +1,8 @@
public final class A {
public final void foo(@org.jetbrains.annotations.Nullable P p1, @org.jetbrains.annotations.Nullable P p2) { /* compiled code */ }
public final class A /* A*/ {
public A();// .ctor()
public final void foo(@org.jetbrains.annotations.NotNull kotlin.jvm.functions.Function4<? super RS,? super P,? super P,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,? extends java.lang.Object> listener) { /* compiled code */ }
public final void foo(@org.jetbrains.annotations.NotNull() kotlin.jvm.functions.Function4<? super RS,? super P,? super P,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,? extends java.lang.Object>);// foo(kotlin.jvm.functions.Function4<? super RS,? super P,? super P,? super kotlin.coroutines.Continuation<? super kotlin.Unit>,? extends java.lang.Object>)
public final void foo(@org.jetbrains.annotations.Nullable() P, @org.jetbrains.annotations.Nullable() P);// foo(P, P)
public A() { /* compiled code */ }
}

19
compiler/testData/asJava/lightClasses/TypePararametersInClass.java vendored
View File

@@ -1,11 +1,12 @@
public abstract class A <T extends A<T>> extends B<java.util.Collection<? extends T>> implements C<T> {
public A() { /* compiled code */ }
public abstract class A /* A*/<T extends A<T>> extends B<java.util.Collection<? extends T>> implements C<T> {
public A();// .ctor()
public class Inner <D> extends B<java.util.Collection<? extends T>> implements C<D> {
public Inner() { /* compiled code */ }
}
public final class Inner2 <X> extends A<T>.Inner<X> implements C<X> {
public Inner2() { /* compiled code */ }
}
}
public class Inner /* A.Inner*/<D> extends B<java.util.Collection<? extends T>> implements C<D> {
public Inner();// .ctor()
}public final class Inner2 /* A.Inner2*/<X> extends A<T>.Inner<X> implements C<X> {
public Inner2();// .ctor()
}}

11
compiler/testData/asJava/lightClasses/VarArgs.java vendored
View File

@@ -1,7 +1,8 @@
public final class C {
public final void f(@org.jetbrains.annotations.NotNull int... i) { /* compiled code */ }
public final class C /* C*/ {
public C();// .ctor()
public final void p(int i, @org.jetbrains.annotations.NotNull java.lang.String... s) { /* compiled code */ }
public final /* vararg */ void f(@org.jetbrains.annotations.NotNull() int...);// f(int[])
public C() { /* compiled code */ }
}
public final /* vararg */ void p(int, @org.jetbrains.annotations.NotNull() java.lang.String...);// p(int, java.lang.String[])
}

7
compiler/testData/asJava/lightClasses/compilationErrors/ActualClass.java vendored
View File

@@ -1,3 +1,4 @@
public final class B {
public B() { /* compiled code */ }
}
public final class B /* p.B*/ {
public B();// .ctor()
}

2
compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAlias.java vendored
View File

@@ -1,2 +1,2 @@
public final class ActualTypeAliasKt {
public final class ActualTypeAliasKt /* p.ActualTypeAliasKt*/ {
}

2
compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.java vendored
View File

@@ -1,3 +1,3 @@
@kotlin.jvm.JvmPackageName(name = "a.b.c")
public final class ActualTypeAliasCustomJvmPackageNameKt {
public final class ActualTypeAliasCustomJvmPackageNameKt /* a.b.c.ActualTypeAliasCustomJvmPackageNameKt*/ {
}

2
compiler/testData/asJava/lightClasses/compilationErrors/AllInlineOnly.java vendored
View File

@@ -1,2 +1,2 @@
public final class AllInlineOnly {
public final class AllInlineOnly /* p.AllInlineOnly*/ {
}

1
compiler/testData/asJava/lightClasses/compilationErrors/AllInlineOnly.kt vendored
View File

@@ -1,4 +1,5 @@
// p.AllInlineOnly
// WITH_RUNTIME
@file:kotlin.jvm.JvmMultifileClass
@file:kotlin.jvm.JvmName("AllInlineOnly")

25
compiler/testData/asJava/lightClasses/compilationErrors/AnnotationModifiers.java vendored
View File

@@ -1,17 +1,18 @@
public final class A {
@kotlin.jvm.Transient
@kotlin.jvm.Volatile
@org.jetbrains.annotations.NotNull
private transient volatile java.lang.String c;
public final class A /* A*/ {
@kotlin.jvm.Transient()
@kotlin.jvm.Volatile()
@org.jetbrains.annotations.NotNull()
private transient volatile java.lang.String c;
@kotlin.jvm.Synchronized
@kotlin.jvm.Strictfp
public final synchronized strictfp void f() { /* compiled code */ }
@kotlin.jvm.Strictfp()
@kotlin.jvm.Synchronized()
public final synchronized strictfp void f();// f()
@org.jetbrains.annotations.NotNull
public final java.lang.String getC() { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
public final java.lang.String getC();// getC()
public final void setC(@org.jetbrains.annotations.NotNull java.lang.String p) { /* compiled code */ }
public A();// .ctor()
public final void setC(@org.jetbrains.annotations.NotNull() java.lang.String);// setC(java.lang.String)
public A() { /* compiled code */ }
}

9
compiler/testData/asJava/lightClasses/compilationErrors/EnumNameOverride.java vendored
View File

@@ -1,5 +1,6 @@
public enum EnumNameOverride implements Bar {
;
public enum EnumNameOverride /* EnumNameOverride*/ implements Bar {
;
private EnumNameOverride() { /* compiled code */ }
}
private EnumNameOverride();// .ctor()
}

5
compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.java vendored
View File

@@ -1,4 +1,5 @@
@kotlin.jvm.JvmPackageName(name = "a.b.c")
public final class JvmPackageNameKt {
public static final void f() { /* compiled code */ }
public final class JvmPackageNameKt /* a.b.c.JvmPackageNameKt*/ {
public static final void f();// f()
}

15
compiler/testData/asJava/lightClasses/compilationErrors/PrivateInTrait.java vendored
View File

@@ -1,9 +1,10 @@
public interface PrivateInTrait {
static final class DefaultImpls {
private static java.lang.String getNn(PrivateInTrait $this) { /* compiled code */ }
public abstract interface PrivateInTrait /* PrivateInTrait*/ {
private static void setNn(PrivateInTrait $this, java.lang.String value) { /* compiled code */ }
public static final class DefaultImpls /* PrivateInTrait.DefaultImpls*/ {
private static java.lang.String getN(PrivateInTrait);// getN(PrivateInTrait)
private static java.lang.String getN(PrivateInTrait $this) { /* compiled code */ }
}
}
private static java.lang.String getNn(PrivateInTrait);// getNn(PrivateInTrait)
private static void setNn(PrivateInTrait, java.lang.String);// setNn(PrivateInTrait, java.lang.String)
}}

31
compiler/testData/asJava/lightClasses/compilationErrors/RepetableAnnotations.java vendored
View File

@@ -1,18 +1,19 @@
public final class Annotations {
@p.R(s = "a")
@p.R(s = "b")
@p.R(s = "c")
public final void repeatables1() { /* compiled code */ }
public final class Annotations /* p.Annotations*/ {
@p.R(s = "a")
@p.R(s = "b")
@p.R(s = "c")
public final void repeatables1();// repeatables1()
@p.R(s = "a")
public final void repeatables2() { /* compiled code */ }
@p.R(s = "a")
@p.R(s = "c")
@p.R(s = "f")
@p.S(g = "D")
@p.S(g = "b")
public final void repeatables3();// repeatables3()
@p.R(s = "a")
@p.S(g = "b")
@p.R(s = "c")
@p.S(g = "D")
@p.R(s = "f")
public final void repeatables3() { /* compiled code */ }
@p.R(s = "a")
public final void repeatables2();// repeatables2()
public Annotations() { /* compiled code */ }
}
public Annotations();// .ctor()
}

26
compiler/testData/asJava/lightClasses/compilationErrors/SameName.java vendored
View File

@@ -1,17 +1,21 @@
public final class A {
private final int i;
private final java.lang.String i$1;
private final java.lang.String j;
private final java.lang.String j$1;
public final class A /* A*/ {
private final int i;
public final void f(int i, double s) { /* compiled code */ }
private final java.lang.String i$1;
public final void f(int i, double s) { /* compiled code */ }
private final java.lang.String j$1;
public final int g(int i, double s) { /* compiled code */ }
private final java.lang.String j;
@org.jetbrains.annotations.NotNull
public final java.lang.String g(int s, double i) { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
public final java.lang.String g(int, double);// g(int, double)
public A();// .ctor()
public final int g(int, double);// g(int, double)
public final void f(int, double);// f(int, double)
public final void f(int, double);// f(int, double)
public A() { /* compiled code */ }
}

9
compiler/testData/asJava/lightClasses/compilationErrors/TopLevelDestructuring.java vendored
View File

@@ -1,5 +1,6 @@
public final class TopLevelDestructuringKt {
private static final int z;
public final class TopLevelDestructuringKt /* TopLevelDestructuringKt*/ {
private static final int z;
public static final int getZ() { /* compiled code */ }
}
public static final int getZ();// getZ()
}

27
compiler/testData/asJava/lightClasses/compilationErrors/TraitClassObjectField.java vendored
View File

@@ -1,14 +1,17 @@
public interface TraitClassObjectField {
@org.jetbrains.annotations.NotNull
TraitClassObjectField.Companion Companion;
@org.jetbrains.annotations.Nullable
java.lang.String x = "";
public abstract interface TraitClassObjectField /* TraitClassObjectField*/ {
@org.jetbrains.annotations.NotNull()
public static final TraitClassObjectField.Companion Companion;
static final class Companion {
@org.jetbrains.annotations.Nullable
public static final java.lang.String x = "";
private static final java.lang.String y;
@org.jetbrains.annotations.Nullable()
public static final java.lang.String x = "" /* initializer type: java.lang.String */ /* constant value */;
private Companion() { /* compiled code */ }
}
}
public static final class Companion /* TraitClassObjectField.Companion*/ {
@org.jetbrains.annotations.Nullable()
public static final java.lang.String x = "" /* initializer type: java.lang.String */ /* constant value */;
private static final java.lang.String y;
private Companion();// .ctor()
}}

15
compiler/testData/asJava/lightClasses/compilationErrors/TwoOverrides.java vendored
View File

@@ -1,9 +1,10 @@
public final class TwoOverrides implements java.lang.Iterable<java.lang.String>, kotlin.collections.Iterable<java.lang.String>, kotlin.jvm.internal.markers.KMappedMarker {
@org.jetbrains.annotations.Nullable
public java.lang.Void iterator() { /* compiled code */ }
public final class TwoOverrides /* TwoOverrides*/ implements java.lang.Iterable<java.lang.String>, kotlin.collections.Iterable<java.lang.String>, kotlin.jvm.internal.markers.KMappedMarker {
@org.jetbrains.annotations.Nullable()
public java.lang.Void iterator();// iterator()
@org.jetbrains.annotations.Nullable
public java.lang.Void iterator() { /* compiled code */ }
@org.jetbrains.annotations.Nullable()
public java.lang.Void iterator();// iterator()
public TwoOverrides() { /* compiled code */ }
}
public TwoOverrides();// .ctor()
}

45
compiler/testData/asJava/lightClasses/compilationErrors/WrongAnnotations.java vendored
View File

@@ -1,31 +1,32 @@
public final class A {
@org.jetbrains.annotations.NotNull
public static final A.Companion Companion;
public final class A /* A*/ {
@org.jetbrains.annotations.NotNull()
public static final A.Companion Companion;
public A() { /* compiled code */ }
@kotlin.jvm.JvmStatic()
public static final void f3();// f3()
@kotlin.jvm.JvmStatic
public static final void f3() { /* compiled code */ }
public A();// .ctor()
public static final class Companion {
@kotlin.jvm.JvmName(name = "realName")
public final void realName() { /* compiled code */ }
@kotlin.jvm.JvmName(name = 1)
public final void f2() { /* compiled code */ }
public static final class Companion /* A.Companion*/ {
@kotlin.jvm.JvmName()
public final void f4();// f4()
@kotlin.jvm.JvmStatic
public final void f3() { /* compiled code */ }
@kotlin.jvm.JvmName(name = "realName")
public final void realName();// realName()
@kotlin.jvm.JvmName
public final void f4() { /* compiled code */ }
@kotlin.jvm.JvmName(name = 1)
public final void f2();// f2()
@kotlin.jvm.JvmOverloads
public final void f5() { /* compiled code */ }
@kotlin.jvm.JvmOverloads()
public final void f5();// f5()
@kotlin.jvm.JvmOverloads
public final void f6() { /* compiled code */ }
@kotlin.jvm.JvmOverloads()
public final void f6();// f6()
private Companion() { /* compiled code */ }
}
}
@kotlin.jvm.JvmStatic()
public final void f3();// f3()
private Companion();// .ctor()
}}

9
compiler/testData/asJava/lightClasses/delegation/Function.java vendored
View File

@@ -1,6 +1,7 @@
public final class Derived implements Base {
public Derived(@org.jetbrains.annotations.NotNull Base x) { /* compiled code */ }
public final class Derived /* Derived*/ implements Base {
@org.jetbrains.annotations.NotNull()
public java.lang.String baz(@org.jetbrains.annotations.NotNull() java.lang.String);// baz(java.lang.String)
public Derived(@org.jetbrains.annotations.NotNull() Base);// .ctor(Base)
@org.jetbrains.annotations.NotNull
public java.lang.String baz(@org.jetbrains.annotations.NotNull java.lang.String g) { /* compiled code */ }
}

9
compiler/testData/asJava/lightClasses/delegation/Property.java vendored
View File

@@ -1,6 +1,7 @@
public final class Derived implements Base {
public Derived(@org.jetbrains.annotations.NotNull Base x) { /* compiled code */ }
public final class Derived /* Derived*/ implements Base {
@org.jetbrains.annotations.NotNull()
public java.lang.String getBoo();// getBoo()
public Derived(@org.jetbrains.annotations.NotNull() Base);// .ctor(Base)
@org.jetbrains.annotations.NotNull
public java.lang.String getBoo() { /* compiled code */ }
}

4
compiler/testData/asJava/lightClasses/facades/AllPrivate.java vendored
View File

@@ -1,2 +1,2 @@
public final class AllPrivate {
}
public final class AllPrivate /* p.AllPrivate*/ {
}

1
compiler/testData/asJava/lightClasses/facades/AllPrivate.kt vendored
View File

@@ -1,4 +1,5 @@
// p.AllPrivate
// WITH_RUNTIME
@file:kotlin.jvm.JvmMultifileClass
@file:kotlin.jvm.JvmName("AllPrivate")

7
compiler/testData/asJava/lightClasses/facades/MultiFile.java vendored
View File

@@ -1,3 +1,4 @@
public final class MultiFile {
public static final int getFoo() { /* compiled code */ }
}
public final class MultiFile /* test.MultiFile*/ {
public static final int getFoo();// getFoo()
}

2
compiler/testData/asJava/lightClasses/facades/MultiFile.kt vendored
View File

@@ -1,5 +1,5 @@
// test.MultiFile
// WITH_RUNTIME
@file:JvmMultifileClass
@file:JvmName("MultiFile")

7
compiler/testData/asJava/lightClasses/facades/SingleFile.java vendored
View File

@@ -1,3 +1,4 @@
public final class SingleFileKt {
public static final void foo() { /* compiled code */ }
}
public final class SingleFileKt /* SingleFileKt*/ {
public static final void foo();// foo()
}

5
compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.java vendored
View File

@@ -1,4 +1,5 @@
@kotlin.jvm.JvmName(name = "NewName")
public final class NewName {
public static final void foo() { /* compiled code */ }
public final class NewName /* NewName*/ {
public static final void foo();// foo()
}

35
compiler/testData/asJava/lightClasses/ideRegression/AllOpenAnnotatedClasses.java vendored
View File

@@ -1,25 +1,26 @@
@test.AllOpen
public class C {
private final int p;
@test.AllOpen()
public class C /* test.C*/ {
private final int p;
public void f() { /* compiled code */ }
public C();// .ctor()
public void g() { /* compiled code */ }
public int getP();// getP()
public int getP() { /* compiled code */ }
public void f();// f()
public C() { /* compiled code */ }
public void g();// g()
public static final class D {
public final void z() { /* compiled code */ }
public D() { /* compiled code */ }
}
@test.AllOpen
public static class H {
public void j() { /* compiled code */ }
@test.AllOpen()
public static class H /* test.C.H*/ {
public H();// .ctor()
public H() { /* compiled code */ }
}
}
public void j();// j()
}public static final class D /* test.C.D*/ {
public D();// .ctor()
public final void z();// z()
}}

47
compiler/testData/asJava/lightClasses/ideRegression/ImplementingCharSequenceAndNumber.java vendored
View File

@@ -1,38 +1,37 @@
public final class Container {
public Container() { /* compiled code */ }
public final class Container /* p1.Container*/ {
public Container();// .ctor()
public static final class MyString implements java.lang.CharSequence {
public int getLength() { /* compiled code */ }
@org.jetbrains.annotations.NotNull
public error.NonExistentClass chars() { /* compiled code */ }
@org.jetbrains.annotations.NotNull
public error.NonExistentClass codePoints() { /* compiled code */ }
public static final class MyNumber /* p1.Container.MyNumber*/ extends java.lang.Number {
public MyNumber();// .ctor()
public char get(int index) { /* compiled code */ }
public byte toByte();// toByte()
@org.jetbrains.annotations.NotNull
public java.lang.CharSequence subSequence(int startIndex, int endIndex) { /* compiled code */ }
public char toChar();// toChar()
public MyString() { /* compiled code */ }
}
public double toDouble();// toDouble()
public static final class MyNumber extends java.lang.Number {
public byte toByte() { /* compiled code */ }
public float toFloat();// toFloat()
public char toChar() { /* compiled code */ }
public int toInt();// toInt()
public double toDouble() { /* compiled code */ }
public long toLong();// toLong()
public float toFloat() { /* compiled code */ }
public short toShort();// toShort()
public int toInt() { /* compiled code */ }
}public static final class MyString /* p1.Container.MyString*/ implements java.lang.CharSequence {
@org.jetbrains.annotations.NotNull()
public java.lang.CharSequence subSequence(int, int);// subSequence(int, int)
public long toLong() { /* compiled code */ }
public MyString();// .ctor()
public short toShort() { /* compiled code */ }
public char get(int);// get(int)
public MyNumber() { /* compiled code */ }
}
}
public error.NonExistentClass chars();// chars()
public error.NonExistentClass codePoints();// codePoints()
public int getLength();// getLength()
}}

7
compiler/testData/asJava/lightClasses/ideRegression/ImplementingMap.java vendored
View File

@@ -1,5 +1,6 @@
public final class TypeHierarchyMap <TValue> implements java.util.Map<java.lang.Class<?>,TValue>, kotlin.collections.Map<java.lang.Class<?>,TValue>, kotlin.jvm.internal.markers.KMappedMarker {
public boolean containsKey(@org.jetbrains.annotations.NotNull java.lang.Class<?> key) { /* compiled code */ }
public final class TypeHierarchyMap /* p1.TypeHierarchyMap*/<TValue> implements java.util.Map<java.lang.Class<?>,TValue>, kotlin.collections.Map<java.lang.Class<?>,TValue>, kotlin.jvm.internal.markers.KMappedMarker {
public TypeHierarchyMap();// .ctor()
public boolean containsKey(@org.jetbrains.annotations.NotNull() java.lang.Class<?>);// containsKey(java.lang.Class<?>)
public TypeHierarchyMap() { /* compiled code */ }
}

62
compiler/testData/asJava/lightClasses/ideRegression/ImplementingMutableSet.java vendored
View File

@@ -1,40 +1,44 @@
public final class SmartSet <T> extends kotlin.collections.AbstractSet<T> implements java.util.Set<T>, kotlin.collections.MutableSet<T>, kotlin.jvm.internal.markers.KMutableSet {
private java.lang.Object data;
private int size;
private static final int ARRAY_THRESHOLD;
@org.jetbrains.annotations.NotNull
public static final SmartSet.Companion Companion;
public final class SmartSet /* SmartSet*/<T> extends kotlin.collections.AbstractSet<T> implements java.util.Set<T>, kotlin.collections.MutableSet<T>, kotlin.jvm.internal.markers.KMutableSet {
@org.jetbrains.annotations.NotNull()
public static final SmartSet.Companion Companion;
public int getSize() { /* compiled code */ }
private int size;
public void setSize(int i) { /* compiled code */ }
private java.lang.Object data;
@org.jetbrains.annotations.NotNull
public java.util.Iterator<T> iterator() { /* compiled code */ }
private static final int ARRAY_THRESHOLD;
public boolean add(T element) { /* compiled code */ }
@kotlin.jvm.JvmStatic()
@org.jetbrains.annotations.NotNull()
public static final <T> SmartSet<T> create();// <T> create()
public void clear() { /* compiled code */ }
@kotlin.jvm.JvmStatic()
@org.jetbrains.annotations.NotNull()
public static final <T> SmartSet<T> create(@org.jetbrains.annotations.NotNull() java.util.Collection<? extends T>);// <T> create(java.util.Collection<? extends T>)
private SmartSet() { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
public java.util.Iterator<T> iterator();// iterator()
@kotlin.jvm.JvmStatic
@org.jetbrains.annotations.NotNull
public static final <T> SmartSet<T> create() { /* compiled code */ }
private SmartSet();// .ctor()
@kotlin.jvm.JvmStatic
@org.jetbrains.annotations.NotNull
public static final <T> SmartSet<T> create(@org.jetbrains.annotations.NotNull java.util.Collection<? extends T> set) { /* compiled code */ }
public boolean add(T);// add(T)
public static final class Companion {
@kotlin.jvm.JvmStatic
@org.jetbrains.annotations.NotNull
public final <T> SmartSet<T> create() { /* compiled code */ }
public int getSize();// getSize()
@kotlin.jvm.JvmStatic
@org.jetbrains.annotations.NotNull
public final <T> SmartSet<T> create(@org.jetbrains.annotations.NotNull java.util.Collection<? extends T> set) { /* compiled code */ }
public void clear();// clear()
private Companion() { /* compiled code */ }
}
}
public void setSize(int);// setSize(int)
public static final class Companion /* SmartSet.Companion*/ {
@kotlin.jvm.JvmStatic()
@org.jetbrains.annotations.NotNull()
public final <T> SmartSet<T> create();// <T> create()
@kotlin.jvm.JvmStatic()
@org.jetbrains.annotations.NotNull()
public final <T> SmartSet<T> create(@org.jetbrains.annotations.NotNull() java.util.Collection<? extends T>);// <T> create(java.util.Collection<? extends T>)
private Companion();// .ctor()
}}

9
compiler/testData/asJava/lightClasses/ideRegression/InheritingInterfaceDefaultImpls.java vendored
View File

@@ -1,7 +1,8 @@
public final class Inheritor implements p.I, p.I2 {
public final void f() { /* compiled code */ }
public final class Inheritor /* p.Inheritor*/ implements p.I, p.I2 {
public Inheritor();// .ctor()
public void g() { /* compiled code */ }
public final void f();// f()
public void g();// g()
public Inheritor() { /* compiled code */ }
}

11
compiler/testData/asJava/lightClasses/ideRegression/OverridingFinalInternal.java vendored
View File

@@ -1,7 +1,8 @@
public final class C extends p.A {
public int getAp$light_idea_test_case() { /* compiled code */ }
public final class C /* p.C*/ extends p.A {
public C();// .ctor()
public int af$light_idea_test_case() { /* compiled code */ }
public int af();// af$light_idea_test_case()
public C() { /* compiled code */ }
}
public int getAp();// getAp$light_idea_test_case()
}

15
compiler/testData/asJava/lightClasses/ideRegression/OverridingInternal.java vendored
View File

@@ -1,13 +1,14 @@
public final class C extends p.A implements p.I {
private final int ip;
public final class C /* p.C*/ extends p.A implements p.I {
private final int ip;
public int getAp$light_idea_test_case() { /* compiled code */ }
public C();// .ctor()
public int af$light_idea_test_case() { /* compiled code */ }
public int <no name provided>$light_idea_test_case();// <no name provided>$light_idea_test_case()
public int getIp$light_idea_test_case() { /* compiled code */ }
public int af$light_idea_test_case();// af$light_idea_test_case()
public int $$<no name provided>$light_idea_test_case /* Real name is '<no name provided>$light_idea_test_case' */() { /* compiled code */ }
public int getAp$light_idea_test_case();// getAp$light_idea_test_case()
public int getIp$light_idea_test_case();// getIp$light_idea_test_case()
public C() { /* compiled code */ }
}

11
compiler/testData/asJava/lightClasses/ideRegression/OverridingProtected.java vendored
View File

@@ -1,7 +1,8 @@
public final class C extends p.A {
protected int getAp() { /* compiled code */ }
public final class C /* p.C*/ extends p.A {
protected int af();// af()
protected int af() { /* compiled code */ }
protected int getAp();// getAp()
public C() { /* compiled code */ }
}
public C();// .ctor()
}

117
compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.java vendored
View File

@@ -1,72 +1,85 @@
public final class Class {
@org.jetbrains.annotations.Nullable
private final java.lang.String nullableVal;
@org.jetbrains.annotations.Nullable
private java.lang.String nullableVar;
@org.jetbrains.annotations.NotNull
private final java.lang.String notNullVal;
@org.jetbrains.annotations.NotNull
private java.lang.String notNullVar;
private final java.lang.String privateNN;
private final java.lang.String privateN;
public final class Class /* Class*/ {
@org.jetbrains.annotations.NotNull()
private final java.lang.String notNullVal;
@org.jetbrains.annotations.NotNull
public final java.lang.String notNull(@org.jetbrains.annotations.NotNull java.lang.String a) { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
private java.lang.String notNullVar;
@org.jetbrains.annotations.Nullable
public final java.lang.String nullable(@org.jetbrains.annotations.Nullable java.lang.String a) { /* compiled code */ }
@org.jetbrains.annotations.Nullable()
private final java.lang.String nullableVal;
@org.jetbrains.annotations.NotNull
public final java.lang.String notNullWithNN() { /* compiled code */ }
@org.jetbrains.annotations.Nullable()
private java.lang.String nullableVar;
@org.jetbrains.annotations.Nullable
@org.jetbrains.annotations.NotNull
public final java.lang.String notNullWithN() { /* compiled code */ }
private final java.lang.String privateN;
@org.jetbrains.annotations.Nullable
public final java.lang.String nullableWithN() { /* compiled code */ }
private final java.lang.String privateNN;
@org.jetbrains.annotations.NotNull
@org.jetbrains.annotations.Nullable
public final java.lang.String nullableWithNN() { /* compiled code */ }
public java.lang.String lateInitVar;
@org.jetbrains.annotations.Nullable
public final java.lang.String getNullableVal() { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
@org.jetbrains.annotations.Nullable()
public final java.lang.String getNotNullValWithGet();// getNotNullValWithGet()
@org.jetbrains.annotations.Nullable
public final java.lang.String getNullableVar() { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
@org.jetbrains.annotations.Nullable()
public final java.lang.String getNotNullVarWithGetSet();// getNotNullVarWithGetSet()
public final void setNullableVar(@org.jetbrains.annotations.Nullable java.lang.String p) { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
@org.jetbrains.annotations.Nullable()
public final java.lang.String getNullableValWithGet();// getNullableValWithGet()
@org.jetbrains.annotations.NotNull
public final java.lang.String getNotNullVal() { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
@org.jetbrains.annotations.Nullable()
public final java.lang.String getNullableVarWithGetSet();// getNullableVarWithGetSet()
@org.jetbrains.annotations.NotNull
public final java.lang.String getNotNullVar() { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
@org.jetbrains.annotations.Nullable()
public final java.lang.String notNullWithN();// notNullWithN()
public final void setNotNullVar(@org.jetbrains.annotations.NotNull java.lang.String p) { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
@org.jetbrains.annotations.Nullable()
public final java.lang.String nullableWithNN();// nullableWithNN()
@org.jetbrains.annotations.Nullable
@org.jetbrains.annotations.NotNull
public final java.lang.String getNotNullValWithGet() { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
public final java.lang.String getLateInitVar();// getLateInitVar()
@org.jetbrains.annotations.Nullable
@org.jetbrains.annotations.NotNull
public final java.lang.String getNotNullVarWithGetSet() { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
public final java.lang.String getNotNullVal();// getNotNullVal()
@org.jetbrains.annotations.Nullable
public final void setNotNullVarWithGetSet(@org.jetbrains.annotations.NotNull java.lang.String v) { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
public final java.lang.String getNotNullVar();// getNotNullVar()
@org.jetbrains.annotations.NotNull
@org.jetbrains.annotations.Nullable
public final java.lang.String getNullableValWithGet() { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
public final java.lang.String notNull(@org.jetbrains.annotations.NotNull() java.lang.String);// notNull(java.lang.String)
@org.jetbrains.annotations.NotNull
@org.jetbrains.annotations.Nullable
public final java.lang.String getNullableVarWithGetSet() { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
public final java.lang.String notNullWithNN();// notNullWithNN()
@org.jetbrains.annotations.NotNull
public final void setNullableVarWithGetSet(@org.jetbrains.annotations.Nullable java.lang.String v) { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
public final void setNullableVarWithGetSet(@org.jetbrains.annotations.Nullable() java.lang.String);// setNullableVarWithGetSet(java.lang.String)
@org.jetbrains.annotations.Nullable()
public final java.lang.String getNullableVal();// getNullableVal()
@org.jetbrains.annotations.Nullable()
public final java.lang.String getNullableVar();// getNullableVar()
@org.jetbrains.annotations.Nullable()
public final java.lang.String nullable(@org.jetbrains.annotations.Nullable() java.lang.String);// nullable(java.lang.String)
@org.jetbrains.annotations.Nullable()
public final java.lang.String nullableWithN();// nullableWithN()
@org.jetbrains.annotations.Nullable()
public final void setNotNullVarWithGetSet(@org.jetbrains.annotations.NotNull() java.lang.String);// setNotNullVarWithGetSet(java.lang.String)
public Class();// .ctor()
public final void setLateInitVar(@org.jetbrains.annotations.NotNull() java.lang.String);// setLateInitVar(java.lang.String)
public final void setNotNullVar(@org.jetbrains.annotations.NotNull() java.lang.String);// setNotNullVar(java.lang.String)
public final void setNullableVar(@org.jetbrains.annotations.Nullable() java.lang.String);// setNullableVar(java.lang.String)
public Class() { /* compiled code */ }
}

2
compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt vendored
View File

@@ -34,4 +34,6 @@ class Class {
private val privateNN: String = { "" }()
private val privateN: String? = { "" }()
lateinit var lateInitVar: String
}

29
compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java vendored
View File

@@ -1,16 +1,19 @@
public final class ClassObjectField {
@org.jetbrains.annotations.Nullable
private static final java.lang.String x;
private static final java.lang.String y;
@org.jetbrains.annotations.NotNull
public static final ClassObjectField.Companion Companion;
public final class ClassObjectField /* ClassObjectField*/ {
@org.jetbrains.annotations.NotNull()
public static final ClassObjectField.Companion Companion;
public ClassObjectField() { /* compiled code */ }
@org.jetbrains.annotations.Nullable()
private static final java.lang.String x;
public static final class Companion {
@org.jetbrains.annotations.Nullable
public final java.lang.String getX() { /* compiled code */ }
private static final java.lang.String y;
private Companion() { /* compiled code */ }
}
}
public ClassObjectField();// .ctor()
public static final class Companion /* ClassObjectField.Companion*/ {
@org.jetbrains.annotations.Nullable()
public final java.lang.String getX();// getX()
private Companion();// .ctor()
}}

5
compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.java vendored
View File

@@ -1,3 +1,4 @@
public final class ClassWithConstructor {
public ClassWithConstructor(@org.jetbrains.annotations.Nullable java.lang.String nullable, @org.jetbrains.annotations.NotNull java.lang.String notNull) { /* compiled code */ }
public final class ClassWithConstructor /* ClassWithConstructor*/ {
public ClassWithConstructor(@org.jetbrains.annotations.Nullable() java.lang.String, @org.jetbrains.annotations.NotNull() java.lang.String);// .ctor(java.lang.String, java.lang.String)
}

22
compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.java vendored
View File

@@ -1,14 +1,16 @@
public final class ClassWithConstructorAndProperties {
@org.jetbrains.annotations.Nullable
private final java.lang.String nullable;
@org.jetbrains.annotations.NotNull
private final java.lang.String notNull;
public final class ClassWithConstructorAndProperties /* ClassWithConstructorAndProperties*/ {
@org.jetbrains.annotations.NotNull()
private final java.lang.String notNull;
@org.jetbrains.annotations.Nullable
public final java.lang.String getNullable() { /* compiled code */ }
@org.jetbrains.annotations.Nullable()
private final java.lang.String nullable;
@org.jetbrains.annotations.NotNull
public final java.lang.String getNotNull() { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
public final java.lang.String getNotNull();// getNotNull()
@org.jetbrains.annotations.Nullable()
public final java.lang.String getNullable();// getNullable()
public ClassWithConstructorAndProperties(@org.jetbrains.annotations.Nullable() java.lang.String, @org.jetbrains.annotations.NotNull() java.lang.String);// .ctor(java.lang.String, java.lang.String)
public ClassWithConstructorAndProperties(@org.jetbrains.annotations.Nullable java.lang.String nullable, @org.jetbrains.annotations.NotNull java.lang.String notNull) { /* compiled code */ }
}

110
compiler/testData/asJava/lightClasses/nullabilityAnnotations/FileFacade.java vendored
View File

@@ -1,72 +1,78 @@
public final class FileFacadeKt {
@org.jetbrains.annotations.Nullable
private static final java.lang.String nullableVal;
@org.jetbrains.annotations.Nullable
private static java.lang.String nullableVar;
@org.jetbrains.annotations.NotNull
private static final java.lang.String notNullVal;
@org.jetbrains.annotations.NotNull
private static java.lang.String notNullVar;
private static final java.lang.String privateNn;
private static final java.lang.String privateN;
public final class FileFacadeKt /* FileFacadeKt*/ {
@org.jetbrains.annotations.NotNull()
private static final java.lang.String notNullVal;
@org.jetbrains.annotations.NotNull
public static final java.lang.String notNull(@org.jetbrains.annotations.NotNull java.lang.String a) { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
private static java.lang.String notNullVar;
@org.jetbrains.annotations.Nullable
public static final java.lang.String nullable(@org.jetbrains.annotations.Nullable java.lang.String a) { /* compiled code */ }
@org.jetbrains.annotations.Nullable()
private static final java.lang.String nullableVal;
@org.jetbrains.annotations.NotNull
public static final java.lang.String notNullWithNN() { /* compiled code */ }
@org.jetbrains.annotations.Nullable()
private static java.lang.String nullableVar;
@org.jetbrains.annotations.Nullable
@org.jetbrains.annotations.NotNull
public static final java.lang.String notNullWithN() { /* compiled code */ }
private static final java.lang.String privateN;
@org.jetbrains.annotations.Nullable
public static final java.lang.String nullableWithN() { /* compiled code */ }
private static final java.lang.String privateNn;
@org.jetbrains.annotations.NotNull
@org.jetbrains.annotations.Nullable
public static final java.lang.String nullableWithNN() { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
@org.jetbrains.annotations.Nullable()
public static final java.lang.String getNotNullValWithGet();// getNotNullValWithGet()
@org.jetbrains.annotations.Nullable
public static final java.lang.String getNullableVal() { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
@org.jetbrains.annotations.Nullable()
public static final java.lang.String getNotNullVarWithGetSet();// getNotNullVarWithGetSet()
@org.jetbrains.annotations.Nullable
public static final java.lang.String getNullableVar() { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
@org.jetbrains.annotations.Nullable()
public static final java.lang.String getNullableValWithGet();// getNullableValWithGet()
public static final void setNullableVar(@org.jetbrains.annotations.Nullable java.lang.String p) { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
@org.jetbrains.annotations.Nullable()
public static final java.lang.String getNullableVarWithGetSet();// getNullableVarWithGetSet()
@org.jetbrains.annotations.NotNull
public static final java.lang.String getNotNullVal() { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
@org.jetbrains.annotations.Nullable()
public static final java.lang.String notNullWithN();// notNullWithN()
@org.jetbrains.annotations.NotNull
public static final java.lang.String getNotNullVar() { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
@org.jetbrains.annotations.Nullable()
public static final java.lang.String nullableWithNN();// nullableWithNN()
public static final void setNotNullVar(@org.jetbrains.annotations.NotNull java.lang.String p) { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
public static final java.lang.String getNotNullVal();// getNotNullVal()
@org.jetbrains.annotations.Nullable
@org.jetbrains.annotations.NotNull
public static final java.lang.String getNotNullValWithGet() { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
public static final java.lang.String getNotNullVar();// getNotNullVar()
@org.jetbrains.annotations.Nullable
@org.jetbrains.annotations.NotNull
public static final java.lang.String getNotNullVarWithGetSet() { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
public static final java.lang.String notNull(@org.jetbrains.annotations.NotNull() java.lang.String);// notNull(java.lang.String)
@org.jetbrains.annotations.Nullable
public static final void setNotNullVarWithGetSet(@org.jetbrains.annotations.NotNull java.lang.String v) { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
public static final java.lang.String notNullWithNN();// notNullWithNN()
@org.jetbrains.annotations.NotNull
@org.jetbrains.annotations.Nullable
public static final java.lang.String getNullableValWithGet() { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
public static final void setNullableVarWithGetSet(@org.jetbrains.annotations.Nullable() java.lang.String);// setNullableVarWithGetSet(java.lang.String)
@org.jetbrains.annotations.NotNull
@org.jetbrains.annotations.Nullable
public static final java.lang.String getNullableVarWithGetSet() { /* compiled code */ }
@org.jetbrains.annotations.Nullable()
public static final java.lang.String getNullableVal();// getNullableVal()
@org.jetbrains.annotations.NotNull
public static final void setNullableVarWithGetSet(@org.jetbrains.annotations.Nullable java.lang.String v) { /* compiled code */ }
@org.jetbrains.annotations.Nullable()
public static final java.lang.String getNullableVar();// getNullableVar()
@org.jetbrains.annotations.Nullable()
public static final java.lang.String nullable(@org.jetbrains.annotations.Nullable() java.lang.String);// nullable(java.lang.String)
@org.jetbrains.annotations.Nullable()
public static final java.lang.String nullableWithN();// nullableWithN()
@org.jetbrains.annotations.Nullable()
public static final void setNotNullVarWithGetSet(@org.jetbrains.annotations.NotNull() java.lang.String);// setNotNullVarWithGetSet(java.lang.String)
private static final java.lang.String privateFun(java.lang.String, java.lang.String);// privateFun(java.lang.String, java.lang.String)
public static final void setNotNullVar(@org.jetbrains.annotations.NotNull() java.lang.String);// setNotNullVar(java.lang.String)
public static final void setNullableVar(@org.jetbrains.annotations.Nullable() java.lang.String);// setNullableVar(java.lang.String)
private static final java.lang.String privateFun(java.lang.String a, java.lang.String b) { /* compiled code */ }
}

17
compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.java vendored
View File

@@ -1,12 +1,13 @@
public interface Generic <N, NN> {
N a(N n);
public abstract interface Generic /* Generic*/<N, NN> {
@org.jetbrains.annotations.NotNull()
public abstract NN b(@org.jetbrains.annotations.NotNull() NN);// b(NN)
@org.jetbrains.annotations.NotNull
NN b(@org.jetbrains.annotations.NotNull NN nn);
@org.jetbrains.annotations.Nullable()
public abstract N a1(@org.jetbrains.annotations.Nullable() N);// a1(N)
@org.jetbrains.annotations.Nullable
N a1(@org.jetbrains.annotations.Nullable N n);
@org.jetbrains.annotations.Nullable()
public abstract NN b1(@org.jetbrains.annotations.Nullable() NN);// b1(NN)
public abstract N a(N);// a(N)
@org.jetbrains.annotations.Nullable
NN b1(@org.jetbrains.annotations.Nullable NN nn);
}

15
compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.java vendored
View File

@@ -1,11 +1,12 @@
public final class C implements Tr {
private final int v;
public final class C /* C*/ implements Tr {
private final int v;
@org.jetbrains.annotations.NotNull
public java.lang.Integer foo() { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
public java.lang.Integer foo();// foo()
@org.jetbrains.annotations.NotNull
public java.lang.Integer getV() { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
public java.lang.Integer getV();// getV()
public C();// .ctor()
public C() { /* compiled code */ }
}

23
compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.java vendored
View File

@@ -1,15 +1,16 @@
public final class C {
@kotlin.jvm.JvmOverloads
@org.jetbrains.annotations.NotNull
public final java.lang.String foo(@org.jetbrains.annotations.NotNull java.lang.String o, @org.jetbrains.annotations.NotNull java.lang.String o1, @org.jetbrains.annotations.NotNull java.lang.String o3, @org.jetbrains.annotations.Nullable java.lang.String o4) { /* compiled code */ }
public final class C /* C*/ {
@kotlin.jvm.JvmOverloads()
@org.jetbrains.annotations.NotNull()
public final java.lang.String foo(@org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.Nullable() java.lang.String);// foo(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
@kotlin.jvm.JvmOverloads
@org.jetbrains.annotations.NotNull
public final java.lang.String foo(@org.jetbrains.annotations.NotNull java.lang.String o, @org.jetbrains.annotations.NotNull java.lang.String o1, @org.jetbrains.annotations.Nullable java.lang.String o4) { /* compiled code */ }
@kotlin.jvm.JvmOverloads()
@org.jetbrains.annotations.NotNull()
public final java.lang.String foo(@org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.Nullable() java.lang.String);// foo(java.lang.String, java.lang.String, java.lang.String)
@kotlin.jvm.JvmOverloads
@org.jetbrains.annotations.NotNull
public final java.lang.String foo(@org.jetbrains.annotations.NotNull java.lang.String o1, @org.jetbrains.annotations.Nullable java.lang.String o4) { /* compiled code */ }
@kotlin.jvm.JvmOverloads()
@org.jetbrains.annotations.NotNull()
public final java.lang.String foo(@org.jetbrains.annotations.NotNull() java.lang.String, @org.jetbrains.annotations.Nullable() java.lang.String);// foo(java.lang.String, java.lang.String)
public C();// .ctor()
public C() { /* compiled code */ }
}

7
compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.java vendored
View File

@@ -1,4 +1,5 @@
public final class NullableUnitReturnKt {
@org.jetbrains.annotations.Nullable
public static final kotlin.Unit foo() { /* compiled code */ }
public final class NullableUnitReturnKt /* NullableUnitReturnKt*/ {
@org.jetbrains.annotations.Nullable()
public static final kotlin.Unit foo();// foo()
}

7
compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.java vendored
View File

@@ -1,5 +1,6 @@
public final class C implements Base {
public void foo() { /* compiled code */ }
public final class C /* C*/ implements Base {
public C();// .ctor()
public void foo();// foo()
public C() { /* compiled code */ }
}

17
compiler/testData/asJava/lightClasses/nullabilityAnnotations/PlatformTypes.java vendored
View File

@@ -1,11 +1,12 @@
public final class PlatformTypes {
public final java.lang.String simplyPlatform() { /* compiled code */ }
public final class PlatformTypes /* PlatformTypes*/ {
@org.jetbrains.annotations.NotNull()
public final java.util.List<java.lang.String> bothNotNull();// bothNotNull()
@org.jetbrains.annotations.Nullable
public final java.util.List<java.lang.String> bothNullable() { /* compiled code */ }
@org.jetbrains.annotations.Nullable()
public final java.util.List<java.lang.String> bothNullable();// bothNullable()
@org.jetbrains.annotations.NotNull
public final java.util.List<java.lang.String> bothNotNull() { /* compiled code */ }
public PlatformTypes();// .ctor()
public PlatformTypes() { /* compiled code */ }
}
public final java.lang.String simplyPlatform();// simplyPlatform()
}

53
compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.java vendored
View File

@@ -1,43 +1,44 @@
public interface Primitives {
int $$int /* Real name is 'int' */(int i);
public abstract interface Primitives /* Primitives*/ {
@org.jetbrains.annotations.Nullable()
public abstract java.lang.Boolean getNullableBool();// getNullableBool()
@org.jetbrains.annotations.Nullable
java.lang.Boolean getNullableBool();
@org.jetbrains.annotations.Nullable()
public abstract java.lang.Byte getNullableByte();// getNullableByte()
@org.jetbrains.annotations.Nullable
java.lang.Byte getNullableByte();
@org.jetbrains.annotations.Nullable()
public abstract java.lang.Character getNullableChar();// getNullableChar()
@org.jetbrains.annotations.Nullable
java.lang.Short getNullableShort();
@org.jetbrains.annotations.Nullable()
public abstract java.lang.Double getNullableDouble();// getNullableDouble()
@org.jetbrains.annotations.Nullable
java.lang.Character getNullableChar();
@org.jetbrains.annotations.Nullable()
public abstract java.lang.Float getNullableFloat();// getNullableFloat()
@org.jetbrains.annotations.Nullable
java.lang.Integer getNullableInt();
@org.jetbrains.annotations.Nullable()
public abstract java.lang.Integer getNullableInt();// getNullableInt()
@org.jetbrains.annotations.Nullable
java.lang.Long getNullableLong();
@org.jetbrains.annotations.Nullable()
public abstract java.lang.Long getNullableLong();// getNullableLong()
@org.jetbrains.annotations.Nullable
java.lang.Float getNullableFloat();
@org.jetbrains.annotations.Nullable()
public abstract java.lang.Short getNullableShort();// getNullableShort()
@org.jetbrains.annotations.Nullable
java.lang.Double getNullableDouble();
public abstract boolean getBool();// getBool()
boolean getBool();
public abstract byte getByte();// getByte()
byte getByte();
public abstract char getChar();// getChar()
short getShort();
public abstract double getDouble();// getDouble()
char getChar();
public abstract float getFloat();// getFloat()
int getInt();
public abstract int getInt();// getInt()
long getLong();
public abstract int int(int);// int(int)
float getFloat();
public abstract long getLong();// getLong()
public abstract short getShort();// getShort()
double getDouble();
}

15
compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.java vendored
View File

@@ -1,11 +1,12 @@
public final class PrivateInClass {
private final java.lang.String getNn() { /* compiled code */ }
public final class PrivateInClass /* PrivateInClass*/ {
private PrivateInClass(java.lang.String);// .ctor(java.lang.String)
private final void setNn(java.lang.String value) { /* compiled code */ }
private final java.lang.String bar(java.lang.String, java.lang.String);// bar(java.lang.String, java.lang.String)
private final java.lang.String getN() { /* compiled code */ }
private final java.lang.String getN();// getN()
private final java.lang.String bar(java.lang.String a, java.lang.String b) { /* compiled code */ }
private final java.lang.String getNn();// getNn()
private PrivateInClass(java.lang.String g) { /* compiled code */ }
}
private final void setNn(java.lang.String);// setNn(java.lang.String)
}

17
compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.java vendored
View File

@@ -1,11 +1,12 @@
public final class Synthetic {
private final void foo() { /* compiled code */ }
public final class Synthetic /* Synthetic*/ {
private final void foo();// foo()
public Synthetic() { /* compiled code */ }
public Synthetic();// .ctor()
public final class Inner {
public final void test() { /* compiled code */ }
public Inner() { /* compiled code */ }
}
}
public final class Inner /* Synthetic.Inner*/ {
public Inner();// .ctor()
public final void test();// test()
}}

51
compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.java vendored
View File

@@ -1,37 +1,38 @@
public interface Trait {
@org.jetbrains.annotations.NotNull
java.lang.String notNull(@org.jetbrains.annotations.NotNull java.lang.String p);
public abstract interface Trait /* Trait*/ {
@org.jetbrains.annotations.NotNull()
@org.jetbrains.annotations.Nullable()
public abstract java.lang.String notNullWithN();// notNullWithN()
@org.jetbrains.annotations.Nullable
java.lang.String nullable(@org.jetbrains.annotations.Nullable java.lang.String p);
@org.jetbrains.annotations.NotNull()
@org.jetbrains.annotations.Nullable()
public abstract java.lang.String nullableWithNN();// nullableWithNN()
@org.jetbrains.annotations.NotNull
java.lang.String notNullWithNN();
@org.jetbrains.annotations.NotNull()
public abstract java.lang.String getNotNullVal();// getNotNullVal()
@org.jetbrains.annotations.Nullable
@org.jetbrains.annotations.NotNull
java.lang.String notNullWithN();
@org.jetbrains.annotations.NotNull()
public abstract java.lang.String getNotNullVar();// getNotNullVar()
@org.jetbrains.annotations.Nullable
java.lang.String nullableWithN();
@org.jetbrains.annotations.NotNull()
public abstract java.lang.String notNull(@org.jetbrains.annotations.NotNull() java.lang.String);// notNull(java.lang.String)
@org.jetbrains.annotations.NotNull
@org.jetbrains.annotations.Nullable
java.lang.String nullableWithNN();
@org.jetbrains.annotations.NotNull()
public abstract java.lang.String notNullWithNN();// notNullWithNN()
@org.jetbrains.annotations.Nullable
java.lang.String getNullableVal();
@org.jetbrains.annotations.Nullable()
public abstract java.lang.String getNullableVal();// getNullableVal()
@org.jetbrains.annotations.Nullable
java.lang.String getNullableVar();
@org.jetbrains.annotations.Nullable()
public abstract java.lang.String getNullableVar();// getNullableVar()
void setNullableVar(@org.jetbrains.annotations.Nullable java.lang.String p);
@org.jetbrains.annotations.Nullable()
public abstract java.lang.String nullable(@org.jetbrains.annotations.Nullable() java.lang.String);// nullable(java.lang.String)
@org.jetbrains.annotations.NotNull
java.lang.String getNotNullVal();
@org.jetbrains.annotations.Nullable()
public abstract java.lang.String nullableWithN();// nullableWithN()
@org.jetbrains.annotations.NotNull
java.lang.String getNotNullVar();
public abstract void setNotNullVar(@org.jetbrains.annotations.NotNull() java.lang.String);// setNotNullVar(java.lang.String)
public abstract void setNullableVar(@org.jetbrains.annotations.Nullable() java.lang.String);// setNullableVar(java.lang.String)
void setNotNullVar(@org.jetbrains.annotations.NotNull java.lang.String p);
}

2
compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.kt vendored
View File

@@ -10,7 +10,7 @@ interface Trait {
@NotNull fun notNullWithNN(): String
@Nullable fun notNullWithN(): String
@Nullable fun nullableWithN(): String?
@Nullable fun `nullableWithN`(): String?
@NotNull fun nullableWithNN(): String?
val nullableVal: String?

7
compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.java vendored
View File

@@ -1,5 +1,6 @@
public final class C implements Base<kotlin.Unit> {
public void foo(@org.jetbrains.annotations.NotNull kotlin.Unit t) { /* compiled code */ }
public final class C /* C*/ implements Base<kotlin.Unit> {
public C();// .ctor()
public void foo(@org.jetbrains.annotations.NotNull() kotlin.Unit);// foo(kotlin.Unit)
public C() { /* compiled code */ }
}

5
compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.java vendored
View File

@@ -1,3 +1,4 @@
public final class UnitParameterKt {
public static final void foo(@org.jetbrains.annotations.NotNull kotlin.Unit s) { /* compiled code */ }
public final class UnitParameterKt /* UnitParameterKt*/ {
public static final void foo(@org.jetbrains.annotations.NotNull() kotlin.Unit);// foo(kotlin.Unit)
}

5
compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.java vendored
View File

@@ -1,3 +1,4 @@
public final class VoidReturnKt {
public static final void foo(@org.jetbrains.annotations.NotNull java.lang.String g) { /* compiled code */ }
public final class VoidReturnKt /* VoidReturnKt*/ {
public static final void foo(@org.jetbrains.annotations.NotNull() java.lang.String);// foo(java.lang.String)
}

35
compiler/testData/asJava/lightClasses/object/SimpleObject.java vendored
View File

@@ -1,21 +1,26 @@
public final class A {
private static final int c;
@org.jetbrains.annotations.NotNull
private static java.lang.String v;
public static final int cc = 1;
@org.jetbrains.annotations.NotNull
public static final java.lang.String cv = "A";
@org.jetbrains.annotations.NotNull
public static final pack.A INSTANCE;
public final class A /* pack.A*/ {
@org.jetbrains.annotations.NotNull()
private static java.lang.String v;
public final int getC() { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
public static final java.lang.String cv = "A" /* initializer type: java.lang.String */ /* constant value A */;
@org.jetbrains.annotations.NotNull
public final java.lang.String getV() { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
public static final pack.A INSTANCE;
public final void setV(@org.jetbrains.annotations.NotNull java.lang.String p) { /* compiled code */ }
private static final int c;
public final int f() { /* compiled code */ }
public static final int cc = 1 /* initializer type: int */ /* constant value 1 */;
@org.jetbrains.annotations.NotNull()
public final java.lang.String getV();// getV()
private A();// .ctor()
public final int f();// f()
public final int getC();// getC()
public final void setV(@org.jetbrains.annotations.NotNull() java.lang.String);// setV(java.lang.String)
private A() { /* compiled code */ }
}

24
compiler/testData/asJava/lightClasses/publicField/CompanionObject.java vendored
View File

@@ -1,13 +1,15 @@
public final class C {
@kotlin.jvm.JvmField
@org.jetbrains.annotations.NotNull
public static final java.lang.String foo;
@org.jetbrains.annotations.NotNull
public static final C.Companion Companion;
public final class C /* C*/ {
@kotlin.jvm.JvmField()
@org.jetbrains.annotations.NotNull()
public static final java.lang.String foo;
public C() { /* compiled code */ }
@org.jetbrains.annotations.NotNull()
public static final C.Companion Companion;
public static final class Companion {
private Companion() { /* compiled code */ }
}
}
public C();// .ctor()
public static final class Companion /* C.Companion*/ {
private Companion();// .ctor()
}}

11
compiler/testData/asJava/lightClasses/publicField/Simple.java vendored
View File

@@ -1,7 +1,8 @@
public final class C {
@kotlin.jvm.JvmField
@org.jetbrains.annotations.NotNull
public final java.lang.String foo;
public final class C /* C*/ {
@kotlin.jvm.JvmField()
@org.jetbrains.annotations.NotNull()
public final java.lang.String foo;
public C();// .ctor()
public C() { /* compiled code */ }
}

7
compiler/testData/asJava/lightClasses/script/HelloWorld.java vendored
View File

@@ -1,5 +1,6 @@
public class HelloWorld extends kotlin.script.templates.standard.ScriptTemplateWithArgs {
public static final void main(java.lang.String[] p) { /* compiled code */ }
public class HelloWorld /* HelloWorld*/ extends kotlin.script.templates.standard.ScriptTemplateWithArgs {
public HelloWorld(java.lang.String[]);// .ctor(java.lang.String[])
public static final void main(java.lang.String[]);// main(java.lang.String[])
public HelloWorld(java.lang.String[] p) { /* compiled code */ }
}

34
compiler/testData/asJava/lightClasses/script/InnerClasses.java vendored
View File

@@ -1,24 +1,26 @@
public class InnerClasses extends kotlin.script.templates.standard.ScriptTemplateWithArgs {
public static final void main(java.lang.String[] p) { /* compiled code */ }
public class InnerClasses /* InnerClasses*/ extends kotlin.script.templates.standard.ScriptTemplateWithArgs {
public InnerClasses(java.lang.String[]);// .ctor(java.lang.String[])
public InnerClasses(java.lang.String[] p) { /* compiled code */ }
public static final void main(java.lang.String[]);// main(java.lang.String[])
public static final class Bar {
private final int b;
private final int a;
public final int getB() { /* compiled code */ }
public static final class Bar /* InnerClasses.Bar*/ {
private final int a;
public final int getAPlusB() { /* compiled code */ }
private final int b;
public final int getA() { /* compiled code */ }
public Bar(int);// .ctor(int)
public Bar(int a) { /* compiled code */ }
public final int getA();// getA()
public static final class Baz {
public final void doSomething() { /* compiled code */ }
public final int getAPlusB();// getAPlusB()
public Baz() { /* compiled code */ }
}
}
}
public final int getB();// getB()
public static final class Baz /* InnerClasses.Bar.Baz*/ {
public Baz();// .ctor()
public final void doSomething();// doSomething()
}}}

7
compiler/testData/asJava/script/ide/HelloWorld.java vendored
View File

@@ -1,5 +1,6 @@
public class HelloWorld {
public static final void main(java.lang.String[] p) { /* compiled code */ }
public class HelloWorld /* HelloWorld*/ extends kotlin.script.templates.standard.ScriptTemplateWithArgs {
public HelloWorld();// .ctor()
public static final void main(java.lang.String[]);// main(java.lang.String[])
public HelloWorld() { /* compiled code */ }
}

34
compiler/testData/asJava/script/ide/InnerClasses.java vendored
View File

@@ -1,24 +1,26 @@
public class InnerClasses {
public static final void main(java.lang.String[] p) { /* compiled code */ }
public class InnerClasses /* InnerClasses*/ extends kotlin.script.templates.standard.ScriptTemplateWithArgs {
public InnerClasses();// .ctor()
public InnerClasses() { /* compiled code */ }
public static final void main(java.lang.String[]);// main(java.lang.String[])
public static final class Bar {
private final int b;
private final int a;
public final int getB() { /* compiled code */ }
public static final class Bar /* InnerClasses.Bar*/ {
private final int a;
public final int getAPlusB() { /* compiled code */ }
private final int b;
public final int getA() { /* compiled code */ }
public Bar(int);// .ctor(int)
public Bar(int a) { /* compiled code */ }
public final int getA();// getA()
public static final class Baz {
public final void doSomething() { /* compiled code */ }
public final int getAPlusB();// getAPlusB()
public Baz() { /* compiled code */ }
}
}
}
public final int getB();// getB()
public static final class Baz /* InnerClasses.Bar.Baz*/ {
public Baz();// .ctor()
public final void doSomething();// doSomething()
}}}

1
compiler/testData/asJava/ultraLightClasses/annotationWithSetParamPropertyModifier.java vendored
View File

@@ -5,7 +5,6 @@ public abstract @interface Anno /* Anno*/ {
public final class TestClass /* TestClass*/ {
private int hello;
@null()
public TestClass(int);// .ctor(int)
public final int getHello();// getHello()

15
compiler/testData/asJava/ultraLightClasses/delegatesWithAnnotations.java vendored
View File

@@ -1,34 +1,28 @@
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
public abstract @interface SimpleAnn /* SimpleAnn*/ {
@null()
public abstract java.lang.String value();// value()
}
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
public abstract @interface Ann /* Ann*/ {
@null()
public abstract SimpleAnn[] t();// t()
@null()
public abstract int x();// x()
public abstract java.lang.Class<?> z();// z()
@null()
public abstract java.lang.Class<?>[] e();// e()
@null()
public abstract java.lang.String y();// y()
@null()
public abstract kotlin.DeprecationLevel depr();// depr()
public abstract int x();// x()
}
public abstract interface Base /* Base*/ {
@Ann(x = 1, y = "134", z = String::class, e = {Int::class, Double::class}, depr = DeprecationLevel.WARNING, t = {@SimpleAnn(value = "243"), @SimpleAnn(value = "4324")})
public abstract void foo(@Ann(x = 2, y = "324", z = Ann::class, e = {Byte::class, Base::class}, depr = DeprecationLevel.WARNING, t = {@SimpleAnn(value = "687"), @SimpleAnn(value = "78")}) @org.jetbrains.annotations.NotNull() java.lang.String);// foo(java.lang.String)
@Ann(x = 1, y = "134", z = String::class, e = {Int::class, Double::class}, depr = kotlin.DeprecationLevel.WARNING, t = {@SimpleAnn(value = "243"), @SimpleAnn(value = "4324")})
public abstract void foo(@Ann(x = 2, y = "324", z = Ann::class, e = {Byte::class, Base::class}, depr = kotlin.DeprecationLevel.WARNING, t = {@SimpleAnn(value = "687"), @SimpleAnn(value = "78")}) @org.jetbrains.annotations.NotNull() java.lang.String);// foo(java.lang.String)
}
@@ -36,7 +30,6 @@ public final class Derived /* Derived*/ implements Base {
@Ann(x = 1, y = "134", z = java.lang.String.class, e = {int.class, double.class}, depr = kotlin.DeprecationLevel.WARNING, t = {@SimpleAnn(value="243"), @SimpleAnn(value="4324")})
public void foo(@Ann(x = 2, y = "324", z = Ann.class, e = {byte.class, Base.class}, depr = kotlin.DeprecationLevel.WARNING, t = {@SimpleAnn(value="687"), @SimpleAnn(value="78")}) @org.jetbrains.annotations.NotNull() java.lang.String);// foo(java.lang.String)
@null()
public Derived(@org.jetbrains.annotations.NotNull() Base);// .ctor(Base)
}

8
compiler/testData/asJava/ultraLightClasses/dollarsInNameLocal.java vendored
View File

@@ -1,5 +1,4 @@
public final class Foo /* c.b.a.Foo*/ {
@null()
public Foo();// .ctor()
public final void bar();// bar()
@@ -7,9 +6,10 @@ public final class Foo /* c.b.a.Foo*/ {
}
public static final class A$B /* null*/ {
@null()
public A$B();// .ctor()
class $$$$$$$ ...
class C$D ...
@@ -17,21 +17,19 @@ public static final class A$B /* null*/ {
}
public final class C$D /* null*/ {
@null()
public C$D();// .ctor()
}
public final class $$$$$$$ /* null*/ {
@null()
public $$$$$$$();// .ctor()
class G$G$ ...
}
public final class G$G$ /* null*/ {
@null()
public G$G$();// .ctor()
}

21
compiler/testData/asJava/ultraLightClasses/inferringAnonymousObjectTypes.java vendored
View File

@@ -1,7 +1,6 @@
public final class Prop /* Prop*/ {
private final java.lang.Object someProp;
@null()
public Prop();// .ctor()
}
@@ -12,16 +11,16 @@ final class null /* null*/ {
}
final class C /* C*/ {
private final int y;
@org.jetbrains.annotations.NotNull()
private final kotlin.jvm.functions.Function0<java.lang.Object> initChild;
@null()
public C(int);// .ctor(int)
private final int y;
@org.jetbrains.annotations.NotNull()
public final kotlin.jvm.functions.Function0<java.lang.Object> getInitChild();// getInitChild()
public C(int);// .ctor(int)
public final int getY();// getY()
}
@@ -35,17 +34,17 @@ final class null /* null*/ {
}
public final class ValidPublicSupertype /* ValidPublicSupertype*/ {
@org.jetbrains.annotations.NotNull()
private final java.lang.Runnable x;
@null()
public ValidPublicSupertype();// .ctor()
@org.jetbrains.annotations.NotNull()
public final java.lang.Runnable bar();// bar()
@org.jetbrains.annotations.NotNull()
public final java.lang.Runnable getX();// getX()
public ValidPublicSupertype();// .ctor()
}
final class null /* null*/ implements java.lang.Runnable {
@@ -66,17 +65,17 @@ public abstract interface I /* I*/ {
}
public final class InvalidPublicSupertype /* InvalidPublicSupertype*/ {
@org.jetbrains.annotations.NotNull()
private final java.lang.Runnable x;
@null()
public InvalidPublicSupertype();// .ctor()
@org.jetbrains.annotations.NotNull()
public final java.lang.Runnable bar();// bar()
@org.jetbrains.annotations.NotNull()
public final java.lang.Runnable getX();// getX()
public InvalidPublicSupertype();// .ctor()
}
final class null /* null*/ implements I, java.lang.Runnable {

1
compiler/testData/asJava/ultraLightClasses/inlineClasses.java vendored
View File

@@ -9,7 +9,6 @@ public enum Foo /* Foo*/ {
}
public final class InlinedDelegate /* InlinedDelegate*/<T> {
@null()
public final T getNode();// getNode()
}

1
compiler/testData/asJava/ultraLightClasses/jvmSyntheticForAccessors.java vendored
View File

@@ -1,5 +1,4 @@
public final class X /* X*/ {
@null()
public X();// .ctor()
public final int getW();// getW()

3
compiler/testData/asJava/ultraLightClasses/localClassDerived.java vendored
View File

@@ -1,5 +1,4 @@
public final class Boo /* Boo*/ {
@null()
public Boo();// .ctor()
public final void fooBar();// fooBar()
@@ -7,13 +6,11 @@ public final class Boo /* Boo*/ {
}
public static final class LocalClassBase /* null*/ {
@null()
public LocalClassBase();// .ctor()
}
public static final class LocalClassDerived /* null*/ extends LocalClassBase {
@null()
public LocalClassDerived();// .ctor()
}

3
compiler/testData/asJava/ultraLightClasses/properties.kt vendored
View File

@@ -91,9 +91,6 @@ class MyProperty<T> {
class Modifiers {
@delegate:Transient
val plainField: Int = 1
@delegate:Transient
val lazy by lazy { 1 }
}
interface A {

3
compiler/testData/asJava/ultraLightFacades/properties.kt vendored
View File

@@ -61,9 +61,6 @@ operator fun setValue(t: T, p: KProperty<*>, i: Int) {}
@delegate:Transient
val plainField: Int = 1
@delegate:Transient
val lazy by lazy { 1 }
public var int1: Int
private set
protected get

9
compiler/testData/asJava/ultraLightScripts/FunsPropsAndFields.java vendored
View File

@@ -1,4 +1,4 @@
public class FunsPropsAndFields /* FunsPropsAndFields*/ {
public class FunsPropsAndFields /* FunsPropsAndFields*/ extends kotlin.script.templates.standard.ScriptTemplateWithArgs {
@kotlin.jvm.JvmField()
public final int testField;
@@ -6,18 +6,17 @@ public class FunsPropsAndFields /* FunsPropsAndFields*/ {
private int testPropVar;
@null()
public FunsPropsAndFields(@null() java.lang.String[]);// .ctor(java.lang.String[])
@org.jetbrains.annotations.NotNull()
public final java.lang.String testFun(int);// testFun(int)
public FunsPropsAndFields(java.lang.String[]);// .ctor(java.lang.String[])
public final int getTestPropVal();// getTestPropVal()
public final int getTestPropVar();// getTestPropVar()
public final void setTestPropVar(int);// setTestPropVar(int)
public static final void main(@null() java.lang.String[]);// main(java.lang.String[])
public static final void main(java.lang.String[]);// main(java.lang.String[])
}

7
compiler/testData/asJava/ultraLightScripts/HelloWorld.java vendored
View File

@@ -1,7 +1,6 @@
public class HelloWorld /* HelloWorld*/ {
@null()
public HelloWorld(@null() java.lang.String[]);// .ctor(java.lang.String[])
public class HelloWorld /* HelloWorld*/ extends kotlin.script.templates.standard.ScriptTemplateWithArgs {
public HelloWorld(java.lang.String[]);// .ctor(java.lang.String[])
public static final void main(@null() java.lang.String[]);// main(java.lang.String[])
public static final void main(java.lang.String[]);// main(java.lang.String[])
}

7
compiler/testData/asJava/ultraLightScripts/InnerClasses.java vendored
View File

@@ -1,8 +1,7 @@
public class InnerClasses /* InnerClasses*/ {
@null()
public InnerClasses(@null() java.lang.String[]);// .ctor(java.lang.String[])
public class InnerClasses /* InnerClasses*/ extends kotlin.script.templates.standard.ScriptTemplateWithArgs {
public InnerClasses(java.lang.String[]);// .ctor(java.lang.String[])
public static final void main(@null() java.lang.String[]);// main(java.lang.String[])
public static final void main(java.lang.String[]);// main(java.lang.String[])
class Bar ...

12
compiler/tests-common/tests/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt
View File

@@ -9,6 +9,7 @@ import com.intellij.openapi.util.io.FileUtil
import com.intellij.psi.PsiClass
import com.intellij.psi.impl.compiled.ClsElementImpl
import junit.framework.TestCase
import org.jetbrains.kotlin.asJava.PsiClassRenderer.renderClass
import org.jetbrains.kotlin.asJava.classes.KtLightClass
import org.jetbrains.kotlin.test.KotlinTestUtils
import java.io.File
@@ -22,7 +23,7 @@ object LightClassTestCommon {
expectedFile: File,
testDataFile: File,
findLightClass: (String) -> PsiClass?,
normalizeText: (String) -> String
normalizeText: (String) -> String,
) {
val text = FileUtil.loadFile(testDataFile, true)
val matcher = SUBJECT_FQ_NAME_PATTERN.matcher(text)
@@ -40,14 +41,7 @@ object LightClassTestCommon {
return NOT_GENERATED_DIRECTIVE
}
TestCase.assertTrue("Not a light class: $lightClass ($fqName)", lightClass is KtLightClass)
val delegate = (lightClass as KtLightClass).clsDelegate
TestCase.assertTrue("Not a CLS element: $delegate", delegate is ClsElementImpl)
val buffer = StringBuilder()
(delegate as ClsElementImpl).appendMirrorText(0, buffer)
return normalizeText(buffer.toString())
return normalizeText(lightClass.renderClass(renderInner = true))
}
// Actual text for light class is generated with ClsElementImpl.appendMirrorText() that can find empty DefaultImpl inner class in stubs

243
compiler/tests-common/tests/org/jetbrains/kotlin/asJava/PsiClassRenderer.kt Normal file
View File

@@ -0,0 +1,243 @@
/*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.asJava
import com.intellij.psi.*
import com.intellij.psi.util.MethodSignature
import org.jetbrains.kotlin.asJava.elements.KtLightNullabilityAnnotation
import org.jetbrains.kotlin.asJava.elements.KtLightPsiArrayInitializerMemberValue
import org.jetbrains.kotlin.asJava.elements.KtLightPsiLiteral
import org.jetbrains.kotlin.load.kotlin.NON_EXISTENT_CLASS_NAME
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.Name
object PsiClassRenderer {
private fun PsiType.renderType() = getCanonicalText(true)
private fun PsiReferenceList?.renderRefList(keyword: String, sortReferences: Boolean = true): String {
if (this == null) return ""
val references = referencedTypes
if (references.isEmpty()) return ""
val referencesTypes = references.map { it.renderType() }.toTypedArray()
if (sortReferences) referencesTypes.sort()
return " " + keyword + " " + referencesTypes.joinToString()
}
private fun PsiVariable.renderVar(): String {
var result = this.renderModifiers(type) + type.renderType() + " " + name
if (this is PsiParameter && this.isVarArgs) {
result += " /* vararg */"
}
if (hasInitializer()) {
result += " = ${initializer?.text} /* initializer type: ${initializer?.type?.renderType()} */"
}
computeConstantValue()?.let { result += " /* constant value $it */" }
return result
}
private fun Array<PsiTypeParameter>.renderTypeParams() =
if (isEmpty()) ""
else "<" + joinToString {
val bounds =
if (it.extendsListTypes.isNotEmpty())
" extends " + it.extendsListTypes.joinToString(" & ", transform = { it.renderType() })
else ""
it.name!! + bounds
} + "> "
private fun KtLightPsiLiteral.renderKtLightPsiLiteral(): String =
(value as? Pair<*, *>)?.let {
val classId = it.first as? ClassId
val name = it.second as? Name
if (classId != null && name != null) "${classId.asSingleFqName()}.${name.asString()}" else null
} ?: text
private fun PsiAnnotationMemberValue.renderAnnotationMemberValue(): String = when (this) {
is KtLightPsiArrayInitializerMemberValue -> "{${initializers.joinToString { it.renderAnnotationMemberValue() }}}"
is PsiAnnotation -> renderAnnotation()
is KtLightPsiLiteral -> renderKtLightPsiLiteral()
else -> text
}
private fun PsiMethod.renderMethod() =
renderModifiers(returnType) +
(if (isVarArgs) "/* vararg */ " else "") +
typeParameters.renderTypeParams() +
(returnType?.renderType() ?: "") + " " +
name +
"(" + parameterList.parameters.joinToString { it.renderModifiers(it.type) + it.type.renderType() } + ")" +
(this as? PsiAnnotationMethod)?.defaultValue?.let { " default " + it.renderAnnotationMemberValue() }.orEmpty() +
throwsList.referencedTypes.let { thrownTypes ->
if (thrownTypes.isEmpty()) ""
else " throws " + thrownTypes.joinToString { it.renderType() }
} +
";" +
"// ${getSignature(PsiSubstitutor.EMPTY).renderSignature()}"
private fun MethodSignature.renderSignature(): String {
val typeParams = typeParameters.renderTypeParams()
val paramTypes = parameterTypes.joinToString(prefix = "(", postfix = ")") { it.renderType() }
val name = if (isConstructor) ".ctor" else name
return "$typeParams $name$paramTypes"
}
private fun PsiEnumConstant.renderEnumConstant(renderInner: Boolean): String {
val initializingClass = initializingClass ?: return name
return buildString {
appendLine("$name {")
append(initializingClass.renderMembers(renderInner))
append("}")
}
}
fun PsiClass.renderClass(renderInner: Boolean = false): String {
val classWord = when {
isAnnotationType -> "@interface"
isInterface -> "interface"
isEnum -> "enum"
else -> "class"
}
return buildString {
append(renderModifiers())
append("$classWord ")
append("$name /* $qualifiedName*/")
append(typeParameters.renderTypeParams())
append(extendsList.renderRefList("extends"))
append(implementsList.renderRefList("implements"))
appendLine(" {")
if (isEnum) {
append(
fields
.filterIsInstance<PsiEnumConstant>()
.joinToString(",\n") { it.renderEnumConstant(renderInner) }.prependDefaultIndent()
)
append(";\n\n")
}
append(renderMembers(renderInner))
append("}")
}
}
private fun PsiClass.renderMembers(renderInner: Boolean): String {
return buildString {
appendSorted(
fields
.filterNot { it is PsiEnumConstant }
.map { it.renderVar().prependDefaultIndent() + ";\n\n" }
)
appendSorted(
methods
.map { it.renderMethod().prependDefaultIndent() + "\n\n" }
)
appendSorted(
innerClasses.map {
appendLine()
if (renderInner)
it.renderClass(renderInner)
else
"class ${it.name} ...\n\n".prependDefaultIndent()
}
)
}
}
private fun StringBuilder.appendSorted(list: List<String>) {
append(list.sorted().joinToString(""))
}
private fun String.prependDefaultIndent() = prependIndent(" ")
private fun PsiAnnotation.renderAnnotation(): String {
if (qualifiedName == "kotlin.Metadata") return ""
val renderedAttributes = parameterList.attributes.map {
val attributeValue = it.value?.renderAnnotationMemberValue() ?: "?"
val isAnnotationQualifiedName =
(qualifiedName?.startsWith("java.lang.annotation.") == true || qualifiedName?.startsWith("kotlin.annotation.") == true)
val name = if (it.name == null && isAnnotationQualifiedName) "value" else it.name
if (name != null) "$name = $attributeValue" else attributeValue
}
val renderedAttributesString = renderedAttributes.joinToString()
if (qualifiedName == null && renderedAttributesString.isEmpty()) {
return ""
}
return "@$qualifiedName(${renderedAttributes.joinToString()})"
}
private fun PsiModifierListOwner.renderModifiers(typeIfApplicable: PsiType? = null): String {
val annotationsBuffer = mutableListOf<String>()
var nullableIsRendered = false
var notNullIsRendered = false
for (annotation in annotations) {
if (annotation is KtLightNullabilityAnnotation<*> && skipRenderingNullability(typeIfApplicable)) {
continue
}
if (annotation.qualifiedName == "org.jetbrains.annotations.Nullable") {
if (nullableIsRendered) continue
nullableIsRendered = true
}
if (annotation.qualifiedName == "org.jetbrains.annotations.NotNull") {
if (notNullIsRendered) continue
notNullIsRendered = true
}
val renderedAnnotation = annotation.renderAnnotation()
if (renderedAnnotation.isNotEmpty()) {
annotationsBuffer.add(
renderedAnnotation + (if (this is PsiParameter) " " else "\n")
)
}
}
annotationsBuffer.sort()
val resultBuffer = StringBuffer(annotationsBuffer.joinToString(separator = ""))
for (modifier in PsiModifier.MODIFIERS.filter(::hasModifierProperty)) {
if (modifier == PsiModifier.DEFAULT) {
resultBuffer.append(PsiModifier.ABSTRACT).append(" ")
} else if (modifier != PsiModifier.FINAL || !(this is PsiClass && this.isEnum)) {
resultBuffer.append(modifier).append(" ")
}
}
return resultBuffer.toString()
}
private val NON_EXISTENT_QUALIFIED_CLASS_NAME = NON_EXISTENT_CLASS_NAME.replace("/", ".")
private fun isPrimitiveOrNonExisting(typeIfApplicable: PsiType?): Boolean {
if (typeIfApplicable is PsiPrimitiveType) return true
if (typeIfApplicable?.getCanonicalText(false) == NON_EXISTENT_QUALIFIED_CLASS_NAME) return true
return typeIfApplicable is PsiPrimitiveType
}
private fun PsiModifierListOwner.skipRenderingNullability(typeIfApplicable: PsiType?) =
isPrimitiveOrNonExisting(typeIfApplicable)// || isPrivateOrParameterInPrivateMethod()
}

2
idea/tests/org/jetbrains/kotlin/asJava/KtLightAnnotationTest.kt
View File

@@ -121,7 +121,7 @@ class KtLightAnnotationTest : KotlinLightCodeInsightFixtureTestCase() {
myFixture.testHighlighting("Autowired.java", "AnnotatedClass.kt")
val annotations = myFixture.findClass("AnnotatedClass").fields.single()
.expectAnnotations(2).single { it.qualifiedName == "Autowired" }
.expectAnnotations(1).single { it.qualifiedName == "Autowired" }
val annotationAttributeVal = annotations.findAttributeValue("required") as PsiElement
assertTextRangeAndValue("true", true, annotationAttributeVal)
}

Some files were not shown because too many files have changed in this diff Show More