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/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.fir.txt
Vendored
+3 -3
View File
@@ -1,12 +1,12 @@
public abstract interface AdapterDoesntOverrideDeclaration : R|kotlin/Any| {
public abstract interface Sub : R|test/AdapterDoesntOverrideDeclaration.Super| {
public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
public abstract fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
public abstract fun foo(r: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
public abstract fun foo(r: R|ft<kotlin/Function0<kotlin/Unit!>, kotlin/Function0<kotlin/Unit!>?>|): R|kotlin/Unit|
}
public abstract interface Super : R|kotlin/Any| {
public abstract fun foo(r: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
public abstract fun foo(r: R|ft<kotlin/Function0<kotlin/Unit!>, kotlin/Function0<kotlin/Unit!>?>|): R|kotlin/Unit|
}
}
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.fir.txt
Vendored
+2 -2
View File
@@ -2,9 +2,9 @@ public abstract interface InheritedAdapterAndDeclaration : R|kotlin/Any| {
public abstract interface Sub : R|test/InheritedAdapterAndDeclaration.Super| {
}
public abstract interface Super : R|kotlin/Any| {
public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
public abstract fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
public abstract fun foo(r: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
public abstract fun foo(r: R|ft<kotlin/Function0<kotlin/Unit!>, kotlin/Function0<kotlin/Unit!>?>|): R|kotlin/Unit|
}
}
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAmbiguousAdapters.fir.txt
Vendored
+2 -2
View File
@@ -2,9 +2,9 @@ public abstract interface InheritedAmbiguousAdapters : R|kotlin/Any| {
public abstract interface Sub : R|test/InheritedAmbiguousAdapters.Super| {
}
public abstract interface Super : R|kotlin/Any| {
public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
public abstract fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
public abstract fun foo(r: R|ft<java/io/Closeable, java/io/Closeable?>|): R|kotlin/Unit|
public abstract fun foo(r: R|java/io/Closeable!|): R|kotlin/Unit|
}
}
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.fir.txt
Vendored
+4 -4
View File
@@ -1,14 +1,14 @@
public abstract interface InheritedAndOverriddenAmbiguousAdapters : R|kotlin/Any| {
public abstract interface Sub : R|test/InheritedAndOverriddenAmbiguousAdapters.Super| {
public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
public abstract fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
public abstract fun foo(r: R|ft<java/io/Closeable, java/io/Closeable?>|): R|kotlin/Unit|
public abstract fun foo(r: R|java/io/Closeable!|): R|kotlin/Unit|
}
public abstract interface Super : R|kotlin/Any| {
public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
public abstract fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
public abstract fun foo(r: R|ft<java/io/Closeable, java/io/Closeable?>|): R|kotlin/Unit|
public abstract fun foo(r: R|java/io/Closeable!|): R|kotlin/Unit|
}
}
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.fir.txt
Vendored
+2 -2
View File
@@ -1,12 +1,12 @@
public abstract interface InheritedOverridden : R|kotlin/Any| {
public open class Sub : R|test/InheritedOverridden.Super| {
public open fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
public open fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
public constructor(): R|test/InheritedOverridden.Sub|
}
public open class Super : R|kotlin/Any| {
public open fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
public open fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
public constructor(): R|test/InheritedOverridden.Super|
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.fir.txt
Vendored
+3 -3
View File
@@ -1,14 +1,14 @@
public abstract interface InheritedOverriddenAdapter : R|kotlin/Any| {
public open class Sub : R|test/InheritedOverriddenAdapter.Super| {
public open fun foo(r: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
public open fun foo(r: R|ft<kotlin/Function0<kotlin/Unit!>, kotlin/Function0<kotlin/Unit!>?>|): R|kotlin/Unit|
public open fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
public open fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
public constructor(): R|test/InheritedOverriddenAdapter.Sub|
}
public open class Super : R|kotlin/Any| {
public open fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
public open fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
public constructor(): R|test/InheritedOverriddenAdapter.Super|
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.fir.txt
Vendored
+2 -2
View File
@@ -2,11 +2,11 @@ public abstract interface InheritedSameAdapters : R|kotlin/Any| {
public abstract interface Sub : R|test/InheritedSameAdapters.Super1|, R|test/InheritedSameAdapters.Super2| {
}
public abstract interface Super1 : R|kotlin/Any| {
public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
public abstract fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
}
public abstract interface Super2 : R|kotlin/Any| {
public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
public abstract fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
}
}
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.fir.txt
Vendored
+3 -3
View File
@@ -2,13 +2,13 @@ public abstract interface InheritedSameAdaptersWithSubstitution : R|kotlin/Any|
public abstract interface Sub : R|test/InheritedSameAdaptersWithSubstitution.Super1|, R|test/InheritedSameAdaptersWithSubstitution.Super2Substituted| {
}
public abstract interface Super1 : R|kotlin/Any| {
public abstract fun foo(r: R|ft<java/util/Comparator<ft<kotlin/String, kotlin/String?>>, java/util/Comparator<ft<kotlin/String, kotlin/String?>>?>|): R|kotlin/Unit|
public abstract fun foo(r: R|ft<java/util/Comparator<kotlin/String!>, java/util/Comparator<kotlin/String!>?>|): R|kotlin/Unit|
}
public abstract interface Super2<T : R|ft<kotlin/Any, kotlin/Any?>|> : R|kotlin/Any| {
public abstract interface Super2<T : R|kotlin/Any!|> : R|kotlin/Any| {
public abstract fun foo(r: R|ft<java/util/Comparator<ft<T & Any, T?>>, java/util/Comparator<ft<T & Any, T?>>?>|): R|kotlin/Unit|
}
public abstract interface Super2Substituted : R|test/InheritedSameAdaptersWithSubstitution.Super2<ft<kotlin/String, kotlin/String?>>| {
public abstract interface Super2Substituted : R|test/InheritedSameAdaptersWithSubstitution.Super2<kotlin/String!>| {
}
}
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.fir.txt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ public abstract interface InheritedSimple : R|kotlin/Any| {
public abstract interface Sub : R|test/InheritedSimple.Super| {
}
public abstract interface Super : R|kotlin/Any| {
public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
public abstract fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
}
}
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.fir.txt
Vendored
+5 -5
View File
@@ -1,16 +1,16 @@
public abstract interface OverriddenAmbiguousAdapters : R|kotlin/Any| {
public abstract interface Sub : R|test/OverriddenAmbiguousAdapters.Super| {
public abstract fun foo(r: R|ft<kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>, kotlin/Function0<ft<kotlin/Unit, kotlin/Unit?>>?>|): R|kotlin/Unit|
public abstract fun foo(r: R|ft<kotlin/Function0<kotlin/Unit!>, kotlin/Function0<kotlin/Unit!>?>|): R|kotlin/Unit|
public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
public abstract fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
public abstract fun foo(r: R|ft<java/io/Closeable, java/io/Closeable?>|): R|kotlin/Unit|
public abstract fun foo(r: R|java/io/Closeable!|): R|kotlin/Unit|
}
public abstract interface Super : R|kotlin/Any| {
public abstract fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|): R|kotlin/Unit|
public abstract fun foo(r: R|java/lang/Runnable!|): R|kotlin/Unit|
public abstract fun foo(r: R|ft<java/io/Closeable, java/io/Closeable?>|): R|kotlin/Unit|
public abstract fun foo(r: R|java/io/Closeable!|): R|kotlin/Unit|
}
}