azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KT-55308, KT-55769 Sort InnerClasses entries. Add DONT_SORT_DECLARATIONS directive

Browse Source
This commit is contained in:
Pavel Mikhailovskii
2023-01-13 01:07:10 +00:00
committed by Space Team
parent 63a0660cc3
commit 38a56ba8e8
14 changed files with 432 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum_ir.txt
Vendored
+100
View File
@@ -0,0 +1,100 @@
@kotlin.Metadata()
public enum E {
/*public static final*/ X /* = new E() */,
/*public static final*/ Y /* = new E() */;
E() {
}
public abstract void a();
public final void b() {
}
@kotlin.Metadata()
public static final class NestedClass {
public NestedClass() {
super();
}
}
@kotlin.Metadata()
public static final class Obj {
@org.jetbrains.annotations.NotNull()
public static final E.Obj INSTANCE = null;
private Obj() {
super();
}
}
}
////////////////////
@kotlin.Metadata()
public enum E2 {
/*public static final*/ X /* = new E2() */,
/*public static final*/ Y /* = new E2() */;
E2(int n) {
}
E2(java.lang.String s) {
}
public abstract void a();
}
////////////////////
@kotlin.Metadata()
public enum E3 {
/*public static final*/ X /* = new E3() */,
/*public static final*/ Y /* = new E3() */;
@org.jetbrains.annotations.NotNull()
private final java.lang.String a = null;
E3(java.lang.String a) {
}
@org.jetbrains.annotations.NotNull()
public final java.lang.String getA() {
return null;
}
}
////////////////////
@kotlin.Metadata()
public enum E4 {
/*public static final*/ X /* = new E4() */;
@org.jetbrains.annotations.NotNull()
private final java.lang.String a = null;
private final int b = 0;
private final long c = 0L;
private final boolean d = false;
E4(java.lang.String a, int b, long c, boolean d) {
}
@org.jetbrains.annotations.NotNull()
public final java.lang.String getA() {
return null;
}
public final int getB() {
return 0;
}
public final long getC() {
return 0L;
}
public final boolean getD() {
return false;
}
}
plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2_ir.txt
Vendored
+21 -21
View File
@@ -29,6 +29,22 @@ public final class A$B {
}
}
@kotlin.Metadata()
public static final class D$$$E {
public D$$$E() {
super();
}
}
@kotlin.Metadata()
public static final class D$$E {
public D$$E() {
super();
}
}
@kotlin.Metadata()
public static final class D$E {
@kotlin.jvm.JvmField()
@@ -60,22 +76,6 @@ public final class A$B {
}
}
}
@kotlin.Metadata()
public static final class D$$E {
public D$$E() {
super();
}
}
@kotlin.Metadata()
public static final class D$$$E {
public D$$$E() {
super();
}
}
}
////////////////////
@@ -88,11 +88,6 @@ public final class Experiment {
super();
}
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
@kotlin.Metadata()
public static abstract @interface Type {
}
@Experiment.Type()
@kotlin.Metadata()
public static final class Group {
@@ -141,6 +136,11 @@ public final class Experiment {
return null;
}
}
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
@kotlin.Metadata()
public static abstract @interface Type {
}
}
////////////////////
plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage_ir.txt
Vendored
+21 -21
View File
@@ -31,6 +31,22 @@ public final class A$B {
}
}
@kotlin.Metadata()
public static final class D$$$E {
public D$$$E() {
super();
}
}
@kotlin.Metadata()
public static final class D$$E {
public D$$E() {
super();
}
}
@kotlin.Metadata()
public static final class D$E {
@kotlin.jvm.JvmField()
@@ -62,22 +78,6 @@ public final class A$B {
}
}
}
@kotlin.Metadata()
public static final class D$$E {
public D$$E() {
super();
}
}
@kotlin.Metadata()
public static final class D$$$E {
public D$$$E() {
super();
}
}
}
////////////////////
@@ -91,11 +91,6 @@ public final class Experiment {
super();
}
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
@kotlin.Metadata()
public static abstract @interface Type {
}
@test.Experiment.Type()
@kotlin.Metadata()
public static final class Group {
@@ -140,6 +135,11 @@ public final class Experiment {
return null;
}
}
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
@kotlin.Metadata()
public static abstract @interface Type {
}
}
////////////////////
plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses_ir.txt
Vendored
+166
View File
@@ -0,0 +1,166 @@
@kotlin.Metadata()
public final class A {
@org.jetbrains.annotations.Nullable()
private final A x = null;
public A() {
super();
}
@org.jetbrains.annotations.Nullable()
public final A getX() {
return null;
}
@org.jetbrains.annotations.Nullable()
public final A f1(@org.jetbrains.annotations.NotNull()
A a, @org.jetbrains.annotations.NotNull()
A.B b) {
return null;
}
@kotlin.Metadata()
public static abstract interface B {
@org.jetbrains.annotations.Nullable()
public abstract A.B getY();
@kotlin.Metadata()
public static final class DefaultImpls {
public DefaultImpls() {
super();
}
}
}
@kotlin.Metadata()
public static final class C {
@org.jetbrains.annotations.NotNull()
public static final A.C INSTANCE = null;
private C() {
super();
}
}
}
////////////////////
@kotlin.Metadata()
public final class A2 {
public A2() {
super();
}
@kotlin.Metadata()
public static final class B {
public B() {
super();
}
@kotlin.Metadata()
public static final class C {
public C() {
super();
}
@kotlin.Metadata()
public static final class D {
public D() {
super();
}
@kotlin.Metadata()
public static final class Cme {
public Cme() {
super();
}
}
@kotlin.Metadata()
public static final class E {
public E() {
super();
}
}
}
}
}
}
////////////////////
@kotlin.Metadata()
public final class Foo {
public Foo() {
super();
}
}
////////////////////
@kotlin.Metadata()
public final class Test {
public Test() {
super();
}
@kotlin.Metadata()
public final class Inner {
public Inner() {
super();
}
}
@kotlin.Metadata()
public static final class Nested {
public Nested() {
super();
}
@kotlin.Metadata()
public static final class NestedNested {
public NestedNested() {
super();
}
}
}
@kotlin.Metadata()
public static enum NestedEnum {
/*public static final*/ BLACK /* = new NestedEnum() */,
/*public static final*/ WHITE /* = new NestedEnum() */;
NestedEnum() {
}
}
@kotlin.Metadata()
public static abstract interface NestedInterface {
}
@kotlin.Metadata()
public static final class NestedObject {
@org.jetbrains.annotations.NotNull()
public static final Test.NestedObject INSTANCE = null;
private NestedObject() {
super();
}
}
}
plugins/kapt3/kapt3-compiler/testData/kotlinRunner/NestedClasses.it_ir.txt
Vendored
+8 -8
View File
@@ -37,6 +37,14 @@ public final class Simple {
}
}
@kotlin.Metadata()
public final class InnerClass {
public InnerClass() {
super();
}
}
@kotlin.Metadata()
public static final class NestedClass {
@@ -52,12 +60,4 @@ public final class Simple {
}
}
}
@kotlin.Metadata()
public final class InnerClass {
public InnerClass() {
super();
}
}
}