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

[FIR][renderer] add phase renderer for file and file annotations container

Browse Source 
^KT-56543
This commit is contained in:
Dmitrii Gridin
2023-03-22 15:31:04 +01:00
committed by Space Team
parent 706ff6b61f
commit 8c599a84af
51 changed files with 918 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/testdata/lazyResolve/functions/functionCallWithGenericResult.txt
Vendored
+28 -14
View File
@@ -1,6 +1,7 @@
RAW_FIR:
FILE: functionCallWithGenericResult.kt
FILE: [RAW_FIR] functionCallWithGenericResult.kt
[RAW_FIR] annotations container
public? open [RAW_FIR] class Foo<[RAW_FIR] T : CharSequence> : R|kotlin/Any| {
public? [RAW_FIR] [ContainingClassKey=Foo] constructor<[RAW_FIR] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -11,7 +12,8 @@ FILE: functionCallWithGenericResult.kt
public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
IMPORTS:
FILE: functionCallWithGenericResult.kt
FILE: [IMPORTS] functionCallWithGenericResult.kt
[RAW_FIR] annotations container
public? open [RAW_FIR] class Foo<[RAW_FIR] T : CharSequence> : R|kotlin/Any| {
public? [RAW_FIR] [ContainingClassKey=Foo] constructor<[RAW_FIR] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -22,7 +24,8 @@ FILE: functionCallWithGenericResult.kt
public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
COMPILER_REQUIRED_ANNOTATIONS:
FILE: functionCallWithGenericResult.kt
FILE: [IMPORTS] functionCallWithGenericResult.kt
[RAW_FIR] annotations container
public? open [RAW_FIR] class Foo<[RAW_FIR] T : CharSequence> : R|kotlin/Any| {
public? [RAW_FIR] [ContainingClassKey=Foo] constructor<[RAW_FIR] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -33,7 +36,8 @@ FILE: functionCallWithGenericResult.kt
public? final? [COMPILER_REQUIRED_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
COMPANION_GENERATION:
FILE: functionCallWithGenericResult.kt
FILE: [IMPORTS] functionCallWithGenericResult.kt
[RAW_FIR] annotations container
public? open [RAW_FIR] class Foo<[RAW_FIR] T : CharSequence> : R|kotlin/Any| {
public? [RAW_FIR] [ContainingClassKey=Foo] constructor<[RAW_FIR] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -44,7 +48,8 @@ FILE: functionCallWithGenericResult.kt
public? final? [COMPANION_GENERATION] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
SUPER_TYPES:
FILE: functionCallWithGenericResult.kt
FILE: [IMPORTS] functionCallWithGenericResult.kt
[RAW_FIR] annotations container
public? open [RAW_FIR] class Foo<[RAW_FIR] T : CharSequence> : R|kotlin/Any| {
public? [RAW_FIR] [ContainingClassKey=Foo] constructor<[RAW_FIR] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -55,7 +60,8 @@ FILE: functionCallWithGenericResult.kt
public? final? [SUPER_TYPES] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
TYPES:
FILE: functionCallWithGenericResult.kt
FILE: [IMPORTS] functionCallWithGenericResult.kt
[RAW_FIR] annotations container
public? open [RAW_FIR] class Foo<[RAW_FIR] T : CharSequence> : R|kotlin/Any| {
public? [RAW_FIR] [ContainingClassKey=Foo] constructor<[RAW_FIR] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -66,7 +72,8 @@ FILE: functionCallWithGenericResult.kt
public? final? [TYPES] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
STATUS:
FILE: functionCallWithGenericResult.kt
FILE: [IMPORTS] functionCallWithGenericResult.kt
[RAW_FIR] annotations container
public? open [RAW_FIR] class Foo<[RAW_FIR] T : CharSequence> : R|kotlin/Any| {
public? [RAW_FIR] [ContainingClassKey=Foo] constructor<[RAW_FIR] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -77,7 +84,8 @@ FILE: functionCallWithGenericResult.kt
public final [STATUS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
EXPECT_ACTUAL_MATCHING:
FILE: functionCallWithGenericResult.kt
FILE: [IMPORTS] functionCallWithGenericResult.kt
[RAW_FIR] annotations container
public? open [RAW_FIR] class Foo<[RAW_FIR] T : CharSequence> : R|kotlin/Any| {
public? [RAW_FIR] [ContainingClassKey=Foo] constructor<[RAW_FIR] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -90,7 +98,8 @@ FILE: functionCallWithGenericResult.kt
}
ARGUMENTS_OF_ANNOTATIONS:
FILE: functionCallWithGenericResult.kt
FILE: [IMPORTS] functionCallWithGenericResult.kt
[RAW_FIR] annotations container
public? open [RAW_FIR] class Foo<[RAW_FIR] T : CharSequence> : R|kotlin/Any| {
public? [RAW_FIR] [ContainingClassKey=Foo] constructor<[RAW_FIR] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -103,7 +112,8 @@ FILE: functionCallWithGenericResult.kt
}
CONTRACTS:
FILE: functionCallWithGenericResult.kt
FILE: [IMPORTS] functionCallWithGenericResult.kt
[RAW_FIR] annotations container
public? open [RAW_FIR] class Foo<[RAW_FIR] T : CharSequence> : R|kotlin/Any| {
public? [RAW_FIR] [ContainingClassKey=Foo] constructor<[RAW_FIR] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -116,7 +126,8 @@ FILE: functionCallWithGenericResult.kt
}
IMPLICIT_TYPES_BODY_RESOLVE:
FILE: functionCallWithGenericResult.kt
FILE: [IMPORTS] functionCallWithGenericResult.kt
[RAW_FIR] annotations container
public? open [RAW_FIR] class Foo<[RAW_FIR] T : CharSequence> : R|kotlin/Any| {
public? [RAW_FIR] [ContainingClassKey=Foo] constructor<[RAW_FIR] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -129,7 +140,8 @@ FILE: functionCallWithGenericResult.kt
}
ANNOTATIONS_ARGUMENTS_MAPPING:
FILE: functionCallWithGenericResult.kt
FILE: [IMPORTS] functionCallWithGenericResult.kt
[RAW_FIR] annotations container
public? open [RAW_FIR] class Foo<[RAW_FIR] T : CharSequence> : R|kotlin/Any| {
public? [RAW_FIR] [ContainingClassKey=Foo] constructor<[RAW_FIR] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -142,7 +154,8 @@ FILE: functionCallWithGenericResult.kt
}
BODY_RESOLVE:
FILE: functionCallWithGenericResult.kt
FILE: [IMPORTS] functionCallWithGenericResult.kt
[RAW_FIR] annotations container
public? open [RAW_FIR] class Foo<[RAW_FIR] T : CharSequence> : R|kotlin/Any| {
public? [RAW_FIR] [ContainingClassKey=Foo] constructor<[RAW_FIR] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -157,7 +170,8 @@ FILE: functionCallWithGenericResult.kt
}
FILE RAW TO BODY:
FILE: functionCallWithGenericResult.kt
FILE: [IMPORTS] functionCallWithGenericResult.kt
[BODY_RESOLVE] annotations container
public open [BODY_RESOLVE] class Foo<[BODY_RESOLVE] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
public [BODY_RESOLVE] [ContainingClassKey=Foo] constructor<[BODY_RESOLVE] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
super<R|kotlin/Any|>()
analysis/low-level-api-fir/testdata/lazyResolve/functions/functionWithGenericExpectedTypeInside.txt
Vendored
+28 -14
View File
@@ -1,6 +1,7 @@
RAW_FIR:
FILE: functionWithGenericExpectedTypeInside.kt
FILE: [RAW_FIR] functionWithGenericExpectedTypeInside.kt
[RAW_FIR] annotations container
public? open [RAW_FIR] class Foo<[RAW_FIR] T : CharSequence> : R|kotlin/Any| {
public? [RAW_FIR] [ContainingClassKey=Foo] constructor<[RAW_FIR] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -17,7 +18,8 @@ FILE: functionWithGenericExpectedTypeInside.kt
public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
IMPORTS:
FILE: functionWithGenericExpectedTypeInside.kt
FILE: [IMPORTS] functionWithGenericExpectedTypeInside.kt
[RAW_FIR] annotations container
public? open [RAW_FIR] class Foo<[RAW_FIR] T : CharSequence> : R|kotlin/Any| {
public? [RAW_FIR] [ContainingClassKey=Foo] constructor<[RAW_FIR] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -34,7 +36,8 @@ FILE: functionWithGenericExpectedTypeInside.kt
public? final? [RAW_FIR] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
COMPILER_REQUIRED_ANNOTATIONS:
FILE: functionWithGenericExpectedTypeInside.kt
FILE: [IMPORTS] functionWithGenericExpectedTypeInside.kt
[RAW_FIR] annotations container
public? open [RAW_FIR] class Foo<[RAW_FIR] T : CharSequence> : R|kotlin/Any| {
public? [RAW_FIR] [ContainingClassKey=Foo] constructor<[RAW_FIR] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -51,7 +54,8 @@ FILE: functionWithGenericExpectedTypeInside.kt
public? final? [COMPILER_REQUIRED_ANNOTATIONS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
COMPANION_GENERATION:
FILE: functionWithGenericExpectedTypeInside.kt
FILE: [IMPORTS] functionWithGenericExpectedTypeInside.kt
[RAW_FIR] annotations container
public? open [RAW_FIR] class Foo<[RAW_FIR] T : CharSequence> : R|kotlin/Any| {
public? [RAW_FIR] [ContainingClassKey=Foo] constructor<[RAW_FIR] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -68,7 +72,8 @@ FILE: functionWithGenericExpectedTypeInside.kt
public? final? [COMPANION_GENERATION] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
SUPER_TYPES:
FILE: functionWithGenericExpectedTypeInside.kt
FILE: [IMPORTS] functionWithGenericExpectedTypeInside.kt
[RAW_FIR] annotations container
public? open [RAW_FIR] class Foo<[RAW_FIR] T : CharSequence> : R|kotlin/Any| {
public? [RAW_FIR] [ContainingClassKey=Foo] constructor<[RAW_FIR] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -85,7 +90,8 @@ FILE: functionWithGenericExpectedTypeInside.kt
public? final? [SUPER_TYPES] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
TYPES:
FILE: functionWithGenericExpectedTypeInside.kt
FILE: [IMPORTS] functionWithGenericExpectedTypeInside.kt
[RAW_FIR] annotations container
public? open [RAW_FIR] class Foo<[RAW_FIR] T : CharSequence> : R|kotlin/Any| {
public? [RAW_FIR] [ContainingClassKey=Foo] constructor<[RAW_FIR] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -102,7 +108,8 @@ FILE: functionWithGenericExpectedTypeInside.kt
public? final? [TYPES] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
STATUS:
FILE: functionWithGenericExpectedTypeInside.kt
FILE: [IMPORTS] functionWithGenericExpectedTypeInside.kt
[RAW_FIR] annotations container
public? open [RAW_FIR] class Foo<[RAW_FIR] T : CharSequence> : R|kotlin/Any| {
public? [RAW_FIR] [ContainingClassKey=Foo] constructor<[RAW_FIR] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -119,7 +126,8 @@ FILE: functionWithGenericExpectedTypeInside.kt
public final [STATUS] fun resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
EXPECT_ACTUAL_MATCHING:
FILE: functionWithGenericExpectedTypeInside.kt
FILE: [IMPORTS] functionWithGenericExpectedTypeInside.kt
[RAW_FIR] annotations container
public? open [RAW_FIR] class Foo<[RAW_FIR] T : CharSequence> : R|kotlin/Any| {
public? [RAW_FIR] [ContainingClassKey=Foo] constructor<[RAW_FIR] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -138,7 +146,8 @@ FILE: functionWithGenericExpectedTypeInside.kt
}
ARGUMENTS_OF_ANNOTATIONS:
FILE: functionWithGenericExpectedTypeInside.kt
FILE: [IMPORTS] functionWithGenericExpectedTypeInside.kt
[RAW_FIR] annotations container
public? open [RAW_FIR] class Foo<[RAW_FIR] T : CharSequence> : R|kotlin/Any| {
public? [RAW_FIR] [ContainingClassKey=Foo] constructor<[RAW_FIR] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -157,7 +166,8 @@ FILE: functionWithGenericExpectedTypeInside.kt
}
CONTRACTS:
FILE: functionWithGenericExpectedTypeInside.kt
FILE: [IMPORTS] functionWithGenericExpectedTypeInside.kt
[RAW_FIR] annotations container
public? open [RAW_FIR] class Foo<[RAW_FIR] T : CharSequence> : R|kotlin/Any| {
public? [RAW_FIR] [ContainingClassKey=Foo] constructor<[RAW_FIR] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -176,7 +186,8 @@ FILE: functionWithGenericExpectedTypeInside.kt
}
IMPLICIT_TYPES_BODY_RESOLVE:
FILE: functionWithGenericExpectedTypeInside.kt
FILE: [IMPORTS] functionWithGenericExpectedTypeInside.kt
[RAW_FIR] annotations container
public? open [RAW_FIR] class Foo<[RAW_FIR] T : CharSequence> : R|kotlin/Any| {
public? [RAW_FIR] [ContainingClassKey=Foo] constructor<[RAW_FIR] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -195,7 +206,8 @@ FILE: functionWithGenericExpectedTypeInside.kt
}
ANNOTATIONS_ARGUMENTS_MAPPING:
FILE: functionWithGenericExpectedTypeInside.kt
FILE: [IMPORTS] functionWithGenericExpectedTypeInside.kt
[RAW_FIR] annotations container
public? open [RAW_FIR] class Foo<[RAW_FIR] T : CharSequence> : R|kotlin/Any| {
public? [RAW_FIR] [ContainingClassKey=Foo] constructor<[RAW_FIR] T : CharSequence>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -214,7 +226,8 @@ FILE: functionWithGenericExpectedTypeInside.kt
}
BODY_RESOLVE:
FILE: functionWithGenericExpectedTypeInside.kt
FILE: [IMPORTS] functionWithGenericExpectedTypeInside.kt
[RAW_FIR] annotations container
public open [TYPES] class Foo<[TYPES] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
public [TYPES] [ContainingClassKey=Foo] constructor<[TYPES] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
LAZY_super<R|kotlin/Any|>
@@ -235,7 +248,8 @@ FILE: functionWithGenericExpectedTypeInside.kt
}
FILE RAW TO BODY:
FILE: functionWithGenericExpectedTypeInside.kt
FILE: [IMPORTS] functionWithGenericExpectedTypeInside.kt
[BODY_RESOLVE] annotations container
public open [BODY_RESOLVE] class Foo<[BODY_RESOLVE] T : R|kotlin/CharSequence|> : R|kotlin/Any| {
public [BODY_RESOLVE] [ContainingClassKey=Foo] constructor<[BODY_RESOLVE] T : R|kotlin/CharSequence|>(): R|Foo<T>| {
super<R|kotlin/Any|>()
analysis/low-level-api-fir/testdata/lazyResolve/functions/functionWithTypeParameters.txt
Vendored
+28 -14
View File
@@ -1,63 +1,77 @@
RAW_FIR:
FILE: functionWithTypeParameters.kt
FILE: [RAW_FIR] functionWithTypeParameters.kt
[RAW_FIR] annotations container
public? final? [RAW_FIR] fun <[RAW_FIR] T : Int, [RAW_FIR] K> resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
IMPORTS:
FILE: functionWithTypeParameters.kt
FILE: [IMPORTS] functionWithTypeParameters.kt
[RAW_FIR] annotations container
public? final? [RAW_FIR] fun <[RAW_FIR] T : Int, [RAW_FIR] K> resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
COMPILER_REQUIRED_ANNOTATIONS:
FILE: functionWithTypeParameters.kt
FILE: [IMPORTS] functionWithTypeParameters.kt
[RAW_FIR] annotations container
public? final? [COMPILER_REQUIRED_ANNOTATIONS] fun <[COMPILER_REQUIRED_ANNOTATIONS] T : Int, [COMPILER_REQUIRED_ANNOTATIONS] K> resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
COMPANION_GENERATION:
FILE: functionWithTypeParameters.kt
FILE: [IMPORTS] functionWithTypeParameters.kt
[RAW_FIR] annotations container
public? final? [COMPANION_GENERATION] fun <[COMPANION_GENERATION] T : Int, [COMPANION_GENERATION] K> resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
SUPER_TYPES:
FILE: functionWithTypeParameters.kt
FILE: [IMPORTS] functionWithTypeParameters.kt
[RAW_FIR] annotations container
public? final? [SUPER_TYPES] fun <[SUPER_TYPES] T : Int, [SUPER_TYPES] K> resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
TYPES:
FILE: functionWithTypeParameters.kt
FILE: [IMPORTS] functionWithTypeParameters.kt
[RAW_FIR] annotations container
public? final? [TYPES] fun <[TYPES] T : R|kotlin/Int|, [TYPES] K> resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
STATUS:
FILE: functionWithTypeParameters.kt
FILE: [IMPORTS] functionWithTypeParameters.kt
[RAW_FIR] annotations container
public final [STATUS] fun <[STATUS] T : R|kotlin/Int|, [STATUS] K> resolveMe(): R|kotlin/Unit| { LAZY_BLOCK }
EXPECT_ACTUAL_MATCHING:
FILE: functionWithTypeParameters.kt
FILE: [IMPORTS] functionWithTypeParameters.kt
[RAW_FIR] annotations container
public final [EXPECT_ACTUAL_MATCHING] fun <[EXPECT_ACTUAL_MATCHING] T : R|kotlin/Int|, [EXPECT_ACTUAL_MATCHING] K> resolveMe(): R|kotlin/Unit| {
}
ARGUMENTS_OF_ANNOTATIONS:
FILE: functionWithTypeParameters.kt
FILE: [IMPORTS] functionWithTypeParameters.kt
[RAW_FIR] annotations container
public final [ARGUMENTS_OF_ANNOTATIONS] fun <[ARGUMENTS_OF_ANNOTATIONS] T : R|kotlin/Int|, [ARGUMENTS_OF_ANNOTATIONS] K> resolveMe(): R|kotlin/Unit| {
}
CONTRACTS:
FILE: functionWithTypeParameters.kt
FILE: [IMPORTS] functionWithTypeParameters.kt
[RAW_FIR] annotations container
public final [CONTRACTS] fun <[CONTRACTS] T : R|kotlin/Int|, [CONTRACTS] K> resolveMe(): R|kotlin/Unit| {
}
IMPLICIT_TYPES_BODY_RESOLVE:
FILE: functionWithTypeParameters.kt
FILE: [IMPORTS] functionWithTypeParameters.kt
[RAW_FIR] annotations container
public final [IMPLICIT_TYPES_BODY_RESOLVE] fun <[IMPLICIT_TYPES_BODY_RESOLVE] T : R|kotlin/Int|, [IMPLICIT_TYPES_BODY_RESOLVE] K> resolveMe(): R|kotlin/Unit| {
}
ANNOTATIONS_ARGUMENTS_MAPPING:
FILE: functionWithTypeParameters.kt
FILE: [IMPORTS] functionWithTypeParameters.kt
[RAW_FIR] annotations container
public final [ANNOTATIONS_ARGUMENTS_MAPPING] fun <[ANNOTATIONS_ARGUMENTS_MAPPING] T : R|kotlin/Int|, [ANNOTATIONS_ARGUMENTS_MAPPING] K> resolveMe(): R|kotlin/Unit| {
}
BODY_RESOLVE:
FILE: functionWithTypeParameters.kt
FILE: [IMPORTS] functionWithTypeParameters.kt
[RAW_FIR] annotations container
public final [BODY_RESOLVE] fun <[BODY_RESOLVE] T : R|kotlin/Int|, [BODY_RESOLVE] K> resolveMe(): R|kotlin/Unit| {
}
FILE RAW TO BODY:
FILE: functionWithTypeParameters.kt
FILE: [IMPORTS] functionWithTypeParameters.kt
[BODY_RESOLVE] annotations container
public final [BODY_RESOLVE] fun <[BODY_RESOLVE] T : R|kotlin/Int|, [BODY_RESOLVE] K> resolveMe(): R|kotlin/Unit| {
}