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

Add flag to force loading old inference diagnostics

Browse Source
This commit is contained in:
Mikhail Zarechenskiy
2017-10-27 11:31:57 +03:00
parent 6486c8dccc
commit 0410287cf9
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.kt
+4 -1
View File
@@ -217,7 +217,7 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes
computeJvmSignatureDiagnostics(bindingContext) computeJvmSignatureDiagnostics(bindingContext)
val ok = booleanArrayOf(true) val ok = booleanArrayOf(true)
val withNewInference = newInferenceEnabled && withNewInferenceDirective val withNewInference = newInferenceEnabled && withNewInferenceDirective && !USE_OLD_INFERENCE_DIAGNOSTICS_FOR_NI
val diagnostics = ContainerUtil.filter( val diagnostics = ContainerUtil.filter(
CheckerTestUtil.getDiagnosticsIncludingSyntaxErrors( CheckerTestUtil.getDiagnosticsIncludingSyntaxErrors(
bindingContext, implementingModulesBindings, ktFile, markDynamicCalls, dynamicCallDescriptors, withNewInference bindingContext, implementingModulesBindings, ktFile, markDynamicCalls, dynamicCallDescriptors, withNewInference
@@ -324,6 +324,9 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes
val WITH_NEW_INFERENCE_DIRECTIVE = "WITH_NEW_INFERENCE" val WITH_NEW_INFERENCE_DIRECTIVE = "WITH_NEW_INFERENCE"
// Change it to "true" to load diagnostics for old inference to test new inference (ignore diagnostics with <NI; prefix)
private val USE_OLD_INFERENCE_DIAGNOSTICS_FOR_NI = false
private fun parseDiagnosticFilterDirective(directiveMap: Map<String, String>, allowUnderscoreUsage: Boolean): Condition<Diagnostic> { private fun parseDiagnosticFilterDirective(directiveMap: Map<String, String>, allowUnderscoreUsage: Boolean): Condition<Diagnostic> {
val directives = directiveMap[DIAGNOSTICS_DIRECTIVE] val directives = directiveMap[DIAGNOSTICS_DIRECTIVE]
val initialCondition = val initialCondition =