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

Changed imports semantics: imports order does not affect resolve, explicit imports have higher priority for classes

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-01-14 20:55:53 +03:00
parent 8fc0063410
commit b888ea601c
23 changed files with 427 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/imports/AllUnderImportsAmbiguity.kt
+17
View File
@@ -0,0 +1,17 @@
// FILE: a.kt
package a
class X
// FILE: b.kt
package b
class X
// FILE: c.kt
package c
import a.*
import b.*
class Y : <!UNRESOLVED_REFERENCE!>X<!>
compiler/testData/diagnostics/tests/imports/AllUnderImportsAmbiguity.txt
+31
View File
@@ -0,0 +1,31 @@
package
package a {
internal final class X {
public constructor X()
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 toString(): kotlin.String
}
}
package b {
internal final class X {
public constructor X()
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 toString(): kotlin.String
}
}
package c {
internal final class Y {
public constructor Y()
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 toString(): kotlin.String
}
}
compiler/testData/diagnostics/tests/imports/AllUnderImportsLessPriority.kt
+17
View File
@@ -0,0 +1,17 @@
// FILE: a.kt
package a
open class X
// FILE: b.kt
package b
class X
// FILE: c.kt
package c
import a.X
import b.*
class Y : X()
compiler/testData/diagnostics/tests/imports/AllUnderImportsLessPriority.txt
+31
View File
@@ -0,0 +1,31 @@
package
package a {
internal open class X {
public constructor X()
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 toString(): kotlin.String
}
}
package b {
internal final class X {
public constructor X()
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 toString(): kotlin.String
}
}
package c {
internal final class Y : a.X {
public constructor Y()
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 toString(): kotlin.String
}
}
compiler/testData/diagnostics/tests/imports/AllUnderImportsSamePriorityForFunction.kt
+19
View File
@@ -0,0 +1,19 @@
// FILE: a.kt
package a
fun X(<!UNUSED_PARAMETER!>p<!>: Int) {}
// FILE: b.kt
package b
fun X(): Int = 1
// FILE: c.kt
package c
import b.*
import a.X
fun foo() {
val <!UNUSED_VARIABLE!>v<!>: Int = X()
}
compiler/testData/diagnostics/tests/imports/AllUnderImportsSamePriorityForFunction.txt
+13
View File
@@ -0,0 +1,13 @@
package
package a {
internal fun X(/*0*/ p: kotlin.Int): kotlin.Unit
}
package b {
internal fun X(): kotlin.Int
}
package c {
internal fun foo(): kotlin.Unit
}
compiler/testData/diagnostics/tests/imports/AllUnderImportsSamePriorityForProperty.kt
+19
View File
@@ -0,0 +1,19 @@
// FILE: a.kt
package a
var X: Int = 1
// FILE: b.kt
package b
var X: String = ""
// FILE: c.kt
package c
import a.X
import b.*
fun foo() {
<!OVERLOAD_RESOLUTION_AMBIGUITY!>X<!> = 1
}
compiler/testData/diagnostics/tests/imports/AllUnderImportsSamePriorityForProperty.txt
+13
View File
@@ -0,0 +1,13 @@
package
package a {
internal var X: kotlin.Int
}
package b {
internal var X: kotlin.String
}
package c {
internal fun foo(): kotlin.Unit
}
compiler/testData/diagnostics/tests/imports/ExplicitImportsAmbiguity.kt
+17
View File
@@ -0,0 +1,17 @@
// FILE: a.kt
package a
class X
// FILE: b.kt
package b
class X
// FILE: c.kt
package c
import a.X
import b.X
class Y : <!UNRESOLVED_REFERENCE!>X<!>
compiler/testData/diagnostics/tests/imports/ExplicitImportsAmbiguity.txt
+31
View File
@@ -0,0 +1,31 @@
package
package a {
internal final class X {
public constructor X()
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 toString(): kotlin.String
}
}
package b {
internal final class X {
public constructor X()
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 toString(): kotlin.String
}
}
package c {
internal final class Y {
public constructor Y()
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 toString(): kotlin.String
}
}
compiler/testData/diagnostics/tests/imports/ExplicitImportsUnambiguityForFunction.kt
+19
View File
@@ -0,0 +1,19 @@
// FILE: a.kt
package a
fun X(<!UNUSED_PARAMETER!>p<!>: Int) {}
// FILE: b.kt
package b
fun X(): Int = 1
// FILE: c.kt
package c
import b.X
import a.X
fun foo() {
val <!UNUSED_VARIABLE!>v<!>: Int = X()
}
compiler/testData/diagnostics/tests/imports/ExplicitImportsUnambiguityForFunction.txt
+13
View File
@@ -0,0 +1,13 @@
package
package a {
internal fun X(/*0*/ p: kotlin.Int): kotlin.Unit
}
package b {
internal fun X(): kotlin.Int
}
package c {
internal fun foo(): kotlin.Unit
}