diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java
index fb182581833..b6e91d53c3e 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java
@@ -203,7 +203,7 @@ public interface Errors {
     DiagnosticFactory0<JetNamedDeclaration> PUBLIC_MEMBER_SHOULD_SPECIFY_TYPE = DiagnosticFactory0.create(ERROR, NAMED_ELEMENT);
 
     DiagnosticFactory2<JetDeclaration, CallableMemberDescriptor, String> CONFLICTING_OVERLOADS = DiagnosticFactory2.create(ERROR, DECLARATION);
-    DiagnosticFactory1<PsiElement, String> CONFLICTING_PLATFORM_DECLARATIONS = DiagnosticFactory1.create(ERROR);
+    DiagnosticFactory1<PsiElement, String> CONFLICTING_PLATFORM_DECLARATIONS = DiagnosticFactory1.create(ERROR, DECLARATION_OR_DEFAULT);
 
     DiagnosticFactory0<JetNamedDeclaration> NON_FINAL_MEMBER_IN_FINAL_CLASS = DiagnosticFactory0.create(WARNING, modifierSetPosition(
             JetTokens.OPEN_KEYWORD));
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategies.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategies.java
index 90325c91d2f..c7f7dd2254e 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategies.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategies.java
@@ -190,6 +190,25 @@ public class PositioningStrategies {
         }
     };
 
