Merge pull request #11293 from smowton/smowton/admin/exclude-kotlin-metadata-annotation

smowton · web-flow · commit 254a5b0928ae · 2022-11-17T11:50:21.000Z
Java: Remove no-longer-needed expected diagnostics
diff --git a/java/ql/test/kotlin/library-tests/annotation_classes/def.kt b/java/ql/test/kotlin/library-tests/annotation_classes/def.kt
@@ -1,5 +1,3 @@
 
 annotation class SomeAnnotation
 
-// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)
-// Diagnostic Matches: Unknown location for kotlin.Metadata
diff --git a/java/ql/test/kotlin/library-tests/annotations/jvmName/test.kt b/java/ql/test/kotlin/library-tests/annotations/jvmName/test.kt
@@ -17,10 +17,8 @@ annotation class Ann(
     val p: Int,
     @get:JvmName("w") val q: Int)
 
-// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)
 // Diagnostic Matches: Incomplete annotation: @kotlin.jvm.JvmName(name="changeY")
 // Diagnostic Matches: Incomplete annotation: @kotlin.jvm.JvmName(name="getX_prop")
 // Diagnostic Matches: Incomplete annotation: @kotlin.jvm.JvmName(name="method")
 // Diagnostic Matches: Incomplete annotation: @kotlin.jvm.JvmName(name="y")
-// Diagnostic Matches: Unknown location for kotlin.Metadata
 // Diagnostic Matches: Unknown location for kotlin.jvm.JvmName
diff --git a/java/ql/test/kotlin/library-tests/arrays-with-variances/takesArrayList.kt b/java/ql/test/kotlin/library-tests/arrays-with-variances/takesArrayList.kt
@@ -111,7 +111,5 @@ public class TakesArrayList {
 
 }
 
-// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)
-// Diagnostic Matches: Unknown location for kotlin.Metadata
 // Diagnostic Matches: Completion failure for type: org.jetbrains.annotations.NotNull
 // Diagnostic Matches: Unknown location for org.jetbrains.annotations.NotNull
diff --git a/java/ql/test/kotlin/library-tests/extensions/extensions.kt b/java/ql/test/kotlin/library-tests/extensions/extensions.kt
@@ -32,6 +32,4 @@ fun foo() {
 }
 
 // Diagnostic Matches: Completion failure for type: org.jetbrains.annotations.NotNull
-// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)
-// Diagnostic Matches: Unknown location for kotlin.Metadata
 // Diagnostic Matches: Unknown location for org.jetbrains.annotations.NotNull
diff --git a/java/ql/test/kotlin/library-tests/generics-location/generics.kt b/java/ql/test/kotlin/library-tests/generics-location/generics.kt
@@ -10,5 +10,3 @@ class B<T> {
     }
 }
 
-// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)
-// Diagnostic Matches: Unknown location for kotlin.Metadata
diff --git a/java/ql/test/kotlin/library-tests/internal-constructor-called-from-java/test.kt b/java/ql/test/kotlin/library-tests/internal-constructor-called-from-java/test.kt
@@ -4,5 +4,3 @@ public class Test() {
 
 }
 
-// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)
-// Diagnostic Matches: Unknown location for kotlin.Metadata
diff --git a/java/ql/test/kotlin/library-tests/internal-public-alias/test.kt b/java/ql/test/kotlin/library-tests/internal-public-alias/test.kt
@@ -11,5 +11,3 @@ public class Test {
 
 }
 
-// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)
-// Diagnostic Matches: Unknown location for kotlin.Metadata
diff --git a/java/ql/test/kotlin/library-tests/java_and_kotlin/Kotlin.kt b/java/ql/test/kotlin/library-tests/java_and_kotlin/Kotlin.kt
@@ -16,7 +16,5 @@ class Dkotlin : Base() {
 
 // Diagnostic Matches: Completion failure for type: org.jetbrains.annotations.NotNull
 // Diagnostic Matches: Completion failure for type: org.jetbrains.annotations.Nullable
-// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)
-// Diagnostic Matches: Unknown location for kotlin.Metadata
 // Diagnostic Matches: Unknown location for org.jetbrains.annotations.NotNull
 // Diagnostic Matches: Unknown location for org.jetbrains.annotations.Nullable
diff --git a/java/ql/test/kotlin/library-tests/java_and_kotlin_internal/Kotlin.kt b/java/ql/test/kotlin/library-tests/java_and_kotlin_internal/Kotlin.kt
@@ -3,5 +3,3 @@ public class Kotlin {
 	}
 }
 
-// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)
-// Diagnostic Matches: Unknown location for kotlin.Metadata
diff --git a/java/ql/test/kotlin/library-tests/jvmoverloads_flow/test.kt b/java/ql/test/kotlin/library-tests/jvmoverloads_flow/test.kt
@@ -86,8 +86,6 @@ public class TestDefaultParameterReference {
 
 }
 
-// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)
-// Diagnostic Matches: Unknown location for kotlin.Metadata
 // Diagnostic Matches: Completion failure for type: org.jetbrains.annotations.NotNull
 // Diagnostic Matches: Unknown location for org.jetbrains.annotations.NotNull
 // Diagnostic Matches: Completion failure for type: kotlin.jvm.JvmOverloads
