[FIR] Remove links to spec sentences during comparison fir and old front-end test data

This commit is contained in:
Victor Petukhov
2020-03-29 21:30:34 +03:00
parent a29385e758
commit 218c13efc5
9 changed files with 12 additions and 1 deletions
@@ -412,6 +412,7 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes
val RENDER_DIAGNOSTICS_FULL_TEXT = "RENDER_DIAGNOSTICS_FULL_TEXT"
val DIAGNOSTIC_IN_TESTDATA_PATTERN = Regex("<!>|<!(.*?(\\(\".*?\"\\)|\\(\\))??)+(?<!<)!>")
val SPEC_LINKS_IN_TESTDATA_PATTERN = Regex("""/\*\s+\*\s+RELEVANT SPEC SENTENCES[\w\W]*?\*/\n""")
fun parseDiagnosticFilterDirective(
directiveMap: Directives,
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir
import com.intellij.openapi.util.text.StringUtil
import junit.framework.TestCase
import org.jetbrains.kotlin.checkers.BaseDiagnosticsTest.Companion.DIAGNOSTIC_IN_TESTDATA_PATTERN
import org.jetbrains.kotlin.checkers.BaseDiagnosticsTest.Companion.SPEC_LINKS_IN_TESTDATA_PATTERN
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.test.util.trimTrailingWhitespacesAndAddNewlineAtEOF
import java.io.File
@@ -51,6 +52,8 @@ fun compareAndMergeFirFileAndOldFrontendFile(
}
fun loadTestDataWithoutDiagnostics(file: File): String {
val textWithoutDiagnostics = KotlinTestUtils.doLoadFile(file).replace(DIAGNOSTIC_IN_TESTDATA_PATTERN, "")
val textWithoutDiagnostics = KotlinTestUtils.doLoadFile(file)
.replace(DIAGNOSTIC_IN_TESTDATA_PATTERN, "")
.replace(SPEC_LINKS_IN_TESTDATA_PATTERN, "")
return StringUtil.convertLineSeparators(textWithoutDiagnostics.trim()).trimTrailingWhitespacesAndAddNewlineAtEOF()
}