From 6b36833ee21231046190ecdd9128e0abdf42199b Mon Sep 17 00:00:00 2001 From: Toshiaki Kameyama Date: Fri, 14 Jun 2019 12:23:55 +0900 Subject: [PATCH] Highlight usages: highlight declaration/usage on call of function with lambda argument (KT-30824) #KT-30824 Fixed --- .../highlighter/KotlinHighlightExitPointsHandlerFactory.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightExitPointsHandlerFactory.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightExitPointsHandlerFactory.kt index 4ab7419e29a..6e32fa682c0 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightExitPointsHandlerFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightExitPointsHandlerFactory.kt @@ -64,7 +64,7 @@ class KotlinHighlightExitPointsHandlerFactory : HighlightUsagesHandlerFactoryBas val lambda = call.lambdaArguments.singleOrNull() ?: return null val literal = lambda.getLambdaExpression()?.functionLiteral ?: return null - return OnExitUsagesHandler(editor, file, literal) + return OnExitUsagesHandler(editor, file, literal, highlightReferences = true) } } @@ -73,7 +73,7 @@ class KotlinHighlightExitPointsHandlerFactory : HighlightUsagesHandlerFactoryBas ?: getOnLambdaCallUsageHandler(editor, file, target) } - private class OnExitUsagesHandler(editor: Editor, file: PsiFile, val target: KtExpression) : + private class OnExitUsagesHandler(editor: Editor, file: PsiFile, val target: KtExpression, val highlightReferences: Boolean = false) : HighlightUsagesHandlerBase(editor, file) { override fun getTargets() = listOf(target) @@ -140,6 +140,8 @@ class KotlinHighlightExitPointsHandlerFactory : HighlightUsagesHandlerFactoryBas } }) } + + override fun highlightReferences() = highlightReferences } }