From cb3af906cd39fdbdb684beb1cacdb48c7e5162ac Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Thu, 10 Aug 2023 10:27:03 +0200 Subject: [PATCH] K2: Do not check import conflicts for implicit imports fixes scripting resolve tests in LV20 branch --- .../fir/analysis/checkers/declaration/FirImportsChecker.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirImportsChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirImportsChecker.kt index def9be4db87..2ed3cd544bb 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirImportsChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirImportsChecker.kt @@ -5,6 +5,8 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration +import org.jetbrains.kotlin.KtFakeSourceElement +import org.jetbrains.kotlin.KtFakeSourceElementKind import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.diagnostics.reportOn @@ -167,7 +169,7 @@ object FirImportsChecker : FirFileChecker() { !import.isAllUnder && import.importedName?.identifierOrNullIfSpecial?.isNotEmpty() == true && import.resolvesToClass(context) - } + }.filterNot { (it.source as? KtFakeSourceElement)?.kind == KtFakeSourceElementKind.ImplicitImport } interestingImports .groupBy { it.aliasName ?: it.importedName!! } .values