From a02e5d452f456236d7d2a9cdb22cf6df11bdfe1c Mon Sep 17 00:00:00 2001
From: Dmitry Savvinov <dmitry.savvinov@jetbrains.com>
Date: Tue, 14 Jan 2020 15:14:21 +0300
Subject: [PATCH] Minor: remove unnecessary callback from checkFiles

Filter list of files on call-sites instead
---
 .../gradle/GradleMultiplatformHighlightingTest.kt  | 14 +++++---------
 .../kotlin/gradle/ImportAndCheckHighlighting.kt    |  6 ++----
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/GradleMultiplatformHighlightingTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/GradleMultiplatformHighlightingTest.kt
index 3589ed3190c..bd4d238f5ec 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/GradleMultiplatformHighlightingTest.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/GradleMultiplatformHighlightingTest.kt
@@ -41,12 +41,10 @@ class GradleMultiplatformHighlightingTest : GradleImportingTestCase() {
         val project = myTestFixture.project
 
         checkFiles(
-            files,
+            files.filter { it.extension == "kt" },
             project,
             object : GradleDaemonAnalyzerTestCase(testLineMarkers = true, checkWarnings = true, checkInfos = false) {}
-        ) { file ->
-            file.extension == "kt"
-        }
+        )
     }
 
     override fun testDataDirName(): String {
@@ -72,19 +70,17 @@ abstract class GradleDaemonAnalyzerTestCase(
 internal fun checkFiles(
     files: List<VirtualFile>,
     project: Project,
-    analyzer: GradleDaemonAnalyzerTestCase,
-    fileFilter: (VirtualFile) -> Boolean
+    analyzer: GradleDaemonAnalyzerTestCase
 ) {
     var atLeastOneFile = false
-    val kotlinFiles = files.filter(fileFilter)
     val content = mutableMapOf<VirtualFile, String>()
-    kotlinFiles.forEach { file ->
+    files.forEach { file ->
         val (_, textWithTags) = configureEditorByExistingFile(file, project)
         atLeastOneFile = true
         content[file] = textWithTags
     }
     Assert.assertTrue(atLeastOneFile)
-    kotlinFiles.forEach { file ->
+    files.forEach { file ->
         val (editor, _) = configureEditorByExistingFile(file, project, content[file])
         analyzer.checkHighlighting(project, editor)
     }
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckHighlighting.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckHighlighting.kt
index 6003cfe467b..8850093e556 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckHighlighting.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/ImportAndCheckHighlighting.kt
@@ -29,16 +29,14 @@ class ImportAndCheckHighlighting : MultiplePluginVersionGradleImportingTestCase(
         importProject()
         val project = myTestFixture.project
         checkFiles(
-            files,
+            files.filter { it.extension == "kt" || it.extension == "java" },
             project,
             object : GradleDaemonAnalyzerTestCase(
                 testLineMarkers = testLineMarkers,
                 checkWarnings = checkWarnings,
                 checkInfos = false
             ) {}
-        ) { file ->
-            file.extension == "kt" || file.extension == "java"
-        }
+        )
     }
 
     override fun testDataDirName(): String {