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 c6000042107..252264db1f7 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/HasActualMarker.kt +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/HasActualMarker.kt @@ -28,7 +28,6 @@ import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.resolve.MultiTargetPlatform import org.jetbrains.kotlin.resolve.descriptorUtil.module import org.jetbrains.kotlin.resolve.getMultiTargetPlatform -import java.awt.event.MouseEvent private fun ModuleDescriptor?.getMultiTargetPlatformName(): String? { if (this == null) return null @@ -74,7 +73,7 @@ fun KtDeclaration.navigateToActualTitle() = "Choose actual for $name" fun KtDeclaration.navigateToActualUsagesTitle() = "Actuals for $name" -fun buildNavigateToActualDeclarationsPopup(e: MouseEvent?, element: PsiElement?): NavigationPopupDescriptor? { +fun buildNavigateToActualDeclarationsPopup(element: PsiElement?): NavigationPopupDescriptor? { return element?.markerDeclaration?.let { val navigatableActualDeclarations = it.allNavigatableActualDeclarations() if (navigatableActualDeclarations.isEmpty()) return null 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 ff9d7dac6f9..0eb8ee87c1a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/HasExpectedMarker.kt +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/HasExpectedMarker.kt @@ -24,7 +24,6 @@ import org.jetbrains.kotlin.idea.core.toDescriptor import org.jetbrains.kotlin.idea.util.expectedDeclarationIfAny import org.jetbrains.kotlin.idea.util.hasDeclarationOf import org.jetbrains.kotlin.psi.KtDeclaration -import java.awt.event.MouseEvent fun getExpectedDeclarationTooltip(declaration: KtDeclaration): String? { val descriptor = declaration.toDescriptor() as? MemberDescriptor ?: return null @@ -43,7 +42,7 @@ fun KtDeclaration.navigateToExpectedTitle() = "Choose expected for $name" fun KtDeclaration.navigateToExpectedUsagesTitle() = "Expected for $name" -fun buildNavigateToExpectedDeclarationsPopup(e: MouseEvent?, element: PsiElement?): NavigationPopupDescriptor? { +fun buildNavigateToExpectedDeclarationsPopup(element: PsiElement?): NavigationPopupDescriptor? { return element?.markerDeclaration?.let { val navigatableExpectedDeclarations = it.allNavigatableExpectedDeclarations() if (navigatableExpectedDeclarations.isEmpty()) return null 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 5a607520807..0bcd843569c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt @@ -206,7 +206,7 @@ private val PLATFORM_ACTUAL = object : MarkerType( { element -> element?.markerDeclaration?.let { getPlatformActualTooltip(it) } }, object : LineMarkerNavigator() { override fun browse(e: MouseEvent?, element: PsiElement?) { - buildNavigateToActualDeclarationsPopup(e, element)?.showPopup(e) + buildNavigateToActualDeclarationsPopup(element)?.showPopup(e) } }) { override fun getNavigationHandler(): GutterIconNavigationHandler { @@ -217,7 +217,7 @@ private val PLATFORM_ACTUAL = object : MarkerType( } override fun getTargetsPopupDescriptor(element: PsiElement?): NavigationPopupDescriptor? { - return buildNavigateToActualDeclarationsPopup(null, element) + return buildNavigateToActualDeclarationsPopup(element) } } } @@ -228,7 +228,7 @@ private val EXPECTED_DECLARATION = object : MarkerType( { element -> element?.markerDeclaration?.let { getExpectedDeclarationTooltip(it) } }, object : LineMarkerNavigator() { override fun browse(e: MouseEvent?, element: PsiElement?) { - buildNavigateToExpectedDeclarationsPopup(e, element)?.showPopup(e) + buildNavigateToExpectedDeclarationsPopup(element)?.showPopup(e) } }) { override fun getNavigationHandler(): GutterIconNavigationHandler { @@ -239,7 +239,7 @@ private val EXPECTED_DECLARATION = object : MarkerType( } override fun getTargetsPopupDescriptor(element: PsiElement?): NavigationPopupDescriptor? { - return buildNavigateToExpectedDeclarationsPopup(null, element) + return buildNavigateToExpectedDeclarationsPopup(element) } } }