Update existing test data depending on diagnostic parameter rendering
This commit is contained in:
Pavel V. Talanov
+2
-2
@@ -1,7 +1,7 @@
|
||||
compiler/testData/cli/jvm/conflictingOverloads.kt:1:1: error: 'public fun a(): kotlin.collections.List<kotlin.Int>' conflicts with another declaration in package '<root>'
|
||||
compiler/testData/cli/jvm/conflictingOverloads.kt:1:1: error: 'public fun a(): List<Int>' conflicts with another declaration in package '<root>'
|
||||
fun a(): List<Int> = null!!
|
||||
^
|
||||
compiler/testData/cli/jvm/conflictingOverloads.kt:2:1: error: 'public fun a(): kotlin.collections.List<kotlin.String>' conflicts with another declaration in package '<root>'
|
||||
compiler/testData/cli/jvm/conflictingOverloads.kt:2:1: error: 'public fun a(): List<String>' conflicts with another declaration in package '<root>'
|
||||
fun a(): List<String> = null!!
|
||||
^
|
||||
COMPILATION_ERROR
|
||||
+18
-18
@@ -1,46 +1,46 @@
|
||||
compiler/testData/cli/jvm/signatureClash.kt:6:5: error: accidental override: The following declarations have the same JVM signature (getX()I):
|
||||
fun <get-x>(): kotlin.Int
|
||||
fun getX(): kotlin.Int
|
||||
fun <get-x>(): Int
|
||||
fun getX(): Int
|
||||
fun getX() = 1
|
||||
^
|
||||
compiler/testData/cli/jvm/signatureClash.kt:8:5: error: platform declaration clash: The following declarations have the same JVM signature (getA()I):
|
||||
fun <get-a>(): kotlin.Int
|
||||
fun getA(): kotlin.Int
|
||||
fun <get-a>(): Int
|
||||
fun getA(): Int
|
||||
fun getA(): Int = 1
|
||||
^
|
||||
compiler/testData/cli/jvm/signatureClash.kt:9:5: error: platform declaration clash: The following declarations have the same JVM signature (getA()I):
|
||||
fun <get-a>(): kotlin.Int
|
||||
fun getA(): kotlin.Int
|
||||
fun <get-a>(): Int
|
||||
fun getA(): Int
|
||||
val a: Int = 1
|
||||
^
|
||||
compiler/testData/cli/jvm/signatureClash.kt:12:1: error: platform declaration clash: The following declarations have the same JVM signature (getB()I):
|
||||
fun <get-b>(): kotlin.Int
|
||||
fun getB(): kotlin.Int
|
||||
fun <get-b>(): Int
|
||||
fun getB(): Int
|
||||
fun getB(): Int = 1
|
||||
^
|
||||
compiler/testData/cli/jvm/signatureClash.kt:13:1: error: platform declaration clash: The following declarations have the same JVM signature (getB()I):
|
||||
fun <get-b>(): kotlin.Int
|
||||
fun getB(): kotlin.Int
|
||||
fun <get-b>(): Int
|
||||
fun getB(): Int
|
||||
val b: Int = 1
|
||||
^
|
||||
compiler/testData/cli/jvm/signatureClash.kt:19:7: error: platform declaration clash: The following declarations have the same JVM signature (getTr()I):
|
||||
fun <get-tr>(): kotlin.Int
|
||||
fun getTr(): kotlin.Int
|
||||
fun <get-tr>(): Int
|
||||
fun getTr(): Int
|
||||
class SubTr : Tr {
|
||||
^
|
||||
compiler/testData/cli/jvm/signatureClash.kt:20:5: error: platform declaration clash: The following declarations have the same JVM signature (getTr()I):
|
||||
fun <get-tr>(): kotlin.Int
|
||||
fun getTr(): kotlin.Int
|
||||
fun <get-tr>(): Int
|
||||
fun getTr(): Int
|
||||
val tr = 1
|
||||
^
|
||||
compiler/testData/cli/jvm/signatureClash.kt:24:7: error: platform declaration clash: The following declarations have the same JVM signature (access$f(LC;)V):
|
||||
fun `access$f`(c: C): kotlin.Unit
|
||||
fun f(): kotlin.Unit
|
||||
fun `access$f`(c: C): Unit
|
||||
fun f(): Unit
|
||||
class C {
|
||||
^
|
||||
compiler/testData/cli/jvm/signatureClash.kt:26:5: error: platform declaration clash: The following declarations have the same JVM signature (access$f(LC;)V):
|
||||
fun `access$f`(c: C): kotlin.Unit
|
||||
fun f(): kotlin.Unit
|
||||
fun `access$f`(c: C): Unit
|
||||
fun f(): Unit
|
||||
fun `access$f`(c: C) {}
|
||||
^
|
||||
COMPILATION_ERROR
|
||||
+28
-28
@@ -1,71 +1,71 @@
|
||||
compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA;)I):
|
||||
fun <get-foo>(): kotlin.Int
|
||||
fun `access$getFoo$p`(a: A): kotlin.Int
|
||||
fun <get-foo>(): Int
|
||||
fun `access$getFoo$p`(a: A): Int
|
||||
class A {
|
||||
^
|
||||
compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA;I)V):
|
||||
fun <set-foo>(<set-?>: kotlin.Int): kotlin.Unit
|
||||
fun `access$setFoo$p`(a: A, d: kotlin.Int): kotlin.Unit
|
||||
fun <set-foo>(<set-?>: Int): Unit
|
||||
fun `access$setFoo$p`(a: A, d: Int): Unit
|
||||
class A {
|
||||
^
|
||||
compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$cp()I):
|
||||
fun <get-foo>(): kotlin.Int
|
||||
fun `access$getFoo$cp`(): kotlin.Int
|
||||
fun <get-foo>(): Int
|
||||
fun `access$getFoo$cp`(): Int
|
||||
class A {
|
||||
^
|
||||
compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$cp(I)V):
|
||||
fun <set-foo>(<set-?>: kotlin.Int): kotlin.Unit
|
||||
fun `access$setFoo$cp`(d: kotlin.Int): kotlin.Unit
|
||||
fun <set-foo>(<set-?>: Int): Unit
|
||||
fun `access$setFoo$cp`(d: Int): Unit
|
||||
class A {
|
||||
^
|
||||
compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$getBar$lp(LA;)I):
|
||||
fun <get-bar>(): kotlin.Int
|
||||
fun `access$getBar$lp`(a: A): kotlin.Int
|
||||
fun <get-bar>(): Int
|
||||
fun `access$getBar$lp`(a: A): Int
|
||||
class A {
|
||||
^
|
||||
compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:5:5: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA;)I):
|
||||
fun <get-foo>(): kotlin.Int
|
||||
fun `access$getFoo$p`(a: A): kotlin.Int
|
||||
fun <get-foo>(): Int
|
||||
fun `access$getFoo$p`(a: A): Int
|
||||
fun `access$getFoo$p`(a: A): Int = 1
|
||||
^
|
||||
compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:6:5: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA;I)V):
|
||||
fun <set-foo>(<set-?>: kotlin.Int): kotlin.Unit
|
||||
fun `access$setFoo$p`(a: A, d: kotlin.Int): kotlin.Unit
|
||||
fun <set-foo>(<set-?>: Int): Unit
|
||||
fun `access$setFoo$p`(a: A, d: Int): Unit
|
||||
fun `access$setFoo$p`(a: A, d: Int) {}
|
||||
^
|
||||
compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:9:5: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$cp()I):
|
||||
fun <get-foo>(): kotlin.Int
|
||||
fun `access$getFoo$cp`(): kotlin.Int
|
||||
fun <get-foo>(): Int
|
||||
fun `access$getFoo$cp`(): Int
|
||||
fun `access$getFoo$cp`(): Int = 1
|
||||
^
|
||||
compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:10:5: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$cp(I)V):
|
||||
fun <set-foo>(<set-?>: kotlin.Int): kotlin.Unit
|
||||
fun `access$setFoo$cp`(d: kotlin.Int): kotlin.Unit
|
||||
fun <set-foo>(<set-?>: Int): Unit
|
||||
fun `access$setFoo$cp`(d: Int): Unit
|
||||
fun `access$setFoo$cp`(d: Int) {}
|
||||
^
|
||||
compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:16:5: error: platform declaration clash: The following declarations have the same JVM signature (access$getBar$lp(LA;)I):
|
||||
fun <get-bar>(): kotlin.Int
|
||||
fun `access$getBar$lp`(a: A): kotlin.Int
|
||||
fun <get-bar>(): Int
|
||||
fun `access$getBar$lp`(a: A): Int
|
||||
fun `access$getBar$lp`(a: A): Int = 7
|
||||
^
|
||||
compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:18:15: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA$Companion;)I):
|
||||
fun <get-foo>(): kotlin.Int
|
||||
fun `access$getFoo$p`(p: A.Companion): kotlin.Int
|
||||
fun <get-foo>(): Int
|
||||
fun `access$getFoo$p`(p: A.Companion): Int
|
||||
companion object {
|
||||
^
|
||||
compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:18:15: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA$Companion;I)V):
|
||||
fun <set-foo>(<set-?>: kotlin.Int): kotlin.Unit
|
||||
fun `access$setFoo$p`(p: A.Companion, d: kotlin.Int): kotlin.Unit
|
||||
fun <set-foo>(<set-?>: Int): Unit
|
||||
fun `access$setFoo$p`(p: A.Companion, d: Int): Unit
|
||||
companion object {
|
||||
^
|
||||
compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:28:9: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA$Companion;)I):
|
||||
fun <get-foo>(): kotlin.Int
|
||||
fun `access$getFoo$p`(p: A.Companion): kotlin.Int
|
||||
fun <get-foo>(): Int
|
||||
fun `access$getFoo$p`(p: A.Companion): Int
|
||||
fun `access$getFoo$p`(p: A.Companion): Int = 1
|
||||
^
|
||||
compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:29:9: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA$Companion;I)V):
|
||||
fun <set-foo>(<set-?>: kotlin.Int): kotlin.Unit
|
||||
fun `access$setFoo$p`(p: A.Companion, d: kotlin.Int): kotlin.Unit
|
||||
fun <set-foo>(<set-?>: Int): Unit
|
||||
fun `access$setFoo$p`(p: A.Companion, d: Int): Unit
|
||||
fun `access$setFoo$p`(p: A.Companion, d: Int) {}
|
||||
^
|
||||
COMPILATION_ERROR
|
||||
+16
-16
@@ -1,41 +1,41 @@
|
||||
compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA;)I):
|
||||
fun <get-foo>(): kotlin.Int
|
||||
fun `access$getFoo$p`(a: A): kotlin.Int
|
||||
fun <get-foo>(): Int
|
||||
fun `access$getFoo$p`(a: A): Int
|
||||
class A {
|
||||
^
|
||||
compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA;I)V):
|
||||
fun <set-foo>(<set-?>: kotlin.Int): kotlin.Unit
|
||||
fun `access$setFoo$p`(a: A, d: kotlin.Int): kotlin.Unit
|
||||
fun <set-foo>(<set-?>: Int): Unit
|
||||
fun `access$setFoo$p`(a: A, d: Int): Unit
|
||||
class A {
|
||||
^
|
||||
compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo(LA;)I):
|
||||
fun `access$getFoo`(a: A): kotlin.Int
|
||||
fun getFoo(): kotlin.Int
|
||||
fun `access$getFoo`(a: A): Int
|
||||
fun getFoo(): Int
|
||||
class A {
|
||||
^
|
||||
compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo(LA;I)V):
|
||||
fun `access$setFoo`(a: A, d: kotlin.Int): kotlin.Unit
|
||||
fun setFoo(i: kotlin.Int): kotlin.Unit
|
||||
fun `access$setFoo`(a: A, d: Int): Unit
|
||||
fun setFoo(i: Int): Unit
|
||||
class A {
|
||||
^
|
||||
compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:5:5: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA;)I):
|
||||
fun <get-foo>(): kotlin.Int
|
||||
fun `access$getFoo$p`(a: A): kotlin.Int
|
||||
fun <get-foo>(): Int
|
||||
fun `access$getFoo$p`(a: A): Int
|
||||
fun `access$getFoo$p`(a: A): Int = 1
|
||||
^
|
||||
compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:6:5: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA;I)V):
|
||||
fun <set-foo>(<set-?>: kotlin.Int): kotlin.Unit
|
||||
fun `access$setFoo$p`(a: A, d: kotlin.Int): kotlin.Unit
|
||||
fun <set-foo>(<set-?>: Int): Unit
|
||||
fun `access$setFoo$p`(a: A, d: Int): Unit
|
||||
fun `access$setFoo$p`(a: A, d: Int) {}
|
||||
^
|
||||
compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:11:5: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo(LA;)I):
|
||||
fun `access$getFoo`(a: A): kotlin.Int
|
||||
fun getFoo(): kotlin.Int
|
||||
fun `access$getFoo`(a: A): Int
|
||||
fun getFoo(): Int
|
||||
fun `access$getFoo`(a: A): Int = 1
|
||||
^
|
||||
compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:12:5: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo(LA;I)V):
|
||||
fun `access$setFoo`(a: A, d: kotlin.Int): kotlin.Unit
|
||||
fun setFoo(i: kotlin.Int): kotlin.Unit
|
||||
fun `access$setFoo`(a: A, d: Int): Unit
|
||||
fun setFoo(i: Int): Unit
|
||||
fun `access$setFoo`(a: A, d: Int) {}
|
||||
^
|
||||
COMPILATION_ERROR
|
||||
+12
-12
@@ -1,31 +1,31 @@
|
||||
compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:15:5: error: accidental override: The following declarations have the same JVM signature (access$foo(LDerived;)V):
|
||||
fun `access$foo`(d: Derived): kotlin.Unit
|
||||
fun foo(): kotlin.Unit
|
||||
fun `access$foo`(d: Derived): Unit
|
||||
fun foo(): Unit
|
||||
private fun foo() {}
|
||||
^
|
||||
compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:18:9: error: accidental override: The following declarations have the same JVM signature (access$getBar$p(LDerived;)I):
|
||||
fun <get-bar>(): kotlin.Int
|
||||
fun `access$getBar$p`(d: Derived): kotlin.Int
|
||||
fun <get-bar>(): Int
|
||||
fun `access$getBar$p`(d: Derived): Int
|
||||
get
|
||||
^
|
||||
compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:19:9: error: accidental override: The following declarations have the same JVM signature (access$setBar$p(LDerived;I)V):
|
||||
fun <set-bar>(<set-?>: kotlin.Int): kotlin.Unit
|
||||
fun `access$setBar$p`(d: Derived, i: kotlin.Int): kotlin.Unit
|
||||
fun <set-bar>(<set-?>: Int): Unit
|
||||
fun `access$setBar$p`(d: Derived, i: Int): Unit
|
||||
set
|
||||
^
|
||||
compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:21:5: error: accidental override: The following declarations have the same JVM signature (access$getBaz$p(LDerived;)I):
|
||||
fun <get-baz>(): kotlin.Int
|
||||
fun `access$getBaz$p`(d: Derived): kotlin.Int
|
||||
fun <get-baz>(): Int
|
||||
fun `access$getBaz$p`(d: Derived): Int
|
||||
private var baz = 1
|
||||
^
|
||||
compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:23:5: error: accidental override: The following declarations have the same JVM signature (access$getBoo$p(LDerived;)I):
|
||||
fun <get-boo>(): kotlin.Int
|
||||
fun `access$getBoo$p`(d: Derived): kotlin.Int
|
||||
fun <get-boo>(): Int
|
||||
fun `access$getBoo$p`(d: Derived): Int
|
||||
private val boo = 1
|
||||
^
|
||||
compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:27:9: error: accidental override: The following declarations have the same JVM signature (access$setBar1$p(LDerived;I)V):
|
||||
fun <set-bar1>(<set-?>: kotlin.Int): kotlin.Unit
|
||||
fun `access$setBar1$p`(d: Derived, i: kotlin.Int): kotlin.Unit
|
||||
fun <set-bar1>(<set-?>: Int): Unit
|
||||
fun `access$setBar1$p`(d: Derived, i: Int): Unit
|
||||
set
|
||||
^
|
||||
COMPILATION_ERROR
|
||||
+1
-1
@@ -3,7 +3,7 @@ compiler/testData/cli/jvm/wrongAbiVersion.kt:4:5: error: unresolved reference: b
|
||||
bar()
|
||||
^
|
||||
compiler/testData/cli/jvm/wrongAbiVersion.kt:6:7: error: unresolved reference. None of the following candidates is applicable because of receiver type mismatch:
|
||||
public fun kotlin.String.replaceIndent(newIndent: kotlin.String = ...): kotlin.String defined in kotlin.text
|
||||
public fun String.replaceIndent(newIndent: String = ...): String defined in kotlin.text
|
||||
(note: this may be caused by the fact that some classes compiled with an incompatible version of Kotlin were found in the classpath. Such classes cannot be loaded properly by this version of Kotlin compiler. See below for more information)
|
||||
1.replaceIndent(2, 3)
|
||||
^
|
||||
|
||||
Reference in New Issue
Block a user