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

K2: Do not check import conflicts for implicit imports

Browse Source 
fixes scripting resolve tests in LV20 branch
This commit is contained in:
Ilya Chernikov
2023-08-10 10:27:03 +02:00
committed by Space Team
parent a5b530d505
commit cb3af906cd
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirImportsChecker.kt
+3 -1
View File
@@ -5,6 +5,8 @@
package org.jetbrains.kotlin.fir.analysis.checkers.declaration 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.descriptors.Visibilities
import org.jetbrains.kotlin.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.diagnostics.DiagnosticReporter
import org.jetbrains.kotlin.diagnostics.reportOn import org.jetbrains.kotlin.diagnostics.reportOn
@@ -167,7 +169,7 @@ object FirImportsChecker : FirFileChecker() {
!import.isAllUnder && !import.isAllUnder &&
import.importedName?.identifierOrNullIfSpecial?.isNotEmpty() == true && import.importedName?.identifierOrNullIfSpecial?.isNotEmpty() == true &&
import.resolvesToClass(context) import.resolvesToClass(context)
} }.filterNot { (it.source as? KtFakeSourceElement)?.kind == KtFakeSourceElementKind.ImplicitImport }
interestingImports interestingImports
.groupBy { it.aliasName ?: it.importedName!! } .groupBy { it.aliasName ?: it.importedName!! }
.values .values