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/functions/functionCallWithGenericResult.txt
Vendored
-14
View File
@@ -1,6 +1,5 @@
RAW_FIR:
FILE: [ResolvedTo(RAW_FIR)] functionCallWithGenericResult.kt
[ResolvedTo(BODY_RESOLVE)] annotations container
public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -12,7 +11,6 @@ FILE: [ResolvedTo(RAW_FIR)] functionCallWithGenericResult.kt
IMPORTS:
FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt
[ResolvedTo(BODY_RESOLVE)] annotations container
public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -24,7 +22,6 @@ FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt
COMPILER_REQUIRED_ANNOTATIONS:
FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt
[ResolvedTo(BODY_RESOLVE)] annotations container
public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -36,7 +33,6 @@ FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt
COMPANION_GENERATION:
FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt
[ResolvedTo(BODY_RESOLVE)] annotations container
public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -48,7 +44,6 @@ FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt
SUPER_TYPES:
FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt
[ResolvedTo(BODY_RESOLVE)] annotations container
public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -60,7 +55,6 @@ FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt
TYPES:
FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt
[ResolvedTo(BODY_RESOLVE)] annotations container
public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -72,7 +66,6 @@ FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt
STATUS:
FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt
[ResolvedTo(BODY_RESOLVE)] annotations container
public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -84,7 +77,6 @@ FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt
EXPECT_ACTUAL_MATCHING:
FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt
[ResolvedTo(BODY_RESOLVE)] annotations container
public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -96,7 +88,6 @@ FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt
ARGUMENTS_OF_ANNOTATIONS:
FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt
[ResolvedTo(BODY_RESOLVE)] annotations container
public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -108,7 +99,6 @@ FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt
CONTRACTS:
FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt
[ResolvedTo(BODY_RESOLVE)] annotations container
public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -122,7 +112,6 @@ FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt
IMPLICIT_TYPES_BODY_RESOLVE:
FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt
[ResolvedTo(BODY_RESOLVE)] annotations container
public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -136,7 +125,6 @@ FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt
ANNOTATIONS_ARGUMENTS_MAPPING:
FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt
[ResolvedTo(BODY_RESOLVE)] annotations container
public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -150,7 +138,6 @@ FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt
BODY_RESOLVE:
FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt
[ResolvedTo(BODY_RESOLVE)] annotations container
public? open [ResolvedTo(RAW_FIR)] class Foo<[ResolvedTo(RAW_FIR)] T : CharSequence> : R|kotlin/Any| {
public? [ResolvedTo(RAW_FIR)] [ContainingClassKey=Foo] constructor<[ResolvedTo(RAW_FIR)] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -166,7 +153,6 @@ FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt
FILE RAW TO BODY:
FILE: [ResolvedTo(IMPORTS)] functionCallWithGenericResult.kt
[ResolvedTo(BODY_RESOLVE)] annotations container
public open [ResolvedTo(BODY_RESOLVE)] class Foo<[ResolvedTo(BODY_RESOLVE)] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
public [ResolvedTo(BODY_RESOLVE)] [ContainingClassKey=Foo] constructor<[ResolvedTo(BODY_RESOLVE)] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
super<R|kotlin/Any|>()