Line markers: use descriptors in isExpect/ActualDeclaration

2017-10-09 16:21:41 +03:00
parent 1bf0424b1c
commit 104826e0a9
1 changed files with 2 additions and 2 deletions
@@ -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