[Analysis API] KtPsiTypeProvider: drop asPsiTypeElement method
This was an implementation detail of SLC. In the case, if we want to have proper parents for type annotations in light classes, we have to properly implement `PsiTypeElement` for required declarations. ^KT-66603 ^KT-56870
This commit is contained in:
committed by
Space Team
parent
2fbde7a85c
commit
e1bf85f790
+9
-59
@@ -7,21 +7,11 @@ package org.jetbrains.kotlin.analysis.api.components
|
||||
|
||||
import com.intellij.psi.PsiElement
|
||||
import com.intellij.psi.PsiType
|
||||
import com.intellij.psi.PsiTypeElement
|
||||
import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion
|
||||
import org.jetbrains.kotlin.analysis.api.types.KtType
|
||||
import org.jetbrains.kotlin.analysis.api.types.KtTypeMappingMode
|
||||
|
||||
public abstract class KtPsiTypeProvider : KtAnalysisSessionComponent() {
|
||||
public abstract fun asPsiTypeElement(
|
||||
type: KtType,
|
||||
useSitePosition: PsiElement,
|
||||
mode: KtTypeMappingMode,
|
||||
isAnnotationMethod: Boolean,
|
||||
suppressWildcards: Boolean?,
|
||||
allowErrorTypes: Boolean,
|
||||
): PsiTypeElement?
|
||||
|
||||
public abstract fun asPsiType(
|
||||
type: KtType,
|
||||
useSitePosition: PsiElement,
|
||||
@@ -34,58 +24,11 @@ public abstract class KtPsiTypeProvider : KtAnalysisSessionComponent() {
|
||||
|
||||
public abstract fun asKtType(
|
||||
psiType: PsiType,
|
||||
useSitePosition: PsiElement
|
||||
useSitePosition: PsiElement,
|
||||
): KtType?
|
||||
}
|
||||
|
||||
public interface KtPsiTypeProviderMixIn : KtAnalysisSessionMixIn {
|
||||
/**
|
||||
* Converts the given [KtType] to [PsiTypeElement] under [useSitePosition] context.
|
||||
*
|
||||
* [useSitePosition] is used as the parent of the resulting [PsiTypeElement],
|
||||
* which is in turn used to resolve [PsiTypeElement].
|
||||
*
|
||||
* [useSitePosition] is also used to determine if the given [KtType] needs to be approximated.
|
||||
* For example, if the given type is local yet available in the same scope of use site, we can
|
||||
* still use such local type. Otherwise, e.g., exposed to public as a return type, the resulting
|
||||
* type will be approximated accordingly.
|
||||
*
|
||||
* If [allowErrorTypes] set to false then method returns `null` if the conversion encounters any
|
||||
* erroneous cases, e.g., errors in type arguments.
|
||||
* A client can handle such case in its own way. For instance,
|
||||
* * UAST will return `UastErrorType` as a default error type.
|
||||
*
|
||||
* If [allowErrorTypes] set to true then erroneous types will be replaced with `error.NonExistentClass` type.
|
||||
*
|
||||
* [suppressWildcards] indicates whether wild cards in type arguments need to be suppressed or not,
|
||||
* e.g., according to the annotation on the containing declarations.
|
||||
* `true` means they should be suppressed;
|
||||
* `false` means they should appear;
|
||||
* `null` is no-op by default, i.e., their suppression/appearance is determined by type annotations.
|
||||
*
|
||||
* Note: [PsiTypeElement] is JVM conception, so this method will return `null` for non-JVM platforms.
|
||||
*
|
||||
* @return [PsiTypeElement] without type annotations if mapping is successful
|
||||
*
|
||||
* @see asPsiType
|
||||
*/
|
||||
public fun KtType.asPsiTypeElement(
|
||||
useSitePosition: PsiElement,
|
||||
allowErrorTypes: Boolean,
|
||||
mode: KtTypeMappingMode = KtTypeMappingMode.DEFAULT,
|
||||
isAnnotationMethod: Boolean = false,
|
||||
suppressWildcards: Boolean? = null,
|
||||
): PsiTypeElement? = withValidityAssertion {
|
||||
analysisSession.psiTypeProvider.asPsiTypeElement(
|
||||
type = this,
|
||||
useSitePosition = useSitePosition,
|
||||
mode = mode,
|
||||
isAnnotationMethod = isAnnotationMethod,
|
||||
suppressWildcards = suppressWildcards,
|
||||
allowErrorTypes = allowErrorTypes,
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts the given [KtType] to [PsiType] under [useSitePosition] context.
|
||||
*
|
||||
@@ -98,7 +41,14 @@ public interface KtPsiTypeProviderMixIn : KtAnalysisSessionMixIn {
|
||||
* we can still use such a local type.
|
||||
* Otherwise, e.g., exposed to public as a return type, the resulting type will be approximated accordingly.
|
||||
*
|
||||
* @param allowErrorTypes if **false** the result will be null in the case of an error type inside the [type][this]
|
||||
* @param allowErrorTypes if **false** the result will be null in the case of an error type inside the [type][this].
|
||||
* Erroneous types will be replaced with `error.NonExistentClass` type.
|
||||
*
|
||||
* @param suppressWildcards indicates whether wild cards in type arguments need to be suppressed or not,
|
||||
* e.g., according to the annotation on the containing declarations.
|
||||
* - `true` means they should be suppressed.
|
||||
* - `false` means they should appear.
|
||||
* - `null` is no-op by default, i.e., their suppression/appearance is determined by type annotations.
|
||||
*
|
||||
* @param preserveAnnotations if **true** the result [PsiType] will have converted annotations from the original [type][this]
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user