+    public static final PositioningStrategy<PsiElement> DECLARATION_OR_DEFAULT = new PositioningStrategy<PsiElement>() {
+        @NotNull
+        @Override
+        public List<TextRange> mark(@NotNull PsiElement element) {
+            if (element instanceof JetDeclaration) {
+                return DECLARATION.mark((JetDeclaration) element);
+            }
+            return DEFAULT.mark(element);
+        }
+
+        @Override
+        public boolean isValid(@NotNull PsiElement element) {
+            if (element instanceof JetDeclaration) {
+                return DECLARATION.isValid((JetDeclaration) element);
+            }
+            return DEFAULT.isValid(element);
+        }
+    };
+
     public static final PositioningStrategy<JetModifierListOwner> ABSTRACT_MODIFIER = modifierSetPosition(JetTokens.ABSTRACT_KEYWORD);
 
     public static final PositioningStrategy<JetModifierListOwner> OVERRIDE_MODIFIER = modifierSetPosition(JetTokens.OVERRIDE_KEYWORD);
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.kt
index 6d9868c155a..344341da471 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.kt
@@ -4,5 +4,5 @@ open class B {
 
 class C : B() {
     val x: Int
-        <!CONFLICTING_PLATFORM_DECLARATIONS!>get() = 1<!>
+        <!CONFLICTING_PLATFORM_DECLARATIONS!>get()<!> = 1
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.kt
index d703c3dd6da..1806871ed45 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.kt
@@ -4,5 +4,5 @@ open class B {
 }
 
 class C : B() {
-    <!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX() = 1<!>
+    <!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX()<!> = 1
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.kt
index bd0d385cc61..8e4707b30d4 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.kt
@@ -4,5 +4,5 @@ trait T {
 }
 
 class C : T {
-    <!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX() = 1<!>
+    <!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX()<!> = 1
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/collections.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/collections.kt
index bd31b6b5015..71cc6802e58 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/collections.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/collections.kt
@@ -1,4 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
-<!CONFLICTING_PLATFORM_DECLARATIONS!>fun foo(s: List<String>) {}<!>
-<!CONFLICTING_PLATFORM_DECLARATIONS!>fun foo(s: MutableList<String>) {}<!>
\ No newline at end of file
+<!CONFLICTING_PLATFORM_DECLARATIONS!>fun foo(s: List<String>)<!> {}
+<!CONFLICTING_PLATFORM_DECLARATIONS!>fun foo(s: MutableList<String>)<!> {}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.kt
index 541320fe77b..7b491375dcd 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.kt
@@ -8,5 +8,5 @@ trait Bar<T> {
     fun foo(l: List<T>)
 }
 
-<!CONFLICTING_PLATFORM_DECLARATIONS!>class Baz(f: Foo<String>, b: Bar<Int>): Foo<String> by f, Bar<Int> by b {
-}<!>
\ No newline at end of file
+<!CONFLICTING_PLATFORM_DECLARATIONS!>class Baz(f: Foo<String>, b: Bar<Int>)<!>: Foo<String> by f, Bar<Int> by b {
+}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.kt
index 988507ab862..ac1677514d5 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.kt
@@ -5,5 +5,5 @@ trait Foo<T> {
 }
 
 class Bar(f: Foo<String>): Foo<String> by f {
-    <!CONFLICTING_PLATFORM_DECLARATIONS!>fun foo(l: List<Int>) {}<!>
+    <!CONFLICTING_PLATFORM_DECLARATIONS!>fun foo(l: List<Int>)<!> {}
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/genericType.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/genericType.kt
index 22817b1aab6..6402be1593b 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/genericType.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/genericType.kt
@@ -2,5 +2,5 @@
 
 class G<T>
 
-<!CONFLICTING_PLATFORM_DECLARATIONS!>fun foo(x: G<String>): G<Int> {null!!}<!>
-<!CONFLICTING_PLATFORM_DECLARATIONS!>fun foo(x: G<Int>): G<String> {null!!}<!>
\ No newline at end of file
+<!CONFLICTING_PLATFORM_DECLARATIONS!>fun foo(x: G<String>): G<Int><!> {null!!}
+<!CONFLICTING_PLATFORM_DECLARATIONS!>fun foo(x: G<Int>): G<String><!> {null!!}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/kotlinAndJavaCollections.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/kotlinAndJavaCollections.kt
index f5277803b72..7497e2c22b5 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/kotlinAndJavaCollections.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/kotlinAndJavaCollections.kt
@@ -1,4 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -PLATFORM_CLASS_MAPPED_TO_KOTLIN
 
-<!CONFLICTING_PLATFORM_DECLARATIONS!>fun foo(s: List<String>) {}<!>
-<!CONFLICTING_PLATFORM_DECLARATIONS!>fun foo(s: java.util.List<String>) {}<!>
\ No newline at end of file
+<!CONFLICTING_PLATFORM_DECLARATIONS!>fun foo(s: List<String>)<!> {}
+<!CONFLICTING_PLATFORM_DECLARATIONS!>fun foo(s: java.util.List<String>)<!> {}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/nullableType.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/nullableType.kt
index f9bc8faedde..f825dc6a474 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/nullableType.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/nullableType.kt
@@ -1,4 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
-<!CONFLICTING_PLATFORM_DECLARATIONS!>fun foo(x: String) {}<!>
-<!CONFLICTING_PLATFORM_DECLARATIONS!>fun foo(x: String?) {}<!>
\ No newline at end of file
+<!CONFLICTING_PLATFORM_DECLARATIONS!>fun foo(x: String)<!> {}
+<!CONFLICTING_PLATFORM_DECLARATIONS!>fun foo(x: String?)<!> {}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeMappedToJava.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeMappedToJava.kt
index aa82166bf3e..6d6431a9e7a 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeMappedToJava.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeMappedToJava.kt
@@ -1,4 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -PLATFORM_CLASS_MAPPED_TO_KOTLIN
 
-<!CONFLICTING_PLATFORM_DECLARATIONS!>fun foo(s: java.lang.String) {}<!>
-<!CONFLICTING_PLATFORM_DECLARATIONS!>fun foo(s: String) {}<!>
\ No newline at end of file
+<!CONFLICTING_PLATFORM_DECLARATIONS!>fun foo(s: java.lang.String)<!> {}
+<!CONFLICTING_PLATFORM_DECLARATIONS!>fun foo(s: String)<!> {}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.kt
index f6229a343c2..4d00b21ee43 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.kt
@@ -1,4 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
-<!CONFLICTING_PLATFORM_DECLARATIONS!>fun <T> foo(x: T): T {null!!}<!>
-<!CONFLICTING_PLATFORM_DECLARATIONS!>fun foo(x: Any): Any {null!!}<!>
\ No newline at end of file
+<!CONFLICTING_PLATFORM_DECLARATIONS!>fun <T> foo(x: T): T<!> {null!!}
+<!CONFLICTING_PLATFORM_DECLARATIONS!>fun foo(x: Any): Any<!> {null!!}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.kt
index 42f2695bc4d..9916d29df23 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.kt
@@ -2,5 +2,5 @@
 
 trait Foo
 
-<!CONFLICTING_PLATFORM_DECLARATIONS!>fun <T: Foo> foo(x: T): T {null!!}<!>
-<!CONFLICTING_PLATFORM_DECLARATIONS!>fun foo(x: Foo): Foo {null!!}<!>
\ No newline at end of file
+<!CONFLICTING_PLATFORM_DECLARATIONS!>fun <T: Foo> foo(x: T): T<!> {null!!}
+<!CONFLICTING_PLATFORM_DECLARATIONS!>fun foo(x: Foo): Foo<!> {null!!}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.kt
index 72ad8bb6135..c43bd5f0d42 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.kt
@@ -3,6 +3,6 @@
 trait Foo
 trait Bar
 
-<!CONFLICTING_PLATFORM_DECLARATIONS!>fun <T: Foo> foo(x: T): T where T: Bar {null!!}<!>
-<!CONFLICTING_PLATFORM_DECLARATIONS!>fun foo(x: Foo): Foo {null!!}<!>
+<!CONFLICTING_PLATFORM_DECLARATIONS!>fun <T: Foo> foo(x: T): T where T: Bar<!> {null!!}
+<!CONFLICTING_PLATFORM_DECLARATIONS!>fun foo(x: Foo): Foo<!> {null!!}
 fun foo(x: Bar): Bar {null!!}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.kt
index 9321e6904e7..855f63c13bb 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.kt
@@ -3,6 +3,6 @@
 trait Foo
 trait Bar
 
-<!CONFLICTING_PLATFORM_DECLARATIONS!>fun <T> foo(x: T): T where T: Foo, T: Bar {null!!}<!>
-<!CONFLICTING_PLATFORM_DECLARATIONS!>fun foo(x: Foo): Foo {null!!}<!>
+<!CONFLICTING_PLATFORM_DECLARATIONS!>fun <T> foo(x: T): T where T: Foo, T: Bar<!> {null!!}
+<!CONFLICTING_PLATFORM_DECLARATIONS!>fun foo(x: Foo): Foo<!> {null!!}
 fun foo(x: Bar): Bar {null!!}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/class.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/class.kt
index c45452ddb8d..88365771e6c 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/class.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/class.kt
@@ -1,4 +1,4 @@
 class C {
-    <!CONFLICTING_PLATFORM_DECLARATIONS!>val x = 1<!>
-    <!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX() = 1<!>
+    <!CONFLICTING_PLATFORM_DECLARATIONS!>val x<!> = 1
+    <!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX()<!> = 1
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.kt
index 7a0befc98eb..5c3649e6348 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.kt
@@ -1,6 +1,6 @@
 class C {
     class object {
-        <!CONFLICTING_PLATFORM_DECLARATIONS!>val x = 1<!>
-        <!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX() = 1<!>
+        <!CONFLICTING_PLATFORM_DECLARATIONS!>val x<!> = 1
+        <!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX()<!> = 1
     }
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.kt
index feaeeff8326..bd68c0d4b74 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.kt
@@ -1,6 +1,6 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 class C {
-    <!CONFLICTING_PLATFORM_DECLARATIONS!>fun foo(x: Any) {}<!>
-    <!CONFLICTING_PLATFORM_DECLARATIONS!>fun Any.foo() {}<!>
+    <!CONFLICTING_PLATFORM_DECLARATIONS!>fun foo(x: Any)<!> {}
+    <!CONFLICTING_PLATFORM_DECLARATIONS!>fun Any.foo()<!> {}
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.kt
index d4772ea327a..ba07515e61f 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.kt
@@ -1,7 +1,7 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 class C {
-    <!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX(t: Any) = 1<!>
+    <!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX(t: Any)<!> = 1
     val Any.x: Int
-        <!CONFLICTING_PLATFORM_DECLARATIONS!>get() = 1<!>
+        <!CONFLICTING_PLATFORM_DECLARATIONS!>get()<!> = 1
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndSetter.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndSetter.kt
index a955d35df32..eb11234c3f9 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndSetter.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndSetter.kt
@@ -1,7 +1,7 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 class C {
-    <!CONFLICTING_PLATFORM_DECLARATIONS!>fun setX(x: Int) {}<!>
+    <!CONFLICTING_PLATFORM_DECLARATIONS!>fun setX(x: Int)<!> {}
 
-    <!CONFLICTING_PLATFORM_DECLARATIONS!>var x: Int = 1<!>
+    <!CONFLICTING_PLATFORM_DECLARATIONS!>var x: Int<!> = 1
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndVar.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndVar.kt
index a4a4cc49504..ce798380d62 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndVar.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndVar.kt
@@ -1,7 +1,7 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 class C {
-    <!CONFLICTING_PLATFORM_DECLARATIONS!>fun setX(x: Int) {}<!>
+    <!CONFLICTING_PLATFORM_DECLARATIONS!>fun setX(x: Int)<!> {}
 
     var x: Int = 1
         <!CONFLICTING_PLATFORM_DECLARATIONS!>set(v) {}<!>
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClass.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClass.kt
index 578c09ca8e7..9dcaed95eba 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClass.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClass.kt
@@ -1,6 +1,6 @@
 fun foo() {
     class C {
-        <!CONFLICTING_PLATFORM_DECLARATIONS!>val x = 1<!>
-        <!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX() = 1<!>
+        <!CONFLICTING_PLATFORM_DECLARATIONS!>val x<!> = 1
+        <!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX()<!> = 1
     }
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/nestedClass.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/nestedClass.kt
index 74205a15adf..0cc1fbd0388 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/nestedClass.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/nestedClass.kt
@@ -1,6 +1,6 @@
 class B {
     class C {
-        <!CONFLICTING_PLATFORM_DECLARATIONS!>val x = 1<!>
-        <!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX() = 1<!>
+        <!CONFLICTING_PLATFORM_DECLARATIONS!>val x<!> = 1
+        <!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX()<!> = 1
     }
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/object.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/object.kt
index bc020563bab..7bed7f4e05a 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/object.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/object.kt
@@ -1,4 +1,4 @@
 object C {
-    <!CONFLICTING_PLATFORM_DECLARATIONS!>val x = 1<!>
-    <!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX() = 1<!>
+    <!CONFLICTING_PLATFORM_DECLARATIONS!>val x<!> = 1
+    <!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX()<!> = 1
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpression.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpression.kt
index c804c636cb1..64c01b7da3f 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpression.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpression.kt
@@ -1,5 +1,5 @@
 fun foo() =
     object {
-        <!CONFLICTING_PLATFORM_DECLARATIONS!>val x = 1<!>
-        <!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX() = 1<!>
+        <!CONFLICTING_PLATFORM_DECLARATIONS!>val x<!> = 1
+        <!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX()<!> = 1
     }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevel.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevel.kt
index a66562d0df6..1ff79768575 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevel.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevel.kt
@@ -1,2 +1,2 @@
-<!CONFLICTING_PLATFORM_DECLARATIONS!>val x = 1<!>
-<!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX() = 1<!>
\ No newline at end of file
+<!CONFLICTING_PLATFORM_DECLARATIONS!>val x<!> = 1
+<!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX()<!> = 1
\ 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 bd8b5362d63..cfe3263739b 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelDifferentFiles.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelDifferentFiles.kt
@@ -1,5 +1,5 @@
 // FILE: a.kt
-<!CONFLICTING_PLATFORM_DECLARATIONS!>val x = 1<!>
+<!CONFLICTING_PLATFORM_DECLARATIONS!>val x<!> = 1
 
 // FILE: b.kt
-<!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX() = 1<!>
\ No newline at end of file
+<!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX()<!> = 1
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelGetter.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelGetter.kt
index d2b66799096..c697f5fbb47 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelGetter.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelGetter.kt
@@ -1,3 +1,3 @@
 val x: Int
-    <!CONFLICTING_PLATFORM_DECLARATIONS!>get() = 1<!>
-<!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX() = 1<!>
\ No newline at end of file
+    <!CONFLICTING_PLATFORM_DECLARATIONS!>get()<!> = 1
+<!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX()<!> = 1
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/trait.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/trait.kt
index 1d310e1cf6b..55ab42329e6 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/trait.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/trait.kt
@@ -1,5 +1,5 @@
 trait T {
     val x: Int
-        <!CONFLICTING_PLATFORM_DECLARATIONS!>get() = 1<!>
-    <!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX() = 1<!>
+        <!CONFLICTING_PLATFORM_DECLARATIONS!>get()<!> = 1
+    <!CONFLICTING_PLATFORM_DECLARATIONS!>fun getX()<!> = 1
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/componentInheritedFromTrait.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/componentInheritedFromTrait.kt
index 026efff3735..97a4df2f9f8 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/componentInheritedFromTrait.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/componentInheritedFromTrait.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 data class C(val c: Int) {
-    <!CONFLICTING_PLATFORM_DECLARATIONS!>fun `copy$default`(c: C, x: Int, m: Int) = 1<!>
+    <!CONFLICTING_PLATFORM_DECLARATIONS!>fun `copy$default`(c: C, x: Int, m: Int)<!> = 1
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/defaults.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/defaults.kt
index fde10128ebf..e466848001d 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/defaults.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/defaults.kt
@@ -1,6 +1,6 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
-<!CONFLICTING_PLATFORM_DECLARATIONS!>class C {
-    <!CONFLICTING_PLATFORM_DECLARATIONS!>fun `a$default`(c: C, x: Int, m: Int) {}<!>
+<!CONFLICTING_PLATFORM_DECLARATIONS!>class C<!> {
+    <!CONFLICTING_PLATFORM_DECLARATIONS!>fun `a$default`(c: C, x: Int, m: Int)<!> {}
     fun a(x: Int = 1) {}
-}<!>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.kt
index 6fe57a76192..1578fb68f0b 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.kt
@@ -1,5 +1,5 @@
 trait Foo
 
 class Bar(f: Foo) : Foo by f {
-    <!CONFLICTING_PLATFORM_DECLARATIONS!>val `$delegate_0`: Foo? = null<!>
+    <!CONFLICTING_PLATFORM_DECLARATIONS!>val `$delegate_0`: Foo?<!> = null
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.kt
index 242d306a4a0..831eb4c7ee1 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.kt
@@ -1,7 +1,7 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 class C {
-    <!CONFLICTING_PLATFORM_DECLARATIONS!>inner class D {
-        <!CONFLICTING_PLATFORM_DECLARATIONS!>val `this$0`: C? = null<!>
-    }<!>
+    <!CONFLICTING_PLATFORM_DECLARATIONS!>inner class D<!> {
+        <!CONFLICTING_PLATFORM_DECLARATIONS!>val `this$0`: C?<!> = null
+    }
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/oneTrait.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/oneTrait.kt
index 0239e364628..3ca8556c082 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/oneTrait.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/oneTrait.kt
@@ -3,5 +3,5 @@ trait T {
 }
 
 class C : T {
-    <!CONFLICTING_PLATFORM_DECLARATIONS!>val x = 1<!>
+    <!CONFLICTING_PLATFORM_DECLARATIONS!>val x<!> = 1
 }
\ No newline at end of file
diff --git a/idea/testData/checker/duplicateJvmSignature/functionAndProperty/class.kt b/idea/testData/checker/duplicateJvmSignature/functionAndProperty/class.kt
index 9140b8c8ad9..18a43126837 100644
--- a/idea/testData/checker/duplicateJvmSignature/functionAndProperty/class.kt
+++ b/idea/testData/checker/duplicateJvmSignature/functionAndProperty/class.kt
@@ -1,4 +1,4 @@
 class C {
-    <error>val x = 1</error>
-    <error>fun getX() = 1</error>
+    <error>val x</error> = 1
+    <error>fun getX()</error> = 1
 }
\ No newline at end of file
diff --git a/idea/testData/checker/duplicateJvmSignature/functionAndProperty/classObject.kt b/idea/testData/checker/duplicateJvmSignature/functionAndProperty/classObject.kt
index 85ef49331ad..5c99c034738 100644
--- a/idea/testData/checker/duplicateJvmSignature/functionAndProperty/classObject.kt
+++ b/idea/testData/checker/duplicateJvmSignature/functionAndProperty/classObject.kt
@@ -1,6 +1,6 @@
 class C {
     class object {
-        <error>val x = 1</error>
-        <error>fun getX() = 1</error>
+        <error>val x</error> = 1
+        <error>fun getX()</error> = 1
     }
 }
\ No newline at end of file
diff --git a/idea/testData/checker/duplicateJvmSignature/functionAndProperty/localClass.kt b/idea/testData/checker/duplicateJvmSignature/functionAndProperty/localClass.kt
index ced85553267..2fb323c47ce 100644
--- a/idea/testData/checker/duplicateJvmSignature/functionAndProperty/localClass.kt
+++ b/idea/testData/checker/duplicateJvmSignature/functionAndProperty/localClass.kt
@@ -1,6 +1,6 @@
 fun foo() {
     class C {
-        <error>val x = 1</error>
-        <error>fun getX() = 1</error>
+        <error>val x</error> = 1
+        <error>fun getX()</error> = 1
     }
 }
\ No newline at end of file
diff --git a/idea/testData/checker/duplicateJvmSignature/functionAndProperty/nestedClass.kt b/idea/testData/checker/duplicateJvmSignature/functionAndProperty/nestedClass.kt
index 5455d4a1475..e70ccffb289 100644
--- a/idea/testData/checker/duplicateJvmSignature/functionAndProperty/nestedClass.kt
+++ b/idea/testData/checker/duplicateJvmSignature/functionAndProperty/nestedClass.kt
@@ -1,6 +1,6 @@
 class B {
     class C {
-        <error>val x = 1</error>
-        <error>fun getX() = 1</error>
+        <error>val x</error> = 1
+        <error>fun getX()</error> = 1
     }
 }
\ No newline at end of file
diff --git a/idea/testData/checker/duplicateJvmSignature/functionAndProperty/object.kt b/idea/testData/checker/duplicateJvmSignature/functionAndProperty/object.kt
index ced024a5983..0234305c8d3 100644
--- a/idea/testData/checker/duplicateJvmSignature/functionAndProperty/object.kt
+++ b/idea/testData/checker/duplicateJvmSignature/functionAndProperty/object.kt
@@ -1,4 +1,4 @@
 object C {
-    <error>val x = 1</error>
-    <error>fun getX() = 1</error>
+    <error>val x</error> = 1
+    <error>fun getX()</error> = 1
 }
\ No newline at end of file
diff --git a/idea/testData/checker/duplicateJvmSignature/functionAndProperty/objectExpression.kt b/idea/testData/checker/duplicateJvmSignature/functionAndProperty/objectExpression.kt
index 3dd729a9772..5b1d0da0fe5 100644
--- a/idea/testData/checker/duplicateJvmSignature/functionAndProperty/objectExpression.kt
+++ b/idea/testData/checker/duplicateJvmSignature/functionAndProperty/objectExpression.kt
@@ -1,5 +1,5 @@
 fun foo() =
     object {
-        <error>val x = 1</error>
-        <error>fun getX() = 1</error>
+        <error>val x</error> = 1
+        <error>fun getX()</error> = 1
     }
\ No newline at end of file
diff --git a/idea/testData/checker/duplicateJvmSignature/functionAndProperty/topLevel.kt b/idea/testData/checker/duplicateJvmSignature/functionAndProperty/topLevel.kt
index 28d788dd0b0..71efcfa7655 100644
--- a/idea/testData/checker/duplicateJvmSignature/functionAndProperty/topLevel.kt
+++ b/idea/testData/checker/duplicateJvmSignature/functionAndProperty/topLevel.kt
@@ -1,2 +1,2 @@
-<error>val x = 1</error>
-<error>fun getX() = 1</error>
\ No newline at end of file
+<error>val x</error> = 1
+<error>fun getX()</error> = 1
\ No newline at end of file
diff --git a/idea/testData/checker/duplicateJvmSignature/traitImpl/twoTraits.kt b/idea/testData/checker/duplicateJvmSignature/traitImpl/twoTraits.kt
index 25cb919d2d4..8a0490579de 100644
--- a/idea/testData/checker/duplicateJvmSignature/traitImpl/twoTraits.kt
+++ b/idea/testData/checker/duplicateJvmSignature/traitImpl/twoTraits.kt
@@ -7,5 +7,5 @@ trait T2 {
         get() = 1
 }
 
-<error>class C : T1, T2</error> {
+class <error>C</error> : T1, T2 {
 }
\ No newline at end of file