From 104826e0a91ecb9420b0940ed771e2c1a38e34c2 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Mon, 9 Oct 2017 16:21:41 +0300
Subject: [PATCH] Line markers: use descriptors in isExpect/ActualDeclaration

---
 .../idea/highlighter/markers/KotlinLineMarkerProvider.kt      | 4 ++--
 1 file changed, 2 insertions(+), 2 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 6a795e9dce2..b21a78d16c8 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt
@@ -64,10 +64,10 @@ class KotlinLineMarkerProvider : LineMarkerProvider {
     }
 
     private fun KtNamedDeclaration.isExpectDeclaration(): Boolean =
-            hasExpectModifier() || containingClassOrObject?.isExpectDeclaration() == true
+            (toDescriptor() as? MemberDescriptor)?.isExpect == true
 
     private fun KtNamedDeclaration.isActualDeclaration(): Boolean =
-            hasActualModifier()
+            (toDescriptor() as? MemberDescriptor)?.isActual == true
 
     override fun collectSlowLineMarkers(elements: List<PsiElement>, result: MutableCollection<LineMarkerInfo<*>>) {
         if (elements.isEmpty()) return