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

Render 'annotation class not found' for error types in tests

Browse Source 
After 13ae3d9 it became unclear whether an annotation mentioned in test data is
resolved or not, this change fixes that
This commit is contained in:
Alexander Udalov
2016-03-18 14:19:38 +03:00
parent 70dd79d7e4
commit e42cb2af40
13 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/PackageInTypePosition.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package
@[ERROR : foo]() public fun bar(/*0*/ p: [ERROR : foo]): [ERROR : foo]
@[ERROR : foo]() /* annotation class not found */ public fun bar(/*0*/ p: [ERROR : foo]): [ERROR : foo]
package foo {
}
compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.txt
Vendored
+1 -1
View File
@@ -2,4 +2,4 @@ package
@java.lang.Deprecated() public fun a(): kotlin.Unit
@java.util.ArrayList<kotlin.Int>() public fun b(): kotlin.Unit
@[ERROR : Xoo]() public fun c(): kotlin.Unit
@[ERROR : Xoo]() /* annotation class not found */ public fun c(): kotlin.Unit
compiler/testData/diagnostics/tests/annotations/AnnotationForObject.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
package
@[ERROR : someErrorAnnotation]() public object Test {
@[ERROR : someErrorAnnotation]() /* annotation class not found */ public object Test {
private constructor Test()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/annotations/UnresolvedAnnotationOnObject.txt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ package
package test {
public val some: test.SomeObject
@[ERROR : BadAnnotation]() public object SomeObject {
@[ERROR : BadAnnotation]() /* annotation class not found */ public object SomeObject {
private constructor SomeObject()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/annotations/kt1860-negative.txt
Vendored
+2 -2
View File
@@ -2,10 +2,10 @@ package
public var bar: kotlin.Int
public val x: (kotlin.Int) -> kotlin.Int
public fun foo(/*0*/ @[ERROR : varargs]() f: kotlin.Int): kotlin.Unit
public fun foo(/*0*/ @[ERROR : varargs]() /* annotation class not found */ f: kotlin.Int): kotlin.Unit
public final class Hello {
public constructor Hello(/*0*/ @[ERROR : varargs]() args: kotlin.Any)
public constructor Hello(/*0*/ @[ERROR : varargs]() /* annotation class not found */ args: kotlin.Any)
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/annotations/typeParameterAsAnnotation.txt
Vendored
+2 -2
View File
@@ -3,7 +3,7 @@ package
public final class Bar</*0*/ T : kotlin.Annotation> {
public constructor Bar</*0*/ T : kotlin.Annotation>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@[ERROR : Not an annotation: T]() public final fun foo(): kotlin.Int
@[ERROR : Not an annotation: T]() /* annotation class not found */ public final fun foo(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@@ -11,7 +11,7 @@ public final class Bar</*0*/ T : kotlin.Annotation> {
public final class Foo</*0*/ T> {
public constructor Foo</*0*/ T>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@[ERROR : Not an annotation: T]() public final fun foo(): kotlin.Int
@[ERROR : Not an annotation: T]() /* annotation class not found */ public final fun foo(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/annotations/unresolvedReferenceRange.txt
Vendored
+5 -5
View File
@@ -1,34 +1,34 @@
package
@[ERROR : Ann]() public final class A {
@[ERROR : Ann]() /* annotation class not found */ public final class A {
public constructor A()
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
}
@[ERROR : Ann]() public final class B {
@[ERROR : Ann]() /* annotation class not found */ public final class B {
public constructor B()
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
}
@[ERROR : Ann]() public final class C {
@[ERROR : Ann]() /* annotation class not found */ public final class C {
public constructor C()
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
}
@[ERROR : kotlin.Ann]() public final class D {
@[ERROR : kotlin.Ann]() /* annotation class not found */ public final class D {
public constructor D()
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
}
@[ERROR : kotlin.annotation.Ann]() public final class E {
@[ERROR : kotlin.annotation.Ann]() /* annotation class not found */ public final class E {
public constructor E()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.txt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ public final class Test {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@[ERROR : ClassObjectAnnotation]() @Test.NestedAnnotation() public companion object Companion {
@[ERROR : ClassObjectAnnotation]() /* annotation class not found */ @Test.NestedAnnotation() public companion object Companion {
private constructor Companion()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/j+k/annotationWithArgumentsMissingDependencies.txt
Vendored
+2 -2
View File
@@ -2,10 +2,10 @@ package
public fun main(): kotlin.Unit
@missing.Ann() public open class A {
@missing.Ann() /* annotation class not found */ public open class A {
public constructor A()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@missing.Ann() public open fun foo(): kotlin.String!
@missing.Ann() /* annotation class not found */ public open fun foo(): kotlin.String!
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/platformTypes/noAnnotationInClassPath.txt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ public fun test(): kotlin.Unit
public interface A</*0*/ T : kotlin.Any!> {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun foo(/*0*/ @javax.annotation.Nullable() y: T?): kotlin.Boolean
public abstract fun foo(/*0*/ @javax.annotation.Nullable() /* annotation class not found */ y: T?): 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/regressions/ea65509.txt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ package
public final class ClassB {
public constructor ClassB()
@[ERROR : ClassA]() public final fun <no name provided>(): kotlin.Unit
@[ERROR : ClassA]() /* annotation class not found */ public final fun <no name provided>(): kotlin.Unit
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/regressions/kt1639-JFrame.txt
Vendored
+3 -3
View File
@@ -293,10 +293,10 @@ package test {
invisible_fake final override /*1*/ /*fake_override*/ fun getFocusTraversalKeys_NoIDCheck(/*0*/ p0: kotlin.Int): kotlin.collections.(Mutable)Set<(raw) kotlin.Any?>!
public open override /*1*/ /*fake_override*/ fun getFocusTraversalPolicy(): [ERROR : Unresolved java classifier: FocusTraversalPolicy]!
public open override /*1*/ /*fake_override*/ fun getFocusableWindowState(): kotlin.Boolean
@java.beans.Transient() public open override /*1*/ /*fake_override*/ fun getFont(): [ERROR : Unresolved java classifier: Font]!
@java.beans.Transient() /* annotation class not found */ public open override /*1*/ /*fake_override*/ fun getFont(): [ERROR : Unresolved java classifier: Font]!
public open override /*1*/ /*fake_override*/ fun getFontMetrics(/*0*/ p0: [ERROR : Unresolved java classifier: Font]!): [ERROR : Unresolved java classifier: FontMetrics]!
invisible_fake final override /*1*/ /*fake_override*/ fun getFont_NoClientCode(): [ERROR : Unresolved java classifier: Font]!
@java.beans.Transient() public open override /*1*/ /*fake_override*/ fun getForeground(): [ERROR : Unresolved java classifier: Color]!
@java.beans.Transient() /* annotation class not found */ public open override /*1*/ /*fake_override*/ fun getForeground(): [ERROR : Unresolved java classifier: Color]!
public open override /*1*/ /*fake_override*/ fun getGlassPane(): java.awt.Component!
public open override /*1*/ /*fake_override*/ fun getGraphics(): [ERROR : Unresolved java classifier: Graphics]!
public open override /*1*/ /*fake_override*/ fun getGraphicsConfiguration(): [ERROR : Unresolved java classifier: GraphicsConfiguration]!
@@ -450,7 +450,7 @@ package test {
public open override /*1*/ /*fake_override*/ fun isUndecorated(): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun isValid(): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun isValidateRoot(): kotlin.Boolean
@java.beans.Transient() public open override /*1*/ /*fake_override*/ fun isVisible(): kotlin.Boolean
@java.beans.Transient() /* annotation class not found */ public open override /*1*/ /*fake_override*/ fun isVisible(): kotlin.Boolean
invisible_fake final override /*1*/ /*fake_override*/ fun isVisible_NoClientCode(): kotlin.Boolean
@kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun keyDown(/*0*/ p0: [ERROR : Unresolved java classifier: Event]!, /*1*/ p1: kotlin.Int): kotlin.Boolean
@kotlin.Deprecated(message = "Deprecated in Java") public open override /*1*/ /*fake_override*/ fun keyUp(/*0*/ p0: [ERROR : Unresolved java classifier: Event]!, /*1*/ p1: kotlin.Int): kotlin.Boolean
core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt
+5 -1
View File
@@ -374,9 +374,13 @@ internal class DescriptorRendererImpl(
if (target != null) {
append(target.renderName + ":")
}
append(renderType(annotation.type))
val annotationType = annotation.type
append(renderType(annotationType))
if (verbose) {
renderAndSortAnnotationArguments(annotation).joinTo(this, ", ", "(", ")")
if (annotationType.isError) {
append(" /* annotation class not found */")
}
}
}
}