From 98eb990f305ee14f526c62d28e8736390d6dfde5 Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Thu, 10 Aug 2017 14:46:38 +0300
Subject: [PATCH] Line Marking: Place header/impl markers after
 override/inheritance

 #KT-19074 Fixed
---
 .../markers/KotlinLineMarkerProvider.kt       | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

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 19830505a86..0b63ce06cda 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt
@@ -90,19 +90,21 @@ class KotlinLineMarkerProvider : LineMarkerProvider {
                     }
                 }
             }
-
-            if (element is KtNamedDeclaration) {
-                if (element.hasModifier(KtTokens.HEADER_KEYWORD)) {
-                    collectImplementationMarkers(element, result)
-                }
-                else if (element.hasModifier(KtTokens.IMPL_KEYWORD)) {
-                    collectHeaderMarkers(element, result)
-                }
-            }
         }
 
         collectOverriddenFunctions(functions, result)
         collectOverriddenPropertyAccessors(properties, result)
+
+        for (element in elements) {
+            if (element !is KtNamedDeclaration) continue
+
+            if (element.hasModifier(KtTokens.HEADER_KEYWORD)) {
+                collectImplementationMarkers(element, result)
+            }
+            else if (element.hasModifier(KtTokens.IMPL_KEYWORD)) {
+                collectHeaderMarkers(element, result)
+            }
+        }
     }
 }