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

FIR type enhancement: make J2K mapping and changed handling more exact

Browse Source 
Related to KT-29937
This commit is contained in:
Mikhail Glukhikh
2019-02-28 14:39:13 +03:00
parent 9bb2278fd4
commit 7563a98999
40 changed files with 91 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.fir.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
public open class DifferentGetterAndSetter : R|java/lang/Object| {
public open operator function setSomething(color: R|ft<java/lang/String, java/lang/String?>|!): R|kotlin/Unit|
public open operator function setSomething(color: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
public open operator function getSomething(): R|kotlin/Int|
compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public open class JavaBeanVal : R|java/lang/Object| {
public open operator function getColor(): R|ft<java/lang/String, java/lang/String?>|!
public open operator function getColor(): R|ft<kotlin/String, kotlin/String?>|!
}
compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.fir.txt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
public open class JavaBeanVar : R|java/lang/Object| {
public open operator function getColor(): R|ft<java/lang/String, java/lang/String?>|!
public open operator function getColor(): R|ft<kotlin/String, kotlin/String?>|!
public open operator function setColor(string: R|ft<java/lang/String, java/lang/String?>|!): R|kotlin/Unit|
public open operator function setColor(string: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
}
compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
<P> public open class JavaBeanVarOfGenericType : R|java/lang/Object| {
public open operator function getCharacters(): R|ft<java/util/ArrayList<ft<P, P?>>, java/util/ArrayList<ft<P, P?>>>|
public open operator function getCharacters(): R|ft<java/util/ArrayList<ft<P, P?>>, java/util/ArrayList<ft<P, P?>>?>|!
public open operator function setCharacters(characters: R|ft<java/util/ArrayList<ft<P, P?>>, java/util/ArrayList<ft<P, P?>>>|): R|kotlin/Unit|
public open operator function setCharacters(characters: R|ft<java/util/ArrayList<ft<P, P?>>, java/util/ArrayList<ft<P, P?>>?>|!): R|kotlin/Unit|
}
compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.fir.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
public open class TwoSetters : R|java/lang/Object| {
public open operator function setSize(size: R|ft<java/lang/String, java/lang/String?>|!): R|kotlin/Unit|
public open operator function setSize(size: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
public open operator function setSize(size: R|kotlin/Int|): R|kotlin/Unit|