FIR: minor code cleanup

This commit is contained in:
Mikhail Glukhikh
2022-03-14 14:12:33 +03:00
committed by Space
parent 0a7da903f4
commit bd790b792c
3 changed files with 8 additions and 7 deletions
@@ -24,7 +24,7 @@ abstract class FirAbstractSimpleImportingScope(
override fun processClassifiersByNameWithSubstitution(name: Name, processor: (FirClassifierSymbol<*>, ConeSubstitutor) -> Unit) {
val imports = simpleImports[name] ?: return
processImportsByName(null, imports) { symbol ->
processImportsByName(name = null, imports) { symbol ->
processor(symbol, ConeSubstitutor.Empty)
}
}
@@ -78,8 +78,8 @@ private fun FirScope.getFirstClassifierOrNull(
session: FirSession,
bodyResolveComponents: BodyResolveComponents
): Pair<FirClassifierSymbol<*>, ConeSubstitutor>? {
var successful = false
var ambiguity = false
var isSuccessResult = false
var isAmbiguousResult = false
var result: Pair<FirClassifierSymbol<*>, ConeSubstitutor>? = null
processClassifiersByNameWithSubstitution(callInfo.name) { symbol, substitution ->
val classifierDeclaration = symbol.fir
@@ -103,15 +103,15 @@ private fun FirScope.getFirstClassifierOrNull(
isSuccessCandidate = false
}
if (result == null || (!successful && isSuccessCandidate)) {
successful = isSuccessCandidate
if (result == null || (!isSuccessResult && isSuccessCandidate)) {
isSuccessResult = isSuccessCandidate
result = symbol to substitution
} else {
ambiguity = true
isAmbiguousResult = true
}
}
return result.takeUnless { ambiguity }
return result.takeUnless { isAmbiguousResult }
}
private fun processSyntheticConstructors(
@@ -34,6 +34,7 @@ class FirCompanionGenerationTransformer(val session: FirSession) : FirTransforme
}
override fun transformFile(file: FirFile, data: Nothing?): FirFile {
// I don't want to use laziness here to prevent possible multi-threading problems
generatedDeclarationProvider = session.generatedDeclarationsSymbolProvider ?: return file
return file.transformDeclarations(this, data)
}