diff --git a/java/ql/test/kotlin/library-tests/jvmoverloads_generics/test.kt b/java/ql/test/kotlin/library-tests/jvmoverloads_generics/test.kt
@@ -5,8 +5,6 @@ public class A {
 
 }
 
-// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)
-// Diagnostic Matches: Unknown location for kotlin.Metadata
 // Diagnostic Matches: Completion failure for type: kotlin.jvm.JvmOverloads
 // Diagnostic Matches: Completion failure for type: org.jetbrains.annotations.Nullable
 // Diagnostic Matches: Unknown location for kotlin.jvm.JvmOverloads
diff --git a/java/ql/test/kotlin/library-tests/jvmstatic-annotation/PrintAst.expected b/java/ql/test/kotlin/library-tests/jvmstatic-annotation/PrintAst.expected
@@ -141,13 +141,11 @@ test.kt:
 #   65|             0: [MethodAccess] getPropWithStaticGetter(...)
 #   65|               -1: [TypeAccess] NonCompanion
 #    9|   2: [Class] HasCompanion
-#-----|     -3: (Annotations)
 #    9|     2: [Constructor] HasCompanion
 #    9|       5: [BlockStmt] { ... }
 #    9|         0: [SuperConstructorInvocationStmt] super(...)
 #    9|         1: [BlockStmt] { ... }
 #   11|     3: [Class] Companion
-#-----|       -3: (Annotations)
 #   11|       1: [Constructor] Companion
 #   11|         5: [BlockStmt] { ... }
 #   11|           0: [SuperConstructorInvocationStmt] super(...)
@@ -318,7 +316,6 @@ test.kt:
 #   25|               -1: [TypeAccess] HasCompanion
 #   25|             0: [VarAccess] s
 #   31|   3: [Class] NonCompanion
-#-----|     -3: (Annotations)
 #   31|     2: [Constructor] NonCompanion
 #   31|       5: [BlockStmt] { ... }
 #   31|         0: [SuperConstructorInvocationStmt] super(...)
diff --git a/java/ql/test/kotlin/library-tests/jvmstatic-annotation/test.kt b/java/ql/test/kotlin/library-tests/jvmstatic-annotation/test.kt
@@ -66,8 +66,6 @@ fun externalUser() {
 
 }
 
-// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)
-// Diagnostic Matches: Unknown location for kotlin.Metadata
 // Diagnostic Matches: Completion failure for type: kotlin.jvm.JvmStatic
 // Diagnostic Matches: Completion failure for type: org.jetbrains.annotations.NotNull
 // Diagnostic Matches: Unknown location for kotlin.jvm.JvmStatic

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`	`1`
`2`	`2`	`annotation class SomeAnnotation`
`3`	`3`
`4`		`-// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)`
`5`		`-// Diagnostic Matches: Unknown location for kotlin.Metadata`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,5 @@ public class TakesArrayList {`
`111`	`111`
`112`	`112`	`}`
`113`	`113`
`114`		`-// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)`
`115`		`-// Diagnostic Matches: Unknown location for kotlin.Metadata`
`116`	`114`	`// Diagnostic Matches: Completion failure for type: org.jetbrains.annotations.NotNull`
`117`	`115`	`// Diagnostic Matches: Unknown location for org.jetbrains.annotations.NotNull`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,4 @@ fun foo() {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`// Diagnostic Matches: Completion failure for type: org.jetbrains.annotations.NotNull`
`35`		`-// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)`
`36`		`-// Diagnostic Matches: Unknown location for kotlin.Metadata`
`37`	`35`	`// Diagnostic Matches: Unknown location for org.jetbrains.annotations.NotNull`
Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,3 @@ class B<T> {`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`
`13`		`-// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)`
`14`		`-// Diagnostic Matches: Unknown location for kotlin.Metadata`
Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,3 @@ public class Test() {`
`4`	`4`
`5`	`5`	`}`
`6`	`6`
`7`		`-// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)`
`8`		`-// Diagnostic Matches: Unknown location for kotlin.Metadata`
Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,3 @@ public class Test {`
`11`	`11`
`12`	`12`	`}`
`13`	`13`
`14`		`-// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)`
`15`		`-// Diagnostic Matches: Unknown location for kotlin.Metadata`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,3 @@ public class Kotlin {`
`3`	`3`	`}`
`4`	`4`	`}`
`5`	`5`
`6`		`-// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)`
`7`		`-// Diagnostic Matches: Unknown location for kotlin.Metadata`
Original file line number	Diff line number	Diff line change
`@@ -86,8 +86,6 @@ public class TestDefaultParameterReference {`
`86`	`86`
`87`	`87`	`}`
`88`	`88`
`89`		`-// Diagnostic Matches: Incomplete annotation: @kotlin.Metadata(%)`
`90`		`-// Diagnostic Matches: Unknown location for kotlin.Metadata`
`91`	`89`	`// Diagnostic Matches: Completion failure for type: org.jetbrains.annotations.NotNull`
`92`	`90`	`// Diagnostic Matches: Unknown location for org.jetbrains.annotations.NotNull`
`93`	`91`	`// Diagnostic Matches: Completion failure for type: kotlin.jvm.JvmOverloads`