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

Renamed conflicting property in test

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-08-31 19:12:04 +03:00
parent ed2f5ccfa2
commit b859815c79
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/extensions/kt3563.kt
Vendored
+4 -5
View File
@@ -4,14 +4,13 @@ package bar
import java.io.File import java.io.File
class Customer(<!UNUSED_PARAMETER!>name<!>: String) class Customer(<!UNUSED_PARAMETER!>name1<!>: String)
fun foo(f: File, c: Customer) { fun foo(f: File, c: Customer) {
f.name f.name1
c.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>name<!> // name should be unresolved here c.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>name1<!> // name1 should be unresolved here
} }
//from standard library val File.name1: String
val File.name: String
get() = getName() get() = getName()
compiler/testData/diagnostics/tests/extensions/kt3563.txt
Vendored
+2 -2
View File
@@ -1,11 +1,11 @@
package package
package bar { package bar {
internal val java.io.File.name: kotlin.String internal val java.io.File.name1: kotlin.String
internal fun foo(/*0*/ f: java.io.File, /*1*/ c: bar.Customer): kotlin.Unit internal fun foo(/*0*/ f: java.io.File, /*1*/ c: bar.Customer): kotlin.Unit
internal final class Customer { internal final class Customer {
public constructor Customer(/*0*/ name: kotlin.String) public constructor Customer(/*0*/ name1: kotlin.String)
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String