Fix line markers for actual enum entries

#KT-22632 Fixed
This commit is contained in:
Pavel V. Talanov
2018-03-29 16:16:36 +02:00
parent e66768cbb3
commit de71598794
9 changed files with 58 additions and 6 deletions
@@ -35,7 +35,7 @@ class KotlinExpectOrActualGotoRelatedProvider : GotoRelatedProvider() {
val declaration = psiElement.getParentOfTypeAndBranch<KtNamedDeclaration> { nameIdentifier } ?: return emptyList()
val targets = when {
declaration.isExpectDeclaration() -> declaration.actualsForExpected()
declaration.isActualDeclaration() -> listOfNotNull(declaration.expectedDeclarationIfAny())
declaration.isEffectivelyActual() -> listOfNotNull(declaration.expectedDeclarationIfAny())
else -> emptyList()
}
return targets.map(::ActualOrExpectGotoRelatedItem)
@@ -123,7 +123,7 @@ class KotlinLineMarkerProvider : LineMarkerProvider {
if (element.isExpectDeclaration()) {
collectActualMarkers(element, result)
}
else if (element.isActualDeclaration()) {
else if (element.isEffectivelyActual()) {
collectExpectedMarkers(element, result)
}
}