Reformat BaseDiagnosticTest according to code style

compiler/tests-common/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.kt

@@ -150,14 +150,14 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes
             this.declareFlexibleType = EXPLICIT_FLEXIBLE_TYPES_DIRECTIVE in directives
             this.markDynamicCalls = MARK_DYNAMIC_CALLS_DIRECTIVE in directives
             this.withNewInferenceDirective = WITH_NEW_INFERENCE_DIRECTIVE in directives
-            this.newInferenceEnabled = customLanguageVersionSettings?.supportsFeature(LanguageFeature.NewInference) ?: shouldUseNewInferenceForTests()
+            this.newInferenceEnabled = customLanguageVersionSettings?.supportsFeature(LanguageFeature.NewInference) ?:
+                    shouldUseNewInferenceForTests()
             if (fileName.endsWith(".java")) {
                 // TODO: check there are no syntax errors in .java sources
                 this.createKtFile = lazyOf(null)
                 this.clearText = textWithMarkers
                 this.expectedText = this.clearText
-            }
+            } else {
-            else {
                 this.expectedText = textWithMarkers
                 this.clearText = CheckerTestUtil.parseDiagnosedRanges(addExtras(expectedText), diagnosedRanges)
                 this.createKtFile = lazy { TestCheckerUtil.createCheckAndReturnPsiFile(fileName, clearText, project) }
@@ -198,8 +198,7 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes
             if (matcher.find()) {
                 // add imports after the package directive
                 result = result.substring(0, matcher.end()) + imports + result.substring(matcher.end())
-            }
+            } else {
-            else {
                 // add imports at the beginning
                 result = imports + result
             }
@@ -247,7 +246,8 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes
             val inferenceCompatibilityOfTest = asInferenceCompatibility(withNewInference)
             val invertedInferenceCompatibilityOfTest = asInferenceCompatibility(!withNewInference)
 
-            val diagnosticToExpectedDiagnostic = CheckerTestUtil.diagnosticsDiff(diagnosedRanges, diagnostics, object : CheckerTestUtil.DiagnosticDiffCallbacks {
+            val diagnosticToExpectedDiagnostic =
+                CheckerTestUtil.diagnosticsDiff(diagnosedRanges, diagnostics, object : CheckerTestUtil.DiagnosticDiffCallbacks {
                     override fun missingDiagnostic(diagnostic: CheckerTestUtil.TextDiagnostic, expectedStart: Int, expectedEnd: Int) {
                         if (withNewInferenceDirective && diagnostic.inferenceCompatibility != inferenceCompatibilityOfTest) {
                             updateUncheckedDiagnostics(diagnostic, expectedStart, expectedEnd)
@@ -295,8 +295,15 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes
                     }
                 })
 
-            actualText.append(CheckerTestUtil.addDiagnosticMarkersToText(
+            actualText.append(
-                    ktFile, diagnostics, diagnosticToExpectedDiagnostic, { file -> file.text }, uncheckedDiagnostics, withNewInferenceDirective)
+                CheckerTestUtil.addDiagnosticMarkersToText(
+                    ktFile,
+                    diagnostics,
+                    diagnosticToExpectedDiagnostic,
+                    { file -> file.text },
+                    uncheckedDiagnostics,
+                    withNewInferenceDirective
+                )
             )
 
             stripExtras(actualText)
@@ -315,8 +322,10 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes
             val jvmSignatureDiagnostics = HashSet<ActualDiagnostic>()
             val declarations = PsiTreeUtil.findChildrenOfType(ktFile, KtDeclaration::class.java)
             for (declaration in declarations) {
-                val diagnostics = getJvmSignatureDiagnostics(declaration, bindingContext.diagnostics,
+                val diagnostics = getJvmSignatureDiagnostics(
-                                                             GlobalSearchScope.allScope(project)) ?: continue
+                    declaration, bindingContext.diagnostics,
+                    GlobalSearchScope.allScope(project)
+                ) ?: continue
                 jvmSignatureDiagnostics.addAll(diagnostics.forElement(declaration).map { ActualDiagnostic(it, null, newInferenceEnabled) })
             }
             return jvmSignatureDiagnostics
@@ -366,7 +375,10 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes
         // Change it to "true" to load diagnostics for old inference to test new inference (ignore diagnostics with <NI; prefix)
         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 initialCondition =
                 if (allowUnderscoreUsage)
@@ -378,8 +390,8 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes
                 // If "!API_VERSION" is present, disable the NEWER_VERSION_IN_SINCE_KOTLIN diagnostic.
                 // Otherwise it would be reported in any non-trivial test on the @SinceKotlin value.
                 if (API_VERSION_DIRECTIVE in directiveMap) {
-                    return Conditions.and(initialCondition, Condition {
+                    return Conditions.and(initialCondition, Condition { diagnostic ->
-                        diagnostic -> diagnostic.factory !== Errors.NEWER_VERSION_IN_SINCE_KOTLIN
+                        diagnostic.factory !== Errors.NEWER_VERSION_IN_SINCE_KOTLIN
                     })
                 }
                 return initialCondition
@@ -388,13 +400,15 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes
             var condition = initialCondition
             val matcher = DIAGNOSTICS_PATTERN.matcher(directives)
             if (!matcher.find()) {
-                Assert.fail("Wrong syntax in the '// !$DIAGNOSTICS_DIRECTIVE: ...' directive:\n" +
+                Assert.fail(
+                    "Wrong syntax in the '// !$DIAGNOSTICS_DIRECTIVE: ...' directive:\n" +
                             "found: '$directives'\n" +
                             "Must be '([+-!]DIAGNOSTIC_FACTORY_NAME|ERROR|WARNING|INFO)+'\n" +
                             "where '+' means 'include'\n" +
                             "      '-' means 'exclude'\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"
+                )
             }
 
             var first = true
@@ -405,16 +419,17 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes
                 val newCondition: Condition<Diagnostic> =
                     if (name in setOf("ERROR", "WARNING", "INFO")) {
                         Condition { diagnostic -> diagnostic.severity == Severity.valueOf(name) }
-                        }
+                    } else {
-                        else {
                         Condition { diagnostic -> name == diagnostic.factory.name }
                     }
 
                 when (operation) {
                     "!" -> {
                         if (!first) {
-                            Assert.fail("'$operation$name' appears in a position rather than the first one, " +
+                            Assert.fail(
-                                        "which effectively cancels all the previous filters in this directive")
+                                "'$operation$name' appears in a position rather than the first one, " +
+                                        "which effectively cancels all the previous filters in this directive"
+                            )
                         }
                         condition = newCondition
                     }
@@ -422,8 +437,7 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes
                     "-" -> condition = Conditions.and(condition, Conditions.not(newCondition))
                 }
                 first = false
-            }
+            } while (matcher.find())
-            while (matcher.find())
 
             // We always include UNRESOLVED_REFERENCE and SYNTAX_ERROR because they are too likely to indicate erroneous test data
             return Conditions.or(