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

[FIR] BodyResolveContext: withFile should add container as well

Browse Source 
This container will be used during an annotation call owner search

^KT-63042
This commit is contained in:
Dmitrii Gridin
2023-12-06 15:04:41 +01:00
committed by Space Team
parent ed7415ab93
commit edb496f260
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/BodyResolveContext.kt
+1 -1
View File
@@ -402,7 +402,7 @@ class BodyResolveContext(
val importingScopes = createImportingScopes(file, holder.session, holder.scopeSession) val importingScopes = createImportingScopes(file, holder.session, holder.scopeSession)
fileImportsScope += importingScopes fileImportsScope += importingScopes
addNonLocalTowerDataElements(importingScopes.map { it.asTowerDataElement(isLocal = false) }) addNonLocalTowerDataElements(importingScopes.map { it.asTowerDataElement(isLocal = false) })
f() withContainer(file, f)
} }
} }
} }
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt
+1 -1
View File
@@ -805,7 +805,7 @@ open class FirDeclarationsResolveTransformer(
doTransformTypeParameters(simpleFunction) doTransformTypeParameters(simpleFunction)
} }
if (containingDeclaration != null && containingDeclaration !is FirClass && (containingDeclaration !is FirScript || simpleFunction.isLocal)) { if (containingDeclaration != null && containingDeclaration !is FirClass && containingDeclaration !is FirFile && (containingDeclaration !is FirScript || simpleFunction.isLocal)) {
// For class members everything should be already prepared // For class members everything should be already prepared
prepareSignatureForBodyResolve(simpleFunction) prepareSignatureForBodyResolve(simpleFunction)
simpleFunction.transformStatus(this, simpleFunction.resolveStatus().mode()) simpleFunction.transformStatus(this, simpleFunction.resolveStatus().mode())