azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix incorrect code in AbstractJspecifyAnnotationsTest

Browse Source 
There was a warning on line 78
(`diagnosticsToJspecifyMarksMap[diagnostic.name]`) which unconvered that
the map wasn't used in the same way in both call sites.
This commit is contained in:
Alexander Udalov
2020-11-06 19:47:59 +01:00
parent d101f1b3a6
commit f8c2f4a8d0
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractJspecifyAnnotationsTest.kt
+5 -5
View File
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.checkers
import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.util.io.FileUtil
import org.jetbrains.kotlin.ObsoleteTestInfrastructure import org.jetbrains.kotlin.ObsoleteTestInfrastructure
import org.jetbrains.kotlin.checkers.utils.CheckerTestUtil import org.jetbrains.kotlin.checkers.utils.CheckerTestUtil
import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm.NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm
import org.jetbrains.kotlin.test.MockLibraryUtilExt import org.jetbrains.kotlin.test.MockLibraryUtilExt
import java.io.File import java.io.File
import java.util.* import java.util.*
@@ -103,16 +103,16 @@ abstract class AbstractJspecifyAnnotationsTest : AbstractDiagnosticsTest() {
lineIndexesByRanges: TreeMap<Int, Int>, lineIndexesByRanges: TreeMap<Int, Int>,
textLines: List<String> textLines: List<String>
) { ) {
for ((diagnostic, jspecifyMark) in diagnosticsToJspecifyMarksMap) { for ((diagnosticName, jspecifyMark) in diagnosticsToJspecifyMarksMap) {
val diagnosticRanges = diagnosedRanges.filter { diagnostics -> val diagnosticRanges = diagnosedRanges.filter { diagnostics ->
diagnostic.name in diagnostics.getDiagnostics().map { it.name } diagnosticName in diagnostics.getDiagnostics().map { it.name }
}.map { it.start } }.map { it.start }
val lineIndexesWithJspecifyMarks = val lineIndexesWithJspecifyMarks =
textLines.mapIndexedNotNull { index, it -> getJspecifyMarkRegex(jspecifyMark).find(it)?.let { index } } textLines.mapIndexedNotNull { index, it -> getJspecifyMarkRegex(jspecifyMark).find(it)?.let { index } }
for (lineIndex in lineIndexesWithJspecifyMarks) { for (lineIndex in lineIndexesWithJspecifyMarks) {
val lineStartPosition = lineIndexesByRanges.entries.find { (_, index) -> index == lineIndex + 1 }?.key val lineStartPosition = lineIndexesByRanges.entries.find { (_, index) -> index == lineIndex + 1 }?.key
val errorMessage = "Diagnostic '$diagnostic' not found for jspecify mark '$jspecifyMark' at ${lineIndex + 1} line" val errorMessage = "Diagnostic '$diagnosticName' not found for jspecify mark '$jspecifyMark' at ${lineIndex + 1} line"
assertNotNull(errorMessage, lineStartPosition) assertNotNull(errorMessage, lineStartPosition)
@@ -162,7 +162,7 @@ abstract class AbstractJspecifyAnnotationsTest : AbstractDiagnosticsTest() {
private val javaSourcesPathRegex = Pattern.compile("""// JAVA_SOURCES: (.*?(?:\.java)?)\n""") private val javaSourcesPathRegex = Pattern.compile("""// JAVA_SOURCES: (.*?(?:\.java)?)\n""")
val diagnosticsToJspecifyMarksMap = mapOf( val diagnosticsToJspecifyMarksMap = mapOf(
NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS to "jspecify_nullness_mismatch" ErrorsJvm::NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS.name to JSPECIFY_NULLNESS_MISMATCH_MARK
) )
private val importSectionRegex = Regex("""((?:import .*?;\n)+)""") private val importSectionRegex = Regex("""((?:import .*?;\n)+)""")