From 871bfab6da86d1b441d78d04bdc1e466b4132bf3 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Mon, 23 Jan 2023 14:13:56 +0100 Subject: [PATCH] [SLC] replace SymbolAnnotationParameterList with SymbolLazyAnnotationParameterList ^KT-56046 --- .../SymbolAnnotationParameterList.kt | 31 ------------------- .../SymbolLazyAnnotationParameterList.kt | 2 +- .../SymbolLightAnnotationForAnnotationCall.kt | 2 +- .../SymbolLightSimpleAnnotation.kt | 2 +- 4 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/SymbolAnnotationParameterList.kt diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/SymbolAnnotationParameterList.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/SymbolAnnotationParameterList.kt deleted file mode 100644 index 455b5d48d3f..00000000000 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/SymbolAnnotationParameterList.kt +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.light.classes.symbol.annotations - -import com.intellij.psi.PsiAnnotationParameterList -import com.intellij.psi.PsiNameValuePair -import org.jetbrains.kotlin.analysis.api.annotations.KtNamedAnnotationValue -import org.jetbrains.kotlin.asJava.classes.lazyPub -import org.jetbrains.kotlin.asJava.elements.KtLightElementBase -import org.jetbrains.kotlin.psi.KtElement - -internal class SymbolAnnotationParameterList( - parent: SymbolLightAbstractAnnotation, - private val arguments: List, -) : KtLightElementBase(parent), PsiAnnotationParameterList { - - private val _attributes: Array by lazyPub { - arguments.map { - SymbolNameValuePairForAnnotationArgument(it, this) - }.toTypedArray() - } - - override fun getAttributes(): Array = _attributes - - override val kotlinOrigin: KtElement? get() = null - - //TODO: EQ GHC EQIV -} diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/SymbolLazyAnnotationParameterList.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/SymbolLazyAnnotationParameterList.kt index 0724c1a5971..59d738f4b19 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/SymbolLazyAnnotationParameterList.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/SymbolLazyAnnotationParameterList.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.asJava.elements.KtLightElementBase import org.jetbrains.kotlin.psi.KtElement internal class SymbolLazyAnnotationParameterList( - parent: SymbolLightLazyAnnotation, + parent: SymbolLightAbstractAnnotation, private val lazyArguments: Lazy>, ) : KtLightElementBase(parent), PsiAnnotationParameterList { diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/SymbolLightAnnotationForAnnotationCall.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/SymbolLightAnnotationForAnnotationCall.kt index 2c241721b44..9d333f0e0b3 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/SymbolLightAnnotationForAnnotationCall.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/SymbolLightAnnotationForAnnotationCall.kt @@ -24,7 +24,7 @@ internal class SymbolLightAnnotationForAnnotationCall( PsiImplUtil.findDeclaredAttributeValue(this, attributeName) private val _parameterList: PsiAnnotationParameterList by lazyPub { - SymbolAnnotationParameterList(this, annotationCall.arguments) + SymbolLazyAnnotationParameterList(this, lazyOf(annotationCall.arguments)) } override fun getParameterList(): PsiAnnotationParameterList = _parameterList diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/SymbolLightSimpleAnnotation.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/SymbolLightSimpleAnnotation.kt index af12221e204..a79b03c2ec0 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/SymbolLightSimpleAnnotation.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/SymbolLightSimpleAnnotation.kt @@ -37,7 +37,7 @@ internal class SymbolLightSimpleAnnotation( PsiImplUtil.findDeclaredAttributeValue(this, attributeName) private val _parameterList: PsiAnnotationParameterList by lazyPub { - SymbolAnnotationParameterList(this, arguments) + SymbolLazyAnnotationParameterList(this, lazyOf(arguments)) } override fun getParameterList(): PsiAnnotationParameterList = _parameterList