From ae02d78aff4709696352ad18b4109344e951ab3b Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Mon, 4 Sep 2023 13:28:29 +0200 Subject: [PATCH] [PSI] ClassIdCalculator: cleanup code ^KTIJ-26848 ^KTIJ-26896 --- .../jetbrains/kotlin/psi/psiUtil/ClassIdCalculator.kt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/psiUtil/ClassIdCalculator.kt b/compiler/psi/src/org/jetbrains/kotlin/psi/psiUtil/ClassIdCalculator.kt index c5bf6e3703f..97629458486 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/psiUtil/ClassIdCalculator.kt +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/psiUtil/ClassIdCalculator.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * 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. */ @@ -36,11 +36,14 @@ internal object ClassIdCalculator { } } } + if (ktFile == null) return null - val relativeClassName = FqName.fromSegments(containingClasses.reversed().map { containingClass -> - containingClass.name ?: SpecialNames.NO_NAME_PROVIDED.asString() - } + val relativeClassName = FqName.fromSegments( + containingClasses.asReversed().map { containingClass -> + containingClass.name ?: SpecialNames.NO_NAME_PROVIDED.asString() + } ) + return ClassId(ktFile.packageFqName, relativeClassName, /*local=*/false) } } \ No newline at end of file