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

---
 .../idea/highlighter/markers/HasExpectedMarker.kt      | 10 +++++-----
 .../highlighter/markers/KotlinLineMarkerProvider.kt    |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/HasExpectedMarker.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/HasExpectedMarker.kt
index 85c4a1f69a7..f87fc56855c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/HasExpectedMarker.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/HasExpectedMarker.kt
@@ -24,16 +24,16 @@ import org.jetbrains.kotlin.idea.util.expectedDeclarationIfAny
 import org.jetbrains.kotlin.idea.util.hasDeclarationOf
 import org.jetbrains.kotlin.psi.KtDeclaration
 
-fun getExpectedDeclarationTooltip(declaration: KtDeclaration?): String? {
-    val descriptor = declaration?.toDescriptor() as? MemberDescriptor ?: return null
+fun getExpectedDeclarationTooltip(declaration: KtDeclaration): String? {
+    val descriptor = declaration.toDescriptor() as? MemberDescriptor ?: return null
     val platformModuleDescriptor = declaration.containingKtFile.findModuleDescriptor()
 
-    val commonModuleDescriptors = platformModuleDescriptor.implementedDescriptors ?: return null
+    val commonModuleDescriptors = platformModuleDescriptor.implementedDescriptors
     if (!commonModuleDescriptors.any { it.hasDeclarationOf(descriptor) }) return null
 
     return "Has declaration in common module"
 }
 
-fun navigateToExpectedDeclaration(declaration: KtDeclaration?) {
-    declaration?.expectedDeclarationIfAny()?.navigate(false)
+fun navigateToExpectedDeclaration(declaration: KtDeclaration) {
+    declaration.expectedDeclarationIfAny()?.navigate(false)
 }
\ No newline at end of file
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 d528d9a72d2..8dc03b81173 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt
@@ -210,10 +210,10 @@ private val PLATFORM_ACTUAL = MarkerType(
 
 private val EXPECTED_DECLARATION = MarkerType(
     "EXPECTED_DECLARATION",
-    { it?.let { getExpectedDeclarationTooltip(it.markerDeclaration) } },
+    { element -> element?.markerDeclaration?.let { getExpectedDeclarationTooltip(it) } },
     object : LineMarkerNavigator() {
         override fun browse(e: MouseEvent?, element: PsiElement?) {
-            element?.let { navigateToExpectedDeclaration(it.markerDeclaration) }
+            element?.markerDeclaration?.let { navigateToExpectedDeclaration(it) }
         }
     }
 )