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

FIR: minor code cleanup

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirAbstractSimpleImportingScope.kt
+1 -1
View File
@@ -24,7 +24,7 @@ abstract class FirAbstractSimpleImportingScope(
override fun processClassifiersByNameWithSubstitution(name: Name, processor: (FirClassifierSymbol<*>, ConeSubstitutor) -> Unit) { override fun processClassifiersByNameWithSubstitution(name: Name, processor: (FirClassifierSymbol<*>, ConeSubstitutor) -> Unit) {
val imports = simpleImports[name] ?: return val imports = simpleImports[name] ?: return
processImportsByName(null, imports) { symbol -> processImportsByName(name = null, imports) { symbol ->
processor(symbol, ConeSubstitutor.Empty) processor(symbol, ConeSubstitutor.Empty)
} }
} }
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/ConstructorProcessing.kt
+6 -6
View File
@@ -78,8 +78,8 @@ private fun FirScope.getFirstClassifierOrNull(
session: FirSession, session: FirSession,
bodyResolveComponents: BodyResolveComponents bodyResolveComponents: BodyResolveComponents
): Pair<FirClassifierSymbol<*>, ConeSubstitutor>? { ): Pair<FirClassifierSymbol<*>, ConeSubstitutor>? {
var successful = false var isSuccessResult = false
var ambiguity = false var isAmbiguousResult = false
var result: Pair<FirClassifierSymbol<*>, ConeSubstitutor>? = null var result: Pair<FirClassifierSymbol<*>, ConeSubstitutor>? = null
processClassifiersByNameWithSubstitution(callInfo.name) { symbol, substitution -> processClassifiersByNameWithSubstitution(callInfo.name) { symbol, substitution ->
val classifierDeclaration = symbol.fir val classifierDeclaration = symbol.fir
@@ -103,15 +103,15 @@ private fun FirScope.getFirstClassifierOrNull(
isSuccessCandidate = false isSuccessCandidate = false
} }
if (result == null || (!successful && isSuccessCandidate)) { if (result == null || (!isSuccessResult && isSuccessCandidate)) {
successful = isSuccessCandidate isSuccessResult = isSuccessCandidate
result = symbol to substitution result = symbol to substitution
} else { } else {
ambiguity = true isAmbiguousResult = true
} }
} }
return result.takeUnless { ambiguity } return result.takeUnless { isAmbiguousResult }
} }
private fun processSyntheticConstructors( private fun processSyntheticConstructors(
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirCompanionGenerationProcessor.kt
+1
View File
@@ -34,6 +34,7 @@ class FirCompanionGenerationTransformer(val session: FirSession) : FirTransforme
} }
override fun transformFile(file: FirFile, data: Nothing?): FirFile { 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 generatedDeclarationProvider = session.generatedDeclarationsSymbolProvider ?: return file
return file.transformDeclarations(this, data) return file.transformDeclarations(this, data)
} }