diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt
index aa2fb0f19d0..6d5be92d43e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt
@@ -101,6 +101,7 @@ private val OVERRIDDEN_MARK: Icon = AllIcons.Gutter.OverridenMethod
 private val IMPLEMENTED_MARK: Icon = AllIcons.Gutter.ImplementedMethod
 
 private val SUBCLASSED_CLASS = MarkerType(
+        "SUBCLASSED_CLASS",
         { getPsiClass(it)?.let { MarkerType.getSubclassedClassTooltip(it) } },
         object : LineMarkerNavigator() {
             override fun browse(e: MouseEvent?, element: PsiElement?) {
@@ -109,7 +110,8 @@ private val SUBCLASSED_CLASS = MarkerType(
         })
 
 private val OVERRIDDEN_FUNCTION = MarkerType(
-        { getPsiMethod(it)?.let { getOverriddenMethodTooltip(it) } },
+        "OVERRIDDEN_FUNCTION",
+        { getPsiMethod(it)?.let(::getOverriddenMethodTooltip) },
         object : LineMarkerNavigator() {
             override fun browse(e: MouseEvent?, element: PsiElement?) {
                 getPsiMethod(element)?.let { navigateToOverriddenMethod(e, it) }
@@ -117,6 +119,7 @@ private val OVERRIDDEN_FUNCTION = MarkerType(
         })
 
 private val OVERRIDDEN_PROPERTY = MarkerType(
+        "OVERRIDDEN_PROPERTY",
         { it?.let { getOverriddenPropertyTooltip(it.parent as KtNamedDeclaration) } },
         object : LineMarkerNavigator() {
             override fun browse(e: MouseEvent?, element: PsiElement?) {
@@ -158,18 +161,20 @@ private fun collectSuperDeclarationMarkers(declaration: KtDeclaration, result: M
 
     val implements = isImplementsAndNotOverrides(resolveWithParents.descriptor!!, resolveWithParents.overriddenDescriptors)
 
+    val anchor = (declaration as? KtNamedDeclaration)?.nameIdentifier ?: declaration
+
     // NOTE: Don't store descriptors in line markers because line markers are not deleted while editing other files and this can prevent
     // clearing the whole BindingTrace.
-    val marker = LineMarkerInfo(
-            declaration,
-            declaration.textOffset,
-            if (implements) IMPLEMENTING_MARK else OVERRIDING_MARK,
-            Pass.UPDATE_OVERRIDEN_MARKERS,
-            SuperDeclarationMarkerTooltip,
-            SuperDeclarationMarkerNavigationHandler()
-    )
 
-    result.add(marker)
+    result.add(LineMarkerInfo(
+            declaration,
+            anchor.textRange,
+            if (implements) IMPLEMENTING_MARK else OVERRIDING_MARK,
+            Pass.UPDATE_OVERRIDDEN_MARKERS,
+            SuperDeclarationMarkerTooltip,
+            SuperDeclarationMarkerNavigationHandler(),
+            GutterIconRenderer.Alignment.RIGHT
+    ))
 }
 
 private fun collectInheritedClassMarker(element: KtClass, result: MutableCollection<LineMarkerInfo<*>>) {
@@ -186,11 +191,12 @@ private fun collectInheritedClassMarker(element: KtClass, result: MutableCollect
 
     result.add(LineMarkerInfo(
             anchor,
-            anchor.textOffset,
+            anchor.textRange,
             if (isTrait) IMPLEMENTED_MARK else OVERRIDDEN_MARK,
-            Pass.UPDATE_OVERRIDEN_MARKERS,
+            Pass.UPDATE_OVERRIDDEN_MARKERS,
             SUBCLASSED_CLASS.tooltip,
-            SUBCLASSED_CLASS.navigationHandler
+            SUBCLASSED_CLASS.navigationHandler,
+            GutterIconRenderer.Alignment.RIGHT
     ))
 }
 
@@ -216,9 +222,9 @@ private fun collectOverriddenPropertyAccessors(properties: Collection<KtNamedDec
 
         result.add(LineMarkerInfo(
                 anchor,
-                anchor.textOffset,
+                anchor.textRange,
                 if (isImplemented(property)) IMPLEMENTED_MARK else OVERRIDDEN_MARK,
-                Pass.UPDATE_OVERRIDEN_MARKERS,
+                Pass.UPDATE_OVERRIDDEN_MARKERS,
                 OVERRIDDEN_PROPERTY.tooltip,
                 OVERRIDDEN_PROPERTY.navigationHandler,
                 GutterIconRenderer.Alignment.RIGHT
@@ -296,9 +302,9 @@ private fun collectOverriddenFunctions(functions: Collection<KtNamedFunction>, r
 
         result.add(LineMarkerInfo(
                 anchor,
-                anchor.textOffset,
+                anchor.textRange,
                 if (isImplemented(function)) IMPLEMENTED_MARK else OVERRIDDEN_MARK,
-                Pass.UPDATE_OVERRIDEN_MARKERS, OVERRIDDEN_FUNCTION.tooltip,
+                Pass.UPDATE_OVERRIDDEN_MARKERS, OVERRIDDEN_FUNCTION.tooltip,
                 OVERRIDDEN_FUNCTION.navigationHandler,
                 GutterIconRenderer.Alignment.RIGHT
         ))
diff --git a/idea/testData/codeInsight/lineMarker/overrideImplement/BadCodeNoExceptions.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/BadCodeNoExceptions.kt
index 0ae6dea53a6..92ff915a56f 100644
--- a/idea/testData/codeInsight/lineMarker/overrideImplement/BadCodeNoExceptions.kt
+++ b/idea/testData/codeInsight/lineMarker/overrideImplement/BadCodeNoExceptions.kt
@@ -1,10 +1,10 @@
-interface <lineMarker></lineMarker>Hi {
-    fun <lineMarker></lineMarker>foo(): Int
+interface <lineMarker>Hi</lineMarker> {
+    fun <lineMarker>foo</lineMarker>(): Int
 }
 
 // Closing brace is intentionally missed
 val id = array("kotlin.FlexibleType"
 
 private class Some(): Hi {
-    override fun <lineMarker></lineMarker>foo() = 1
+    override fun <lineMarker>foo</lineMarker>() = 1
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/lineMarker/overrideImplement/Class.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/Class.kt
index e1c9fa06162..aaf9dfb7ba2 100644
--- a/idea/testData/codeInsight/lineMarker/overrideImplement/Class.kt
+++ b/idea/testData/codeInsight/lineMarker/overrideImplement/Class.kt
@@ -1,9 +1,9 @@
-open class <lineMarker></lineMarker>A {
-  open fun <lineMarker></lineMarker>a(){
+open class <lineMarker>A</lineMarker> {
+  open fun <lineMarker>a</lineMarker>(){
   }
 }
 
 class B:A(){
-  override fun <lineMarker></lineMarker>a(){
+  override fun <lineMarker>a</lineMarker>(){
   }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/lineMarker/overrideImplement/ClassObjectInStaticNestedClass.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/ClassObjectInStaticNestedClass.kt
index 89197e9c394..503598fd1c9 100644
--- a/idea/testData/codeInsight/lineMarker/overrideImplement/ClassObjectInStaticNestedClass.kt
+++ b/idea/testData/codeInsight/lineMarker/overrideImplement/ClassObjectInStaticNestedClass.kt
@@ -1,11 +1,11 @@
-interface <lineMarker></lineMarker>TestTrait {
-    fun <lineMarker></lineMarker>test()
+interface <lineMarker>TestTrait</lineMarker> {
+    fun <lineMarker>test</lineMarker>()
 }
 
 class A {
     class B {
         companion object : TestTrait { // TODO: No line marker
-            override fun <lineMarker descr="Implements function in 'TestTrait'"></lineMarker>test() {
+            override fun <lineMarker descr="Implements function in 'TestTrait'">test</lineMarker>() {
             }
         }
     }
diff --git a/idea/testData/codeInsight/lineMarker/overrideImplement/DelegatedFun.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/DelegatedFun.kt
index 09aac6ea6cf..0c46cffe410 100644
--- a/idea/testData/codeInsight/lineMarker/overrideImplement/DelegatedFun.kt
+++ b/idea/testData/codeInsight/lineMarker/overrideImplement/DelegatedFun.kt
@@ -1,13 +1,13 @@
-interface <lineMarker></lineMarker>A {
-    fun <lineMarker></lineMarker>f() {
+interface <lineMarker>A</lineMarker> {
+    fun <lineMarker>f</lineMarker>() {
     }
 }
 
-interface <lineMarker></lineMarker>B : A
+interface <lineMarker>B</lineMarker> : A
 
-open class <lineMarker></lineMarker>C(b : B) : B by b, A {
+open class <lineMarker>C</lineMarker>(b : B) : B by b, A {
 }
 
 class D(b : B) : C(b) {
-  override fun <lineMarker descr="Overrides function in 'A'"></lineMarker>f() {}
+  override fun <lineMarker descr="Overrides function in 'A'">f</lineMarker>() {}
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/lineMarker/overrideImplement/DelegatedProperty.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/DelegatedProperty.kt
index f759845a674..567046d11c8 100644
--- a/idea/testData/codeInsight/lineMarker/overrideImplement/DelegatedProperty.kt
+++ b/idea/testData/codeInsight/lineMarker/overrideImplement/DelegatedProperty.kt
@@ -1,13 +1,13 @@
-interface <lineMarker></lineMarker>A {
-    val <lineMarker></lineMarker>f: Int
+interface <lineMarker>A</lineMarker> {
+    val <lineMarker>f</lineMarker>: Int
         get() = 3
 }
 
-interface <lineMarker></lineMarker>B : A
+interface <lineMarker>B</lineMarker> : A
 
-open class <lineMarker></lineMarker>C(b : B) : B by b, A {
+open class <lineMarker>C</lineMarker>(b : B) : B by b, A {
 }
 
 class D(b : B) : C(b) {
-    override val <lineMarker descr="Overrides property in 'A'"></lineMarker>f: Int = 2
+    override val <lineMarker descr="Overrides property in 'A'">f</lineMarker>: Int = 2
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/lineMarker/overrideImplement/EnumEntry.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/EnumEntry.kt
index 91485d5f6d9..9202ab103dd 100644
--- a/idea/testData/codeInsight/lineMarker/overrideImplement/EnumEntry.kt
+++ b/idea/testData/codeInsight/lineMarker/overrideImplement/EnumEntry.kt
@@ -1,7 +1,7 @@
 enum class SampleEnum {
     V1 {
-        override fun <lineMarker descr="Overrides function in 'SampleEnum'"></lineMarker>any() { super.any() }
+        override fun <lineMarker descr="Overrides function in 'SampleEnum'">any</lineMarker>() { super.any() }
     };
 
-    open fun <lineMarker descr="<html><body>Is overridden in <br>&nbsp;&nbsp;&nbsp;&nbsp;Enum constant 'V1' in 'SampleEnum'</body></html>"></lineMarker>any() {}
+    open fun <lineMarker descr="<html><body>Is overridden in <br>&nbsp;&nbsp;&nbsp;&nbsp;Enum constant 'V1' in 'SampleEnum'</body></html>">any</lineMarker>() {}
 }
diff --git a/idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideForClasses.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideForClasses.kt
index 4b4b332b1ac..522b7c93007 100644
--- a/idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideForClasses.kt
+++ b/idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideForClasses.kt
@@ -1,25 +1,25 @@
 package sample
 
-interface <lineMarker descr="*"></lineMarker>S<T> {
-    fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;sample.S2</body></html>"></lineMarker>foo(t: T): T
+interface <lineMarker descr="*">S</lineMarker><T> {
+    fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;sample.S2</body></html>">foo</lineMarker>(t: T): T
 
-    val <lineMarker descr="<html><body>Is implemented in <br/>&nbsp;&nbsp;&nbsp;&nbsp;sample.S2</body></html>"></lineMarker>some: T? get
+    val <lineMarker descr="<html><body>Is implemented in <br/>&nbsp;&nbsp;&nbsp;&nbsp;sample.S2</body></html>">some</lineMarker>: T? get
 
-    var <lineMarker descr="<html><body>Is implemented in <br/>&nbsp;&nbsp;&nbsp;&nbsp;sample.S2</body></html>"></lineMarker>other: T?
+    var <lineMarker descr="<html><body>Is implemented in <br/>&nbsp;&nbsp;&nbsp;&nbsp;sample.S2</body></html>">other</lineMarker>: T?
         get
         set
 }
 
-open abstract class <lineMarker descr="*"></lineMarker>S1 : S<String>
+open abstract class <lineMarker descr="*">S1</lineMarker> : S<String>
 
 class S2 : S1() {
-    override val <lineMarker descr="Implements property in 'S&lt;T&gt;'"></lineMarker>some: String = "S"
+    override val <lineMarker descr="Implements property in 'S&lt;T&gt;'">some</lineMarker>: String = "S"
 
-    override var <lineMarker descr="Implements property in 'S&lt;T&gt;'"></lineMarker>other: String?
+    override var <lineMarker descr="Implements property in 'S&lt;T&gt;'">other</lineMarker>: String?
         get() = null
         set(value) {}
 
-    override fun <lineMarker descr="Implements function in 'S&lt;T&gt;'"></lineMarker>foo(t: String): String {
+    override fun <lineMarker descr="Implements function in 'S&lt;T&gt;'">foo</lineMarker>(t: String): String {
         return super<S1>.foo(t)
     }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideFun.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideFun.kt
index 2cd3c436209..f102ea18080 100644
--- a/idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideFun.kt
+++ b/idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideFun.kt
@@ -1,11 +1,11 @@
-interface <lineMarker></lineMarker>A {
-  fun <lineMarker></lineMarker>f() {}
+interface <lineMarker>A</lineMarker> {
+  fun <lineMarker>f</lineMarker>() {}
 }
 
-interface <lineMarker></lineMarker>B : A
+interface <lineMarker>B</lineMarker> : A
 
-interface <lineMarker></lineMarker>C : B, A
+interface <lineMarker>C</lineMarker> : B, A
 
 class SomeClass() : C {
-  override fun <lineMarker descr="Overrides function in 'A'"></lineMarker>f() {}
+  override fun <lineMarker descr="Overrides function in 'A'">f</lineMarker>() {}
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideFunWithMostRelevantImplementation.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideFunWithMostRelevantImplementation.kt
index 0d071af3208..22530b135ab 100644
--- a/idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideFunWithMostRelevantImplementation.kt
+++ b/idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideFunWithMostRelevantImplementation.kt
@@ -1,13 +1,13 @@
-interface <lineMarker></lineMarker>A {
-    fun <lineMarker></lineMarker><lineMarker></lineMarker>f() {}
+interface <lineMarker>A</lineMarker> {
+    fun <lineMarker><lineMarker>f</lineMarker></lineMarker>() {}
 }
 
-interface <lineMarker></lineMarker>B : A {
-    override fun <lineMarker></lineMarker>f() {}
+interface <lineMarker>B</lineMarker> : A {
+    override fun <lineMarker>f</lineMarker>() {}
 }
 
-interface <lineMarker></lineMarker>C : B, A
+interface <lineMarker>C</lineMarker> : B, A
 
 class SomeClass() : C {
-    override fun <lineMarker descr="Overrides function in 'B'"></lineMarker>f() {}
+    override fun <lineMarker descr="Overrides function in 'B'">f</lineMarker>() {}
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideProperty.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideProperty.kt
index e03c44a012d..4730271e4e4 100644
--- a/idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideProperty.kt
+++ b/idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideProperty.kt
@@ -1,12 +1,12 @@
-interface <lineMarker></lineMarker>A {
-    val <lineMarker></lineMarker>f: Int
+interface <lineMarker>A</lineMarker> {
+    val <lineMarker>f</lineMarker>: Int
         get() = 2
 }
 
-interface <lineMarker></lineMarker>B : A
+interface <lineMarker>B</lineMarker> : A
 
-interface <lineMarker></lineMarker>C : B, A
+interface <lineMarker>C</lineMarker> : B, A
 
 class SomeClass() : C {
-    override val <lineMarker descr="Overrides property in 'A'"></lineMarker>f: Int = 4
+    override val <lineMarker descr="Overrides property in 'A'">f</lineMarker>: Int = 4
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideToStringInTrait.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideToStringInTrait.kt
index 5ad1f9ad91d..38caac214df 100644
--- a/idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideToStringInTrait.kt
+++ b/idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverrideToStringInTrait.kt
@@ -1,9 +1,9 @@
-interface <lineMarker descr="*"></lineMarker>A {
-    override fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;C</body></html>"><lineMarker descr="*"></lineMarker></lineMarker>toString() = "A"
+interface <lineMarker descr="*">A</lineMarker> {
+    override fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;C</body></html>"><lineMarker descr="*">toString</lineMarker></lineMarker>() = "A"
 }
 
-abstract class <lineMarker descr="*"></lineMarker>B: A
+abstract class <lineMarker descr="*">B</lineMarker> : A
 
-class C: B() {
-    override fun <lineMarker descr="Overrides function in 'A'"></lineMarker>toString() = "B"
+class C : B() {
+    override fun <lineMarker descr="Overrides function in 'A'">toString</lineMarker>() = "B"
 }
diff --git a/idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverridesForTraitFunWithImpl.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverridesForTraitFunWithImpl.kt
index 1b71bae5fab..cb48b5d7041 100644
--- a/idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverridesForTraitFunWithImpl.kt
+++ b/idea/testData/codeInsight/lineMarker/overrideImplement/FakeOverridesForTraitFunWithImpl.kt
@@ -1,25 +1,25 @@
-interface <lineMarker descr="*"></lineMarker>A {
-    fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;C</body></html>"></lineMarker>foo(): String = "A"
+interface <lineMarker descr="*">A</lineMarker> {
+    fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;C</body></html>">foo</lineMarker>(): String = "A"
 
     // TODO: B shoudn't be mentioned
-    val <lineMarker descr="<html><body>Is implemented in <br/>&nbsp;&nbsp;&nbsp;&nbsp;B<br>&nbsp;&nbsp;&nbsp;&nbsp;C</body></html>"></lineMarker>some: String? get() = null
+    val <lineMarker descr="<html><body>Is implemented in <br/>&nbsp;&nbsp;&nbsp;&nbsp;B<br>&nbsp;&nbsp;&nbsp;&nbsp;C</body></html>">some</lineMarker>: String? get() = null
 
     // TODO: B shoudn't be mentioned
-    var <lineMarker descr="<html><body>Is implemented in <br/>&nbsp;&nbsp;&nbsp;&nbsp;B<br>&nbsp;&nbsp;&nbsp;&nbsp;C</body></html>"></lineMarker>other: String?
+    var <lineMarker descr="<html><body>Is implemented in <br/>&nbsp;&nbsp;&nbsp;&nbsp;B<br>&nbsp;&nbsp;&nbsp;&nbsp;C</body></html>">other</lineMarker>: String?
         get() = null
         set(value) {}
 }
 
-open class <lineMarker descr="*"></lineMarker>B: A
+open class <lineMarker descr="*">B</lineMarker> : A
 
 class C: B() {
-    override val <lineMarker descr="Overrides property in 'A'"></lineMarker>some: String = "S"
+    override val <lineMarker descr="Overrides property in 'A'">some</lineMarker>: String = "S"
 
-    override var <lineMarker descr="Overrides property in 'A'"></lineMarker>other: String?
+    override var <lineMarker descr="Overrides property in 'A'">other</lineMarker>: String?
         get() = null
         set(value) {}
 
-    override fun <lineMarker descr="Overrides function in 'A'"></lineMarker>foo(): String {
+    override fun <lineMarker descr="Overrides function in 'A'">foo</lineMarker>(): String {
         return super<S1>.foo()
     }
 }
diff --git a/idea/testData/codeInsight/lineMarker/overrideImplement/NavigateToSeveralSuperElements.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/NavigateToSeveralSuperElements.kt
index 435f4c83e50..2343ffb298b 100644
--- a/idea/testData/codeInsight/lineMarker/overrideImplement/NavigateToSeveralSuperElements.kt
+++ b/idea/testData/codeInsight/lineMarker/overrideImplement/NavigateToSeveralSuperElements.kt
@@ -1,13 +1,13 @@
-interface <lineMarker></lineMarker>A1 {
-    fun <lineMarker></lineMarker>foo()
+interface <lineMarker>A1</lineMarker> {
+    fun <lineMarker>foo</lineMarker>()
 }
 
-interface <lineMarker></lineMarker>B1 {
-    fun <lineMarker></lineMarker>foo()
+interface <lineMarker>B1</lineMarker> {
+    fun <lineMarker>foo</lineMarker>()
 }
 
 class C1: A1, B1 {
-    override fun <lineMarker descr="Implements function in 'A1'<br/>Implements function in 'B1'"></lineMarker>foo() {}
+    override fun <lineMarker descr="Implements function in 'A1'<br/>Implements function in 'B1'">foo</lineMarker>() {}
 }
 
 /*
diff --git a/idea/testData/codeInsight/lineMarker/overrideImplement/NoOverridingMarkerOnDefaultTraitImpl.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/NoOverridingMarkerOnDefaultTraitImpl.kt
index c3e9dd307c7..73a42d37ee8 100644
--- a/idea/testData/codeInsight/lineMarker/overrideImplement/NoOverridingMarkerOnDefaultTraitImpl.kt
+++ b/idea/testData/codeInsight/lineMarker/overrideImplement/NoOverridingMarkerOnDefaultTraitImpl.kt
@@ -1,9 +1,9 @@
-interface <lineMarker descr="*"></lineMarker>SkipSupport {
-    fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportWithDefaults</body></html>"></lineMarker>skip()
+interface <lineMarker descr="*">SkipSupport</lineMarker> {
+    fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportWithDefaults</body></html>">skip</lineMarker>()
 }
 
-public interface <lineMarker descr="*"></lineMarker>SkipSupportWithDefaults : SkipSupport {
-    override fun <lineMarker descr="Implements function in 'SkipSupport'"></lineMarker>skip() {}
+public interface <lineMarker descr="*">SkipSupportWithDefaults</lineMarker> : SkipSupport {
+    override fun <lineMarker descr="Implements function in 'SkipSupport'">skip</lineMarker>() {}
 }
 
 open class SkipSupportImpl : SkipSupportWithDefaults
\ No newline at end of file
diff --git a/idea/testData/codeInsight/lineMarker/overrideImplement/Overloads.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/Overloads.kt
index 25c02020c98..8d0b4737c68 100644
--- a/idea/testData/codeInsight/lineMarker/overrideImplement/Overloads.kt
+++ b/idea/testData/codeInsight/lineMarker/overrideImplement/Overloads.kt
@@ -1,9 +1,9 @@
-interface <lineMarker descr="*"></lineMarker>A {
-    fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;B</body></html>"></lineMarker>foo(str: String)
-    fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;B</body></html>"></lineMarker>foo()
+interface <lineMarker descr="*">A</lineMarker> {
+    fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;B</body></html>">foo</lineMarker>(str: String)
+    fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;B</body></html>">foo</lineMarker>()
 }
 
 open class B : A {
-    override fun <lineMarker descr="Implements function in 'A'"></lineMarker>foo(str: String) { }
-    override fun <lineMarker descr="Implements function in 'A'"></lineMarker>foo() { }
+    override fun <lineMarker descr="Implements function in 'A'">foo</lineMarker>(str: String) { }
+    override fun <lineMarker descr="Implements function in 'A'">foo</lineMarker>() { }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/lineMarker/overrideImplement/OverrideFunction.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/OverrideFunction.kt
index d84ac546b7d..4757315012a 100644
--- a/idea/testData/codeInsight/lineMarker/overrideImplement/OverrideFunction.kt
+++ b/idea/testData/codeInsight/lineMarker/overrideImplement/OverrideFunction.kt
@@ -1,14 +1,14 @@
-open class <lineMarker></lineMarker>A {
-  open fun <lineMarker></lineMarker>a(){
+open class <lineMarker>A</lineMarker> {
+  open fun <lineMarker>a</lineMarker>(){
   }
 }
 
-open class <lineMarker></lineMarker>B:A(){
-  override fun <lineMarker></lineMarker><lineMarker></lineMarker>a(){
+open class <lineMarker>B</lineMarker> : A(){
+  override fun <lineMarker><lineMarker>a</lineMarker></lineMarker>(){
   }
 }
 
-class C:B(){
-  override fun <lineMarker></lineMarker>a(){
+class C : B(){
+  override fun <lineMarker>a</lineMarker>(){
   }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/lineMarker/overrideImplement/OverrideIconForOverloadMethodBug.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/OverrideIconForOverloadMethodBug.kt
index 49df74d5fbd..a5f80817c1e 100644
--- a/idea/testData/codeInsight/lineMarker/overrideImplement/OverrideIconForOverloadMethodBug.kt
+++ b/idea/testData/codeInsight/lineMarker/overrideImplement/OverrideIconForOverloadMethodBug.kt
@@ -1,19 +1,19 @@
-interface <lineMarker descr="*"></lineMarker>SkipSupport {
-    fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportImpl<br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportWithDefaults</body></html>"></lineMarker>skip(why: String)
-    fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportWithDefaults</body></html>"></lineMarker>skip()
+interface <lineMarker descr="*">SkipSupport</lineMarker> {
+    fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportImpl<br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportWithDefaults</body></html>">skip</lineMarker>(why: String)
+    fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportWithDefaults</body></html>">skip</lineMarker>()
 }
 
-public interface <lineMarker descr="*"></lineMarker>SkipSupportWithDefaults : SkipSupport {
+public interface <lineMarker descr="*">SkipSupportWithDefaults</lineMarker> : SkipSupport {
     // TODO: should be "Is overriden in SkipSupportImpl"
-    override fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportImpl</body></html>"><lineMarker descr="Implements function in 'SkipSupport'"></lineMarker></lineMarker>skip(why: String) {}
+    override fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportImpl</body></html>"><lineMarker descr="Implements function in 'SkipSupport'">skip</lineMarker></lineMarker>(why: String) {}
 
-    override fun <lineMarker descr="Implements function in 'SkipSupport'"></lineMarker>skip() {
+    override fun <lineMarker descr="Implements function in 'SkipSupport'">skip</lineMarker>() {
         skip("not given")
     }
 }
 
 open class SkipSupportImpl: SkipSupportWithDefaults {
-    override fun <lineMarker descr="Overrides function in 'SkipSupportWithDefaults'"></lineMarker>skip(why: String) = throw RuntimeException(why)
+    override fun <lineMarker descr="Overrides function in 'SkipSupportWithDefaults'">skip</lineMarker>(why: String) = throw RuntimeException(why)
 }
 
 // KT-4428 Incorrect override icon shown for overloaded methods
\ No newline at end of file
diff --git a/idea/testData/codeInsight/lineMarker/overrideImplement/OverrideMemberOfAbstractClass.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/OverrideMemberOfAbstractClass.kt
index 25da4059776..b4e77305a10 100644
--- a/idea/testData/codeInsight/lineMarker/overrideImplement/OverrideMemberOfAbstractClass.kt
+++ b/idea/testData/codeInsight/lineMarker/overrideImplement/OverrideMemberOfAbstractClass.kt
@@ -1,10 +1,10 @@
-abstract class <lineMarker></lineMarker>A {
-  open fun <lineMarker></lineMarker>a(){
+abstract class <lineMarker>A</lineMarker> {
+  open fun <lineMarker>a</lineMarker>(){
   }
 }
 
 open class B : A(){
-  override fun <lineMarker></lineMarker>a(){
+  override fun <lineMarker>a</lineMarker>(){
   }
 }
 
diff --git a/idea/testData/codeInsight/lineMarker/overrideImplement/OverridenTraitDeclarations.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/OverridenTraitDeclarations.kt
index 86f94cbedc8..925e5219f8b 100644
--- a/idea/testData/codeInsight/lineMarker/overrideImplement/OverridenTraitDeclarations.kt
+++ b/idea/testData/codeInsight/lineMarker/overrideImplement/OverridenTraitDeclarations.kt
@@ -1,15 +1,15 @@
 // TODO: Declarations have no implementation and should be considered as "overloaded"
-interface <lineMarker descr="*"></lineMarker>First {
-    val <lineMarker descr="<html><body>Is implemented in <br/>&nbsp;&nbsp;&nbsp;&nbsp;Second</body></html>"></lineMarker>some: Int
-    var <lineMarker descr="<html><body>Is implemented in <br/>&nbsp;&nbsp;&nbsp;&nbsp;Second</body></html>"></lineMarker>other: String
+interface <lineMarker descr="*">First</lineMarker> {
+    val <lineMarker descr="<html><body>Is implemented in <br/>&nbsp;&nbsp;&nbsp;&nbsp;Second</body></html>">some</lineMarker>: Int
+    var <lineMarker descr="<html><body>Is implemented in <br/>&nbsp;&nbsp;&nbsp;&nbsp;Second</body></html>">other</lineMarker>: String
         get
         set
 
-    fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;Second</body></html>"></lineMarker>foo()
+    fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;Second</body></html>">foo</lineMarker>()
 }
 
 interface Second : First {
-    override val <lineMarker descr="Overrides property in 'First'"></lineMarker>some: Int
-    override var <lineMarker descr="Overrides property in 'First'"></lineMarker>other: String
-    override fun <lineMarker descr="Overrides function in 'First'"></lineMarker>foo()
+    override val <lineMarker descr="Overrides property in 'First'">some</lineMarker>: Int
+    override var <lineMarker descr="Overrides property in 'First'">other</lineMarker>: String
+    override fun <lineMarker descr="Overrides function in 'First'">foo</lineMarker>()
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/lineMarker/overrideImplement/OverridingTooltipOnDefaultTraitImpl.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/OverridingTooltipOnDefaultTraitImpl.kt
index 43a55a128eb..e50b324e27e 100644
--- a/idea/testData/codeInsight/lineMarker/overrideImplement/OverridingTooltipOnDefaultTraitImpl.kt
+++ b/idea/testData/codeInsight/lineMarker/overrideImplement/OverridingTooltipOnDefaultTraitImpl.kt
@@ -1,13 +1,13 @@
-interface <lineMarker descr="*"></lineMarker>SkipSupport {
-    fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportImpl1<br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportWithDefaults</body></html>"></lineMarker>skip()
+interface <lineMarker descr="*">SkipSupport</lineMarker> {
+    fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportImpl1<br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportWithDefaults</body></html>">skip</lineMarker>()
 }
 
-public interface <lineMarker descr="*"></lineMarker>SkipSupportWithDefaults : SkipSupport {
-    override fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportImpl1</body></html>"><lineMarker descr="Implements function in 'SkipSupport'"></lineMarker></lineMarker>skip() {}
+public interface <lineMarker descr="*">SkipSupportWithDefaults</lineMarker> : SkipSupport {
+    override fun <lineMarker descr="<html><body>Is implemented in <br>&nbsp;&nbsp;&nbsp;&nbsp;SkipSupportImpl1</body></html>"><lineMarker descr="Implements function in 'SkipSupport'">skip</lineMarker></lineMarker>() {}
 }
 
 public interface SkipSupportImpl1 : SkipSupportWithDefaults {
-    override fun <lineMarker descr="Overrides function in 'SkipSupportWithDefaults'"></lineMarker>skip() {}
+    override fun <lineMarker descr="Overrides function in 'SkipSupportWithDefaults'">skip</lineMarker>() {}
 }
 
 open class SkipSupportImpl : SkipSupportWithDefaults
\ No newline at end of file
diff --git a/idea/testData/codeInsight/lineMarker/overrideImplement/PrimaryConstructorOpen.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/PrimaryConstructorOpen.kt
index dd36a88e504..e1410559e6f 100644
--- a/idea/testData/codeInsight/lineMarker/overrideImplement/PrimaryConstructorOpen.kt
+++ b/idea/testData/codeInsight/lineMarker/overrideImplement/PrimaryConstructorOpen.kt
@@ -1,10 +1,10 @@
-open class <lineMarker></lineMarker>C(
-        open val <lineMarker descr="<html><body>Is overridden in <br/>&nbsp;&nbsp;&nbsp;&nbsp;D</body></html>"></lineMarker>s: String
+open class <lineMarker>C</lineMarker>(
+        open val <lineMarker descr="<html><body>Is overridden in <br/>&nbsp;&nbsp;&nbsp;&nbsp;D</body></html>">s</lineMarker>: String
 ) {
 
 }
 
 
 class D : C("") {
-    override val <lineMarker></lineMarker>s: String get() = "q"
+    override val <lineMarker>s</lineMarker>: String get() = "q"
 }
diff --git a/idea/testData/codeInsight/lineMarker/overrideImplement/PrimaryConstructorOverride.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/PrimaryConstructorOverride.kt
index 15328a8fe08..aee88ffac7d 100644
--- a/idea/testData/codeInsight/lineMarker/overrideImplement/PrimaryConstructorOverride.kt
+++ b/idea/testData/codeInsight/lineMarker/overrideImplement/PrimaryConstructorOverride.kt
@@ -1,7 +1,7 @@
-interface <lineMarker></lineMarker>I {
-    val <lineMarker></lineMarker>name: String
+interface <lineMarker>I</lineMarker> {
+    val <lineMarker>name</lineMarker>: String
 }
 
 class D(
-    override val <lineMarker descr="Implements property in 'I'"></lineMarker>name: String
+    override val <lineMarker descr="Implements property in 'I'">name</lineMarker>: String
 ): I
diff --git a/idea/testData/codeInsight/lineMarker/overrideImplement/PropertyOverride.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/PropertyOverride.kt
index 1c3507c2823..493bace3d5e 100644
--- a/idea/testData/codeInsight/lineMarker/overrideImplement/PropertyOverride.kt
+++ b/idea/testData/codeInsight/lineMarker/overrideImplement/PropertyOverride.kt
@@ -1,7 +1,7 @@
-open class <lineMarker></lineMarker>Base {
-  open var <lineMarker></lineMarker>writable: Int = 12
+open class <lineMarker>Base</lineMarker> {
+  open var <lineMarker>writable</lineMarker>: Int = 12
 }
 
 class SubBase: Base() {
-  override var <lineMarker></lineMarker>writable: Int = 42
+  override var <lineMarker>writable</lineMarker>: Int = 42
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/lineMarker/overrideImplement/ToStringInTrait.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/ToStringInTrait.kt
index 55b6f1c7f09..fec59cdae27 100644
--- a/idea/testData/codeInsight/lineMarker/overrideImplement/ToStringInTrait.kt
+++ b/idea/testData/codeInsight/lineMarker/overrideImplement/ToStringInTrait.kt
@@ -1,5 +1,5 @@
 public interface Foo {
-    override fun <lineMarker descr="Overrides function in 'Any'"></lineMarker>toString() = "str"
+    override fun <lineMarker descr="Overrides function in 'Any'">toString</lineMarker>() = "str"
 }
 
 /*
diff --git a/idea/testData/codeInsight/lineMarker/overrideImplement/Trait.kt b/idea/testData/codeInsight/lineMarker/overrideImplement/Trait.kt
index 2c9cfe8ac72..0682e10d497 100644
--- a/idea/testData/codeInsight/lineMarker/overrideImplement/Trait.kt
+++ b/idea/testData/codeInsight/lineMarker/overrideImplement/Trait.kt
@@ -1,9 +1,9 @@
-interface <lineMarker></lineMarker>A {
-  fun <lineMarker></lineMarker>a(){
+interface <lineMarker>A</lineMarker> {
+  fun <lineMarker>a</lineMarker>(){
   }
 }
 
-class B :A {
-  override fun <lineMarker></lineMarker>a(){
+class B : A {
+  override fun <lineMarker>a</lineMarker>(){
   }
 }
\ No newline at end of file
diff --git a/idea/testData/codeInsight/lineMarker/recursiveCall/conventionCall.kt b/idea/testData/codeInsight/lineMarker/recursiveCall/conventionCall.kt
index 282f2b8b30d..573b62766e8 100644
--- a/idea/testData/codeInsight/lineMarker/recursiveCall/conventionCall.kt
+++ b/idea/testData/codeInsight/lineMarker/recursiveCall/conventionCall.kt
@@ -5,7 +5,7 @@ operator fun Any.get(a: Int) {
 }
 
 class A {
-    override fun <lineMarker descr="Overrides function in 'Any'"></lineMarker>equals(other: Any?): Boolean {
+    override fun <lineMarker descr="Overrides function in 'Any'">equals</lineMarker>(other: Any?): Boolean {
         this <lineMarker descr="Recursive call">==</lineMarker> other
         return true
     }
diff --git a/idea/testData/codeInsight/lineMarker/recursiveCall/superQualifier.kt b/idea/testData/codeInsight/lineMarker/recursiveCall/superQualifier.kt
index 270aba1104f..c6659a075d1 100644
--- a/idea/testData/codeInsight/lineMarker/recursiveCall/superQualifier.kt
+++ b/idea/testData/codeInsight/lineMarker/recursiveCall/superQualifier.kt
@@ -1,10 +1,10 @@
-open class <lineMarker></lineMarker>Super {
-    open fun <lineMarker></lineMarker>f(a: Int) {
+open class <lineMarker>Super</lineMarker> {
+    open fun <lineMarker>f</lineMarker>(a: Int) {
     }
 }
 
 class F: Super() {
-    override fun <lineMarker></lineMarker>f(a: Int) {
+    override fun <lineMarker>f</lineMarker>(a: Int) {
         if (a > 0) {
             super.f(a - 1)
         }
diff --git a/idea/testData/codeInsight/lineMarker/runMarkers/jUnitTestClassWithSubclasses.kt b/idea/testData/codeInsight/lineMarker/runMarkers/jUnitTestClassWithSubclasses.kt
index 0f9da35e984..5245b84fe1c 100644
--- a/idea/testData/codeInsight/lineMarker/runMarkers/jUnitTestClassWithSubclasses.kt
+++ b/idea/testData/codeInsight/lineMarker/runMarkers/jUnitTestClassWithSubclasses.kt
@@ -4,7 +4,7 @@ package testing
 import junit.framework.TestCase
 import org.junit.Test
 
-abstract class <lineMarker descr="*"><lineMarker descr="Run Test"></lineMarker>KBase</lineMarker> : TestCase() {
+abstract class <lineMarker descr="*"><lineMarker descr="Run Test">KBase</lineMarker></lineMarker> : TestCase() {
     @Test
     fun testFoo() {
 
diff --git a/idea/testData/codeInsight/lineMarker/runMarkers/testNGTestClassWithSubclasses.kt b/idea/testData/codeInsight/lineMarker/runMarkers/testNGTestClassWithSubclasses.kt
index 1cb1a4f4b70..bed828669c0 100644
--- a/idea/testData/codeInsight/lineMarker/runMarkers/testNGTestClassWithSubclasses.kt
+++ b/idea/testData/codeInsight/lineMarker/runMarkers/testNGTestClassWithSubclasses.kt
@@ -3,7 +3,7 @@ package testing
 
 import org.testng.annotations.Test
 
-abstract class <lineMarker descr="*"><lineMarker descr="Run Test"></lineMarker>KBase</lineMarker> {
+abstract class <lineMarker descr="*"><lineMarker descr="Run Test">KBase</lineMarker></lineMarker> {
     @Test
     fun <lineMarker descr="*">testFoo</lineMarker>() {