From 4b3e48dc47bb2243000392d5a6ea151b6ceeb080 Mon Sep 17 00:00:00 2001 From: Dmitry Gridin Date: Tue, 28 Jun 2022 13:52:07 +0200 Subject: [PATCH] Revert "[light classes] drop old light classes and backend: iteration #10" This reverts commit 10e8d4befa488ea7d86d8fd8b5c79dd1980b9a89. --- .../cli/jvm/compiler/CliExtraDiagnosticsProvider.kt | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliExtraDiagnosticsProvider.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliExtraDiagnosticsProvider.kt index 39b06ff067f..b7eec859680 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliExtraDiagnosticsProvider.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliExtraDiagnosticsProvider.kt @@ -15,7 +15,6 @@ import org.jetbrains.kotlin.asJava.classes.getOutermostClassOrObject import org.jetbrains.kotlin.asJava.classes.safeIsLocal import org.jetbrains.kotlin.asJava.classes.safeScript import org.jetbrains.kotlin.asJava.classes.shouldNotBeVisibleAsLightClass -import org.jetbrains.kotlin.cli.jvm.compiler.builder.InvalidLightClassDataHolder import org.jetbrains.kotlin.cli.jvm.compiler.builder.LightClassDataHolder import org.jetbrains.kotlin.cli.jvm.compiler.builder.buildLightClass import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil @@ -38,16 +37,10 @@ object CliExtraDiagnosticsProvider { } val containingScript = kclass.containingKtFile.safeScript() - val lightClassDataHolder = when { + return when { !kclass.safeIsLocal() && containingScript != null -> getLightClassCachedValue(containingScript).value else -> getLightClassCachedValue(kclass).value - } - - return if (lightClassDataHolder is InvalidLightClassDataHolder) { - Diagnostics.EMPTY - } else { - lightClassDataHolder.extraDiagnostics - } + }.extraDiagnostics } fun forFacade(file: KtFile, moduleScope: GlobalSearchScope): Diagnostics {