From 132467ae1e23b31845567a44f6fcf372044f5e44 Mon Sep 17 00:00:00 2001 From: Roman Golyshev Date: Wed, 15 Nov 2023 17:34:24 +0100 Subject: [PATCH] KT-62675 [AA] Simplify `ElementToShorten` hierarchy Clearly separate `ShortenKDocQualifier` from it, it does not belong there for now --- .../api/fir/components/KtFirReferenceShortener.kt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirReferenceShortener.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirReferenceShortener.kt index 78a03daeb16..3ebb18b3138 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirReferenceShortener.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirReferenceShortener.kt @@ -398,11 +398,13 @@ private class ShortenQualifier( override val importAllInParent: Boolean = false ) : ElementToShorten() +/** + * N.B. Does not subclass [ElementToShorten] because currently + * there's no reason to do that. + */ private class ShortenKDocQualifier( val element: KDocName, - override val nameToImport: FqName? = null, - override val importAllInParent: Boolean = false -) : ElementToShorten() +) private class CollectingVisitor(private val collector: ElementsToShortenCollector) : FirVisitorVoid() { private val visitedProperty = mutableSetOf() @@ -1258,9 +1260,6 @@ private class ElementsToShortenCollector( is ShortenQualifier -> addElementToShorten( elementInfoToShorten.element, elementInfoToShorten.shortenedRef, nameToImport, isImportWithStar ) - is ShortenKDocQualifier -> addElementToShorten( - elementInfoToShorten.element, shortenedRef = null, nameToImport, isImportWithStar - ) } }