From 8ef2c479e445cdbaccb026344e62df41cff03ee5 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Mon, 20 Aug 2018 18:20:25 +0300
Subject: [PATCH] Refactoring: HasActualMarker (use not-null declarations)

---
 .../kotlin/idea/highlighter/markers/HasActualMarker.kt    | 8 ++++----
 .../idea/highlighter/markers/KotlinLineMarkerProvider.kt  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/HasActualMarker.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/HasActualMarker.kt
index 861ba641c48..91d14223ec8 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/HasActualMarker.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/HasActualMarker.kt
@@ -27,8 +27,8 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.module
 import org.jetbrains.kotlin.resolve.getMultiTargetPlatform
 import java.awt.event.MouseEvent
 
-fun getPlatformActualTooltip(declaration: KtDeclaration?): String? {
-    val actualDeclarations = declaration?.actualsForExpected() ?: return null
+fun getPlatformActualTooltip(declaration: KtDeclaration): String? {
+    val actualDeclarations = declaration.actualsForExpected()
     if (actualDeclarations.isEmpty()) return null
 
     return actualDeclarations.asSequence()
@@ -49,8 +49,8 @@ fun getPlatformActualTooltip(declaration: KtDeclaration?): String? {
         }
 }
 
-fun navigateToPlatformActual(e: MouseEvent?, declaration: KtDeclaration?) {
-    val actualDeclarations = declaration?.actualsForExpected() ?: return
+fun navigateToPlatformActual(e: MouseEvent?, declaration: KtDeclaration) {
+    val actualDeclarations = declaration.actualsForExpected()
     if (actualDeclarations.isEmpty()) return
 
     val renderer = object : DefaultPsiElementCellRenderer() {
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 f055bb664d8..d528d9a72d2 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt
@@ -200,10 +200,10 @@ private val PsiElement.markerDeclaration
 
 private val PLATFORM_ACTUAL = MarkerType(
     "PLATFORM_ACTUAL",
-    { it?.let { getPlatformActualTooltip(it.markerDeclaration) } },
+    { element -> element?.markerDeclaration?.let { getPlatformActualTooltip(it) } },
     object : LineMarkerNavigator() {
         override fun browse(e: MouseEvent?, element: PsiElement?) {
-            element?.let { navigateToPlatformActual(e, it.markerDeclaration) }
+            element?.markerDeclaration?.let { navigateToPlatformActual(e, it) }
         }
     }
 )