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

[FIR] Make FirFile.annotationsContainer nullable

Browse Source 
Previously, when no file annotations were present, the FIR element
didn't have a source.
By making it nullable, it will only be created when appropriate and the
source will never be null.

#KT-55835
This commit is contained in:
Kirill Rakhman
2023-06-26 15:06:13 +03:00
committed by Space Team
parent 311975f1ed
commit bed6cb7154
334 changed files with 47 additions and 1937 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/testdata/lazyResolve/classes/nestedClass.txt
Vendored
-14
View File
@@ -1,6 +1,5 @@
RAW_FIR:
FILE: [ResolvedTo(RAW_FIR)] nestedClass.kt
[ResolvedTo(BODY_RESOLVE)] annotations container
public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
@@ -29,7 +28,6 @@ FILE: [ResolvedTo(RAW_FIR)] nestedClass.kt
IMPORTS:
FILE: [ResolvedTo(IMPORTS)] nestedClass.kt
[ResolvedTo(BODY_RESOLVE)] annotations container
public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
@@ -58,7 +56,6 @@ FILE: [ResolvedTo(IMPORTS)] nestedClass.kt
COMPILER_REQUIRED_ANNOTATIONS:
FILE: [ResolvedTo(IMPORTS)] nestedClass.kt
[ResolvedTo(BODY_RESOLVE)] annotations container
public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
@@ -87,7 +84,6 @@ FILE: [ResolvedTo(IMPORTS)] nestedClass.kt
COMPANION_GENERATION:
FILE: [ResolvedTo(IMPORTS)] nestedClass.kt
[ResolvedTo(BODY_RESOLVE)] annotations container
public? open [ResolvedTo(RAW_FIR)] class TopLevelClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
@@ -116,7 +112,6 @@ FILE: [ResolvedTo(IMPORTS)] nestedClass.kt
SUPER_TYPES:
FILE: [ResolvedTo(IMPORTS)] nestedClass.kt
[ResolvedTo(BODY_RESOLVE)] annotations container
public? open [ResolvedTo(SUPER_TYPES)] class TopLevelClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
@@ -145,7 +140,6 @@ FILE: [ResolvedTo(IMPORTS)] nestedClass.kt
TYPES:
FILE: [ResolvedTo(IMPORTS)] nestedClass.kt
[ResolvedTo(BODY_RESOLVE)] annotations container
public? open [ResolvedTo(SUPER_TYPES)] class TopLevelClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
@@ -174,7 +168,6 @@ FILE: [ResolvedTo(IMPORTS)] nestedClass.kt
STATUS:
FILE: [ResolvedTo(IMPORTS)] nestedClass.kt
[ResolvedTo(BODY_RESOLVE)] annotations container
public? open [ResolvedTo(SUPER_TYPES)] class TopLevelClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
@@ -203,7 +196,6 @@ FILE: [ResolvedTo(IMPORTS)] nestedClass.kt
EXPECT_ACTUAL_MATCHING:
FILE: [ResolvedTo(IMPORTS)] nestedClass.kt
[ResolvedTo(BODY_RESOLVE)] annotations container
public? open [ResolvedTo(SUPER_TYPES)] class TopLevelClass : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
@@ -232,7 +224,6 @@ FILE: [ResolvedTo(IMPORTS)] nestedClass.kt
ARGUMENTS_OF_ANNOTATIONS:
FILE: [ResolvedTo(IMPORTS)] nestedClass.kt
[ResolvedTo(BODY_RESOLVE)] annotations container
public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
@@ -261,7 +252,6 @@ FILE: [ResolvedTo(IMPORTS)] nestedClass.kt
CONTRACTS:
FILE: [ResolvedTo(IMPORTS)] nestedClass.kt
[ResolvedTo(BODY_RESOLVE)] annotations container
public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
@@ -290,7 +280,6 @@ FILE: [ResolvedTo(IMPORTS)] nestedClass.kt
IMPLICIT_TYPES_BODY_RESOLVE:
FILE: [ResolvedTo(IMPORTS)] nestedClass.kt
[ResolvedTo(BODY_RESOLVE)] annotations container
public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
@@ -319,7 +308,6 @@ FILE: [ResolvedTo(IMPORTS)] nestedClass.kt
ANNOTATIONS_ARGUMENTS_MAPPING:
FILE: [ResolvedTo(IMPORTS)] nestedClass.kt
[ResolvedTo(BODY_RESOLVE)] annotations container
public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
@@ -348,7 +336,6 @@ FILE: [ResolvedTo(IMPORTS)] nestedClass.kt
BODY_RESOLVE:
FILE: [ResolvedTo(IMPORTS)] nestedClass.kt
[ResolvedTo(BODY_RESOLVE)] annotations container
public open [ResolvedTo(STATUS)] class TopLevelClass : R|kotlin/Any| {
public [ResolvedTo(STATUS)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
LAZY_super<R|kotlin/Any|>
@@ -377,7 +364,6 @@ FILE: [ResolvedTo(IMPORTS)] nestedClass.kt
FILE RAW TO BODY:
FILE: [ResolvedTo(IMPORTS)] nestedClass.kt
[ResolvedTo(BODY_RESOLVE)] annotations container
public open [ResolvedTo(BODY_RESOLVE)] class TopLevelClass : R|kotlin/Any| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=TopLevelClass] constructor(): R|TopLevelClass| {
super<R|kotlin/Any|>()