From 7790c2fd71ae44d5337c98b6413d32828d2e30b3 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 14 Aug 2015 15:13:47 +0300 Subject: [PATCH] Minor: ignore KDoc like comments which starts with `/**` for example it can be used to mark lookups which we can't report yet --- .../kotlin/jps/build/AbstractLookupTrackerTest.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt index c58f6f95791..71295fc989b 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt @@ -28,7 +28,8 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( allowNoFilesWithSuffixInTestData = true, allowNoBuildLogFileInTestData = true ) { - val MULTILINE_COMMENT = "/\\*[^\\*]*\\*/".toRegex() + // ignore KDoc like comments which starts with `/**`, example: /** text */ + val COMMENT_WITH_LOOKUP_INFO = "/\\*[^*]+\\*/".toRegex() override fun createLookupTracker() = TestLookupTracker() @@ -45,7 +46,7 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( val text = file.readText() - val matchResult = MULTILINE_COMMENT.match(text) + val matchResult = COMMENT_WITH_LOOKUP_INFO.match(text) if (matchResult != null) { matchResult.groups fail("File $file unexpectedly contains multiline comments. In range ${matchResult.range} found: ${matchResult.value} in $text") @@ -90,7 +91,7 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( private fun dropBlockComments(workSrcDir: File) { for (file in workSrcDir.walkTopDown()) { if (!file.isFile) continue - file.writeText(file.readText().replace(MULTILINE_COMMENT, "")) + file.writeText(file.readText().replace(COMMENT_WITH_LOOKUP_INFO, "")) } } }