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
}
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
}
}
compiler/testData/loadJava/compiledKotlin/class/NamedObject.kt
Vendored
+1 -1
View File
@@ -2,6 +2,6 @@
package test
public object Obj {
public val v: String = "val"
public val v: String = { "val" }()
public fun f(): String = "fun"
}
compiler/testData/loadJava/compiledKotlin/class/NamedObject.txt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ package test
public object Obj {
/*primary*/ private constructor Obj()
public final val v: kotlin.String = "val"
public final val v: kotlin.String
public final fun <get-v>(): kotlin.String
public final fun f(): kotlin.String
}
compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClass.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ package test
public class Outer {
public object Obj {
public val v: String = "val"
public val v: String = { "val" }()
public fun f(): String = "fun"
}
}
compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClass.txt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ public final class Outer {
public object Obj {
/*primary*/ private constructor Obj()
public final val v: kotlin.String = "val"
public final val v: kotlin.String
public final fun <get-v>(): kotlin.String
public final fun f(): kotlin.String
}
compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.kt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ package test
public class Outer {
public companion object {
public object Obj {
public val v: String = "val"
public val v: String = { "val" }()
public fun f(): String = "fun"
}
}
compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.txt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ public final class Outer {
public object Obj {
/*primary*/ private constructor Obj()
public final val v: kotlin.String = "val"
public final val v: kotlin.String
public final fun <get-v>(): kotlin.String
public final fun f(): kotlin.String
}
compiler/testData/loadJava/compiledKotlin/class/NamedObjectInNamedObject.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ package test
public object Outer {
public object Obj {
public val v: String = "val"
public val v: String = { "val" }()
public fun f(): String = "fun"
}
}
compiler/testData/loadJava/compiledKotlin/class/NamedObjectInNamedObject.txt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ public object Outer {
public object Obj {
/*primary*/ private constructor Obj()
public final val v: kotlin.String = "val"
public final val v: kotlin.String
public final fun <get-v>(): kotlin.String
public final fun f(): kotlin.String
}
compiler/testData/loadJava/compiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.kt
Vendored
+2 -2
View File
@@ -2,8 +2,8 @@
package test
public object Obj {
public val v: String = "val"
public val v: String = { "val" }()
public fun f(): String = "fun"
}
val x = 5
val x = { 5 }()
compiler/testData/loadJava/compiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt
Vendored
+2 -2
View File
@@ -1,11 +1,11 @@
package test
public val x: kotlin.Int = 5
public val x: kotlin.Int
public fun <get-x>(): kotlin.Int
public object Obj {
/*primary*/ private constructor Obj()
public final val v: kotlin.String = "val"
public final val v: kotlin.String
public final fun <get-v>(): kotlin.String
public final fun f(): kotlin.String
}