From f32483000af081fa3a92e5887be8721c781a927c Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Mon, 2 Jan 2023 20:53:29 +0100 Subject: [PATCH] [AA FIR] KtFirAnnotationListForDeclaration: avoid resolve on creation --- .../api/fir/annotations/KtFirAnnotationListForDeclaration.kt | 2 +- .../lightClassByPsi/facades/jvmWildcardAnnotations.fir.java | 2 +- .../lightClassByPsi/jvmWildcardAnnotations.fir.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/annotations/KtFirAnnotationListForDeclaration.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/annotations/KtFirAnnotationListForDeclaration.kt index beb0706e181..cf065812cef 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/annotations/KtFirAnnotationListForDeclaration.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/annotations/KtFirAnnotationListForDeclaration.kt @@ -63,7 +63,7 @@ internal class KtFirAnnotationListForDeclaration private constructor( useSiteSession: FirSession, token: KtLifetimeToken, ): KtAnnotationsList { - return if (firSymbol.resolvedAnnotationsWithArguments.isEmpty()) { + return if (firSymbol.annotations.isEmpty()) { KtEmptyAnnotationsList(token) } else { KtFirAnnotationListForDeclaration(firSymbol, useSiteSession, token) diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.fir.java index b83877346f3..5e96e710ada 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/facades/jvmWildcardAnnotations.fir.java @@ -33,7 +33,7 @@ public final class JvmWildcardAnnotationsKt /* JvmWildcardAnnotationsKt*/ { public static final void deepOpen(@org.jetbrains.annotations.NotNull() Out>>);// deepOpen(Out>>) @org.jetbrains.annotations.NotNull() - public static final OutPair, Out>> falseTrueFalse();// falseTrueFalse() + public static final OutPair, Out>> falseTrueFalse();// falseTrueFalse() @org.jetbrains.annotations.NotNull() public static final OutPair>> combination();// combination() diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.fir.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.fir.java index f23a750e21e..9268ec72dbc 100644 --- a/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.fir.java +++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/jvmWildcardAnnotations.fir.java @@ -25,7 +25,7 @@ public final class Container /* Container*/ { public final void deepOpen(@org.jetbrains.annotations.NotNull() Out>>);// deepOpen(Out>>) @org.jetbrains.annotations.NotNull() - public final OutPair, Out>> falseTrueFalse();// falseTrueFalse() + public final OutPair, Out>> falseTrueFalse();// falseTrueFalse() @org.jetbrains.annotations.NotNull() public final OutPair>> combination();// combination()