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

Code stylistic improvements in BaseDiagnosticTest

Browse Source
This commit is contained in:
victor.petukhov
2018-12-28 14:09:56 +03:00
parent b354518a41
commit fad59e200c
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.kt
+15 -13
View File
@@ -143,7 +143,7 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes
private val whatDiagnosticsToConsider: Condition<Diagnostic> private val whatDiagnosticsToConsider: Condition<Diagnostic>
val customLanguageVersionSettings: LanguageVersionSettings? val customLanguageVersionSettings: LanguageVersionSettings?
val jvmTarget: JvmTarget? val jvmTarget: JvmTarget?
val declareCheckType: Boolean val declareCheckType: Boolean = CHECK_TYPE_DIRECTIVE in directives
val declareFlexibleType: Boolean val declareFlexibleType: Boolean
val checkLazyLog: Boolean val checkLazyLog: Boolean
private val markDynamicCalls: Boolean private val markDynamicCalls: Boolean
@@ -153,7 +153,6 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes
val renderDiagnosticMessages: Boolean val renderDiagnosticMessages: Boolean
init { init {
this.declareCheckType = CHECK_TYPE_DIRECTIVE in directives
this.whatDiagnosticsToConsider = parseDiagnosticFilterDirective(directives, declareCheckType) this.whatDiagnosticsToConsider = parseDiagnosticFilterDirective(directives, declareCheckType)
this.customLanguageVersionSettings = parseLanguageVersionSettings(directives) this.customLanguageVersionSettings = parseLanguageVersionSettings(directives)
this.jvmTarget = parseJvmTarget(directives) this.jvmTarget = parseJvmTarget(directives)
@@ -315,9 +314,11 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes
fun updateUncheckedDiagnostics(diagnostic: TextDiagnostic, start: Int, end: Int) { fun updateUncheckedDiagnostics(diagnostic: TextDiagnostic, start: Int, end: Int) {
diagnostic.enhanceInferenceCompatibility(invertedInferenceCompatibilityOfTest) diagnostic.enhanceInferenceCompatibility(invertedInferenceCompatibilityOfTest)
uncheckedDiagnostics.add(PositionalTextDiagnostic(diagnostic, start, end)) uncheckedDiagnostics.add(PositionalTextDiagnostic(diagnostic, start, end
} )
}) )
}
})
actualText.append( actualText.append(
CheckerTestUtil.addDiagnosticMarkersToText( CheckerTestUtil.addDiagnosticMarkersToText(
@@ -348,7 +349,8 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes
val declarations = PsiTreeUtil.findChildrenOfType(ktFile, KtDeclaration::class.java) val declarations = PsiTreeUtil.findChildrenOfType(ktFile, KtDeclaration::class.java)
for (declaration in declarations) { for (declaration in declarations) {
val diagnostics = getJvmSignatureDiagnostics( val diagnostics = getJvmSignatureDiagnostics(
declaration, bindingContext.diagnostics, declaration,
bindingContext.diagnostics,
GlobalSearchScope.allScope(project) GlobalSearchScope.allScope(project)
) ?: continue ) ?: continue
jvmSignatureDiagnostics.addAll(diagnostics.forElement(declaration).map { ActualDiagnostic(it, null, newInferenceEnabled) }) jvmSignatureDiagnostics.addAll(diagnostics.forElement(declaration).map { ActualDiagnostic(it, null, newInferenceEnabled) })
@@ -425,12 +427,12 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes
if (!matcher.find()) { if (!matcher.find()) {
Assert.fail( Assert.fail(
"Wrong syntax in the '// !$DIAGNOSTICS_DIRECTIVE: ...' directive:\n" + "Wrong syntax in the '// !$DIAGNOSTICS_DIRECTIVE: ...' directive:\n" +
"found: '$directives'\n" + "found: '$directives'\n" +
"Must be '([+-!]DIAGNOSTIC_FACTORY_NAME|ERROR|WARNING|INFO)+'\n" + "Must be '([+-!]DIAGNOSTIC_FACTORY_NAME|ERROR|WARNING|INFO)+'\n" +
"where '+' means 'include'\n" + "where '+' means 'include'\n" +
" '-' means 'exclude'\n" + " '-' means 'exclude'\n" +
" '!' means 'exclude everything but this'\n" + " '!' means 'exclude everything but this'\n" +
"directives are applied in the order of appearance, i.e. !FOO +BAR means include only FOO and BAR" "directives are applied in the order of appearance, i.e. !FOO +BAR means include only FOO and BAR"
) )
} }
@@ -451,7 +453,7 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes
if (!first) { if (!first) {
Assert.fail( Assert.fail(
"'$operation$name' appears in a position rather than the first one, " + "'$operation$name' appears in a position rather than the first one, " +
"which effectively cancels all the previous filters in this directive" "which effectively cancels all the previous filters in this directive"
) )
} }
condition = newCondition condition = newCondition