From f46fa263ef0fb98a75eaeb68ca48f3589417429b Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Tue, 30 Jan 2018 15:41:06 +0300
Subject: [PATCH] Fix two psi checker tests (related to annotation diagnostic /
 parsing)

---
 idea/testData/checker/JvmStaticUsagesRuntime.kt        | 10 +++++-----
 .../checker/recovery/namelessToplevelDeclarations.kt   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/idea/testData/checker/JvmStaticUsagesRuntime.kt b/idea/testData/checker/JvmStaticUsagesRuntime.kt
index 5ceefc1b758..2bea1b40fe6 100644
--- a/idea/testData/checker/JvmStaticUsagesRuntime.kt
+++ b/idea/testData/checker/JvmStaticUsagesRuntime.kt
@@ -17,13 +17,13 @@ class A {
 
     fun test() {
         val <warning descr="[UNUSED_VARIABLE] Variable 's' is never used">s</warning> = object {
-            <error descr="[JVM_STATIC_NOT_IN_OBJECT] Only functions in named objects and companion objects of classes can be annotated with '@JvmStatic'">@JvmStatic fun a3()</error> {
+            <error descr="[JVM_STATIC_NOT_IN_OBJECT_OR_CLASS_COMPANION] Only members in named objects and companion objects of classes can be annotated with '@JvmStatic'">@JvmStatic fun a3()</error> {
 
             }
         }
     }
 
-    <error descr="[JVM_STATIC_NOT_IN_OBJECT] Only functions in named objects and companion objects of classes can be annotated with '@JvmStatic'">@JvmStatic fun a4()</error> {
+    <error descr="[JVM_STATIC_NOT_IN_OBJECT_OR_CLASS_COMPANION] Only members in named objects and companion objects of classes can be annotated with '@JvmStatic'">@JvmStatic fun a4()</error> {
 
     }
 }
@@ -31,7 +31,7 @@ class A {
 <error descr="[WRONG_ANNOTATION_TARGET] This annotation is not applicable to target 'interface'">@JvmStatic</error>
 interface B {
     companion object {
-        <error descr="[JVM_STATIC_NOT_IN_OBJECT] Only functions in named objects and companion objects of classes can be annotated with '@JvmStatic'">@JvmStatic fun a1()</error> {
+        <error descr="[JVM_STATIC_NOT_IN_OBJECT_OR_CLASS_COMPANION] Only members in named objects and companion objects of classes can be annotated with '@JvmStatic'">@JvmStatic fun a1()</error> {
 
         }
     }
@@ -44,13 +44,13 @@ interface B {
 
     fun test() {
         val <warning descr="[UNUSED_VARIABLE] Variable 's' is never used">s</warning> = object {
-            <error descr="[JVM_STATIC_NOT_IN_OBJECT] Only functions in named objects and companion objects of classes can be annotated with '@JvmStatic'">@JvmStatic fun a3()</error> {
+            <error descr="[JVM_STATIC_NOT_IN_OBJECT_OR_CLASS_COMPANION] Only members in named objects and companion objects of classes can be annotated with '@JvmStatic'">@JvmStatic fun a3()</error> {
 
             }
         }
     }
 
-    <error descr="[JVM_STATIC_NOT_IN_OBJECT] Only functions in named objects and companion objects of classes can be annotated with '@JvmStatic'">@JvmStatic fun a4()</error> {
+    <error descr="[JVM_STATIC_NOT_IN_OBJECT_OR_CLASS_COMPANION] Only members in named objects and companion objects of classes can be annotated with '@JvmStatic'">@JvmStatic fun a4()</error> {
 
     }
 }
diff --git a/idea/testData/checker/recovery/namelessToplevelDeclarations.kt b/idea/testData/checker/recovery/namelessToplevelDeclarations.kt
index 0688386365e..a7cf09adb91 100644
--- a/idea/testData/checker/recovery/namelessToplevelDeclarations.kt
+++ b/idea/testData/checker/recovery/namelessToplevelDeclarations.kt
@@ -21,4 +21,4 @@ object<error> </error>{
 
 enum class<error> </error>{}
 
-annotation class<error> </error><error>{}</error>
\ No newline at end of file
+annotation class<error> </error>{}
\ No newline at end of file