From 4f08d2b16a357d0c1d5d6703c97729cfd6f2da4a Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 23 May 2017 18:21:01 +0200
Subject: [PATCH] Remove incorrect argument count check from TODO searcher

---
 .../idea/search/ideaExtensions/KotlinTodoSearcher.kt   |  5 +----
 idea/testData/search/todo/todoCall.kt                  |  1 +
 .../org/jetbrains/kotlin/search/TodoSearchTest.kt      | 10 ++++++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

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 ff43a6d4374..7bcd2b568d7 100644
--- a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinTodoSearcher.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinTodoSearcher.kt
@@ -54,10 +54,7 @@ class KotlinTodoSearcher : QueryExecutorBase<IndexPatternOccurrence, IndexPatter
         file.accept(object : KtTreeVisitorVoid() {
             override fun visitCallExpression(expression: KtCallExpression) {
                 if (expression.calleeExpression?.text == "TODO") {
-                    val argList = expression.valueArgumentList
-                    if (argList?.arguments?.size == 1) {
-                        consumer.process(KotlinTodoOccurrence(file, expression.textRange, pattern))
-                    }
+                    consumer.process(KotlinTodoOccurrence(file, expression.textRange, pattern))
                 }
             }
         })
diff --git a/idea/testData/search/todo/todoCall.kt b/idea/testData/search/todo/todoCall.kt
index 7872ba348e3..699e2f1ca6e 100644
--- a/idea/testData/search/todo/todoCall.kt
+++ b/idea/testData/search/todo/todoCall.kt
@@ -1 +1,2 @@
 fun foo() = TODO("Fix me")
+fun bar() = TODO()
diff --git a/idea/tests/org/jetbrains/kotlin/search/TodoSearchTest.kt b/idea/tests/org/jetbrains/kotlin/search/TodoSearchTest.kt
index 3b7235cf4ca..300412fc0d9 100644
--- a/idea/tests/org/jetbrains/kotlin/search/TodoSearchTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/search/TodoSearchTest.kt
@@ -17,6 +17,7 @@
 package org.jetbrains.kotlin.search
 
 import com.intellij.psi.search.PsiTodoSearchHelper
+import com.intellij.psi.search.TodoItem
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
@@ -32,8 +33,13 @@ class TodoSearchTest : KotlinLightCodeInsightFixtureTestCase() {
     fun testTodoCall() {
         val file = myFixture.configureByFile("todoCall.kt")
         val todoItems = PsiTodoSearchHelper.SERVICE.getInstance(myFixture.project).findTodoItems(file)
-        assertEquals(1, todoItems.size)
-        assertEquals("TODO(\"Fix me\")", todoItems[0].textRange.substring(todoItems[0].file.text))
+        assertEquals(2, todoItems.size)
+        verifyTodoItemText(todoItems[0], "TODO(\"Fix me\")")
+        verifyTodoItemText(todoItems[1], "TODO()")
+    }
+
+    private fun verifyTodoItemText(todoItem: TodoItem, s: String) {
+        assertEquals(s, todoItem.textRange.substring(todoItem.file.text))
     }
 
     fun testTodoDef() {