[SLC] cleanup code

This commit is contained in:
Dmitrii Gridin
2023-01-16 15:51:27 +01:00
committed by Space Team
parent 6fb59cc19b
commit 927d244682
7 changed files with 15 additions and 13 deletions
@@ -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
@@ -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
@@ -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(),
@@ -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 =
@@ -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()
}
@@ -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()
}
}
@@ -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 : Any> 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,