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

Highlight only declarations, without body, on platform signature clashes

Browse Source
This commit is contained in:
Andrey Breslav
2014-05-28 12:35:50 +04:00
parent 3575c375e3
commit 22c47c2f82
43 changed files with 95 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/componentInheritedFromTrait.kt
+1 -1
View File
@@ -1,5 +1,5 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
data class C(val c: Int) {
<!CONFLICTING_PLATFORM_DECLARATIONS!>fun `copy$default`(c: C, x: Int, m: Int) = 1<!>
<!CONFLICTING_PLATFORM_DECLARATIONS!>fun `copy$default`(c: C, x: Int, m: Int)<!> = 1
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/defaults.kt
+3 -3
View File
@@ -1,6 +1,6 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
<!CONFLICTING_PLATFORM_DECLARATIONS!>class C {
<!CONFLICTING_PLATFORM_DECLARATIONS!>fun `a$default`(c: C, x: Int, m: Int) {}<!>
<!CONFLICTING_PLATFORM_DECLARATIONS!>class C<!> {
<!CONFLICTING_PLATFORM_DECLARATIONS!>fun `a$default`(c: C, x: Int, m: Int)<!> {}
fun a(x: Int = 1) {}
}<!>
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.kt
+1 -1
View File
@@ -1,5 +1,5 @@
trait Foo
class Bar(f: Foo) : Foo by f {
<!CONFLICTING_PLATFORM_DECLARATIONS!>val `$delegate_0`: Foo? = null<!>
<!CONFLICTING_PLATFORM_DECLARATIONS!>val `$delegate_0`: Foo?<!> = null
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.kt
+3 -3
View File
@@ -1,7 +1,7 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
class C {
<!CONFLICTING_PLATFORM_DECLARATIONS!>inner class D {
<!CONFLICTING_PLATFORM_DECLARATIONS!>val `this$0`: C? = null<!>
}<!>
<!CONFLICTING_PLATFORM_DECLARATIONS!>inner class D<!> {
<!CONFLICTING_PLATFORM_DECLARATIONS!>val `this$0`: C?<!> = null
}
}