From c93b78c6dc19f652266c1fe67202b73474403291 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Fri, 3 Oct 2014 18:55:01 +0400
Subject: [PATCH] Fixed diagnostics tests

---
 .../box/functions/tailRecursion/recursiveCallInLambda.kt      | 1 +
 compiler/testData/diagnostics/tests/Abstract.kt               | 3 +++
 .../testData/diagnostics/tests/AbstractInAbstractClass.kt     | 3 +++
 compiler/testData/diagnostics/tests/AbstractInClass.kt        | 3 +++
 .../testData/diagnostics/tests/classObjects/ClassObjects.kt   | 4 ++--
 .../functionAndProperty/topLevelDifferentFiles.kt             | 2 ++
 compiler/testData/diagnostics/tests/enum/AbstractInEnum.kt    | 3 +++
 7 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLambda.kt b/compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLambda.kt
index f46d34487a8..9f5d624d630 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLambda.kt
+++ b/compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLambda.kt
@@ -1,4 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
+
 <!NO_TAIL_CALLS_FOUND!>tailRecursive fun foo()<!> {
     bar {
         <!NON_TAIL_RECURSIVE_CALL!>foo<!>()
diff --git a/compiler/testData/diagnostics/tests/Abstract.kt b/compiler/testData/diagnostics/tests/Abstract.kt
index 57d1c773dec..0a42057b9f6 100644
--- a/compiler/testData/diagnostics/tests/Abstract.kt
+++ b/compiler/testData/diagnostics/tests/Abstract.kt
@@ -1,6 +1,7 @@
 // FILE: b.kt
 package MyPackage
     //properties
+
     <!MUST_BE_INITIALIZED!>val a: Int<!>
     val a1: Int = 1
     <!MUST_BE_INITIALIZED!><!ILLEGAL_MODIFIER!>abstract<!> val a2: Int<!>
@@ -22,12 +23,14 @@ package MyPackage
     <!ILLEGAL_MODIFIER!>abstract<!> val e3: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>; get() = a
 
     //methods
+
     <!NON_MEMBER_FUNCTION_NO_BODY!>fun f()<!>
     fun g() {}
     <!ILLEGAL_MODIFIER!>abstract<!> fun h()
     <!ILLEGAL_MODIFIER!>abstract<!> fun j() {}
 
     //property accessors
+
     var i: Int                       <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
     var i1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>;  <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
 
diff --git a/compiler/testData/diagnostics/tests/AbstractInAbstractClass.kt b/compiler/testData/diagnostics/tests/AbstractInAbstractClass.kt
index 218bb40075e..3085f0e022e 100644
--- a/compiler/testData/diagnostics/tests/AbstractInAbstractClass.kt
+++ b/compiler/testData/diagnostics/tests/AbstractInAbstractClass.kt
@@ -2,6 +2,7 @@ package abstract
 
 abstract class MyAbstractClass() {
     //properties
+
     <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>val a: Int<!>
     val a1: Int = 1
     abstract val a2: Int
@@ -23,12 +24,14 @@ abstract class MyAbstractClass() {
     abstract val e3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; <!ABSTRACT_PROPERTY_WITH_GETTER!>get() = a<!>
 
     //methods
+
     <!NON_ABSTRACT_FUNCTION_WITH_NO_BODY!>fun f()<!>
     fun g() {}
     abstract fun h()
     <!ABSTRACT_FUNCTION_WITH_BODY!>abstract<!> fun j() {}
 
     //property accessors
+
     var i: Int                       <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
     var i1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>;  <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
 
diff --git a/compiler/testData/diagnostics/tests/AbstractInClass.kt b/compiler/testData/diagnostics/tests/AbstractInClass.kt
index 587fbecf3e6..4a8557137b4 100644
--- a/compiler/testData/diagnostics/tests/AbstractInClass.kt
+++ b/compiler/testData/diagnostics/tests/AbstractInClass.kt
@@ -2,6 +2,7 @@ package abstract
 
 class MyClass() {
     //properties
+
     <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>val a: Int<!>
     val a1: Int = 1
     <!ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS!>abstract<!> val a2: Int
@@ -23,12 +24,14 @@ class MyClass() {
     <!ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS!>abstract<!> val e3: Int = 0; get() = a
 
     //methods
+
     <!NON_ABSTRACT_FUNCTION_WITH_NO_BODY!>fun f()<!>
     fun g() {}
     <!ABSTRACT_FUNCTION_IN_NON_ABSTRACT_CLASS!>abstract<!> fun h()
     <!ABSTRACT_FUNCTION_IN_NON_ABSTRACT_CLASS, ABSTRACT_FUNCTION_WITH_BODY!>abstract<!> fun j() {}
 
     //property accessors
+
     var i: Int                       <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
     var i1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>;  <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
 
diff --git a/compiler/testData/diagnostics/tests/classObjects/ClassObjects.kt b/compiler/testData/diagnostics/tests/classObjects/ClassObjects.kt
index bc1e6576e87..ba3fa570557 100644
--- a/compiler/testData/diagnostics/tests/classObjects/ClassObjects.kt
+++ b/compiler/testData/diagnostics/tests/classObjects/ClassObjects.kt
@@ -17,7 +17,7 @@ class B() {
 object b {
   <!CLASS_OBJECT_NOT_ALLOWED!>class object {
     val x = 1
-  }<!> // error
+  } // error<!>
 }
 
 val a = A.x
@@ -28,4 +28,4 @@ val s = <!NO_CLASS_OBJECT!>System<!>  // error
 fun test() {
   System.out.println()
   java.lang.System.out.println()
-}
+}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelDifferentFiles.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelDifferentFiles.kt
index b0c6420a9c5..bdc79d29d01 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelDifferentFiles.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelDifferentFiles.kt
@@ -1,5 +1,7 @@
 // FILE: a.kt
+
 <!CONFLICTING_JVM_DECLARATIONS!>val x<!> = 1
 
 // FILE: b.kt
+
 <!CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/enum/AbstractInEnum.kt b/compiler/testData/diagnostics/tests/enum/AbstractInEnum.kt
index fe330dd5291..038bf6d234f 100644
--- a/compiler/testData/diagnostics/tests/enum/AbstractInEnum.kt
+++ b/compiler/testData/diagnostics/tests/enum/AbstractInEnum.kt
@@ -3,6 +3,7 @@ package abstract
 
 enum class MyEnum() {
     //properties
+
     <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>val a: Int<!>
     val a1: Int = 1
     abstract val a2: Int
@@ -24,12 +25,14 @@ enum class MyEnum() {
     abstract val e3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; <!ABSTRACT_PROPERTY_WITH_GETTER!>get() = a<!>
 
     //methods
+
     <!NON_ABSTRACT_FUNCTION_WITH_NO_BODY!>fun f()<!>
     fun g() {}
     abstract fun h()
     <!ABSTRACT_FUNCTION_WITH_BODY!>abstract<!> fun j() {}
 
     //property accessors
+
     var i: Int                       <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set
     var i1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>;  <!ILLEGAL_MODIFIER!>abstract<!> get  <!ILLEGAL_MODIFIER!>abstract<!> set