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

FIR: introduce flexible types pretty rendering for no arguments case

Browse Source 
#KT-52020 Fixed
This commit is contained in:
Mikhail Glukhikh
2022-06-24 10:52:58 +02:00
committed by Space
parent 31ec10142b
commit 38f4a35be2
265 changed files with 654 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/annotations/AnnotatedParameterInInnerClassConstructor.fir.txt
Vendored
+3 -3
View File
@@ -6,11 +6,11 @@ public/*package*/ open class AnnotatedParameterInInnerClassConstructor : R|kotli
}
public/*package*/ open inner class Inner : R|kotlin/Any| {
public/*package*/ test/AnnotatedParameterInInnerClassConstructor.constructor(@R|test/AnnotatedParameterInInnerClassConstructor.Anno|(value = String(a)) a: R|ft<kotlin/String, kotlin/String?>|, @R|test/AnnotatedParameterInInnerClassConstructor.Anno|(value = String(b)) b: R|ft<kotlin/String, kotlin/String?>|): R|test/AnnotatedParameterInInnerClassConstructor.Inner|
public/*package*/ test/AnnotatedParameterInInnerClassConstructor.constructor(@R|test/AnnotatedParameterInInnerClassConstructor.Anno|(value = String(a)) a: R|kotlin/String!|, @R|test/AnnotatedParameterInInnerClassConstructor.Anno|(value = String(b)) b: R|kotlin/String!|): R|test/AnnotatedParameterInInnerClassConstructor.Inner|
}
public/*package*/ open inner class InnerGeneric<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public/*package*/ test/AnnotatedParameterInInnerClassConstructor.constructor<T : R|ft<kotlin/Any, kotlin/Any?>|>(@R|test/AnnotatedParameterInInnerClassConstructor.Anno|(value = String(a)) a: R|ft<kotlin/String, kotlin/String?>|, @R|test/AnnotatedParameterInInnerClassConstructor.Anno|(value = String(b)) b: R|ft<kotlin/String, kotlin/String?>|): R|test/AnnotatedParameterInInnerClassConstructor.InnerGeneric<T>|
public/*package*/ open inner class InnerGeneric<T : R|kotlin/Any!|> : R|kotlin/Any| {
public/*package*/ test/AnnotatedParameterInInnerClassConstructor.constructor<T : R|kotlin/Any!|>(@R|test/AnnotatedParameterInInnerClassConstructor.Anno|(value = String(a)) a: R|kotlin/String!|, @R|test/AnnotatedParameterInInnerClassConstructor.Anno|(value = String(b)) b: R|kotlin/String!|): R|test/AnnotatedParameterInInnerClassConstructor.InnerGeneric<T>|
}
}
compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
public/*package*/ open class AnnotatedTypeInFun : R|kotlin/Any| {
public/*package*/ open fun foo(@R|test/AnnotatedTypeInFun.Anno|(value = String(a)) a: R|ft<@R|test/AnnotatedTypeInFun.Anno|(value = String(a)) kotlin/String, @R|test/AnnotatedTypeInFun.Anno|(value = String(a)) kotlin/String?>|, @R|test/AnnotatedTypeInFun.Anno|(value = String(b)) b: R|ft<@R|test/AnnotatedTypeInFun.Anno|(value = String(b)) kotlin/String, @R|test/AnnotatedTypeInFun.Anno|(value = String(b)) kotlin/String?>|): R|kotlin/Unit|
public/*package*/ open fun foo(@R|test/AnnotatedTypeInFun.Anno|(value = String(a)) a: R|@R|test/AnnotatedTypeInFun.Anno|(value = String(a)) kotlin/String!|, @R|test/AnnotatedTypeInFun.Anno|(value = String(b)) b: R|@R|test/AnnotatedTypeInFun.Anno|(value = String(b)) kotlin/String!|): R|kotlin/Unit|
public/*package*/ constructor(): R|test/AnnotatedTypeInFun|
compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
public open class AnnotatedValueParameter : R|kotlin/Any| {
public open fun f(@R|test/AnnotatedValueParameter.Anno|(value = String(non-empty)) parameter: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
public open fun f(@R|test/AnnotatedValueParameter.Anno|(value = String(non-empty)) parameter: R|ft<kotlin/collections/MutableList<kotlin/String!>, kotlin/collections/List<kotlin/String!>?>|): R|kotlin/Unit|
public constructor(): R|test/AnnotatedValueParameter|
compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.fir.txt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ public open class ClassObjectArrayInParam : R|kotlin/Any| {
public constructor(vararg value: R|kotlin/Array<kotlin/reflect/KClass<*>>|): R|test/ClassObjectArrayInParam.Anno|
}
@R|test/ClassObjectArrayInParam.Anno|(value = <implicitArrayOf>(<getClass>(<getClass>(R|ft<test/ClassObjectArrayInParam, test/ClassObjectArrayInParam?>|)), <getClass>(<getClass>(R|ft<test/ClassObjectArrayInParam.Nested, test/ClassObjectArrayInParam.Nested?>|)), <getClass>(<getClass>(R|ft<kotlin/String, kotlin/String?>|)), <getClass>(<getClass>(R|ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>|)), <getClass>(<getClass>(R|ft<kotlin/Array<ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>>, kotlin/Array<out ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<out ft<kotlin/String, kotlin/String?>>?>>?>|)), <getClass>(<getClass>(R|ft<kotlin/Array<ft<kotlin/IntArray, kotlin/IntArray?>>, kotlin/Array<out ft<kotlin/IntArray, kotlin/IntArray?>>?>|)), <getClass>(<getClass>(R|kotlin/Unit|)))) public open class Nested : R|kotlin/Any| {
@R|test/ClassObjectArrayInParam.Anno|(value = <implicitArrayOf>(<getClass>(<getClass>(R|test/ClassObjectArrayInParam!|)), <getClass>(<getClass>(R|test/ClassObjectArrayInParam.Nested!|)), <getClass>(<getClass>(R|kotlin/String!|)), <getClass>(<getClass>(R|ft<kotlin/collections/MutableList<kotlin/Any?>, kotlin/collections/List<*>?>|)), <getClass>(<getClass>(R|ft<kotlin/Array<ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>>, kotlin/Array<out ft<kotlin/Array<kotlin/String!>, kotlin/Array<out kotlin/String!>?>>?>|)), <getClass>(<getClass>(R|ft<kotlin/Array<kotlin/IntArray!>, kotlin/Array<out kotlin/IntArray!>?>|)), <getClass>(<getClass>(R|kotlin/Unit|)))) public open class Nested : R|kotlin/Any| {
public constructor(): R|test/ClassObjectArrayInParam.Nested|
}
compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.fir.txt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ public open class ClassObjectInParam : R|kotlin/Any| {
public constructor(value: R|kotlin/reflect/KClass<*>|): R|test/ClassObjectInParam.Anno|
}
@R|test/ClassObjectInParam.Anno|(value = <getClass>(<getClass>(R|ft<test/ClassObjectInParam, test/ClassObjectInParam?>|))) public open class Nested : R|kotlin/Any| {
@R|test/ClassObjectInParam.Anno|(value = <getClass>(<getClass>(R|test/ClassObjectInParam!|))) public open class Nested : R|kotlin/Any| {
public constructor(): R|test/ClassObjectInParam.Nested|
}
compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.fir.txt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ public open class ClassObjectInParamRaw : R|kotlin/Any| {
public constructor(value: R|kotlin/reflect/KClass<*>|, arg: R|kotlin/Array<kotlin/reflect/KClass<*>>|): R|test/ClassObjectInParamRaw.Anno|
}
@R|test/ClassObjectInParamRaw.Anno|(value = <getClass>(<getClass>(R|ft<test/ClassObjectInParamRaw, test/ClassObjectInParamRaw?>|)), arg = <implicitArrayOf>()) public open class Nested : R|kotlin/Any| {
@R|test/ClassObjectInParamRaw.Anno|(value = <getClass>(<getClass>(R|test/ClassObjectInParamRaw!|)), arg = <implicitArrayOf>()) public open class Nested : R|kotlin/Any| {
public constructor(): R|test/ClassObjectInParamRaw.Nested|
}
compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.fir.txt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ public open class ClassObjectInParamVariance : R|kotlin/Any| {
public constructor(): R|test/ClassObjectInParamVariance|
public final annotation class Anno : R|kotlin/Annotation| {
public constructor(arg1: R|kotlin/reflect/KClass<out ft<kotlin/Int, kotlin/Int?>>|, arg2: R|kotlin/reflect/KClass<in ft<kotlin/Int, kotlin/Int?>>|, arg3: R|kotlin/Array<kotlin/reflect/KClass<out ft<kotlin/Int, kotlin/Int?>>>|, arg4: R|kotlin/Array<kotlin/reflect/KClass<in ft<kotlin/Int, kotlin/Int?>>>|, arg5: R|kotlin/Array<kotlin/reflect/KClass<out ft<java/lang/Class<*>, java/lang/Class<*>?>>>|, arg6: R|kotlin/Array<kotlin/reflect/KClass<in ft<java/lang/Class<*>, java/lang/Class<*>?>>>|, arg7: R|kotlin/Array<kotlin/reflect/KClass<out ft<java/lang/Class<ft<kotlin/Int, kotlin/Int?>>, java/lang/Class<ft<kotlin/Int, kotlin/Int?>>?>>>|, arg8: R|kotlin/Array<kotlin/reflect/KClass<in ft<java/lang/Class<ft<kotlin/Int, kotlin/Int?>>, java/lang/Class<ft<kotlin/Int, kotlin/Int?>>?>>>|): R|test/ClassObjectInParamVariance.Anno|
public constructor(arg1: R|kotlin/reflect/KClass<out kotlin/Int!>|, arg2: R|kotlin/reflect/KClass<in kotlin/Int!>|, arg3: R|kotlin/Array<kotlin/reflect/KClass<out kotlin/Int!>>|, arg4: R|kotlin/Array<kotlin/reflect/KClass<in kotlin/Int!>>|, arg5: R|kotlin/Array<kotlin/reflect/KClass<out ft<java/lang/Class<*>, java/lang/Class<*>?>>>|, arg6: R|kotlin/Array<kotlin/reflect/KClass<in ft<java/lang/Class<*>, java/lang/Class<*>?>>>|, arg7: R|kotlin/Array<kotlin/reflect/KClass<out ft<java/lang/Class<kotlin/Int!>, java/lang/Class<kotlin/Int!>?>>>|, arg8: R|kotlin/Array<kotlin/reflect/KClass<in ft<java/lang/Class<kotlin/Int!>, java/lang/Class<kotlin/Int!>?>>>|): R|test/ClassObjectInParamVariance.Anno|
}
}
compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.fir.txt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ public abstract interface CustomAnnotation : R|kotlin/Any| {
public constructor(value: R|test/CustomAnnotation.MyEnum|): R|test/CustomAnnotation.MyAnnotation|
}
public final enum class MyEnum : R|kotlin/Enum<ft<test/CustomAnnotation.MyEnum, test/CustomAnnotation.MyEnum?>>| {
public final enum class MyEnum : R|kotlin/Enum<test/CustomAnnotation.MyEnum!>| {
public final static enum entry ONE: R|@EnhancedNullability test/CustomAnnotation.MyEnum|
public final static fun values(): R|kotlin/Array<test/CustomAnnotation.MyEnum>| {
}
compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.fir.txt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ public open class EnumArgumentWithCustomToString : R|kotlin/Any| {
public constructor(): R|test/EnumArgumentWithCustomToString|
public final enum class E : R|kotlin/Enum<ft<test/EnumArgumentWithCustomToString.E, test/EnumArgumentWithCustomToString.E?>>| {
public final enum class E : R|kotlin/Enum<test/EnumArgumentWithCustomToString.E!>| {
public final static enum entry CAKE: R|@EnhancedNullability test/EnumArgumentWithCustomToString.E|
public final static fun values(): R|kotlin/Array<test/EnumArgumentWithCustomToString.E>| {
}
compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
public final enum class EnumConstructorParameter : R|kotlin/Enum<ft<test/EnumConstructorParameter, test/EnumConstructorParameter?>>| {
public final enum class EnumConstructorParameter : R|kotlin/Enum<test/EnumConstructorParameter!>| {
public final static enum entry INSTANCE: R|@EnhancedNullability test/EnumConstructorParameter|
private constructor(@R|test/EnumConstructorParameter.Anno|(value = String(string)) s: R|ft<kotlin/String, kotlin/String?>|): R|test/EnumConstructorParameter|
private constructor(@R|test/EnumConstructorParameter.Anno|(value = String(string)) s: R|kotlin/String!|): R|test/EnumConstructorParameter|
private constructor(x: R|kotlin/Int|): R|test/EnumConstructorParameter|
compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.fir.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
public open class JavaDocDeprecated : R|kotlin/Any| {
public open fun getFoo(text: R|ft<kotlin/String, kotlin/String?>|): R|ft<kotlin/String, kotlin/String?>|
public open fun getFoo(text: R|kotlin/String!|): R|kotlin/String!|
public constructor(): R|test/JavaDocDeprecated|
compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.fir.txt
Vendored
+1 -1
View File
@@ -7,7 +7,7 @@ public open class NestedEnumArgument : R|kotlin/Any| {
public constructor(value: R|test/NestedEnumArgument.E|): R|test/NestedEnumArgument.Anno|
}
public final enum class E : R|kotlin/Enum<ft<test/NestedEnumArgument.E, test/NestedEnumArgument.E?>>| {
public final enum class E : R|kotlin/Enum<test/NestedEnumArgument.E!>| {
public final static enum entry FIRST: R|@EnhancedNullability test/NestedEnumArgument.E|
public final static fun values(): R|kotlin/Array<test/NestedEnumArgument.E>| {
}