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/annotations/AnnotatedConstructor.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public open class AnnotatedConstructor : R|java/lang/Object| {
@R|test/AnnotatedConstructor.Anno|(String(constructor)) public final function AnnotatedConstructor(): R|test/AnnotatedConstructor|
@R|test/AnnotatedConstructor.Anno|(String(constructor)) public final fun AnnotatedConstructor(): R|test/AnnotatedConstructor|
}
compiler/testData/loadJava/compiledJava/annotations/AnnotatedEnumEntry.fir.txt
Vendored
+3 -3
View File
@@ -1,11 +1,11 @@
public final enum class AnnotatedEnumEntry : R|java/lang/Enum<test/AnnotatedEnumEntry>| {
@R|test/AnnotatedEnumEntry.Anno|(String(a)) public final static property E1(val): R|ft<test/AnnotatedEnumEntry, test/AnnotatedEnumEntry?>|!
@R|test/AnnotatedEnumEntry.Anno|(String(a)) public final static val E1: R|ft<test/AnnotatedEnumEntry, test/AnnotatedEnumEntry?>|!
public get(): R|ft<test/AnnotatedEnumEntry, test/AnnotatedEnumEntry?>|!
@R|test/AnnotatedEnumEntry.Anno|(String(b)) @R|test/AnnotatedEnumEntry.Anno2|() public final static property E2(val): R|ft<test/AnnotatedEnumEntry, test/AnnotatedEnumEntry?>|!
@R|test/AnnotatedEnumEntry.Anno|(String(b)) @R|test/AnnotatedEnumEntry.Anno2|() public final static val E2: R|ft<test/AnnotatedEnumEntry, test/AnnotatedEnumEntry?>|!
public get(): R|ft<test/AnnotatedEnumEntry, test/AnnotatedEnumEntry?>|!
public final static property E3(val): R|ft<test/AnnotatedEnumEntry, test/AnnotatedEnumEntry?>|!
public final static val E3: R|ft<test/AnnotatedEnumEntry, test/AnnotatedEnumEntry?>|!
public get(): R|ft<test/AnnotatedEnumEntry, test/AnnotatedEnumEntry?>|!
}
compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.fir.txt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
public open class AnnotatedField : R|java/lang/Object| {
@R|test/AnnotatedField.Anno|(String(static)) public final static property x(val): R|kotlin/Int|
@R|test/AnnotatedField.Anno|(String(static)) public final static val x: R|kotlin/Int|
public get(): R|kotlin/Int|
@R|test/AnnotatedField.Anno|(String(member)) public final property y(val): R|kotlin/Int|
@R|test/AnnotatedField.Anno|(String(member)) public final val y: R|kotlin/Int|
public get(): R|kotlin/Int|
}
compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public open class AnnotatedMethod : R|java/lang/Object| {
@R|test/AnnotatedMethod.Anno|(Int(42)) public open operator function f(): R|kotlin/Unit|
@R|test/AnnotatedMethod.Anno|(Int(42)) public open operator fun f(): R|kotlin/Unit|
}
compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public/*package*/ open class AnnotatedTypeInFun : R|java/lang/Object| {
public/*package*/ open operator function foo(@R|test/AnnotatedTypeInFun.Anno|(String(a)) a: @R|test/AnnotatedTypeInFun.Anno|(String(a)) R|ft<kotlin/String, kotlin/String?>|!, @R|test/AnnotatedTypeInFun.Anno|(String(b)) b: @R|test/AnnotatedTypeInFun.Anno|(String(b)) R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
public/*package*/ open operator fun foo(@R|test/AnnotatedTypeInFun.Anno|(String(a)) a: @R|test/AnnotatedTypeInFun.Anno|(String(a)) R|ft<kotlin/String, kotlin/String?>|!, @R|test/AnnotatedTypeInFun.Anno|(String(b)) b: @R|test/AnnotatedTypeInFun.Anno|(String(b)) R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
}
compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public open class AnnotatedValueParameter : R|java/lang/Object| {
public open operator function f(@R|test/AnnotatedValueParameter.Anno|(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 operator fun f(@R|test/AnnotatedValueParameter.Anno|(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|
}
compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public open class EnumArgumentWithCustomToString : R|java/lang/Object| {
@R|test/EnumArgumentWithCustomToString.EnumAnno|(R|test/EnumArgumentWithCustomToString.E.CAKE|()) @R|test/EnumArgumentWithCustomToString.EnumArrayAnno|(<implicitArrayOf>(R|test/EnumArgumentWithCustomToString.E.CAKE|(), R|test/EnumArgumentWithCustomToString.E.CAKE|())) public/*package*/ open operator function annotated(): R|kotlin/Unit|
@R|test/EnumArgumentWithCustomToString.EnumAnno|(R|test/EnumArgumentWithCustomToString.E.CAKE|()) @R|test/EnumArgumentWithCustomToString.EnumArrayAnno|(<implicitArrayOf>(R|test/EnumArgumentWithCustomToString.E.CAKE|(), R|test/EnumArgumentWithCustomToString.E.CAKE|())) public/*package*/ open operator fun annotated(): R|kotlin/Unit|
}
compiler/testData/loadJava/compiledJava/annotations/EnumConstructorParameter.fir.txt
Vendored
+3 -3
View File
@@ -1,9 +1,9 @@
public final enum class EnumConstructorParameter : R|java/lang/Enum<test/EnumConstructorParameter>| {
public final static property INSTANCE(val): R|ft<test/EnumConstructorParameter, test/EnumConstructorParameter?>|!
public final static val INSTANCE: R|ft<test/EnumConstructorParameter, test/EnumConstructorParameter?>|!
public get(): R|ft<test/EnumConstructorParameter, test/EnumConstructorParameter?>|!
private final function EnumConstructorParameter(@R|test/EnumConstructorParameter.Anno|(String(string)) s: R|ft<kotlin/String, kotlin/String?>|!): R|test/EnumConstructorParameter|
private final fun EnumConstructorParameter(@R|test/EnumConstructorParameter.Anno|(String(string)) s: R|ft<kotlin/String, kotlin/String?>|!): R|test/EnumConstructorParameter|
private final function EnumConstructorParameter(x: R|kotlin/Int|): R|test/EnumConstructorParameter|
private final fun EnumConstructorParameter(x: R|kotlin/Int|): R|test/EnumConstructorParameter|
}
compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public open class JavaDocDeprecated : R|java/lang/Object| {
public open operator function getFoo(text: R|ft<kotlin/String, kotlin/String?>|!): R|ft<kotlin/String, kotlin/String?>|!
public open operator fun getFoo(text: R|ft<kotlin/String, kotlin/String?>|!): R|ft<kotlin/String, kotlin/String?>|!
}
compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public open class NestedEnumArgument : R|java/lang/Object| {
@R|test/NestedEnumArgument.Anno|(R|test/NestedEnumArgument.E.FIRST|()) public/*package*/ open operator function foo(): R|kotlin/Unit|
@R|test/NestedEnumArgument.Anno|(R|test/NestedEnumArgument.E.FIRST|()) public/*package*/ open operator fun foo(): R|kotlin/Unit|
}
compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.fir.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
public abstract interface StringConstantInParam : R|java/lang/Object| {
public final static property HEL(val): R|ft<kotlin/String, kotlin/String?>|!
public final static val HEL: R|ft<kotlin/String, kotlin/String?>|!
public get(): R|ft<kotlin/String, kotlin/String?>|!
}