diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/annotationParameters.txt b/analysis/low-level-api-fir/testdata/lazyResolve/annotationParameters.txt index fbd82d06184..b00f8c83478 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/annotationParameters.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/annotationParameters.txt @@ -207,13 +207,13 @@ FILE: annotationParameters.kt public [RAW_FIR] get(): R|kotlin/enums/EnumEntries| } - public? final? [COMPILER_REQUIRED_ANNOTATIONS] annotation class Anno : R|kotlin/Annotation| { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=Anno] constructor([COMPILER_REQUIRED_ANNOTATIONS] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| { + public? final? [RAW_FIR] annotation class Anno : R|kotlin/Annotation| { + public? [RAW_FIR] [ContainingClassKey=Anno] constructor([RAW_FIR] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| { LAZY_super } - public? final? [COMPILER_REQUIRED_ANNOTATIONS] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=Anno] get(): A.X + public? final? [RAW_FIR] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| + public? [RAW_FIR] [ContainingClassKey=Anno] get(): A.X } public? final? [SUPER_TYPES] class B : R|kotlin/Any| { @@ -245,13 +245,13 @@ FILE: annotationParameters.kt public [RAW_FIR] get(): R|kotlin/enums/EnumEntries| } - public? final? [COMPILER_REQUIRED_ANNOTATIONS] annotation class Anno : R|kotlin/Annotation| { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=Anno] constructor([COMPILER_REQUIRED_ANNOTATIONS] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| { + public? final? [RAW_FIR] annotation class Anno : R|kotlin/Annotation| { + public? [RAW_FIR] [ContainingClassKey=Anno] constructor([RAW_FIR] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| { LAZY_super } - public? final? [COMPILER_REQUIRED_ANNOTATIONS] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=Anno] get(): A.X + public? final? [RAW_FIR] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| + public? [RAW_FIR] [ContainingClassKey=Anno] get(): A.X } public final [SUPER_TYPES] class B : R|kotlin/Any| { @@ -283,13 +283,13 @@ FILE: annotationParameters.kt public [STATUS] get(): R|kotlin/enums/EnumEntries| } - public? final? [COMPILER_REQUIRED_ANNOTATIONS] annotation class Anno : R|kotlin/Annotation| { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=Anno] constructor([COMPILER_REQUIRED_ANNOTATIONS] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| { + public? final? [RAW_FIR] annotation class Anno : R|kotlin/Annotation| { + public? [RAW_FIR] [ContainingClassKey=Anno] constructor([RAW_FIR] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| { LAZY_super } - public? final? [COMPILER_REQUIRED_ANNOTATIONS] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=Anno] get(): A.X + public? final? [RAW_FIR] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| + public? [RAW_FIR] [ContainingClassKey=Anno] get(): A.X } public final [STATUS] class B : R|kotlin/Any| { @@ -321,13 +321,13 @@ FILE: annotationParameters.kt public [STATUS] get(): R|kotlin/enums/EnumEntries| } - public? final? [COMPILER_REQUIRED_ANNOTATIONS] annotation class Anno : R|kotlin/Annotation| { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=Anno] constructor([COMPILER_REQUIRED_ANNOTATIONS] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| { + public? final? [RAW_FIR] annotation class Anno : R|kotlin/Annotation| { + public? [RAW_FIR] [ContainingClassKey=Anno] constructor([RAW_FIR] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| { LAZY_super } - public? final? [COMPILER_REQUIRED_ANNOTATIONS] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=Anno] get(): A.X + public? final? [RAW_FIR] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| + public? [RAW_FIR] [ContainingClassKey=Anno] get(): A.X } public final [STATUS] class B : R|kotlin/Any| { @@ -360,13 +360,13 @@ FILE: annotationParameters.kt public [STATUS] get(): R|kotlin/enums/EnumEntries| } - public? final? [COMPILER_REQUIRED_ANNOTATIONS] annotation class Anno : R|kotlin/Annotation| { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=Anno] constructor([COMPILER_REQUIRED_ANNOTATIONS] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| { + public? final? [RAW_FIR] annotation class Anno : R|kotlin/Annotation| { + public? [RAW_FIR] [ContainingClassKey=Anno] constructor([RAW_FIR] [CorrespondingProperty=/Anno.args] args: A.X): R|Anno| { LAZY_super } - public? final? [COMPILER_REQUIRED_ANNOTATIONS] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=Anno] get(): A.X + public? final? [RAW_FIR] [IsFromPrimaryConstructor=true] val args: A.X = R|/args| + public? [RAW_FIR] [ContainingClassKey=Anno] get(): A.X } public final [STATUS] class B : R|kotlin/Any| { diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/classes/nestedClassWithPropertiesOverrides.txt b/analysis/low-level-api-fir/testdata/lazyResolve/classes/nestedClassWithPropertiesOverrides.txt index 8e07f08a253..7f87697443b 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/classes/nestedClassWithPropertiesOverrides.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/classes/nestedClassWithPropertiesOverrides.txt @@ -97,9 +97,9 @@ FILE: nestedClassWithPropertiesOverrides.kt SUPER_TYPES: FILE: nestedClassWithPropertiesOverrides.kt - public? final? [COMPILER_REQUIRED_ANNOTATIONS] interface OV : R|kotlin/Any| { - public? final? [COMPILER_REQUIRED_ANNOTATIONS] val originalExpressions: A - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=OV] get(): A + public? final? [RAW_FIR] interface OV : R|kotlin/Any| { + public? final? [RAW_FIR] val originalExpressions: A + public? [RAW_FIR] [ContainingClassKey=OV] get(): A public? final? [SUPER_TYPES] class ResolveMe : R|OV| { public? [SUPER_TYPES] [ContainingClassKey=ResolveMe] constructor(): R|OV.ResolveMe| { @@ -136,8 +136,8 @@ FILE: nestedClassWithPropertiesOverrides.kt } } - public? final? [COMPILER_REQUIRED_ANNOTATIONS] class A : R|kotlin/Any| { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=A] constructor(): R|A| { + public? final? [RAW_FIR] class A : R|kotlin/Any| { + public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } @@ -160,8 +160,8 @@ FILE: nestedClassWithPropertiesOverrides.kt } } - public? final? [COMPILER_REQUIRED_ANNOTATIONS] class A : R|kotlin/Any| { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=A] constructor(): R|A| { + public? final? [RAW_FIR] class A : R|kotlin/Any| { + public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } @@ -184,8 +184,8 @@ FILE: nestedClassWithPropertiesOverrides.kt } } - public? final? [COMPILER_REQUIRED_ANNOTATIONS] class A : R|kotlin/Any| { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=A] constructor(): R|A| { + public? final? [RAW_FIR] class A : R|kotlin/Any| { + public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } @@ -208,8 +208,8 @@ FILE: nestedClassWithPropertiesOverrides.kt } } - public? final? [COMPILER_REQUIRED_ANNOTATIONS] class A : R|kotlin/Any| { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=A] constructor(): R|A| { + public? final? [RAW_FIR] class A : R|kotlin/Any| { + public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } @@ -232,8 +232,8 @@ FILE: nestedClassWithPropertiesOverrides.kt } } - public? final? [COMPILER_REQUIRED_ANNOTATIONS] class A : R|kotlin/Any| { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=A] constructor(): R|A| { + public? final? [RAW_FIR] class A : R|kotlin/Any| { + public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } @@ -256,8 +256,8 @@ FILE: nestedClassWithPropertiesOverrides.kt } } - public? final? [COMPILER_REQUIRED_ANNOTATIONS] class A : R|kotlin/Any| { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=A] constructor(): R|A| { + public? final? [RAW_FIR] class A : R|kotlin/Any| { + public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } @@ -280,8 +280,8 @@ FILE: nestedClassWithPropertiesOverrides.kt } } - public? final? [COMPILER_REQUIRED_ANNOTATIONS] class A : R|kotlin/Any| { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=A] constructor(): R|A| { + public? final? [RAW_FIR] class A : R|kotlin/Any| { + public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } @@ -304,8 +304,8 @@ FILE: nestedClassWithPropertiesOverrides.kt } } - public? final? [COMPILER_REQUIRED_ANNOTATIONS] class A : R|kotlin/Any| { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=A] constructor(): R|A| { + public? final? [RAW_FIR] class A : R|kotlin/Any| { + public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/enumEntry.txt b/analysis/low-level-api-fir/testdata/lazyResolve/enumEntry.txt index b823aaebe56..35230d8340a 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/enumEntry.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/enumEntry.txt @@ -126,8 +126,8 @@ FILE: enumEntry.kt TYPES: FILE: enumEntry.kt - public? final? [COMPILER_REQUIRED_ANNOTATIONS] annotation class Anno : R|kotlin/Annotation| { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=Anno] constructor(): R|Anno| { + public? final? [RAW_FIR] annotation class Anno : R|kotlin/Annotation| { + public? [RAW_FIR] [ContainingClassKey=Anno] constructor(): R|Anno| { LAZY_super } @@ -151,8 +151,8 @@ FILE: enumEntry.kt STATUS: FILE: enumEntry.kt - public? final? [COMPILER_REQUIRED_ANNOTATIONS] annotation class Anno : R|kotlin/Annotation| { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=Anno] constructor(): R|Anno| { + public? final? [RAW_FIR] annotation class Anno : R|kotlin/Annotation| { + public? [RAW_FIR] [ContainingClassKey=Anno] constructor(): R|Anno| { LAZY_super } @@ -176,8 +176,8 @@ FILE: enumEntry.kt ARGUMENTS_OF_ANNOTATIONS: FILE: enumEntry.kt - public? final? [COMPILER_REQUIRED_ANNOTATIONS] annotation class Anno : R|kotlin/Annotation| { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=Anno] constructor(): R|Anno| { + public? final? [RAW_FIR] annotation class Anno : R|kotlin/Annotation| { + public? [RAW_FIR] [ContainingClassKey=Anno] constructor(): R|Anno| { LAZY_super } @@ -201,8 +201,8 @@ FILE: enumEntry.kt CONTRACTS: FILE: enumEntry.kt - public? final? [COMPILER_REQUIRED_ANNOTATIONS] annotation class Anno : R|kotlin/Annotation| { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=Anno] constructor(): R|Anno| { + public? final? [RAW_FIR] annotation class Anno : R|kotlin/Annotation| { + public? [RAW_FIR] [ContainingClassKey=Anno] constructor(): R|Anno| { LAZY_super } @@ -232,8 +232,8 @@ FILE: enumEntry.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: enumEntry.kt - public? final? [COMPILER_REQUIRED_ANNOTATIONS] annotation class Anno : R|kotlin/Annotation| { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=Anno] constructor(): R|Anno| { + public? final? [RAW_FIR] annotation class Anno : R|kotlin/Annotation| { + public? [RAW_FIR] [ContainingClassKey=Anno] constructor(): R|Anno| { LAZY_super } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/errors/anonymousObjectInInvalidPosition.txt b/analysis/low-level-api-fir/testdata/lazyResolve/errors/anonymousObjectInInvalidPosition.txt index 167822a7823..6f72e1b9802 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/errors/anonymousObjectInInvalidPosition.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/errors/anonymousObjectInInvalidPosition.txt @@ -48,8 +48,8 @@ TYPES: FILE: anonymousObjectInInvalidPosition.kt private final? [TYPES] val resolveMe: = LAZY_EXPRESSION private [TYPES] get(): - public? final? [COMPILER_REQUIRED_ANNOTATIONS] interface A<[COMPILER_REQUIRED_ANNOTATIONS] T> : R|kotlin/Any| { - public? final? [COMPILER_REQUIRED_ANNOTATIONS] fun x(): R|kotlin/Unit| + public? final? [RAW_FIR] interface A<[RAW_FIR] T> : R|kotlin/Any| { + public? final? [RAW_FIR] fun x(): R|kotlin/Unit| } @@ -57,8 +57,8 @@ STATUS: FILE: anonymousObjectInInvalidPosition.kt private final [STATUS] val resolveMe: = LAZY_EXPRESSION private [STATUS] get(): - public? final? [COMPILER_REQUIRED_ANNOTATIONS] interface A<[COMPILER_REQUIRED_ANNOTATIONS] T> : R|kotlin/Any| { - public? final? [COMPILER_REQUIRED_ANNOTATIONS] fun x(): R|kotlin/Unit| + public? final? [RAW_FIR] interface A<[RAW_FIR] T> : R|kotlin/Any| { + public? final? [RAW_FIR] fun x(): R|kotlin/Unit| } @@ -66,8 +66,8 @@ ARGUMENTS_OF_ANNOTATIONS: FILE: anonymousObjectInInvalidPosition.kt private final [ARGUMENTS_OF_ANNOTATIONS] val resolveMe: = LAZY_EXPRESSION private [ARGUMENTS_OF_ANNOTATIONS] get(): - public? final? [COMPILER_REQUIRED_ANNOTATIONS] interface A<[COMPILER_REQUIRED_ANNOTATIONS] T> : R|kotlin/Any| { - public? final? [COMPILER_REQUIRED_ANNOTATIONS] fun x(): R|kotlin/Unit| + public? final? [RAW_FIR] interface A<[RAW_FIR] T> : R|kotlin/Any| { + public? final? [RAW_FIR] fun x(): R|kotlin/Unit| } @@ -84,8 +84,8 @@ FILE: anonymousObjectInInvalidPosition.kt } private [CONTRACTS] get(): - public? final? [COMPILER_REQUIRED_ANNOTATIONS] interface A<[COMPILER_REQUIRED_ANNOTATIONS] T> : R|kotlin/Any| { - public? final? [COMPILER_REQUIRED_ANNOTATIONS] fun x(): R|kotlin/Unit| + public? final? [RAW_FIR] interface A<[RAW_FIR] T> : R|kotlin/Any| { + public? final? [RAW_FIR] fun x(): R|kotlin/Unit| } @@ -102,8 +102,8 @@ FILE: anonymousObjectInInvalidPosition.kt } private [IMPLICIT_TYPES_BODY_RESOLVE] get(): - public? final? [COMPILER_REQUIRED_ANNOTATIONS] interface A<[COMPILER_REQUIRED_ANNOTATIONS] T> : R|kotlin/Any| { - public? final? [COMPILER_REQUIRED_ANNOTATIONS] fun x(): R|kotlin/Unit| + public? final? [RAW_FIR] interface A<[RAW_FIR] T> : R|kotlin/Any| { + public? final? [RAW_FIR] fun x(): R|kotlin/Unit| } @@ -120,8 +120,8 @@ FILE: anonymousObjectInInvalidPosition.kt } private [ANNOTATIONS_ARGUMENTS_MAPPING] get(): - public? final? [COMPILER_REQUIRED_ANNOTATIONS] interface A<[COMPILER_REQUIRED_ANNOTATIONS] T> : R|kotlin/Any| { - public? final? [COMPILER_REQUIRED_ANNOTATIONS] fun x(): R|kotlin/Unit| + public? final? [RAW_FIR] interface A<[RAW_FIR] T> : R|kotlin/Any| { + public? final? [RAW_FIR] fun x(): R|kotlin/Unit| } @@ -138,8 +138,8 @@ FILE: anonymousObjectInInvalidPosition.kt } private [EXPECT_ACTUAL_MATCHING] get(): - public? final? [COMPILER_REQUIRED_ANNOTATIONS] interface A<[COMPILER_REQUIRED_ANNOTATIONS] T> : R|kotlin/Any| { - public? final? [COMPILER_REQUIRED_ANNOTATIONS] fun x(): R|kotlin/Unit| + public? final? [RAW_FIR] interface A<[RAW_FIR] T> : R|kotlin/Any| { + public? final? [RAW_FIR] fun x(): R|kotlin/Unit| } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functionWithParameter.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functionWithParameter.txt index 5ceb9db143b..e033da30add 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/functionWithParameter.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/functionWithParameter.txt @@ -31,25 +31,25 @@ FILE: functionWithParameter.kt TYPES: FILE: functionWithParameter.kt - public? final? [COMPILER_REQUIRED_ANNOTATIONS] interface I : R|kotlin/Any| { + public? final? [RAW_FIR] interface I : R|kotlin/Any| { } public? final? [TYPES] fun resolveMe([TYPES] param: R|I|): { LAZY_BLOCK } STATUS: FILE: functionWithParameter.kt - public? final? [COMPILER_REQUIRED_ANNOTATIONS] interface I : R|kotlin/Any| { + public? final? [RAW_FIR] interface I : R|kotlin/Any| { } public final [STATUS] fun resolveMe([STATUS] param: R|I|): { LAZY_BLOCK } ARGUMENTS_OF_ANNOTATIONS: FILE: functionWithParameter.kt - public? final? [COMPILER_REQUIRED_ANNOTATIONS] interface I : R|kotlin/Any| { + public? final? [RAW_FIR] interface I : R|kotlin/Any| { } public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe([ARGUMENTS_OF_ANNOTATIONS] param: R|I|): { LAZY_BLOCK } CONTRACTS: FILE: functionWithParameter.kt - public? final? [COMPILER_REQUIRED_ANNOTATIONS] interface I : R|kotlin/Any| { + public? final? [RAW_FIR] interface I : R|kotlin/Any| { } public final [CONTRACTS] fun resolveMe([CONTRACTS] param: R|I|): { ^resolveMe Unit# @@ -57,7 +57,7 @@ FILE: functionWithParameter.kt IMPLICIT_TYPES_BODY_RESOLVE: FILE: functionWithParameter.kt - public? final? [COMPILER_REQUIRED_ANNOTATIONS] interface I : R|kotlin/Any| { + public? final? [RAW_FIR] interface I : R|kotlin/Any| { } public final [IMPLICIT_TYPES_BODY_RESOLVE] fun resolveMe([IMPLICIT_TYPES_BODY_RESOLVE] param: R|I|): R|kotlin/Unit| { ^resolveMe Q|kotlin/Unit| @@ -65,7 +65,7 @@ FILE: functionWithParameter.kt ANNOTATIONS_ARGUMENTS_MAPPING: FILE: functionWithParameter.kt - public? final? [COMPILER_REQUIRED_ANNOTATIONS] interface I : R|kotlin/Any| { + public? final? [RAW_FIR] interface I : R|kotlin/Any| { } public final [ANNOTATIONS_ARGUMENTS_MAPPING] fun resolveMe([ANNOTATIONS_ARGUMENTS_MAPPING] param: R|I|): R|kotlin/Unit| { ^resolveMe Q|kotlin/Unit| @@ -73,7 +73,7 @@ FILE: functionWithParameter.kt EXPECT_ACTUAL_MATCHING: FILE: functionWithParameter.kt - public? final? [COMPILER_REQUIRED_ANNOTATIONS] interface I : R|kotlin/Any| { + public? final? [RAW_FIR] interface I : R|kotlin/Any| { } public final [EXPECT_ACTUAL_MATCHING] fun resolveMe([EXPECT_ACTUAL_MATCHING] param: R|I|): R|kotlin/Unit| { ^resolveMe Q|kotlin/Unit| @@ -81,7 +81,7 @@ FILE: functionWithParameter.kt BODY_RESOLVE: FILE: functionWithParameter.kt - public? final? [COMPILER_REQUIRED_ANNOTATIONS] interface I : R|kotlin/Any| { + public? final? [RAW_FIR] interface I : R|kotlin/Any| { } public final [BODY_RESOLVE] fun resolveMe([BODY_RESOLVE] param: R|I|): R|kotlin/Unit| { ^resolveMe Q|kotlin/Unit| diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionCallWithGenericResult.txt b/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionCallWithGenericResult.txt index 66ce6a11465..97f2b9b3553 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionCallWithGenericResult.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/functions/functionCallWithGenericResult.txt @@ -141,8 +141,8 @@ FILE: functionCallWithGenericResult.kt BODY_RESOLVE: FILE: functionCallWithGenericResult.kt - public? open [COMPILER_REQUIRED_ANNOTATIONS] class Foo<[COMPILER_REQUIRED_ANNOTATIONS] T : CharSequence> : R|kotlin/Any| { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=Foo] constructor<[COMPILER_REQUIRED_ANNOTATIONS] T : CharSequence>(): R|Foo| { + 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| { LAZY_super } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/lambdaAsSAMInterface.txt b/analysis/low-level-api-fir/testdata/lazyResolve/lambdaAsSAMInterface.txt index fd8dc5b3530..042f0815619 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/lambdaAsSAMInterface.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/lambdaAsSAMInterface.txt @@ -201,8 +201,8 @@ FILE: lambdaAsSAMInterface.kt BODY_RESOLVE: FILE: lambdaAsSAMInterface.kt - public? final? [COMPILER_REQUIRED_ANNOTATIONS] class Arg : R|kotlin/Any| { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=Arg] constructor(): R|foo/Arg| { + public? final? [RAW_FIR] class Arg : R|kotlin/Any| { + public? [RAW_FIR] [ContainingClassKey=Arg] constructor(): R|foo/Arg| { LAZY_super } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/superTypes.txt b/analysis/low-level-api-fir/testdata/lazyResolve/superTypes.txt index f2e0fdc02c1..1c31d88953e 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/superTypes.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/superTypes.txt @@ -85,8 +85,8 @@ FILE: superTypes.kt SUPER_TYPES: FILE: superTypes.kt - public? open [COMPILER_REQUIRED_ANNOTATIONS] class A : R|kotlin/Any| { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=A] constructor(): R|A| { + public? open [RAW_FIR] class A : R|kotlin/Any| { + public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/superTypesLoop.txt b/analysis/low-level-api-fir/testdata/lazyResolve/superTypesLoop.txt index cc55b1572f6..fde503bc384 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/superTypesLoop.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/superTypesLoop.txt @@ -115,20 +115,20 @@ FILE: superTypesLoop.kt } } - public? open [COMPILER_REQUIRED_ANNOTATIONS] class A : /B> { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=A] constructor(): R|A| { + public? open [RAW_FIR] class A : /B> { + public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } } - public? open [COMPILER_REQUIRED_ANNOTATIONS] class B : /C> { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=B] constructor(): R|B| { + public? open [RAW_FIR] class B : /C> { + public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| { LAZY_super } } - public? open [COMPILER_REQUIRED_ANNOTATIONS] class C : /A> { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=C] constructor(): R|C| { + public? open [RAW_FIR] class C : /A> { + public? [RAW_FIR] [ContainingClassKey=C] constructor(): R|C| { LAZY_super } @@ -142,14 +142,14 @@ FILE: superTypesLoop.kt } } - public? open [COMPILER_REQUIRED_ANNOTATIONS] class A : /B> { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=A] constructor(): R|A| { + public? open [RAW_FIR] class A : /B> { + public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } } - public? open [COMPILER_REQUIRED_ANNOTATIONS] class B : /C> { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=B] constructor(): R|B| { + public? open [RAW_FIR] class B : /C> { + public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| { LAZY_super } @@ -169,14 +169,14 @@ FILE: superTypesLoop.kt } } - public? open [COMPILER_REQUIRED_ANNOTATIONS] class A : /B> { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=A] constructor(): R|A| { + public? open [RAW_FIR] class A : /B> { + public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } } - public? open [COMPILER_REQUIRED_ANNOTATIONS] class B : /C> { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=B] constructor(): R|B| { + public? open [RAW_FIR] class B : /C> { + public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| { LAZY_super } @@ -196,14 +196,14 @@ FILE: superTypesLoop.kt } } - public? open [COMPILER_REQUIRED_ANNOTATIONS] class A : /B> { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=A] constructor(): R|A| { + public? open [RAW_FIR] class A : /B> { + public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } } - public? open [COMPILER_REQUIRED_ANNOTATIONS] class B : /C> { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=B] constructor(): R|B| { + public? open [RAW_FIR] class B : /C> { + public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| { LAZY_super } @@ -223,14 +223,14 @@ FILE: superTypesLoop.kt } } - public? open [COMPILER_REQUIRED_ANNOTATIONS] class A : /B> { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=A] constructor(): R|A| { + public? open [RAW_FIR] class A : /B> { + public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } } - public? open [COMPILER_REQUIRED_ANNOTATIONS] class B : /C> { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=B] constructor(): R|B| { + public? open [RAW_FIR] class B : /C> { + public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| { LAZY_super } @@ -250,14 +250,14 @@ FILE: superTypesLoop.kt } } - public? open [COMPILER_REQUIRED_ANNOTATIONS] class A : /B> { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=A] constructor(): R|A| { + public? open [RAW_FIR] class A : /B> { + public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } } - public? open [COMPILER_REQUIRED_ANNOTATIONS] class B : /C> { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=B] constructor(): R|B| { + public? open [RAW_FIR] class B : /C> { + public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| { LAZY_super } @@ -277,14 +277,14 @@ FILE: superTypesLoop.kt } } - public? open [COMPILER_REQUIRED_ANNOTATIONS] class A : /B> { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=A] constructor(): R|A| { + public? open [RAW_FIR] class A : /B> { + public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } } - public? open [COMPILER_REQUIRED_ANNOTATIONS] class B : /C> { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=B] constructor(): R|B| { + public? open [RAW_FIR] class B : /C> { + public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| { LAZY_super } @@ -304,14 +304,14 @@ FILE: superTypesLoop.kt } } - public? open [COMPILER_REQUIRED_ANNOTATIONS] class A : /B> { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=A] constructor(): R|A| { + public? open [RAW_FIR] class A : /B> { + public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } } - public? open [COMPILER_REQUIRED_ANNOTATIONS] class B : /C> { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=B] constructor(): R|B| { + public? open [RAW_FIR] class B : /C> { + public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| { LAZY_super } @@ -331,14 +331,14 @@ FILE: superTypesLoop.kt } } - public? open [COMPILER_REQUIRED_ANNOTATIONS] class A : /B> { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=A] constructor(): R|A| { + public? open [RAW_FIR] class A : /B> { + public? [RAW_FIR] [ContainingClassKey=A] constructor(): R|A| { LAZY_super } } - public? open [COMPILER_REQUIRED_ANNOTATIONS] class B : /C> { - public? [COMPILER_REQUIRED_ANNOTATIONS] [ContainingClassKey=B] constructor(): R|B| { + public? open [RAW_FIR] class B : /C> { + public? [RAW_FIR] [ContainingClassKey=B] constructor(): R|B| { LAZY_super } diff --git a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterBounds.txt b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterBounds.txt index a42e4d3e3dc..d8fcb85a887 100644 --- a/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterBounds.txt +++ b/analysis/low-level-api-fir/testdata/lazyResolve/typeParameterBounds.txt @@ -1,3 +1,4 @@ + RAW_FIR: FILE: typeParameterBounds.kt public? final? [RAW_FIR] fun resolveMe([RAW_FIR] foo: Foo): R|kotlin/Unit| { LAZY_BLOCK } @@ -46,7 +47,7 @@ FILE: typeParameterBounds.kt TYPES: FILE: typeParameterBounds.kt public? final? [TYPES] fun resolveMe([TYPES] foo: R|Foo|): R|kotlin/Unit| { LAZY_BLOCK } - public? final? [COMPILER_REQUIRED_ANNOTATIONS] interface Foo : R|kotlin/Any| { + public? final? [RAW_FIR] interface Foo : R|kotlin/Any| { } public? final? [RAW_FIR] interface Bar<[RAW_FIR] T : Foo> : R|kotlin/Any| { } @@ -55,7 +56,7 @@ FILE: typeParameterBounds.kt STATUS: FILE: typeParameterBounds.kt public final [STATUS] fun resolveMe([STATUS] foo: R|Foo|): R|kotlin/Unit| { LAZY_BLOCK } - public? final? [COMPILER_REQUIRED_ANNOTATIONS] interface Foo : R|kotlin/Any| { + public? final? [RAW_FIR] interface Foo : R|kotlin/Any| { } public? final? [RAW_FIR] interface Bar<[RAW_FIR] T : Foo> : R|kotlin/Any| { } @@ -64,7 +65,7 @@ FILE: typeParameterBounds.kt ARGUMENTS_OF_ANNOTATIONS: FILE: typeParameterBounds.kt public final [ARGUMENTS_OF_ANNOTATIONS] fun resolveMe([ARGUMENTS_OF_ANNOTATIONS] foo: R|Foo|): R|kotlin/Unit| { LAZY_BLOCK } - public? final? [COMPILER_REQUIRED_ANNOTATIONS] interface Foo : R|kotlin/Any| { + public? final? [RAW_FIR] interface Foo : R|kotlin/Any| { } public? final? [RAW_FIR] interface Bar<[RAW_FIR] T : Foo> : R|kotlin/Any| { } @@ -75,7 +76,7 @@ FILE: typeParameterBounds.kt public final [CONTRACTS] fun resolveMe([CONTRACTS] foo: R|Foo|): R|kotlin/Unit| { foo#.util#() } - public? final? [COMPILER_REQUIRED_ANNOTATIONS] interface Foo : R|kotlin/Any| { + public? final? [RAW_FIR] interface Foo : R|kotlin/Any| { } public? final? [RAW_FIR] interface Bar<[RAW_FIR] T : Foo> : R|kotlin/Any| { } @@ -86,7 +87,7 @@ FILE: typeParameterBounds.kt public final [IMPLICIT_TYPES_BODY_RESOLVE] fun resolveMe([IMPLICIT_TYPES_BODY_RESOLVE] foo: R|Foo|): R|kotlin/Unit| { foo#.util#() } - public? final? [COMPILER_REQUIRED_ANNOTATIONS] interface Foo : R|kotlin/Any| { + public? final? [RAW_FIR] interface Foo : R|kotlin/Any| { } public? final? [RAW_FIR] interface Bar<[RAW_FIR] T : Foo> : R|kotlin/Any| { } @@ -97,7 +98,7 @@ FILE: typeParameterBounds.kt public final [ANNOTATIONS_ARGUMENTS_MAPPING] fun resolveMe([ANNOTATIONS_ARGUMENTS_MAPPING] foo: R|Foo|): R|kotlin/Unit| { foo#.util#() } - public? final? [COMPILER_REQUIRED_ANNOTATIONS] interface Foo : R|kotlin/Any| { + public? final? [RAW_FIR] interface Foo : R|kotlin/Any| { } public? final? [RAW_FIR] interface Bar<[RAW_FIR] T : Foo> : R|kotlin/Any| { } @@ -108,7 +109,7 @@ FILE: typeParameterBounds.kt public final [EXPECT_ACTUAL_MATCHING] fun resolveMe([EXPECT_ACTUAL_MATCHING] foo: R|Foo|): R|kotlin/Unit| { foo#.util#() } - public? final? [COMPILER_REQUIRED_ANNOTATIONS] interface Foo : R|kotlin/Any| { + public? final? [RAW_FIR] interface Foo : R|kotlin/Any| { } public? final? [RAW_FIR] interface Bar<[RAW_FIR] T : Foo> : R|kotlin/Any| { } diff --git a/compiler/fir/analysis-tests/testData/resolve/annotations/kt55286.kt b/compiler/fir/analysis-tests/testData/resolve/annotations/kt55286.kt index 5f3da6fa594..1e6d8c52b2e 100644 --- a/compiler/fir/analysis-tests/testData/resolve/annotations/kt55286.kt +++ b/compiler/fir/analysis-tests/testData/resolve/annotations/kt55286.kt @@ -1,4 +1,3 @@ -// FIR_DISABLE_LAZY_RESOLVE_CHECKS // ISSUE: KT-55286 annotation class Deprecated diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirCallableSymbol.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirCallableSymbol.kt index c8b47cf02a7..8d0dc76aed9 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirCallableSymbol.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirCallableSymbol.kt @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.fir.symbols.impl import org.jetbrains.kotlin.config.ApiVersion -import org.jetbrains.kotlin.fir.FirAnnotationContainer import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.lazyResolveToPhase @@ -67,10 +66,17 @@ abstract class FirCallableSymbol : FirBasedSymbol get() = callableId.callableName fun getDeprecation(apiVersion: ApiVersion): DeprecationsPerUseSite? { + if (!canBeDeprecated()) return null lazyResolveToPhase(FirResolvePhase.STATUS) return fir.deprecationsProvider.getDeprecationsInfo(apiVersion) } + /** + * Checks if symbol can be deprecated by syntax + * @return `true` if symbol might have some deprecation status, or `false` if it's definitely not deprecated + */ + internal open fun canBeDeprecated(): Boolean = true + private fun ensureType(typeRef: FirTypeRef?) { when (typeRef) { null, is FirResolvedTypeRef -> {} diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirClassLikeSymbol.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirClassLikeSymbol.kt index fb78668e64a..b9021a10cfc 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirClassLikeSymbol.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirClassLikeSymbol.kt @@ -26,7 +26,8 @@ sealed class FirClassLikeSymbol( val name get() = classId.shortClassName - fun getDeprecation(apiVersion: ApiVersion): DeprecationsPerUseSite? { + fun getDeprecation(apiVersion: ApiVersion): DeprecationsPerUseSite? { + if (annotations.isEmpty()) return null lazyResolveToPhase(FirResolvePhase.COMPILER_REQUIRED_ANNOTATIONS) return fir.deprecationsProvider.getDeprecationsInfo(apiVersion) } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirFunctionSymbol.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirFunctionSymbol.kt index 39a9cf99446..e542882456e 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirFunctionSymbol.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirFunctionSymbol.kt @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir.symbols.impl import org.jetbrains.kotlin.fir.FirLabel import org.jetbrains.kotlin.fir.contracts.FirResolvedContractDescription import org.jetbrains.kotlin.fir.declarations.* +import org.jetbrains.kotlin.fir.declarations.utils.isLocal import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.references.toResolvedConstructorSymbol @@ -41,7 +42,12 @@ sealed class FirFunctionSymbol( open class FirNamedFunctionSymbol( callableId: CallableId, -) : FirFunctionSymbol(callableId) +) : FirFunctionSymbol(callableId) { + override fun canBeDeprecated(): Boolean { + if (isLocal || callableId.className == null) return annotations.isNotEmpty() + return true + } +} interface FirIntersectionCallableSymbol { val intersections: Collection> @@ -75,6 +81,10 @@ class FirConstructorSymbol( val delegatedConstructorCallIsSuper: Boolean get() = fir.delegatedConstructor?.isSuper ?: false + + override fun canBeDeprecated(): Boolean { + return annotations.isNotEmpty() + } } /** @@ -99,12 +109,20 @@ sealed class FirFunctionWithoutNameSymbol( class FirAnonymousFunctionSymbol : FirFunctionWithoutNameSymbol(Name.identifier("anonymous")) { val label: FirLabel? get() = fir.label + + override fun canBeDeprecated(): Boolean { + return annotations.isNotEmpty() + } } class FirPropertyAccessorSymbol : FirFunctionWithoutNameSymbol(Name.identifier("accessor")) { val isGetter: Boolean get() = fir.isGetter val isSetter: Boolean get() = fir.isSetter val propertySymbol get() = fir.propertySymbol + + override fun canBeDeprecated(): Boolean { + return propertySymbol.canBeDeprecated() + } } class FirErrorFunctionSymbol : FirFunctionWithoutNameSymbol(Name.identifier("error")) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirVariableSymbol.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirVariableSymbol.kt index 957bf7294d6..92d9c72fc53 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirVariableSymbol.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirVariableSymbol.kt @@ -61,6 +61,15 @@ open class FirPropertySymbol( val isVar: Boolean get() = fir.isVar + + override fun canBeDeprecated(): Boolean { + if (isLocal || callableId.className == null) { + return annotations.isNotEmpty() + || getterSymbol?.annotations?.isNotEmpty() == true + || setterSymbol?.annotations?.isNotEmpty() == true + } + return true + } } class FirIntersectionOverridePropertySymbol( @@ -116,6 +125,9 @@ class FirValueParameterSymbol(name: Name) : FirVariableSymbol val containingFunctionSymbol: FirFunctionSymbol<*> get() = fir.containingFunctionSymbol + override fun canBeDeprecated(): Boolean { + return false + } } class FirErrorPropertySymbol( diff --git a/plugins/allopen/testData/diagnostics/kt54260.kt b/plugins/allopen/testData/diagnostics/kt54260.kt index 1feefb18bef..d24058ef424 100644 --- a/plugins/allopen/testData/diagnostics/kt54260.kt +++ b/plugins/allopen/testData/diagnostics/kt54260.kt @@ -1,5 +1,4 @@ // FIR_IDENTICAL -// FIR_DISABLE_LAZY_RESOLVE_CHECKS // WITH_STDLIB annotation class AllOpen diff --git a/plugins/fir-plugin-prototype/testData/box/classWithCompanionObject.kt b/plugins/fir-plugin-prototype/testData/box/classWithCompanionObject.kt index c6adf39aee8..c31fc30fc20 100644 --- a/plugins/fir-plugin-prototype/testData/box/classWithCompanionObject.kt +++ b/plugins/fir-plugin-prototype/testData/box/classWithCompanionObject.kt @@ -1,4 +1,3 @@ -//FIR_DISABLE_LAZY_RESOLVE_CHECKS import org.jetbrains.kotlin.fir.plugin.CompanionWithFoo @CompanionWithFoo diff --git a/plugins/fir-plugin-prototype/testData/box/classWithGeneratedMembersAndNestedClass.kt b/plugins/fir-plugin-prototype/testData/box/classWithGeneratedMembersAndNestedClass.kt index 7087f7e574e..e1cb2a80bce 100644 --- a/plugins/fir-plugin-prototype/testData/box/classWithGeneratedMembersAndNestedClass.kt +++ b/plugins/fir-plugin-prototype/testData/box/classWithGeneratedMembersAndNestedClass.kt @@ -1,4 +1,3 @@ -// FIR_DISABLE_LAZY_RESOLVE_CHECKS import org.jetbrains.kotlin.fir.plugin.NestedClassAndMaterializeMember diff --git a/plugins/fir-plugin-prototype/testData/box/generatedClassWithMembersAndNestedClasses.kt b/plugins/fir-plugin-prototype/testData/box/generatedClassWithMembersAndNestedClasses.kt index 5925fc8caca..c9e25b86abc 100644 --- a/plugins/fir-plugin-prototype/testData/box/generatedClassWithMembersAndNestedClasses.kt +++ b/plugins/fir-plugin-prototype/testData/box/generatedClassWithMembersAndNestedClasses.kt @@ -1,4 +1,3 @@ -// FIR_DISABLE_LAZY_RESOLVE_CHECKS // DUMP_IR package bar diff --git a/plugins/fir-plugin-prototype/testData/box/newSupertype.kt b/plugins/fir-plugin-prototype/testData/box/newSupertype.kt index fc591eb4d17..83d72c30509 100644 --- a/plugins/fir-plugin-prototype/testData/box/newSupertype.kt +++ b/plugins/fir-plugin-prototype/testData/box/newSupertype.kt @@ -1,4 +1,3 @@ -// FIR_DISABLE_LAZY_RESOLVE_CHECKS package foo diff --git a/plugins/fir-plugin-prototype/testData/box/serializer.kt b/plugins/fir-plugin-prototype/testData/box/serializer.kt index 35afd66833b..ca5c4691b1f 100644 --- a/plugins/fir-plugin-prototype/testData/box/serializer.kt +++ b/plugins/fir-plugin-prototype/testData/box/serializer.kt @@ -1,4 +1,3 @@ -// FIR_DISABLE_LAZY_RESOLVE_CHECKS import org.jetbrains.kotlin.fir.plugin.CoreSerializer import org.jetbrains.kotlin.fir.plugin.MySerializable diff --git a/plugins/fir-plugin-prototype/testData/box/topLevelCallables.kt b/plugins/fir-plugin-prototype/testData/box/topLevelCallables.kt index 618faa4ec20..4c2ec3e59f3 100644 --- a/plugins/fir-plugin-prototype/testData/box/topLevelCallables.kt +++ b/plugins/fir-plugin-prototype/testData/box/topLevelCallables.kt @@ -1,4 +1,3 @@ -// FIR_DISABLE_LAZY_RESOLVE_CHECKS package foo import org.jetbrains.kotlin.fir.plugin.DummyFunction diff --git a/plugins/fir-plugin-prototype/testData/diagnostics/memberGen/classWithCompanionObject.kt b/plugins/fir-plugin-prototype/testData/diagnostics/memberGen/classWithCompanionObject.kt index a1a90d60008..87c7325bfff 100644 --- a/plugins/fir-plugin-prototype/testData/diagnostics/memberGen/classWithCompanionObject.kt +++ b/plugins/fir-plugin-prototype/testData/diagnostics/memberGen/classWithCompanionObject.kt @@ -1,4 +1,3 @@ -// FIR_DISABLE_LAZY_RESOLVE_CHECKS import org.jetbrains.kotlin.fir.plugin.CompanionWithFoo @CompanionWithFoo diff --git a/plugins/fir-plugin-prototype/testData/diagnostics/memberGen/classWithGeneratedMembersAndNestedClass.kt b/plugins/fir-plugin-prototype/testData/diagnostics/memberGen/classWithGeneratedMembersAndNestedClass.kt index 30d9df3fef4..19f5680b3aa 100644 --- a/plugins/fir-plugin-prototype/testData/diagnostics/memberGen/classWithGeneratedMembersAndNestedClass.kt +++ b/plugins/fir-plugin-prototype/testData/diagnostics/memberGen/classWithGeneratedMembersAndNestedClass.kt @@ -1,4 +1,3 @@ -// FIR_DISABLE_LAZY_RESOLVE_CHECKS import org.jetbrains.kotlin.fir.plugin.NestedClassAndMaterializeMember @NestedClassAndMaterializeMember diff --git a/plugins/fir-plugin-prototype/testData/diagnostics/memberGen/generatedClassWithMembersAndNestedClasses.kt b/plugins/fir-plugin-prototype/testData/diagnostics/memberGen/generatedClassWithMembersAndNestedClasses.kt index 22843a49c1c..a0e3e587091 100644 --- a/plugins/fir-plugin-prototype/testData/diagnostics/memberGen/generatedClassWithMembersAndNestedClasses.kt +++ b/plugins/fir-plugin-prototype/testData/diagnostics/memberGen/generatedClassWithMembersAndNestedClasses.kt @@ -1,4 +1,3 @@ -// FIR_DISABLE_LAZY_RESOLVE_CHECKS package bar import foo.AllOpenGenerated diff --git a/plugins/fir-plugin-prototype/testData/diagnostics/memberGen/topLevelCallables.kt b/plugins/fir-plugin-prototype/testData/diagnostics/memberGen/topLevelCallables.kt index 96004686f87..2569676e569 100644 --- a/plugins/fir-plugin-prototype/testData/diagnostics/memberGen/topLevelCallables.kt +++ b/plugins/fir-plugin-prototype/testData/diagnostics/memberGen/topLevelCallables.kt @@ -1,4 +1,3 @@ -// FIR_DISABLE_LAZY_RESOLVE_CHECKS package foo import org.jetbrains.kotlin.fir.plugin.DummyFunction diff --git a/plugins/fir-plugin-prototype/testData/diagnostics/status/simpleAnnotation.kt b/plugins/fir-plugin-prototype/testData/diagnostics/status/simpleAnnotation.kt index dd364245289..5599716ed02 100644 --- a/plugins/fir-plugin-prototype/testData/diagnostics/status/simpleAnnotation.kt +++ b/plugins/fir-plugin-prototype/testData/diagnostics/status/simpleAnnotation.kt @@ -1,4 +1,3 @@ -// FIR_DISABLE_LAZY_RESOLVE_CHECKS import org.jetbrains.kotlin.fir.plugin.AllOpen @AllOpen diff --git a/plugins/fir-plugin-prototype/testData/diagnostics/status/visibilityTransformation.kt b/plugins/fir-plugin-prototype/testData/diagnostics/status/visibilityTransformation.kt index 476a9064c6c..69745b43a92 100644 --- a/plugins/fir-plugin-prototype/testData/diagnostics/status/visibilityTransformation.kt +++ b/plugins/fir-plugin-prototype/testData/diagnostics/status/visibilityTransformation.kt @@ -1,4 +1,3 @@ -// FIR_DISABLE_LAZY_RESOLVE_CHECKS import org.jetbrains.kotlin.fir.plugin.AllPublic import org.jetbrains.kotlin.fir.plugin.Visibility diff --git a/plugins/fir-plugin-prototype/testData/diagnostics/supertypes/simple.kt b/plugins/fir-plugin-prototype/testData/diagnostics/supertypes/simple.kt index 40de09d21f4..b589c86b29c 100644 --- a/plugins/fir-plugin-prototype/testData/diagnostics/supertypes/simple.kt +++ b/plugins/fir-plugin-prototype/testData/diagnostics/supertypes/simple.kt @@ -1,4 +1,3 @@ -// FIR_DISABLE_LAZY_RESOLVE_CHECKS package foo import org.jetbrains.kotlin.fir.plugin.MyInterfaceSupertype diff --git a/plugins/fir-plugin-prototype/testData/diagnostics/supertypes/supertypeWithArgument.kt b/plugins/fir-plugin-prototype/testData/diagnostics/supertypes/supertypeWithArgument.kt index 6e5a53546d1..1899d2665ca 100644 --- a/plugins/fir-plugin-prototype/testData/diagnostics/supertypes/supertypeWithArgument.kt +++ b/plugins/fir-plugin-prototype/testData/diagnostics/supertypes/supertypeWithArgument.kt @@ -1,4 +1,3 @@ -// FIR_DISABLE_LAZY_RESOLVE_CHECKS package foo import org.jetbrains.kotlin.fir.plugin.SupertypeWithTypeArgument diff --git a/plugins/noarg/testData/diagnostics/innerClass.fir.kt b/plugins/noarg/testData/diagnostics/innerClass.fir.kt index 7e27b0869b9..ad5bc3248d4 100644 --- a/plugins/noarg/testData/diagnostics/innerClass.fir.kt +++ b/plugins/noarg/testData/diagnostics/innerClass.fir.kt @@ -1,4 +1,3 @@ -// FIR_DISABLE_LAZY_RESOLVE_CHECKS annotation class NoArg class Outer { diff --git a/plugins/noarg/testData/diagnostics/innerClass.kt b/plugins/noarg/testData/diagnostics/innerClass.kt index 94408b10c83..f7bbfb9d26c 100644 --- a/plugins/noarg/testData/diagnostics/innerClass.kt +++ b/plugins/noarg/testData/diagnostics/innerClass.kt @@ -1,4 +1,3 @@ -// FIR_DISABLE_LAZY_RESOLVE_CHECKS annotation class NoArg class Outer { diff --git a/plugins/noarg/testData/diagnostics/noNoargCtorInSuperclass.kt b/plugins/noarg/testData/diagnostics/noNoargCtorInSuperclass.kt index c76245ebae9..aa164068e50 100644 --- a/plugins/noarg/testData/diagnostics/noNoargCtorInSuperclass.kt +++ b/plugins/noarg/testData/diagnostics/noNoargCtorInSuperclass.kt @@ -1,5 +1,4 @@ // FIR_IDENTICAL -// FIR_DISABLE_LAZY_RESOLVE_CHECKS annotation class NoArg open class Base(val s: String)