From 52ccfcecfc64feb0269765389d754d9d6d36ddf4 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 19 Dec 2017 15:46:06 +0100
Subject: [PATCH] Fix highlighting of TODO calls in lambdas

 #KT-19915 Fixed
---
 .../kotlin/idea/search/ideaExtensions/KotlinTodoSearcher.kt  | 1 +
 idea/testData/search/todo/todoCall.kt                        | 5 +++++
 idea/tests/org/jetbrains/kotlin/search/TodoSearchTest.kt     | 3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinTodoSearcher.kt b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinTodoSearcher.kt
index 7bcd2b568d7..4e99ccf201d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinTodoSearcher.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinTodoSearcher.kt
@@ -53,6 +53,7 @@ class KotlinTodoSearcher : QueryExecutorBase<IndexPatternOccurrence, IndexPatter
 
         file.accept(object : KtTreeVisitorVoid() {
             override fun visitCallExpression(expression: KtCallExpression) {
+                super.visitCallExpression(expression)
                 if (expression.calleeExpression?.text == "TODO") {
                     consumer.process(KotlinTodoOccurrence(file, expression.textRange, pattern))
                 }
diff --git a/idea/testData/search/todo/todoCall.kt b/idea/testData/search/todo/todoCall.kt
index 699e2f1ca6e..4606caf94cc 100644
--- a/idea/testData/search/todo/todoCall.kt
+++ b/idea/testData/search/todo/todoCall.kt
@@ -1,2 +1,7 @@
 fun foo() = TODO("Fix me")
 fun bar() = TODO()
+fun baz() {
+    run {
+        TODO("Fix me in lambda")
+    }
+}
diff --git a/idea/tests/org/jetbrains/kotlin/search/TodoSearchTest.kt b/idea/tests/org/jetbrains/kotlin/search/TodoSearchTest.kt
index 300412fc0d9..bba5c45ebc5 100644
--- a/idea/tests/org/jetbrains/kotlin/search/TodoSearchTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/search/TodoSearchTest.kt
@@ -33,9 +33,10 @@ class TodoSearchTest : KotlinLightCodeInsightFixtureTestCase() {
     fun testTodoCall() {
         val file = myFixture.configureByFile("todoCall.kt")
         val todoItems = PsiTodoSearchHelper.SERVICE.getInstance(myFixture.project).findTodoItems(file)
-        assertEquals(2, todoItems.size)
+        assertEquals(3, todoItems.size)
         verifyTodoItemText(todoItems[0], "TODO(\"Fix me\")")
         verifyTodoItemText(todoItems[1], "TODO()")
+        verifyTodoItemText(todoItems[2], "TODO(\"Fix me in lambda\")")
     }
 
     private fun verifyTodoItemText(todoItem: TodoItem, s: String) {