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

Fix ConstantValue-related testData for loadJava tests

Browse Source
This commit is contained in:
Dmitry Petrov
2018-07-23 17:03:28 +03:00
parent cc1d9e88d5
commit 8f103dd8e5
79 changed files with 255 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.txt
Vendored
+7 -7
View File
@@ -2,12 +2,12 @@ package test
public final class ConstructorTypeParamClassObjectConflict</*0*/ test> {
/*primary*/ public constructor ConstructorTypeParamClassObjectConflict</*0*/ test>()
public final val some: kotlin.Int = 12
public final val some: kotlin.Int
public final fun <get-some>(): kotlin.Int
public companion object Companion {
/*primary*/ private constructor Companion()
public final val test: kotlin.Int = 12
public final val test: kotlin.Int
public final fun <get-test>(): kotlin.Int
}
}
@@ -27,14 +27,14 @@ public final class ConstructorTypeParamClassObjectTypeConflict</*0*/ test> {
public final class TestClassObjectAndClassConflict {
/*primary*/ public constructor TestClassObjectAndClassConflict()
public final val bla: kotlin.String = "More"
public final val bla: kotlin.String
public final fun <get-bla>(): kotlin.String
public final val some: kotlin.String = "More"
public final val some: kotlin.String
public final fun <get-some>(): kotlin.String
public companion object Companion {
/*primary*/ private constructor Companion()
public final val bla: kotlin.Int = 12
public final val bla: kotlin.Int
public final fun <get-bla>(): kotlin.Int
}
}
@@ -46,7 +46,7 @@ public final class TestConstructorParamClassObjectConflict {
public companion object Companion {
/*primary*/ private constructor Companion()
public final val test: kotlin.Int = 12
public final val test: kotlin.Int
public final fun <get-test>(): kotlin.Int
}
}
@@ -60,7 +60,7 @@ public final class TestConstructorValClassObjectConflict {
public companion object Companion {
/*primary*/ private constructor Companion()
public final val test: kotlin.Int = 12
public final val test: kotlin.Int
public final fun <get-test>(): kotlin.Int
}
}