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

fix tests in org.jetbrains.kotlin.checkers (related to KT-9072)

Browse Source
This commit is contained in:
Michael Nedzelsky
2015-09-07 20:36:59 +03:00
parent 7c1758a8d3
commit aa44606663
27 changed files with 66 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/declarationChecks/ambiguousObjectExpressionType.kt
Vendored
+18 -18
View File
@@ -16,13 +16,13 @@ class Foo {
privateProperty.f2()
}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>protected val protectedProperty<!> = object : MyClass(), MyTrait {}
protected val protectedProperty = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>val internalProperty<!> = object : MyClass(), MyTrait {}
val internalProperty = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>internal val internal2Property<!> = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>public val publicProperty<!> = object : MyClass(), MyTrait {}
public val publicProperty = object : MyClass(), MyTrait {}
private fun privateFunction() = object : MyClass(), MyTrait {}
@@ -32,13 +32,13 @@ class Foo {
privateFunction().f2()
}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>protected fun protectedFunction()<!> = object : MyClass(), MyTrait {}
protected fun protectedFunction() = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>fun internalFunction()<!> = object : MyClass(), MyTrait {}
fun internalFunction() = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>internal fun internal2Function()<!> = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>public fun publicFunction()<!> = object : MyClass(), MyTrait {}
public fun publicFunction() = object : MyClass(), MyTrait {}
@@ -50,13 +50,13 @@ class Foo {
privatePropertyInner.f2()
}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>protected val protectedProperty<!> = object : MyClass(), MyTrait {}
protected val protectedProperty = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>val internalProperty<!> = object : MyClass(), MyTrait {}
val internalProperty = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>internal val internal2Property<!> = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>public val publicProperty<!> = object : MyClass(), MyTrait {}
public val publicProperty = object : MyClass(), MyTrait {}
private fun privateFunctionInner() = object : MyClass(), MyTrait {}
@@ -66,13 +66,13 @@ class Foo {
privateFunctionInner().f2()
}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>protected fun protectedFunction()<!> = object : MyClass(), MyTrait {}
protected fun protectedFunction() = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>fun internalFunction()<!> = object : MyClass(), MyTrait {}
fun internalFunction() = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>internal fun internal2Function()<!> = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>public fun publicFunction()<!> = object : MyClass(), MyTrait {}
public fun publicFunction() = object : MyClass(), MyTrait {}
}
@@ -90,21 +90,21 @@ class Foo {
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>private val packagePrivateProperty<!> = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!><!WRONG_MODIFIER_TARGET!>protected<!> val packageProtectedProperty<!> = object : MyClass(), MyTrait {}
<!WRONG_MODIFIER_TARGET!>protected<!> val packageProtectedProperty = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>val packageInternalProperty<!> = object : MyClass(), MyTrait {}
val packageInternalProperty = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>internal val packageInternal2Property<!> = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>public val packagePublicProperty<!> = object : MyClass(), MyTrait {}
public val packagePublicProperty = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!><!WRONG_MODIFIER_TARGET!>protected<!> fun packageProtectedFunction()<!> = object : MyClass(), MyTrait {}
<!WRONG_MODIFIER_TARGET!>protected<!> fun packageProtectedFunction() = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>fun packageInternalFunction()<!> = object : MyClass(), MyTrait {}
fun packageInternalFunction() = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>internal fun packageInternal2Function()<!> = object : MyClass(), MyTrait {}
<!AMBIGUOUS_ANONYMOUS_TYPE_INFERRED!>public fun packagePublicFunction()<!> = object : MyClass(), MyTrait {}
public fun packagePublicFunction() = object : MyClass(), MyTrait {}
fun fooPackage() {
val packageLocalVar = object : MyClass(), MyTrait {}
compiler/testData/diagnostics/tests/declarationChecks/unambiguousObjectExpressionType.txt
Vendored
+18 -24
View File
@@ -1,62 +1,56 @@
package
internal val packageInternal2Property: MyClass
public val packageInternalProperty: MyClass
internal val packageInternalProperty: MyClass
private val packagePrivateProperty: MyClass
protected val packageProtectedProperty: MyClass
protected val packageProtectedProperty: packageProtectedProperty.<no name provided>
public val packagePublic2Property: MyClass
public val packagePublicProperty: MyClass
public val packagePublicProperty: packagePublicProperty.<no name provided>
public fun fooPackage(): kotlin.Unit
internal fun internal2Function(): MyClass
public fun internalFunction(): MyClass
internal fun internalFunction(): MyClass
private fun privateFunction(): MyClass
protected fun protectedFunction(): MyClass
protected fun protectedFunction(): protectedFunction.<no name provided>
public fun public2Function(): MyClass
public fun publicFunction(): MyClass
public fun publicFunction(): publicFunction.<no name provided>
public fun testFunctions(): kotlin.Unit
public fun testProperties(): kotlin.Unit
public final class Foo {
public constructor Foo()
internal final val internal2Property: MyClass
public final val internalProperty: MyClass
internal final val internalProperty: MyClass
private final val privateProperty: Foo.privateProperty.<no name provided>
protected final val protected2Property: MyClass
protected final val protectedProperty: MyClass
protected final val protectedProperty: Foo.protectedProperty.<no name provided>
public final val public2Property: MyClass
public final val publicProperty: MyClass
public final val publicProperty: Foo.publicProperty.<no name provided>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
internal final fun internal2Function(): MyClass
public final fun internalFunction(): MyClass
internal final fun internalFunction(): MyClass
private final fun privateFunction(): Foo.privateFunction.<no name provided>
protected final fun protected2Function(): MyClass
protected final fun protectedFunction(): MyClass
protected final fun protectedFunction(): Foo.protectedFunction.<no name provided>
public final fun public2Function(): MyClass
public final fun publicFunction(): MyClass
public final fun publicFunction(): Foo.publicFunction.<no name provided>
public final fun testFunctions(): kotlin.Unit
public final fun testProperties(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public final class FooInner {
public constructor FooInner()
internal final val internal2Property: MyClass
public final val internalProperty: MyClass
internal final val internalProperty: MyClass
private final val privateProperty: Foo.FooInner.privateProperty.<no name provided>
protected final val protected2Property: MyClass
protected final val protectedProperty: MyClass
protected final val protectedProperty: Foo.FooInner.protectedProperty.<no name provided>
public final val public2Property: MyClass
public final val publicProperty: MyClass
public final val publicProperty: Foo.FooInner.publicProperty.<no name provided>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
internal final fun internal2Function(): MyClass
public final fun internalFunction(): MyClass
internal final fun internalFunction(): MyClass
private final fun privateFunction(): Foo.FooInner.privateFunction.<no name provided>
protected final fun protected2Function(): MyClass
protected final fun protectedFunction(): MyClass
protected final fun protectedFunction(): Foo.FooInner.protectedFunction.<no name provided>
public final fun public2Function(): MyClass
public final fun publicFunction(): MyClass
public final fun publicFunction(): Foo.FooInner.publicFunction.<no name provided>
public final fun testFunctions(): kotlin.Unit
public final fun testProperties(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String