From 0ab4770f026b7e4aae04bededdadf090cbee5738 Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Wed, 30 Jun 2021 13:19:26 +0300
Subject: [PATCH] [FIR] Add correctly reported diagnostics to testdata

---
 .../good/returnsImplies/propertyAccessors.kt  |  4 ++--
 .../tests/inline/property/invoke.fir.kt       | 20 -------------------
 .../tests/inline/property/invoke.kt           |  1 +
 .../dsl/errors/contractCallSites.1.3.fir.kt   |  6 +++---
 .../dsl/errors/contractCallSites.1.4.fir.kt   |  4 ++--
 5 files changed, 8 insertions(+), 27 deletions(-)
 delete mode 100644 compiler/testData/diagnostics/tests/inline/property/invoke.fir.kt

diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/propertyAccessors.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/propertyAccessors.kt
index f41966ee0c7..d8bfd41e02f 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/propertyAccessors.kt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/propertyAccessors.kt
@@ -14,7 +14,7 @@ var Any?.isNotNull: Boolean
     set(value) {
         contract {
             returns() implies (this@isNotNull != null)
-            require(this != null)
+            <!ERROR_IN_CONTRACT_DESCRIPTION!>require(this != null)<!>
         }
     }
 
@@ -27,4 +27,4 @@ fun test_1(a: A?) {
 fun test_2(a: A?) {
     a.isNotNull = true
     a.foo()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inline/property/invoke.fir.kt b/compiler/testData/diagnostics/tests/inline/property/invoke.fir.kt
deleted file mode 100644
index 6ab3469ec37..00000000000
--- a/compiler/testData/diagnostics/tests/inline/property/invoke.fir.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_VARIABLE -INFIX_MODIFIER_REQUIRED
-
-inline var value: (p: Int) -> String
-    get() = {"123" }
-    set(s: (p: Int) -> String) {
-        s(11)
-        s.invoke(11)
-        s invoke 11
-
-        val z = s
-    }
-
-inline var value2: Int.(p: Int) -> String
-    get() = {"123" }
-    set(ext: Int.(p: Int) -> String) {
-        11.ext(11)
-        11.ext(11)
-
-        val p = ext
-    }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inline/property/invoke.kt b/compiler/testData/diagnostics/tests/inline/property/invoke.kt
index 04f0d39730f..e0c6941c68f 100644
--- a/compiler/testData/diagnostics/tests/inline/property/invoke.kt
+++ b/compiler/testData/diagnostics/tests/inline/property/invoke.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_VARIABLE -INFIX_MODIFIER_REQUIRED
 
 inline var value: (p: Int) -> String
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/dsl/errors/contractCallSites.1.3.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/dsl/errors/contractCallSites.1.3.fir.kt
index 56dd3270e77..25b4630c391 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/dsl/errors/contractCallSites.1.3.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/dsl/errors/contractCallSites.1.3.fir.kt
@@ -58,11 +58,11 @@ val topLevelAnonymousFunction = fun (x: Boolean) {
 
 var topLevelPropertyAccessors: Int? = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>42<!>
     get() {
-        contract { returns() implies (<!UNRESOLVED_REFERENCE!>field<!> != null) }
+        contract { <!ERROR_IN_CONTRACT_DESCRIPTION!>returns() implies (<!UNRESOLVED_REFERENCE!>field<!> != null)<!> }
         return 42
     }
     set(value) {
-        contract { returns() implies (<!UNRESOLVED_REFERENCE!>field<!> != null) }
+        contract { <!ERROR_IN_CONTRACT_DESCRIPTION!>returns() implies (<!UNRESOLVED_REFERENCE!>field<!> != null)<!> }
     }
 
 
@@ -83,4 +83,4 @@ fun test() {
     val localLambda: (Boolean) -> Unit = { x: Boolean ->
         contract { returns() implies (x) }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/dsl/errors/contractCallSites.1.4.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/dsl/errors/contractCallSites.1.4.fir.kt
index 8617996f90b..9c3aaa4b771 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/dsl/errors/contractCallSites.1.4.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/dsl/errors/contractCallSites.1.4.fir.kt
@@ -73,11 +73,11 @@ val topLevelAnonymousFunction = fun (x: Boolean) {
 
 var topLevelPropertyAccessors: Int? = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>42<!>
     get() {
-        contract { returns() implies (<!UNRESOLVED_REFERENCE!>field<!> != null) }
+        contract { <!ERROR_IN_CONTRACT_DESCRIPTION!>returns() implies (<!UNRESOLVED_REFERENCE!>field<!> != null)<!> }
         return 42
     }
     set(value) {
-        contract { returns() implies (<!UNRESOLVED_REFERENCE!>field<!> != null) }
+        contract { <!ERROR_IN_CONTRACT_DESCRIPTION!>returns() implies (<!UNRESOLVED_REFERENCE!>field<!> != null)<!> }
     }