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.kt
Vendored
+5 -5
View File
@@ -11,7 +11,7 @@ class ConstructorTypeParamClassObjectTypeConflict<test> {
class ConstructorTypeParamClassObjectConflict<test> {
companion object {
val test = 12
val test = { 12 }()
}
val some = test
@@ -19,7 +19,7 @@ class ConstructorTypeParamClassObjectConflict<test> {
class TestConstructorParamClassObjectConflict(test: String) {
companion object {
val test = 12
val test = { 12 }()
}
val some = test
@@ -28,7 +28,7 @@ class TestConstructorParamClassObjectConflict(test: String) {
class TestConstructorValClassObjectConflict(val test: String) {
companion object {
val test = 12
val test = { 12 }()
}
val some = test
@@ -36,10 +36,10 @@ class TestConstructorValClassObjectConflict(val test: String) {
class TestClassObjectAndClassConflict {
companion object {
val bla = 12
val bla = { 12 }()
}
val bla = "More"
val bla = { "More" }()
val some = bla
}