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

[LL FIR] FileStructure: resolve FirFile to body phase as all other elements

Browse Source 
This is the correct behavior as we have to resolve to body phase
to build CFG and run diagnostics collector correctly

^KT-65780 Fixed
This commit is contained in:
Dmitrii Gridin
2024-02-13 14:33:29 +01:00
committed by Space Team
parent 84b6d5d508
commit 7796ef43db
27 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/file/structure/FileStructure.kt
+1 -2
View File
@@ -199,8 +199,7 @@ internal class FileStructure private constructor(
}
container is KtFile -> {
val firFile = moduleComponents.firFileBuilder.buildRawFirFileWithCaching(ktFile)
firFile.lazyResolveToPhase(FirResolvePhase.IMPORTS)
firFile.annotationsContainer?.lazyResolveToPhase(FirResolvePhase.BODY_RESOLVE)
firFile.lazyResolveToPhase(FirResolvePhase.BODY_RESOLVE)
RootStructureElement(firFile, moduleComponents)
}
analysis/low-level-api-fir/testData/getOrBuildFir/annotations/fileAnnotation.txt
Vendored
+1 -1
View File
@@ -6,6 +6,6 @@ FIR element rendered:
@FILE:R|kotlin/Suppress|[Types](names = vararg(String()))
FIR FILE:
FILE: [ResolvedTo(IMPORTS)] fileAnnotation.kt
FILE: [ResolvedTo(BODY_RESOLVE)] fileAnnotation.kt
@FILE:R|kotlin/Suppress|[Types](names = vararg(String()))
[ResolvedTo(BODY_RESOLVE)] annotations container
analysis/low-level-api-fir/testData/getOrBuildFir/annotations/fileAnnotationScript.txt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ FIR element rendered:
@FILE:R|kotlin/Suppress|[Types](names = vararg(String()))
FIR FILE:
FILE: [ResolvedTo(IMPORTS)] fileAnnotationScript.kts
FILE: [ResolvedTo(BODY_RESOLVE)] fileAnnotationScript.kts
@FILE:R|kotlin/Suppress|[Types](names = vararg(String()))
[ResolvedTo(BODY_RESOLVE)] annotations container
context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/file.txt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ FIR element rendered:
@FILE:R|Ann|[Types]()
FIR FILE:
FILE: [ResolvedTo(IMPORTS)] file.kt
FILE: [ResolvedTo(BODY_RESOLVE)] file.kt
@FILE:R|Ann|[Types]()
[ResolvedTo(BODY_RESOLVE)] annotations container
public final [ResolvedTo(STATUS)] annotation class Ann : R|kotlin/Annotation| {
analysis/low-level-api-fir/testData/getOrBuildFir/annotations/useSite/fileScript.txt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ FIR element rendered:
@FILE:R|Ann|[Types]()
FIR FILE:
FILE: [ResolvedTo(IMPORTS)] fileScript.kts
FILE: [ResolvedTo(BODY_RESOLVE)] fileScript.kts
@FILE:R|Ann|[Types]()
[ResolvedTo(BODY_RESOLVE)] annotations container
context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
analysis/low-level-api-fir/testData/getOrBuildFir/inImport/firstImportNamePart.txt
Vendored
+1 -1
View File
@@ -6,4 +6,4 @@ FIR element rendered:
import a.b.c
FIR FILE:
FILE: [ResolvedTo(IMPORTS)] firstImportNamePart.kt
FILE: [ResolvedTo(BODY_RESOLVE)] firstImportNamePart.kt
analysis/low-level-api-fir/testData/getOrBuildFir/inImport/firstImportNamePartScript.txt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ FIR element rendered:
import a.b.c
FIR FILE:
FILE: [ResolvedTo(IMPORTS)] firstImportNamePartScript.kts
FILE: [ResolvedTo(BODY_RESOLVE)] firstImportNamePartScript.kts
context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
SCRIPT: [ResolvedTo(RAW_FIR)] <script-firstImportNamePartScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
analysis/low-level-api-fir/testData/getOrBuildFir/inImport/middleImportNamePart.txt
Vendored
+1 -1
View File
@@ -6,4 +6,4 @@ FIR element rendered:
import a.b.c
FIR FILE:
FILE: [ResolvedTo(IMPORTS)] middleImportNamePart.kt
FILE: [ResolvedTo(BODY_RESOLVE)] middleImportNamePart.kt
analysis/low-level-api-fir/testData/getOrBuildFir/inImport/middleImportNamePartScript.txt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ FIR element rendered:
import a.b.c
FIR FILE:
FILE: [ResolvedTo(IMPORTS)] middleImportNamePartScript.kts
FILE: [ResolvedTo(BODY_RESOLVE)] middleImportNamePartScript.kts
context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
SCRIPT: [ResolvedTo(RAW_FIR)] <script-middleImportNamePartScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
analysis/low-level-api-fir/testData/getOrBuildFir/inImport/qualifiedImportNamePart.txt
Vendored
+1 -1
View File
@@ -6,4 +6,4 @@ FIR element rendered:
import a.b.c
FIR FILE:
FILE: [ResolvedTo(IMPORTS)] qualifiedImportNamePart.kt
FILE: [ResolvedTo(BODY_RESOLVE)] qualifiedImportNamePart.kt
analysis/low-level-api-fir/testData/getOrBuildFir/inImport/qualifiedImportNamePartScript.txt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ FIR element rendered:
import a.b.c
FIR FILE:
FILE: [ResolvedTo(IMPORTS)] qualifiedImportNamePartScript.kts
FILE: [ResolvedTo(BODY_RESOLVE)] qualifiedImportNamePartScript.kts
context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
SCRIPT: [ResolvedTo(RAW_FIR)] <script-qualifiedImportNamePartScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
analysis/low-level-api-fir/testData/getOrBuildFir/inImport/wholeImportDirective.txt
Vendored
+1 -1
View File
@@ -6,4 +6,4 @@ FIR element rendered:
import a.b.c
FIR FILE:
FILE: [ResolvedTo(IMPORTS)] wholeImportDirective.kt
FILE: [ResolvedTo(BODY_RESOLVE)] wholeImportDirective.kt
analysis/low-level-api-fir/testData/getOrBuildFir/inImport/wholeImportDirectiveScript.txt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ FIR element rendered:
import a.b.c
FIR FILE:
FILE: [ResolvedTo(IMPORTS)] wholeImportDirectiveScript.kts
FILE: [ResolvedTo(BODY_RESOLVE)] wholeImportDirectiveScript.kts
context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
SCRIPT: [ResolvedTo(RAW_FIR)] <script-wholeImportDirectiveScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
analysis/low-level-api-fir/testData/getOrBuildFir/inImport/wholeImportName.txt
Vendored
+1 -1
View File
@@ -6,4 +6,4 @@ FIR element rendered:
import a.b.c
FIR FILE:
FILE: [ResolvedTo(IMPORTS)] wholeImportName.kt
FILE: [ResolvedTo(BODY_RESOLVE)] wholeImportName.kt
analysis/low-level-api-fir/testData/getOrBuildFir/inImport/wholeImportNameScript.txt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ FIR element rendered:
import a.b.c
FIR FILE:
FILE: [ResolvedTo(IMPORTS)] wholeImportNameScript.kts
FILE: [ResolvedTo(BODY_RESOLVE)] wholeImportNameScript.kts
context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
SCRIPT: [ResolvedTo(RAW_FIR)] <script-wholeImportNameScript.kts>
[ResolvedTo(RAW_FIR)] lval args: R|kotlin/Array<kotlin/String>|
analysis/low-level-api-fir/testData/getOrBuildFir/inPackage/firstPackageNamePart.txt
Vendored
+1 -1
View File
@@ -6,5 +6,5 @@ FIR element rendered:
package a.b.c
FIR FILE:
FILE: [ResolvedTo(IMPORTS)] firstPackageNamePart.kt
FILE: [ResolvedTo(BODY_RESOLVE)] firstPackageNamePart.kt
package a.b.c
analysis/low-level-api-fir/testData/getOrBuildFir/inPackage/firstPackageNamePartScript.txt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ FIR element rendered:
package a.b.c
FIR FILE:
FILE: [ResolvedTo(IMPORTS)] firstPackageNamePartScript.kts
FILE: [ResolvedTo(BODY_RESOLVE)] firstPackageNamePartScript.kts
package a.b.c
context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
analysis/low-level-api-fir/testData/getOrBuildFir/inPackage/middlePackageNamePart.txt
Vendored
+1 -1
View File
@@ -6,5 +6,5 @@ FIR element rendered:
package a.b.c
FIR FILE:
FILE: [ResolvedTo(IMPORTS)] middlePackageNamePart.kt
FILE: [ResolvedTo(BODY_RESOLVE)] middlePackageNamePart.kt
package a.b.c
analysis/low-level-api-fir/testData/getOrBuildFir/inPackage/middlePackageNamePartScript.txt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ FIR element rendered:
package a.b.c
FIR FILE:
FILE: [ResolvedTo(IMPORTS)] middlePackageNamePartScript.kts
FILE: [ResolvedTo(BODY_RESOLVE)] middlePackageNamePartScript.kts
package a.b.c
context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
analysis/low-level-api-fir/testData/getOrBuildFir/inPackage/qualifiedPackageNamePart.txt
Vendored
+1 -1
View File
@@ -6,5 +6,5 @@ FIR element rendered:
package a.b.c
FIR FILE:
FILE: [ResolvedTo(IMPORTS)] qualifiedPackageNamePart.kt
FILE: [ResolvedTo(BODY_RESOLVE)] qualifiedPackageNamePart.kt
package a.b.c
analysis/low-level-api-fir/testData/getOrBuildFir/inPackage/qualifiedPackageNamePartScript.txt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ FIR element rendered:
package a.b.c
FIR FILE:
FILE: [ResolvedTo(IMPORTS)] qualifiedPackageNamePartScript.kts
FILE: [ResolvedTo(BODY_RESOLVE)] qualifiedPackageNamePartScript.kts
package a.b.c
context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
analysis/low-level-api-fir/testData/getOrBuildFir/inPackage/wholePackageDirective.txt
Vendored
+1 -1
View File
@@ -6,5 +6,5 @@ FIR element rendered:
package a.b.c
FIR FILE:
FILE: [ResolvedTo(IMPORTS)] wholePackageDirective.kt
FILE: [ResolvedTo(BODY_RESOLVE)] wholePackageDirective.kt
package a.b.c
analysis/low-level-api-fir/testData/getOrBuildFir/inPackage/wholePackageDirectiveScript.txt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ FIR element rendered:
package a.b.c
FIR FILE:
FILE: [ResolvedTo(IMPORTS)] wholePackageDirectiveScript.kts
FILE: [ResolvedTo(BODY_RESOLVE)] wholePackageDirectiveScript.kts
package a.b.c
context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
analysis/low-level-api-fir/testData/getOrBuildFir/inPackage/wholePackageName.txt
Vendored
+1 -1
View File
@@ -6,5 +6,5 @@ FIR element rendered:
package a.b.c
FIR FILE:
FILE: [ResolvedTo(IMPORTS)] wholePackageName.kt
FILE: [ResolvedTo(BODY_RESOLVE)] wholePackageName.kt
package a.b.c
analysis/low-level-api-fir/testData/getOrBuildFir/inPackage/wholePackageNameScript.txt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ FIR element rendered:
package a.b.c
FIR FILE:
FILE: [ResolvedTo(IMPORTS)] wholePackageNameScript.kts
FILE: [ResolvedTo(BODY_RESOLVE)] wholePackageNameScript.kts
package a.b.c
context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)
analysis/low-level-api-fir/testData/getOrBuildFir/wholeDeclaration/fileAnnotationList.txt
Vendored
+1 -1
View File
@@ -7,6 +7,6 @@ FIR element rendered:
[ResolvedTo(BODY_RESOLVE)] annotations container
FIR FILE:
FILE: [ResolvedTo(IMPORTS)] fileAnnotationList.kt
FILE: [ResolvedTo(BODY_RESOLVE)] fileAnnotationList.kt
@FILE:R|kotlin/Suppress|[Types](names = vararg(String()))
[ResolvedTo(BODY_RESOLVE)] annotations container
analysis/low-level-api-fir/testData/getOrBuildFir/wholeDeclaration/fileAnnotationListScript.txt
Vendored
+1 -1
View File
@@ -7,7 +7,7 @@ FIR element rendered:
[ResolvedTo(BODY_RESOLVE)] annotations container
FIR FILE:
FILE: [ResolvedTo(IMPORTS)] fileAnnotationListScript.kts
FILE: [ResolvedTo(BODY_RESOLVE)] fileAnnotationListScript.kts
@FILE:R|kotlin/Suppress|[Types](names = vararg(String()))
[ResolvedTo(BODY_RESOLVE)] annotations container
context(<script>@kotlin.script.templates.standard.ScriptTemplateWithArgs)