From 927d24468292d3ddeb6bd41dadf66c220cbbc3d5 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Mon, 16 Jan 2023 15:51:27 +0100 Subject: [PATCH] [SLC] cleanup code --- .../light/classes/symbol/classes/SymbolLightClassBase.kt | 3 +-- .../symbol/classes/SymbolLightClassForClassLike.kt | 4 +++- .../symbol/classes/SymbolLightClassForEnumEntry.kt | 9 +++++---- .../kotlin/light/classes/symbol/lightClassUtils.kt | 2 +- .../classes/symbol/methods/SymbolLightAccessorMethod.kt | 4 ++-- .../SymbolLightSuspendContinuationParameter.kt | 4 +++- .../kotlin/light/classes/symbol/symbolLightUtils.kt | 2 -- 7 files changed, 15 insertions(+), 13 deletions(-) diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassBase.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassBase.kt index 3f57518cb93..585c55af487 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassBase.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassBase.kt @@ -19,10 +19,9 @@ import com.intellij.psi.util.CachedValueProvider import com.intellij.psi.util.PsiUtil import org.jetbrains.annotations.NonNls import org.jetbrains.kotlin.analysis.api.KtAnalysisSession -import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol -import org.jetbrains.kotlin.analysis.api.symbols.receiverType import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionLikeSymbol +import org.jetbrains.kotlin.analysis.api.symbols.receiverType import org.jetbrains.kotlin.analysis.project.structure.KtModule import org.jetbrains.kotlin.analysis.providers.createProjectWideOutOfBlockModificationTracker import org.jetbrains.kotlin.analysis.utils.errors.buildErrorWithAttachment diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForClassLike.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForClassLike.kt index 781a10d0337..9c5ae0c0dbf 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForClassLike.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForClassLike.kt @@ -14,9 +14,11 @@ import com.intellij.psi.stubs.IStubElementType import com.intellij.psi.stubs.StubElement import org.jetbrains.annotations.NonNls import org.jetbrains.kotlin.analysis.api.KtAnalysisSession -import org.jetbrains.kotlin.analysis.api.symbols.* +import org.jetbrains.kotlin.analysis.api.symbols.KtClassKind +import org.jetbrains.kotlin.analysis.api.symbols.KtClassOrObjectSymbol import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolKind import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer +import org.jetbrains.kotlin.analysis.api.symbols.sourcePsiSafe import org.jetbrains.kotlin.analysis.project.structure.KtModule import org.jetbrains.kotlin.asJava.classes.getParentForLocalDeclaration import org.jetbrains.kotlin.asJava.classes.lazyPub diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForEnumEntry.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForEnumEntry.kt index 9b1746d1e46..b5b55f3c5a6 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForEnumEntry.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForEnumEntry.kt @@ -73,10 +73,11 @@ internal class SymbolLightClassForEnumEntry( private val _extendsList: PsiReferenceList? by lazyPub { val mappedType = enumConstant.withEnumEntrySymbol { symbol -> symbol.returnType.asPsiType( - this@SymbolLightClassForEnumEntry, - allowErrorTypes = true, - KtTypeMappingMode.SUPER_TYPE - ) as? PsiClassType} ?: return@lazyPub null + this@SymbolLightClassForEnumEntry, + allowErrorTypes = true, + KtTypeMappingMode.SUPER_TYPE + ) as? PsiClassType + } ?: return@lazyPub null KotlinSuperTypeListBuilder( kotlinOrigin = enumClass.kotlinOrigin?.getSuperTypeList(), diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/lightClassUtils.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/lightClassUtils.kt index 8b07815923b..c57a551d761 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/lightClassUtils.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/lightClassUtils.kt @@ -12,8 +12,8 @@ import org.jetbrains.kotlin.analysis.api.KtAllowAnalysisOnEdt import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.analyze import org.jetbrains.kotlin.analysis.api.lifetime.allowAnalysisOnEdt -import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.analysis.project.structure.KtModule +import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.psi.KtElement internal fun PsiElement.nonExistentType(): PsiType = diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightAccessorMethod.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightAccessorMethod.kt index 0ef367b11ff..b8c9cd1a68e 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightAccessorMethod.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/methods/SymbolLightAccessorMethod.kt @@ -234,8 +234,8 @@ internal class SymbolLightAccessorMethod private constructor( propertySymbol().returnType.asPsiType( this@SymbolLightAccessorMethod, allowErrorTypes = true, - KtTypeMappingMode.RETURN_TYPE, - containingClass.isAnnotationType, + KtTypeMappingMode.RETURN_TYPE, + containingClass.isAnnotationType, ) } ?: nonExistentType() } diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightSuspendContinuationParameter.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightSuspendContinuationParameter.kt index 771674f4ad0..f196a60d7e5 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightSuspendContinuationParameter.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightSuspendContinuationParameter.kt @@ -41,7 +41,9 @@ internal class SymbolLightSuspendContinuationParameter( private val _type by lazyPub { withFunctionSymbol { functionSymbol -> - buildClassType(StandardClassIds.Continuation) { argument(functionSymbol.returnType) }.asPsiType(this, allowErrorTypes = true) ?: nonExistentType() + buildClassType(StandardClassIds.Continuation) { argument(functionSymbol.returnType) } + .asPsiType(this, allowErrorTypes = true) + ?: nonExistentType() } } diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/symbolLightUtils.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/symbolLightUtils.kt index 0762a0cc3ff..29f54f6c65b 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/symbolLightUtils.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/symbolLightUtils.kt @@ -22,7 +22,6 @@ import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.types.* import org.jetbrains.kotlin.analysis.project.structure.KtModule import org.jetbrains.kotlin.asJava.elements.KtLightElement -import org.jetbrains.kotlin.asJava.elements.KtLightElementBase import org.jetbrains.kotlin.asJava.elements.KtLightMember import org.jetbrains.kotlin.asJava.elements.psiType import org.jetbrains.kotlin.descriptors.Modality @@ -37,7 +36,6 @@ import java.util.* internal fun L.invalidAccess(): Nothing = error("Cls delegate shouldn't be accessed for symbol light classes! Qualified name: ${javaClass.name}") - internal fun KtAnalysisSession.mapType( type: KtType, psiContext: PsiElement,