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

FIR: Make FIR rendering more kotlin-styled

Browse Source
This commit is contained in:
Simon Ogorodnik
2019-03-11 16:58:14 +03:00
parent 9cc6e44158
commit 498fb94c37
206 changed files with 758 additions and 768 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
<T> public abstract interface Comparator : R|java/lang/Object| {
public abstract operator function compare(o1: R|ft<T, T?>|!, o2: R|ft<T, T?>|!): R|kotlin/Int|
public abstract operator fun compare(o1: R|ft<T, T?>|!, o2: R|ft<T, T?>|!): R|kotlin/Int|
public abstract operator function equals(obj: R|ft<kotlin/Any, kotlin/Any?>|!): R|kotlin/Boolean|
public abstract operator fun equals(obj: R|ft<kotlin/Any, kotlin/Any?>|!): R|kotlin/Boolean|
}
compiler/testData/loadJava/compiledJava/sam/FilenameFilter.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public abstract interface FilenameFilter : R|java/lang/Object| {
public abstract operator function accept(dir: R|ft<java/io/File, java/io/File?>|!, name: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Boolean|
public abstract operator fun accept(dir: R|ft<java/io/File, java/io/File?>|!, name: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Boolean|
}
compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
<T> public abstract interface GenericInterfaceParameterWithSelfBound : R|java/lang/Object| {
public abstract operator function method(t: R|ft<T, T?>|!): R|ft<T, T?>|!
public abstract operator fun method(t: R|ft<T, T?>|!): R|ft<T, T?>|!
}
compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
<A, B> public abstract interface GenericInterfaceParametersWithBounds : R|java/lang/Object| {
public abstract operator function method(a: R|kotlin/Array<ft<A, A?>>|, b: R|ft<B, B?>|!): R|kotlin/Unit|
public abstract operator fun method(a: R|kotlin/Array<ft<A, A?>>|, b: R|ft<B, B?>|!): R|kotlin/Unit|
}
compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public abstract interface GenericMethodParameters : R|java/lang/Object| {
public abstract operator function method(a: R|kotlin/Array<ft<A, A?>>|, b: R|ft<B, B?>|!): R|kotlin/Unit|
public abstract operator fun method(a: R|kotlin/Array<ft<A, A?>>|, b: R|ft<B, B?>|!): R|kotlin/Unit|
}
compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public abstract interface InterfaceWithObjectMethod : R|java/lang/Object| {
public abstract operator function toString(): R|ft<kotlin/String, kotlin/String?>|!
public abstract operator fun toString(): R|ft<kotlin/String, kotlin/String?>|!
}
compiler/testData/loadJava/compiledJava/sam/Runnable.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public abstract interface Runnable : R|java/lang/Object| {
public abstract operator function run(): R|kotlin/Unit|
public abstract operator fun run(): R|kotlin/Unit|
}
compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOverridding.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public abstract interface SamSubinterfaceOverridding : R|java/lang/Runnable| {
public abstract operator function run(): R|kotlin/Unit|
public abstract operator fun run(): R|kotlin/Unit|
}
compiler/testData/loadJava/compiledJava/sam/VarargParameter.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public abstract interface VarargParameter : R|java/lang/Object| {
public abstract operator function f(vararg strings: R|kotlin/Array<ft<java/lang/String, java/lang/String?>>|): R|kotlin/Unit|
public abstract operator fun f(vararg strings: R|kotlin/Array<ft<java/lang/String, java/lang/String?>>|): R|kotlin/Unit|
}
compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.fir.txt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
public open class AmbiguousAdapters : R|java/lang/Object| {
public open operator function foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|!): R|kotlin/Unit|
public open operator fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|!): R|kotlin/Unit|
public open operator function foo(c: R|ft<java/io/Closeable, java/io/Closeable?>|!): R|kotlin/Unit|
public open operator fun foo(c: R|ft<java/io/Closeable, java/io/Closeable?>|!): R|kotlin/Unit|
}
compiler/testData/loadJava/compiledJava/sam/adapters/Basic.fir.txt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
public open class Basic : R|java/lang/Object| {
public open operator function foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|!): R|kotlin/Unit|
public open operator fun foo(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|!): R|kotlin/Unit|
public open static operator function bar(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|!): R|kotlin/Unit|
public open static operator fun bar(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|!): R|kotlin/Unit|
}
compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public open class Constructor : R|java/lang/Object| {
public final function Constructor(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|!): R|test/Constructor|
public final fun Constructor(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|!): R|test/Constructor|
}
compiler/testData/loadJava/compiledJava/sam/adapters/ConstructorWithAnnotations.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public open class ConstructorWithAnnotations : R|java/lang/Object| {
public final function ConstructorWithAnnotations(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|!, @R|org/jetbrains/annotations/NotNull|() s: R|kotlin/String|): R|test/ConstructorWithAnnotations|
public final fun ConstructorWithAnnotations(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|!, @R|org/jetbrains/annotations/NotNull|() s: R|kotlin/String|): R|test/ConstructorWithAnnotations|
}
compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt
Vendored
+4 -4
View File
@@ -1,10 +1,10 @@
public open class NonTrivialFunctionType : R|java/lang/Object| {
public open operator function foo(filenameFilter: R|ft<java/io/FilenameFilter, java/io/FilenameFilter?>|!): R|kotlin/Unit|
public open operator fun foo(filenameFilter: R|ft<java/io/FilenameFilter, java/io/FilenameFilter?>|!): R|kotlin/Unit|
public open operator function foo(comparator: R|ft<java/util/Comparator<ft<kotlin/String, kotlin/String?>>, java/util/Comparator<ft<kotlin/String, kotlin/String?>>?>|!): R|kotlin/Unit|
public open operator fun foo(comparator: R|ft<java/util/Comparator<ft<kotlin/String, kotlin/String?>>, java/util/Comparator<ft<kotlin/String, kotlin/String?>>?>|!): R|kotlin/Unit|
public open operator function wildcardUnbound(comparator: R|ft<java/util/Comparator<*>, java/util/Comparator<*>?>|!): R|kotlin/Unit|
public open operator fun wildcardUnbound(comparator: R|ft<java/util/Comparator<*>, java/util/Comparator<*>?>|!): R|kotlin/Unit|
public open operator function wildcardBound(comparator: R|ft<java/util/Comparator<in java/lang/CharSequence>, java/util/Comparator<in java/lang/CharSequence>?>|!): R|kotlin/Unit|
public open operator fun wildcardBound(comparator: R|ft<java/util/Comparator<in java/lang/CharSequence>, java/util/Comparator<in java/lang/CharSequence>?>|!): R|kotlin/Unit|
}
compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public open class PrivateSamAdapter : R|java/lang/Object| {
private open operator function samAdapter(r: R|ft<test/PrivateSamAdapter.SamInterface, test/PrivateSamAdapter.SamInterface?>|!): R|kotlin/Unit|
private open operator fun samAdapter(r: R|ft<test/PrivateSamAdapter.SamInterface, test/PrivateSamAdapter.SamInterface?>|!): R|kotlin/Unit|
}
compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public abstract interface SelfAsParameter : R|java/lang/Object| {
public abstract operator function foo(p: R|ft<test/SelfAsParameter, test/SelfAsParameter?>|!): R|kotlin/Unit|
public abstract operator fun foo(p: R|ft<test/SelfAsParameter, test/SelfAsParameter?>|!): R|kotlin/Unit|
}
compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public open class SeveralSamParameters : R|java/lang/Object| {
public open static operator function findMaxAndInvokeCallback(comparator: R|ft<java/util/Comparator<ft<kotlin/String, kotlin/String?>>, java/util/Comparator<ft<kotlin/String, kotlin/String?>>?>|!, a: R|ft<kotlin/String, kotlin/String?>|!, b: R|ft<kotlin/String, kotlin/String?>|!, afterRunnable: R|ft<java/lang/Runnable, java/lang/Runnable?>|!): R|ft<kotlin/String, kotlin/String?>|!
public open static operator fun findMaxAndInvokeCallback(comparator: R|ft<java/util/Comparator<ft<kotlin/String, kotlin/String?>>, java/util/Comparator<ft<kotlin/String, kotlin/String?>>?>|!, a: R|ft<kotlin/String, kotlin/String?>|!, b: R|ft<kotlin/String, kotlin/String?>|!, afterRunnable: R|ft<java/lang/Runnable, java/lang/Runnable?>|!): R|ft<kotlin/String, kotlin/String?>|!
}
compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
<T> public open class TypeParameterOfClass : R|java/lang/Object| {
public open operator function foo(comparator: R|ft<java/util/Comparator<ft<T, T?>>, java/util/Comparator<ft<T, T?>>?>|!): R|kotlin/Unit|
public open operator fun foo(comparator: R|ft<java/util/Comparator<ft<T, T?>>, java/util/Comparator<ft<T, T?>>?>|!): R|kotlin/Unit|
}
compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt
Vendored
+3 -3
View File
@@ -1,8 +1,8 @@
public open class TypeParameterOfMethod : R|java/lang/Object| {
public open static operator function max(comparator: R|ft<java/util/Comparator<ft<T, T?>>, java/util/Comparator<ft<T, T?>>?>|!, value1: R|ft<T, T?>|!, value2: R|ft<T, T?>|!): R|ft<T, T?>|!
public open static operator fun max(comparator: R|ft<java/util/Comparator<ft<T, T?>>, java/util/Comparator<ft<T, T?>>?>|!, value1: R|ft<T, T?>|!, value2: R|ft<T, T?>|!): R|ft<T, T?>|!
public open static operator function max2(comparator: R|ft<java/util/Comparator<ft<T, T?>>, java/util/Comparator<ft<T, T?>>?>|!, value1: R|ft<T, T?>|!, value2: R|ft<T, T?>|!): R|ft<T, T?>|!
public open static operator fun max2(comparator: R|ft<java/util/Comparator<ft<T, T?>>, java/util/Comparator<ft<T, T?>>?>|!, value1: R|ft<T, T?>|!, value2: R|ft<T, T?>|!): R|ft<T, T?>|!
public open static operator function method(a: R|ft<java/util/Comparator<ft<A, A?>>, java/util/Comparator<ft<A, A?>>?>|!, b: R|ft<B, B?>|!): R|kotlin/Unit|
public open static operator fun method(a: R|ft<java/util/Comparator<ft<A, A?>>, java/util/Comparator<ft<A, A?>>?>|!, b: R|ft<B, B?>|!): R|kotlin/Unit|
}