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

[FIR] Do not enhance java fields to firProperty

Browse Source
This commit is contained in:
Simon Ogorodnik
2019-05-15 15:51:25 +03:00
committed by Mikhail Glukhikh
parent 397aaa189e
commit 6c313895df
37 changed files with 86 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt
Vendored
+3 -9
View File
@@ -1,14 +1,8 @@
public open class PropertyArrayTypes<T> : R|kotlin/Any| {
public open var arrayOfArrays: R|kotlin/Array<ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<ft<kotlin/String, kotlin/String?>>?>>|
public get(): R|kotlin/Array<ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<ft<kotlin/String, kotlin/String?>>?>>|
public set(value: R|kotlin/Array<ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<ft<kotlin/String, kotlin/String?>>?>>|): kotlin/Unit
public open field arrayOfArrays: R|kotlin/Array<ft<kotlin/Array<ft<kotlin/String, kotlin/String?>>, kotlin/Array<ft<kotlin/String, kotlin/String?>>?>>|
public open var array: R|kotlin/Array<ft<kotlin/String, kotlin/String?>>|
public get(): R|kotlin/Array<ft<kotlin/String, kotlin/String?>>|
public set(value: R|kotlin/Array<ft<kotlin/String, kotlin/String?>>|): kotlin/Unit
public open field array: R|kotlin/Array<ft<kotlin/String, kotlin/String?>>|
public open var genericArray: R|kotlin/Array<ft<T, T?>>|
public get(): R|kotlin/Array<ft<T, T?>>|
public set(value: R|kotlin/Array<ft<T, T?>>|): kotlin/Unit
public open field genericArray: R|kotlin/Array<ft<T, T?>>|
}
compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt
Vendored
+4 -12
View File
@@ -1,18 +1,10 @@
public open class PropertyComplexTypes<T> : R|kotlin/Any| {
public open var genericType: R|ft<T, T?>|!
public get(): R|ft<T, T?>|!
public set(value: R|ft<T, T?>|!): kotlin/Unit
public open field genericType: R|ft<T, T?>|!
public open var listDefinedGeneric: R|ft<java/util/ArrayList<ft<kotlin/String, kotlin/String?>>, java/util/ArrayList<ft<kotlin/String, kotlin/String?>>?>|!
public get(): R|ft<java/util/ArrayList<ft<kotlin/String, kotlin/String?>>, java/util/ArrayList<ft<kotlin/String, kotlin/String?>>?>|!
public set(value: R|ft<java/util/ArrayList<ft<kotlin/String, kotlin/String?>>, java/util/ArrayList<ft<kotlin/String, kotlin/String?>>?>|!): kotlin/Unit
public open field listDefinedGeneric: R|ft<java/util/ArrayList<ft<kotlin/String, kotlin/String?>>, java/util/ArrayList<ft<kotlin/String, kotlin/String?>>?>|!
public open var listGeneric: R|ft<java/util/ArrayList<ft<T, T?>>, java/util/ArrayList<ft<T, T?>>?>|!
public get(): R|ft<java/util/ArrayList<ft<T, T?>>, java/util/ArrayList<ft<T, T?>>?>|!
public set(value: R|ft<java/util/ArrayList<ft<T, T?>>, java/util/ArrayList<ft<T, T?>>?>|!): kotlin/Unit
public open field listGeneric: R|ft<java/util/ArrayList<ft<T, T?>>, java/util/ArrayList<ft<T, T?>>?>|!
public open var listOfGenericList: R|ft<java/util/ArrayList<ft<java/util/ArrayList<ft<T, T?>>, java/util/ArrayList<ft<T, T?>>?>>, java/util/ArrayList<ft<java/util/ArrayList<ft<T, T?>>, java/util/ArrayList<ft<T, T?>>?>>?>|!
public get(): R|ft<java/util/ArrayList<ft<java/util/ArrayList<ft<T, T?>>, java/util/ArrayList<ft<T, T?>>?>>, java/util/ArrayList<ft<java/util/ArrayList<ft<T, T?>>, java/util/ArrayList<ft<T, T?>>?>>?>|!
public set(value: R|ft<java/util/ArrayList<ft<java/util/ArrayList<ft<T, T?>>, java/util/ArrayList<ft<T, T?>>?>>, java/util/ArrayList<ft<java/util/ArrayList<ft<T, T?>>, java/util/ArrayList<ft<T, T?>>?>>?>|!): kotlin/Unit
public open field listOfGenericList: R|ft<java/util/ArrayList<ft<java/util/ArrayList<ft<T, T?>>, java/util/ArrayList<ft<T, T?>>?>>, java/util/ArrayList<ft<java/util/ArrayList<ft<T, T?>>, java/util/ArrayList<ft<T, T?>>?>>?>|!
}
compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.fir.txt
Vendored
+2 -6
View File
@@ -1,10 +1,6 @@
public open class PropertySimpleType : R|kotlin/Any| {
public open var fieldOne: R|ft<kotlin/String, kotlin/String?>|!
public get(): R|ft<kotlin/String, kotlin/String?>|!
public set(value: R|ft<kotlin/String, kotlin/String?>|!): kotlin/Unit
public open field fieldOne: R|ft<kotlin/String, kotlin/String?>|!
public open var fieldTwo: R|ft<kotlin/String, kotlin/String?>|!
public get(): R|ft<kotlin/String, kotlin/String?>|!
public set(value: R|ft<kotlin/String, kotlin/String?>|!): kotlin/Unit
public open field fieldTwo: R|ft<kotlin/String, kotlin/String?>|!
}