diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/contract.kt b/analysis/low-level-api-fir/testdata/inBlockModification/contract.kt
index b280e2da61f..f006569a592 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/contract.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/contract.kt
@@ -1,9 +1,9 @@
 import kotlin.contracts.InvocationKind
 
-inline fun f<caret>oo(block: () -> Unit) {
+inline fun foo(block: () -> Unit) {
     kotlin.contracts.contract {
         callsInPlace(block, InvocationKind.EXACTLY_ONCE)
     }
 
-    block()
+    <expr>block()</expr>
 }
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/extensionWithDefaultParameters.kt b/analysis/low-level-api-fir/testdata/inBlockModification/extensionWithDefaultParameters.kt
index 04244388efa..d13fb851d50 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/extensionWithDefaultParameters.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/extensionWithDefaultParameters.kt
@@ -2,6 +2,6 @@ class MyProducer {
     fun produce(): Int = 4
 }
 
-fun MyProducer.test<caret>Fun(param1: Int = produce()) {
-
+fun MyProducer.testFun(param1: Int = produce()) {
+    <expr>42</expr>
 }
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/extensionWithDefaultParameters.txt b/analysis/low-level-api-fir/testdata/inBlockModification/extensionWithDefaultParameters.txt
index 5fb4a5b05ed..bd58d4ec62a 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/extensionWithDefaultParameters.txt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/extensionWithDefaultParameters.txt
@@ -1,5 +1,6 @@
 BEFORE MODIFICATION:
 public final [ResolvedTo(BODY_RESOLVE)] fun R|MyProducer|.testFun([ResolvedTo(BODY_RESOLVE)] param1: R|kotlin/Int| = this@R|/testFun|.R|/MyProducer.produce|()): R|kotlin/Unit| {
+    Int(42)
 }
 
 AFTER MODIFICATION:
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/functionWithDefaultParameters.kt b/analysis/low-level-api-fir/testdata/inBlockModification/functionWithDefaultParameters.kt
index 045697fe11b..52b17c002a9 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/functionWithDefaultParameters.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/functionWithDefaultParameters.kt
@@ -1,5 +1,5 @@
-fun test<caret>Fun(param1: Int, param2: String = "str", param3: List<Int> = myList()) {
-
+fun testFun(param1: Int, param2: String = "str", param3: List<Int> = myList()) {
+    <expr>42</expr>
 }
 
 fun myList(): List<Int>
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/functionWithDefaultParameters.txt b/analysis/low-level-api-fir/testdata/inBlockModification/functionWithDefaultParameters.txt
index f2305d78d4f..a0ebc3bab6d 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/functionWithDefaultParameters.txt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/functionWithDefaultParameters.txt
@@ -1,5 +1,6 @@
 BEFORE MODIFICATION:
 public final [ResolvedTo(BODY_RESOLVE)] fun testFun([ResolvedTo(BODY_RESOLVE)] param1: R|kotlin/Int|, [ResolvedTo(BODY_RESOLVE)] param2: R|kotlin/String| = String(str), [ResolvedTo(BODY_RESOLVE)] param3: R|kotlin/collections/List<kotlin/Int>| = R|/myList|()): R|kotlin/Unit| {
+    Int(42)
 }
 
 AFTER MODIFICATION:
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithBodyWithContract.kt b/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithBodyWithContract.kt
index a9a7d19f783..65a38d0bf84 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithBodyWithContract.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithBodyWithContract.kt
@@ -1,12 +1,12 @@
 import kotlin.contracts.contract
 
 class A {
-    fun <caret>x() {
+    fun x() {
         contract {
             req
         }
 
-        val a = doSmth("str")
+        val a = <expr>doSmth("str")</expr>
     }
 }
 
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithBodyWithErrorContract.kt b/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithBodyWithErrorContract.kt
index 336c3a0acd1..529040fd69e 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithBodyWithErrorContract.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithBodyWithErrorContract.kt
@@ -1,8 +1,9 @@
 import kotlin.contracts.*
 
 class A {
-    fun passLa<caret>mbdaValue(l: ContractBuilder.() -> Unit) {
+    fun passLambdaValue(l: ContractBuilder.() -> Unit) {
         contract(l)
+        <expr>42</expr>
     }
 }
 
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithBodyWithErrorContract.out_of_src_roots.txt b/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithBodyWithErrorContract.out_of_src_roots.txt
index 49094530a81..7bb12061ddd 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithBodyWithErrorContract.out_of_src_roots.txt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithBodyWithErrorContract.out_of_src_roots.txt
@@ -8,6 +8,7 @@ public final [ResolvedTo(BODY_RESOLVE)] fun passLambdaValue([ResolvedTo(BODY_RES
         contract#(l#)
     }
 
+    Int(42)
 }
 
 AFTER MODIFICATION:
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithBodyWithErrorContract.txt b/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithBodyWithErrorContract.txt
index 405e349e6a1..47c1cdbbe79 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithBodyWithErrorContract.txt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithBodyWithErrorContract.txt
@@ -8,6 +8,7 @@ public final [ResolvedTo(BODY_RESOLVE)] fun passLambdaValue([ResolvedTo(BODY_RES
         R|kotlin/contracts/contract|(R|<local>/l|)
     }
 
+    Int(42)
 }
 
 AFTER MODIFICATION:
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithBodyWithFakeContract.kt b/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithBodyWithFakeContract.kt
index 5f56ce9b38a..6bbd1003218 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithBodyWithFakeContract.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithBodyWithFakeContract.kt
@@ -1,10 +1,10 @@
 class A {
-    fun <caret>x() {
+    fun x() {
         contract {
             req
         }
 
-        val a = doSmth("str")
+        val <expr>a</expr> = doSmth("str")
     }
 }
 
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithBodyWithType.kt b/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithBodyWithType.kt
index 3a0578c5f4e..fe2341c5615 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithBodyWithType.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithBodyWithType.kt
@@ -1,6 +1,6 @@
 class A {
-    fun <caret>x(): Int {
-        return doSmth("str")
+    fun x(): Int {
+        return <expr>doSmth</expr>("str")
     }
 }
 
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithBodyWithoutType.kt b/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithBodyWithoutType.kt
index 7b3c1bff2d4..df79570d5b4 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithBodyWithoutType.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithBodyWithoutType.kt
@@ -1,6 +1,6 @@
 class A {
-    fun <caret>x() {
-        val a = doSmth("str")
+    fun x() {
+        val <expr>a</expr> = doSmth("str")
     }
 }
 
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithBodyWithoutTypeWithoutName.kt b/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithBodyWithoutTypeWithoutName.kt
index 8a17d89d375..c068320456d 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithBodyWithoutTypeWithoutName.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithBodyWithoutTypeWithoutName.kt
@@ -1,6 +1,6 @@
 class A {
-    fun <caret>() {
-        val a = doSmth("str")
+    fun () {
+        val <expr>a</expr> = doSmth("str")
     }
 }
 
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithTypeWithoutBody.kt b/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithTypeWithoutBody.kt
index a8a51cd620f..938aef70e9f 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithTypeWithoutBody.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithTypeWithoutBody.kt
@@ -1,5 +1,5 @@
 class A {
-    fun <caret>x(): Int = doSmth("str")
+    fun x(): Int = <expr>doSmth</expr>("str")
 }
 
 fun doSmth(i: String) = 4
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithoutBodyWithTypeWithoutName.kt b/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithoutBodyWithTypeWithoutName.kt
index 9502ef9ea81..ea9559a289a 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithoutBodyWithTypeWithoutName.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithoutBodyWithTypeWithoutName.kt
@@ -1,5 +1,5 @@
 class A {
-    fun <caret>(): Int = doSmth("str")
+    fun (): Int = <expr>doSmth</expr>("str")
 }
 
 fun doSmth(i: String) = 4
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithoutBodyWithoutTypeWithoutName.kt b/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithoutBodyWithoutTypeWithoutName.kt
index c54c341693f..a575addf125 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithoutBodyWithoutTypeWithoutName.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithoutBodyWithoutTypeWithoutName.kt
@@ -1,5 +1,5 @@
 class A {
-    fun <caret>() = doSmth("str")
+    fun () = <expr>doSmth</expr>("str")
 }
 
 fun doSmth(i: String) = 4
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithoutBodyWithoutTypeWithoutName.txt b/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithoutBodyWithoutTypeWithoutName.txt
index ace1111236c..d6b3a3199da 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithoutBodyWithoutTypeWithoutName.txt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithoutBodyWithoutTypeWithoutName.txt
@@ -1 +1 @@
-IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS KtNamedFunction DECLARATION
+IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS PLACE
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithoutTypeWithoutBody.kt b/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithoutTypeWithoutBody.kt
index 6493c4899c5..95fbd05d836 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithoutTypeWithoutBody.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithoutTypeWithoutBody.kt
@@ -1,5 +1,5 @@
 class A {
-    fun <caret>x() = doSmth("str")
+    fun x() = <expr>doSmth</expr>("str")
 }
 
 fun doSmth(i: String) = 4
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithoutTypeWithoutBody.txt b/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithoutTypeWithoutBody.txt
index ace1111236c..d6b3a3199da 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithoutTypeWithoutBody.txt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberFunWithoutTypeWithoutBody.txt
@@ -1 +1 @@
-IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS KtNamedFunction DECLARATION
+IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS PLACE
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberGetterWithBodyWithContract.kt b/analysis/low-level-api-fir/testdata/inBlockModification/memberGetterWithBodyWithContract.kt
index 9a99c405e48..a6584aac6d7 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberGetterWithBodyWithContract.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberGetterWithBodyWithContract.kt
@@ -2,12 +2,12 @@ import kotlin.contracts.contract
 
 class A {
     var x: Int
-    ge<caret>t() {
+    get() {
         contract {
             req
         }
 
-        fun doSmth(i: String) = 4
+        fun <expr>doSmth</expr>(i: String) = 4
         return doSmth("str")
     }
     set(value) = Unit
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberGetterWithBodyWithContractWithoutName.kt b/analysis/low-level-api-fir/testdata/inBlockModification/memberGetterWithBodyWithContractWithoutName.kt
index e39ff583c20..d52958bf2a5 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberGetterWithBodyWithContractWithoutName.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberGetterWithBodyWithContractWithoutName.kt
@@ -2,12 +2,12 @@ import kotlin.contracts.contract
 
 class A {
     var : Int
-    ge<caret>t() {
+    get() {
         contract {
             req
         }
 
-        fun doSmth(i: String) = 4
+        fun <expr>doSmth</expr>(i: String) = 4
         return doSmth("str")
     }
     set(value) = Unit
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberGetterWithTypeWithBody.kt b/analysis/low-level-api-fir/testdata/inBlockModification/memberGetterWithTypeWithBody.kt
index 004d617a35d..299357523cd 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberGetterWithTypeWithBody.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberGetterWithTypeWithBody.kt
@@ -1,7 +1,7 @@
 class A {
   val x: Int
-    ge<caret>t() {
-      fun doSmth(i: String) = 4
+    get() {
+      fun doSmth(i: String) = <expr>4</expr>
       return doSmth("str")
     }
 }
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberGetterWithTypeWithoutBody.kt b/analysis/low-level-api-fir/testdata/inBlockModification/memberGetterWithTypeWithoutBody.kt
index dd372c7e937..9557f8dac4b 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberGetterWithTypeWithoutBody.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberGetterWithTypeWithoutBody.kt
@@ -1,5 +1,5 @@
 class A {
-  val x: Int ge<caret>t() = doSmth("str")
+  val x: Int get() = <expr>doSmth</expr>("str")
 }
 
 fun doSmth(i: String) = 4
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberGetterWithTypeWithoutBodyWithoutName.kt b/analysis/low-level-api-fir/testdata/inBlockModification/memberGetterWithTypeWithoutBodyWithoutName.kt
index 8df005f1957..749e5c9f3e5 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberGetterWithTypeWithoutBodyWithoutName.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberGetterWithTypeWithoutBodyWithoutName.kt
@@ -1,5 +1,5 @@
 class A {
-  val : Int ge<caret>t() = doSmth("str")
+  val : Int get() = <expr>doSmth</expr>("str")
 }
 
 fun doSmth(i: String) = 4
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberGetterWithoutTypeWithBody.kt b/analysis/low-level-api-fir/testdata/inBlockModification/memberGetterWithoutTypeWithBody.kt
index 734ba5aa1f9..f9b984ff414 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberGetterWithoutTypeWithBody.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberGetterWithoutTypeWithBody.kt
@@ -1,7 +1,7 @@
 class A {
   val x
-    g<caret>et() {
-      return doSmth("str")
+    get() {
+      return <expr>doSmth</expr>("str")
     }
 }
 
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberGetterWithoutTypeWithoutBody.kt b/analysis/low-level-api-fir/testdata/inBlockModification/memberGetterWithoutTypeWithoutBody.kt
index 1ebf6ac26a5..3155925cc01 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberGetterWithoutTypeWithoutBody.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberGetterWithoutTypeWithoutBody.kt
@@ -1,5 +1,5 @@
 class A {
-  val x ge<caret>t() = doSmth("str")
+  val x get() = <expr>doSmth</expr>("str")
 }
 
 fun doSmth(i: String) = 4
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberGetterWithoutTypeWithoutBody.txt b/analysis/low-level-api-fir/testdata/inBlockModification/memberGetterWithoutTypeWithoutBody.txt
index 1bd196cec5a..d6b3a3199da 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberGetterWithoutTypeWithoutBody.txt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberGetterWithoutTypeWithoutBody.txt
@@ -1 +1 @@
-IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS KtPropertyAccessor DECLARATION
+IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS PLACE
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInDelegate.kt b/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInDelegate.kt
index 773e1046c2e..f009c2d1f49 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInDelegate.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInDelegate.kt
@@ -1,6 +1,6 @@
 class A {
-    val <caret>x: Int by lazy {
-        fun doSmth(i: String) = 4
+    val x: Int by lazy {
+        fun <expr>doSmth</expr>(i: String) = 4
         doSmth("str")
     }
 }
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInDelegate.txt b/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInDelegate.txt
index b94e2395f70..d6b3a3199da 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInDelegate.txt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInDelegate.txt
@@ -1 +1 @@
-IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS KtProperty DECLARATION
+IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS PLACE
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInDelegateWithoutName.kt b/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInDelegateWithoutName.kt
index 6edf6dc0205..c6822e2369b 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInDelegateWithoutName.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInDelegateWithoutName.kt
@@ -1,6 +1,6 @@
 class A {
-    val <caret>: Int by lazy {
+    val : Int by lazy {
         fun doSmth(i: String) = 4
-        doSmth("str")
+        <expr>doSmth</expr>("str")
     }
 }
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInDelegateWithoutName.txt b/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInDelegateWithoutName.txt
index b94e2395f70..d6b3a3199da 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInDelegateWithoutName.txt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInDelegateWithoutName.txt
@@ -1 +1 @@
-IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS KtProperty DECLARATION
+IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS PLACE
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInErrorDelegate.kt b/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInErrorDelegate.kt
index 564cdb3ecb5..b9548e3b259 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInErrorDelegate.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInErrorDelegate.kt
@@ -1,3 +1,3 @@
 class A {
-    val <caret>x: Int by ErrorDelegate()
+    val x: Int by <expr>ErrorDelegate</expr>()
 }
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInErrorDelegate.txt b/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInErrorDelegate.txt
index b94e2395f70..d6b3a3199da 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInErrorDelegate.txt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInErrorDelegate.txt
@@ -1 +1 @@
-IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS KtProperty DECLARATION
+IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS PLACE
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInInitializer.kt b/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInInitializer.kt
index de5005ce9f1..c88a8e595c0 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInInitializer.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInInitializer.kt
@@ -1,6 +1,6 @@
 class A {
-    val x<caret>: Int = run {
+    val x: Int = run {
         fun doSmth(i: String) = 4
-        doSmth("str")
+        <expr>doSmth</expr>("str")
     }
 }
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInInitializer.txt b/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInInitializer.txt
index b94e2395f70..d6b3a3199da 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInInitializer.txt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInInitializer.txt
@@ -1 +1 @@
-IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS KtProperty DECLARATION
+IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS PLACE
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInInitializerWithoutName.kt b/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInInitializerWithoutName.kt
index a7b275ea559..57440c0d39d 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInInitializerWithoutName.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInInitializerWithoutName.kt
@@ -1,6 +1,6 @@
 class A {
-    val <caret>: Int = run {
+    val : Int = run {
         fun doSmth(i: String) = 4
-        doSmth("str")
+        <expr>doSmth</expr>("str")
     }
 }
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInInitializerWithoutName.txt b/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInInitializerWithoutName.txt
index b94e2395f70..d6b3a3199da 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInInitializerWithoutName.txt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithTypeInInitializerWithoutName.txt
@@ -1 +1 @@
-IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS KtProperty DECLARATION
+IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS PLACE
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithoutTypeInDelegate.kt b/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithoutTypeInDelegate.kt
index 7f6cdb10d62..d70ee0e185c 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithoutTypeInDelegate.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithoutTypeInDelegate.kt
@@ -1,6 +1,6 @@
 class A {
-    val <caret>x by lazy {
+    val x by lazy {
         fun doSmth(i: String) = 4
-        doSmth("str")
+        <expr>doSmth</expr>("str")
     }
 }
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithoutTypeInDelegate.txt b/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithoutTypeInDelegate.txt
index b94e2395f70..d6b3a3199da 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithoutTypeInDelegate.txt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithoutTypeInDelegate.txt
@@ -1 +1 @@
-IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS KtProperty DECLARATION
+IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS PLACE
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithoutTypeInErrorDelegate.kt b/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithoutTypeInErrorDelegate.kt
index ebff6f339f6..61f0721bea7 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithoutTypeInErrorDelegate.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithoutTypeInErrorDelegate.kt
@@ -1,3 +1,3 @@
 class A {
-    val <caret>x by ErrorDelegate()
+    val x by <expr>ErrorDelegate</expr>()
 }
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithoutTypeInErrorDelegate.txt b/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithoutTypeInErrorDelegate.txt
index b94e2395f70..d6b3a3199da 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithoutTypeInErrorDelegate.txt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithoutTypeInErrorDelegate.txt
@@ -1 +1 @@
-IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS KtProperty DECLARATION
+IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS PLACE
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithoutTypeInInitializer.kt b/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithoutTypeInInitializer.kt
index 1f384b5df82..3f6eef1a76e 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithoutTypeInInitializer.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithoutTypeInInitializer.kt
@@ -1,5 +1,5 @@
 class A {
-    val x<caret> = run {
-        doSmth("str")
+    val x = run {
+        <expr>doSmth</expr>("str")
     }
 }
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithoutTypeInInitializer.txt b/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithoutTypeInInitializer.txt
index b94e2395f70..d6b3a3199da 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithoutTypeInInitializer.txt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberPropertyWithoutTypeInInitializer.txt
@@ -1 +1 @@
-IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS KtProperty DECLARATION
+IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS PLACE
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberSetterWithTypeWithBody.kt b/analysis/low-level-api-fir/testdata/inBlockModification/memberSetterWithTypeWithBody.kt
index b9edb777e6c..1bd6bec0507 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberSetterWithTypeWithBody.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberSetterWithTypeWithBody.kt
@@ -1,7 +1,7 @@
 class A {
   var x: Int = 1
-    se<caret>t(value) {
-      doSmth(value)
+    set(value) {
+      <expr>doSmth</expr>(value)
     }
 }
 
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberSetterWithTypeWithBodyWithoutName.kt b/analysis/low-level-api-fir/testdata/inBlockModification/memberSetterWithTypeWithBodyWithoutName.kt
index e76721eb7f0..fd503873e63 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberSetterWithTypeWithBodyWithoutName.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberSetterWithTypeWithBodyWithoutName.kt
@@ -1,7 +1,7 @@
 class A {
   var : Int = 1
-    se<caret>t(value) {
-      doSmth(value)
+    set(value) {
+      <expr>doSmth</expr>(value)
     }
 }
 
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberSetterWithTypeWithoutBody.kt b/analysis/low-level-api-fir/testdata/inBlockModification/memberSetterWithTypeWithoutBody.kt
index f358b87e2be..e12c0d3a541 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberSetterWithTypeWithoutBody.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberSetterWithTypeWithoutBody.kt
@@ -1,6 +1,6 @@
 class A {
   var x: Int = 1
-    se<caret>t(value) = doSmth(value)
+    set(value) = <expr>doSmth</expr>(value)
 }
 
 fun doSmth(i: String) = 4
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberSetterWithTypeWithoutBodyWithoutName.kt b/analysis/low-level-api-fir/testdata/inBlockModification/memberSetterWithTypeWithoutBodyWithoutName.kt
index 1ecc8a3eb19..8c10585e4f7 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberSetterWithTypeWithoutBodyWithoutName.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberSetterWithTypeWithoutBodyWithoutName.kt
@@ -1,6 +1,6 @@
 class A {
   var : Int = 1
-    se<caret>t(value) = doSmth(value)
+    set(value) = <expr>doSmth</expr>(value)
 }
 
 fun doSmth(i: String) = 4
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberSetterWithoutTypeWithBody.kt b/analysis/low-level-api-fir/testdata/inBlockModification/memberSetterWithoutTypeWithBody.kt
index bc2045afe4b..85a42132986 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberSetterWithoutTypeWithBody.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberSetterWithoutTypeWithBody.kt
@@ -1,8 +1,8 @@
 class A {
   var x
     get() = 1
-    s<caret>et(value) {
-      doSmth(value)
+    set(value) {
+      <expr>doSmth</expr>(value)
     }
 }
 
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/memberSetterWithoutTypeWithoutBody.kt b/analysis/low-level-api-fir/testdata/inBlockModification/memberSetterWithoutTypeWithoutBody.kt
index 327066cf8e2..43c9bb5e6d4 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/memberSetterWithoutTypeWithoutBody.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/memberSetterWithoutTypeWithoutBody.kt
@@ -1,7 +1,7 @@
 class A {
   var x
     get() = 1
-    s<caret>et(value) = doSmth(value)
+    set(value) = <expr>doSmth</expr>(value)
 }
 
 fun doSmth(i: String) = 4
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/rawContract.kt b/analysis/low-level-api-fir/testdata/inBlockModification/rawContract.kt
index f2701fa7b31..89356f731c6 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/rawContract.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/rawContract.kt
@@ -1,9 +1,9 @@
-fun fo<caret>o(arg: Any?, num: Int?, block: () -> Unit) contract [
+fun foo(arg: Any?, num: Int?, block: () -> Unit) contract [
     returns() implies (arg is String),
     returns() implies (num != null),
     callsInPlace(block, InvocationKind.EXACTLY_ONCE)
 ] {
     require(arg is String)
     require(num != null)
-    block()
+    <expr>block</expr>()
 }
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithBodyWithoutTypeWithoutName.kt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithBodyWithoutTypeWithoutName.kt
index 97ecde4fc99..fe9f613364f 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithBodyWithoutTypeWithoutName.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithBodyWithoutTypeWithoutName.kt
@@ -1,5 +1,5 @@
-fun <caret>() {
-    val a = doSmth("str")
+fun () {
+    val a = <expr>doSmth</expr>("str")
 }
 
 fun doSmth(i: String) = 4
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithTypeWithBody.kt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithTypeWithBody.kt
index ccb64ff650a..c507e5df4ba 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithTypeWithBody.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithTypeWithBody.kt
@@ -1,5 +1,5 @@
-fun fo<caret>o(): Int {
-    return doSmth("str")
+fun foo(): Int {
+    return <expr>doSmth</expr>("str")
 }
 
 fun doSmth(i: String) = 4
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithTypeWithoutBody.kt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithTypeWithoutBody.kt
index 52ec22f94e0..53127829281 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithTypeWithoutBody.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithTypeWithoutBody.kt
@@ -1,3 +1,3 @@
-fun f<caret>oo(): Int = doSmth("str")
+fun foo(): Int = <expr>doSmth</expr>("str")
 
 fun doSmth(i: String) = 4
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithoutBodyWithTypeWithoutName.kt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithoutBodyWithTypeWithoutName.kt
index c29ece2ae49..b99d9540722 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithoutBodyWithTypeWithoutName.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithoutBodyWithTypeWithoutName.kt
@@ -1,3 +1,3 @@
-fun <caret>(): Int = doSmth("str")
+fun (): Int = <expr>doSmth</expr>("str")
 
 fun doSmth(i: String) = 4
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithoutBodyWithoutTypeWithoutName.kt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithoutBodyWithoutTypeWithoutName.kt
index 5743c743d33..035b6d214ed 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithoutBodyWithoutTypeWithoutName.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithoutBodyWithoutTypeWithoutName.kt
@@ -1,3 +1,3 @@
-fun <caret>() = doSmth("str")
+fun () = <expr>doSmth</expr>("str")
 
 fun doSmth(i: String) = 4
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithoutBodyWithoutTypeWithoutName.txt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithoutBodyWithoutTypeWithoutName.txt
index ace1111236c..d6b3a3199da 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithoutBodyWithoutTypeWithoutName.txt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithoutBodyWithoutTypeWithoutName.txt
@@ -1 +1 @@
-IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS KtNamedFunction DECLARATION
+IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS PLACE
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithoutTypeWithBody.kt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithoutTypeWithBody.kt
index 8716c148c21..9746798294e 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithoutTypeWithBody.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithoutTypeWithBody.kt
@@ -1,5 +1,5 @@
-fun f<caret>oo() {
-    doSmth("str")
+fun foo() {
+    <expr>doSmth</expr>("str")
 }
 
 fun doSmth(i: String) = 4
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithoutTypeWithoutBody.kt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithoutTypeWithoutBody.kt
index 14503b87fb5..59b1cfe13c9 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithoutTypeWithoutBody.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithoutTypeWithoutBody.kt
@@ -1,3 +1,3 @@
-fun fo<caret>o() = doSmth("str")
+fun foo() = <expr>doSmth</expr>("str")
 
 fun doSmth(i: String) = 4
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithoutTypeWithoutBody.txt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithoutTypeWithoutBody.txt
index ace1111236c..d6b3a3199da 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithoutTypeWithoutBody.txt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelFunctionWithoutTypeWithoutBody.txt
@@ -1 +1 @@
-IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS KtNamedFunction DECLARATION
+IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS PLACE
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelGetterWithTypeWithBody.kt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelGetterWithTypeWithBody.kt
index c8ac8b007e2..3fe79be3ae3 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelGetterWithTypeWithBody.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelGetterWithTypeWithBody.kt
@@ -1,5 +1,5 @@
   val x: Int
-    ge<caret>t() {
+    get() {
       fun doSmth(i: String) = 4
-      return doSmth("str")
+      return <expr>doSmth</expr>("str")
     }
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelGetterWithTypeWithBodyWithoutName.kt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelGetterWithTypeWithBodyWithoutName.kt
index fe4568150a0..174c0a795de 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelGetterWithTypeWithBodyWithoutName.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelGetterWithTypeWithBodyWithoutName.kt
@@ -1,5 +1,5 @@
   val : Int
-    ge<caret>t() {
+    get() {
       fun doSmth(i: String) = 4
-      return doSmth("str")
+      return <expr>doSmth</expr>("str")
     }
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelGetterWithTypeWithoutBody.kt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelGetterWithTypeWithoutBody.kt
index 3b7230a4857..872486b3a0d 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelGetterWithTypeWithoutBody.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelGetterWithTypeWithoutBody.kt
@@ -1,3 +1,3 @@
-val x: Int g<caret>et() = doSmth("str")
+val x: Int get() = <expr>doSmth</expr>("str")
 
 fun doSmth(i: String) = 4
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelGetterWithTypeWithoutBodyWithoutName.kt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelGetterWithTypeWithoutBodyWithoutName.kt
index 8e9eea37809..60815041053 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelGetterWithTypeWithoutBodyWithoutName.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelGetterWithTypeWithoutBodyWithoutName.kt
@@ -1,3 +1,3 @@
-val : Int g<caret>et() = doSmth("str")
+val : Int get() = <expr>doSmth</expr>("str")
 
 fun doSmth(i: String) = 4
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelGetterWithoutTypeWithBody.kt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelGetterWithoutTypeWithBody.kt
index 838407ed522..664bc6cfd8c 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelGetterWithoutTypeWithBody.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelGetterWithoutTypeWithBody.kt
@@ -1,6 +1,6 @@
   val x
-    g<caret>et() {
-      return doSmth("str")
+    get() {
+      return <expr>doSmth</expr>("str")
     }
 
 fun doSmth(i: String) = 4
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelGetterWithoutTypeWithoutBody.kt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelGetterWithoutTypeWithoutBody.kt
index 3f0e46de639..01df16084f7 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelGetterWithoutTypeWithoutBody.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelGetterWithoutTypeWithoutBody.kt
@@ -1,3 +1,3 @@
-val x get<caret>() = doSmth("str")
+val x get() = <expr>doSmth</expr>("str")
 
 fun doSmth(i: String) = 4
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelGetterWithoutTypeWithoutBody.txt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelGetterWithoutTypeWithoutBody.txt
index 1bd196cec5a..d6b3a3199da 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelGetterWithoutTypeWithoutBody.txt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelGetterWithoutTypeWithoutBody.txt
@@ -1 +1 @@
-IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS KtPropertyAccessor DECLARATION
+IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS PLACE
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithTypeInDelegate.kt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithTypeInDelegate.kt
index ba7105bfaa7..5ada7299850 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithTypeInDelegate.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithTypeInDelegate.kt
@@ -1,4 +1,4 @@
-val x<caret>: Int by lazy {
+val x: Int by lazy {
     fun doSmth(i: String) = 4
-    doSmth("str")
+    <expr>doSmth</expr>("str")
 }
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithTypeInDelegateWithoutName.kt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithTypeInDelegateWithoutName.kt
index e0155da139e..30423238a30 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithTypeInDelegateWithoutName.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithTypeInDelegateWithoutName.kt
@@ -1,4 +1,4 @@
-val <caret>: Int by lazy {
+val : Int by lazy {
     fun doSmth(i: String) = 4
-    doSmth("str")
+    <expr>doSmth</expr>("str")
 }
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithTypeInErrorDelegate.kt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithTypeInErrorDelegate.kt
index efd82d78f9d..86c09ca6f5b 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithTypeInErrorDelegate.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithTypeInErrorDelegate.kt
@@ -1 +1 @@
-val x<caret>: Int by ErrorDelegate()
+val x: Int by <expr>ErrorDelegate</expr>()
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithTypeInInititalzer.kt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithTypeInInititalzer.kt
index b9befeaa582..0b8bd2ff23d 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithTypeInInititalzer.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithTypeInInititalzer.kt
@@ -1,3 +1,3 @@
-val <caret>x: Int = doSmth("str")
+val x: Int = <expr>doSmth</expr>("str")
 
 fun doSmth(i: String) = 4
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithTypeInInititalzerWithoutName.kt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithTypeInInititalzerWithoutName.kt
index 3adf9cd6129..27ae734ce2a 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithTypeInInititalzerWithoutName.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithTypeInInititalzerWithoutName.kt
@@ -1,3 +1,3 @@
-val <caret>: Int = doSmth("str")
+val : Int = <expr>doSmth</expr>("str")
 
 fun doSmth(i: String) = 4
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithoutTypeInDelegate.kt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithoutTypeInDelegate.kt
index 7d9bd37bc2c..74fb2ee24c4 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithoutTypeInDelegate.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithoutTypeInDelegate.kt
@@ -1,4 +1,4 @@
-val x<caret> by lazy {
+val x by lazy {
     fun doSmth(i: String) = 4
-    doSmth("str")
+    <expr>doSmth</expr>("str")
 }
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithoutTypeInDelegate.txt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithoutTypeInDelegate.txt
index b94e2395f70..d6b3a3199da 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithoutTypeInDelegate.txt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithoutTypeInDelegate.txt
@@ -1 +1 @@
-IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS KtProperty DECLARATION
+IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS PLACE
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithoutTypeInErrorDelegate.kt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithoutTypeInErrorDelegate.kt
index ea7b28e82ec..a95c5ce585c 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithoutTypeInErrorDelegate.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithoutTypeInErrorDelegate.kt
@@ -1 +1 @@
-val x<caret> by ErrorDelegate()
+val x by <expr>ErrorDelegate</expr>()
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithoutTypeInErrorDelegate.txt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithoutTypeInErrorDelegate.txt
index b94e2395f70..d6b3a3199da 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithoutTypeInErrorDelegate.txt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithoutTypeInErrorDelegate.txt
@@ -1 +1 @@
-IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS KtProperty DECLARATION
+IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS PLACE
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithoutTypeInInititalzer.kt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithoutTypeInInititalzer.kt
index b8bfc3fdff4..d20e35d143f 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithoutTypeInInititalzer.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithoutTypeInInititalzer.kt
@@ -1,3 +1,3 @@
-val x<caret> = doSmth("str")
+val x = <expr>doSmth</expr>("str")
 
 fun doSmth(i: String) = 4
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithoutTypeInInititalzer.txt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithoutTypeInInititalzer.txt
index b94e2395f70..d6b3a3199da 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithoutTypeInInititalzer.txt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelPropertyWithoutTypeInInititalzer.txt
@@ -1 +1 @@
-IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS KtProperty DECLARATION
+IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS PLACE
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelSetterWithTypeWithBody.kt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelSetterWithTypeWithBody.kt
index 3159ad562ee..d0c85b03b20 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelSetterWithTypeWithBody.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelSetterWithTypeWithBody.kt
@@ -1,6 +1,6 @@
 var x: Int = 1
-    se<caret>t(value) {
-        doSmth(value)
+    set(value) {
+        <expr>doSmth</expr>(value)
     }
 
 fun doSmth(i: String): Unit = 4
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelSetterWithTypeWithBodyWithoutName.kt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelSetterWithTypeWithBodyWithoutName.kt
index cae81fbf07c..96f828595be 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelSetterWithTypeWithBodyWithoutName.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelSetterWithTypeWithBodyWithoutName.kt
@@ -1,6 +1,6 @@
 var : Int = 1
-    se<caret>t(value) {
-        doSmth(value)
+    set(value) {
+        <expr>doSmth</expr>(value)
     }
 
 fun doSmth(i: String): Unit = 4
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelSetterWithTypeWithoutBody.kt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelSetterWithTypeWithoutBody.kt
index b174bdfec09..05de403cd71 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelSetterWithTypeWithoutBody.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelSetterWithTypeWithoutBody.kt
@@ -1,4 +1,4 @@
 var x: Int = 1
-    se<caret>t(value) = doSmth(value)
+    set(value) = <expr>doSmth</expr>(value)
 
 fun doSmth(i: String): Unit = 4
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelSetterWithTypeWithoutBodyWithoutName.kt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelSetterWithTypeWithoutBodyWithoutName.kt
index 796f3db6b66..03e417717ea 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelSetterWithTypeWithoutBodyWithoutName.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelSetterWithTypeWithoutBodyWithoutName.kt
@@ -1,4 +1,4 @@
 var : Int = 1
-    se<caret>t(value) = doSmth(value)
+    set(value) = <expr>doSmth</expr>(value)
 
 fun doSmth(i: String): Unit = 4
\ No newline at end of file
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelSetterWithoutTypeWithBody.kt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelSetterWithoutTypeWithBody.kt
index 108eab08c4e..ba747671394 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelSetterWithoutTypeWithBody.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelSetterWithoutTypeWithBody.kt
@@ -1,7 +1,7 @@
 val x
     get() = 1
-    se<caret>t(value) {
-        doSmth(value)
+    set(value) {
+        <expr>doSmth</expr>(value)
     }
 
 fun doSmth(i: String) = 4
diff --git a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelSetterWithoutTypeWithoutBody.kt b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelSetterWithoutTypeWithoutBody.kt
index d53f9d5f154..650619f8b50 100644
--- a/analysis/low-level-api-fir/testdata/inBlockModification/topLevelSetterWithoutTypeWithoutBody.kt
+++ b/analysis/low-level-api-fir/testdata/inBlockModification/topLevelSetterWithoutTypeWithoutBody.kt
@@ -1,5 +1,5 @@
 val x
     get() = 1
-    se<caret>t(value) = doSmth(value)
+    set(value) = <expr>doSmth</expr>(value)
 
 fun doSmth(i: String) = 4
diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/AbstractInBlockModificationTest.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/AbstractInBlockModificationTest.kt
index 3f23a182d46..4093bfcddba 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/AbstractInBlockModificationTest.kt
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/AbstractInBlockModificationTest.kt
@@ -24,9 +24,13 @@ import org.jetbrains.kotlin.test.services.assertions
 
 abstract class AbstractInBlockModificationTest : AbstractLowLevelApiSingleFileTest() {
     override fun doTestByFileStructure(ktFile: KtFile, moduleStructure: TestModuleStructure, testServices: TestServices) {
-        val declaration = testServices.expressionMarkerProvider.getElementOfTypeAtCaret<KtDeclaration>(ktFile)
-        val isSupposedToBeModified = declaration.isReanalyzableContainer()
-        val actual = if (isSupposedToBeModified) {
+        val selectedElement = testServices.expressionMarkerProvider.getSelectedElementOfTypeByDirective(
+            ktFile = ktFile,
+            module = moduleStructure.modules.last(),
+        )
+
+        val declaration = selectedElement.getNonLocalReanalyzableContainingDeclaration()
+        val actual = if (declaration != null) {
             resolveWithCaches(ktFile) { firSession ->
                 val firDeclarationBefore = declaration.getOrBuildFirOfType<FirDeclaration>(firSession)
                 val declarationTextBefore = firDeclarationBefore.render()
@@ -52,7 +56,7 @@ abstract class AbstractInBlockModificationTest : AbstractLowLevelApiSingleFileTe
                 "BEFORE MODIFICATION:\n$declarationTextBefore\nAFTER MODIFICATION:\n$declarationTextAfterModification"
             }
         } else {
-            "IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS ${declaration::class.simpleName} DECLARATION"
+            "IN-BLOCK MODIFICATION IS NOT APPLICABLE FOR THIS PLACE"
         }
 
         testServices.assertions.assertEqualsToTestDataFileSibling(actual)