From ec341526ad6d56210b7338c907bec306282f0955 Mon Sep 17 00:00:00 2001 From: Bart van Helvert Date: Tue, 18 Nov 2025 12:10:39 +0100 Subject: [PATCH] refactor [uast]: Add explicit types GitOrigin-RevId: d569747ed93662352b5f8af42897f35ff6b69919 --- .../uast/kotlin/KotlinAbstractUExpression.kt | 2 +- .../uast/kotlin/controlStructures/ElvisExpression.kt | 2 +- .../kotlin/controlStructures/KotlinUIfExpression.kt | 2 +- .../controlStructures/KotlinUSwitchExpression.kt | 2 +- .../uast/kotlin/declarations/AbstractKotlinUClass.kt | 4 ++-- .../kotlin/declarations/AbstractKotlinUVariable.kt | 4 ++-- .../kotlin/declarations/KotlinConstructorUMethod.kt | 2 +- .../uast/kotlin/declarations/KotlinScriptUClass.kt | 4 ++-- .../uast/kotlin/declarations/KotlinUAnnotation.kt | 2 +- .../uast/kotlin/declarations/KotlinUAnonymousClass.kt | 2 +- .../uast/kotlin/declarations/KotlinUClass.kt | 6 +++--- .../uast/kotlin/declarations/KotlinUEnumConstant.kt | 6 +++--- .../uast/kotlin/declarations/KotlinUField.kt | 6 +++--- .../uast/kotlin/declarations/KotlinULocalVariable.kt | 4 ++-- .../uast/kotlin/declarations/KotlinUMethod.kt | 6 +++--- .../uast/kotlin/declarations/KotlinUParameter.kt | 4 ++-- .../uast/kotlin/declarations/KotlinUVariable.kt | 4 ++-- .../KotlinDocUQualifiedReferenceExpression.kt | 2 +- .../expressions/KotlinLocalFunctionUVariable.kt | 2 +- .../KotlinStringTemplateUPolyadicExpression.kt | 2 +- .../expressions/KotlinStringULiteralExpression.kt | 2 +- .../KotlinStringUSimpleReferenceExpression.kt | 2 +- .../kotlin/expressions/KotlinUBinaryExpression.kt | 2 +- .../expressions/KotlinUBinaryExpressionWithType.kt | 2 +- .../KotlinUDestructuringDeclarationExpression.kt | 3 ++- .../expressions/KotlinUObjectLiteralExpression.kt | 5 +++-- .../kotlin/expressions/KotlinUPostfixExpression.kt | 2 +- .../kotlin/expressions/KotlinUPrefixExpression.kt | 2 +- .../KotlinUQualifiedReferenceExpression.kt | 2 +- .../expressions/KotlinUSafeQualifiedExpression.kt | 2 +- .../expressions/KotlinUSimpleReferenceExpression.kt | 4 ++-- .../uast/kotlin/expressions/KotlinUSuperExpression.kt | 3 ++- .../uast/kotlin/expressions/KotlinUThisExpression.kt | 3 ++- .../kotlin/expressions/KotlinUTypeCheckExpression.kt | 2 +- .../kotlin/expressions/KotlinUVarargExpression.kt | 2 +- .../jetbrains/uast/kotlin/internal/converterUtils.kt | 11 ++++++----- .../kinds/KotlinBinaryExpressionWithTypeKinds.kt | 4 ++-- .../uast/kotlin/kinds/KotlinBinaryOperators.kt | 6 +++--- .../uast/kotlin/kinds/KotlinPostfixOperators.kt | 2 +- .../kinds/KotlinQualifiedExpressionAccessTypes.kt | 2 +- .../uast/kotlin/kinds/KotlinSpecialExpressionKinds.kt | 10 +++++----- .../kotlin/psi/UastFakeLightNullabilityAnnotation.kt | 2 +- .../uast/kotlin/psi/UastKotlinPsiParameterBase.kt | 2 +- .../uast/kotlin/psi/UastKotlinPsiVariable.kt | 10 +++++----- .../org/jetbrains/uast/kotlin/psi/kotlinPsiUtils.kt | 2 +- .../src/org/jetbrains/uast/kotlin/KotlinConverter.kt | 2 +- .../jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt | 2 +- .../internal/CliKotlinUastResolveProviderService.kt | 4 ++-- 48 files changed, 85 insertions(+), 80 deletions(-) diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/KotlinAbstractUExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/KotlinAbstractUExpression.kt index f66f957020fe..28c8c6d17fce 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/KotlinAbstractUExpression.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/KotlinAbstractUExpression.kt @@ -16,7 +16,7 @@ abstract class KotlinAbstractUExpression( override val javaPsi: PsiElement? = null - override val psi + override val psi: PsiElement? get() = sourcePsi override val uAnnotations: List diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/ElvisExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/ElvisExpression.kt index 3917625993bd..a46c2e663cc2 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/ElvisExpression.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/ElvisExpression.kt @@ -123,7 +123,7 @@ class KotlinUElvisExpression( override val javaPsi: PsiElement? = null override val sourcePsi: PsiElement = elvisExpression override val psi: PsiElement = sourcePsi - override val kind = KotlinSpecialExpressionKinds.ELVIS + override val kind: UastSpecialExpressionKind = KotlinSpecialExpressionKinds.ELVIS override val uAnnotations: List get() { diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUIfExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUIfExpression.kt index 0c81d6ff091c..b7014f00c101 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUIfExpression.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUIfExpression.kt @@ -31,7 +31,7 @@ class KotlinUIfExpression( baseResolveProviderService.baseKotlinConverter.convertOrNull(sourcePsi.`else`, this) } - override val isTernary = false + override val isTernary: Boolean = false override val ifIdentifier: UIdentifier get() = UIdentifier(null, this) diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUSwitchExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUSwitchExpression.kt index 59fac6061715..b825ce3439ce 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUSwitchExpression.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/controlStructures/KotlinUSwitchExpression.kt @@ -33,7 +33,7 @@ class KotlinUSwitchExpression( } } - override fun asRenderString() = buildString { + override fun asRenderString(): String = buildString { val expr = expression?.let { "(" + it.asRenderString() + ") " } ?: "" appendLine("switch $expr {") appendLine(body.asRenderString()) diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/AbstractKotlinUClass.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/AbstractKotlinUClass.kt index d57fcca45018..320e63f91275 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/AbstractKotlinUClass.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/AbstractKotlinUClass.kt @@ -231,6 +231,6 @@ abstract class AbstractKotlinUClass( } } - override fun equals(other: Any?) = other is AbstractKotlinUClass && psi == other.psi - override fun hashCode() = psi.hashCode() + override fun equals(other: Any?): Boolean = other is AbstractKotlinUClass && psi == other.psi + override fun hashCode(): Int = psi.hashCode() } diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/AbstractKotlinUVariable.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/AbstractKotlinUVariable.kt index e48532fd3087..51c93416e7c3 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/AbstractKotlinUVariable.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/AbstractKotlinUVariable.kt @@ -126,7 +126,7 @@ abstract class AbstractKotlinUVariable( return KotlinUIdentifier({ nameIdentifier }, identifierSourcePsi, this) } - override fun equals(other: Any?) = other is AbstractKotlinUVariable && psi == other.psi + override fun equals(other: Any?): Boolean = other is AbstractKotlinUVariable && psi == other.psi class WrappedUAnnotation( psiAnnotation: PsiAnnotation, @@ -162,7 +162,7 @@ abstract class AbstractKotlinUVariable( private val expressionPart = UastLazyPart() override val name: String? = pair.name - override val psi = pair + override val psi: PsiNameValuePair = pair override val javaPsi: PsiElement = psi override val sourcePsi: PsiElement? = null override val uAnnotations: List = emptyList() diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinConstructorUMethod.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinConstructorUMethod.kt index 055c1504a790..4b9f81a5ede7 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinConstructorUMethod.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinConstructorUMethod.kt @@ -26,7 +26,7 @@ open class KotlinConstructorUMethod( private val uastBodyPart = UastLazyPart() private val uastAnchorPart = UastLazyPart() - override val javaPsi = psi + override val javaPsi: PsiMethod = psi internal val isPrimary: Boolean get() = sourcePsi is KtPrimaryConstructor || sourcePsi is KtClassOrObject diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinScriptUClass.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinScriptUClass.kt index a2a25ad0482f..2f4af918e7c2 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinScriptUClass.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinScriptUClass.kt @@ -37,7 +37,7 @@ class KotlinScriptUClass( override val sourcePsi: KtClassOrObject? = psi.kotlinOrigin - override val psi = unwrap(psi) + override val psi: KtLightClassForScript = unwrap(psi) override fun getSuperClass(): UClass? = super.getSuperClass() @@ -76,6 +76,6 @@ class KotlinScriptUClass( KotlinLazyUBlockExpression.create(initializers, this) } - override val javaPsi = psi + override val javaPsi: KtLightMethod = psi } } diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUAnnotation.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUAnnotation.kt index 4f62804e9906..56c2fa5a627e 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUAnnotation.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUAnnotation.kt @@ -89,7 +89,7 @@ class KotlinUAnnotation( baseResolveProviderService.convertToPsiAnnotation(annotationEntry) } - override fun annotationUseSiteTarget() = sourcePsi.useSiteTarget?.getAnnotationUseSiteTarget() + override fun annotationUseSiteTarget(): AnnotationUseSiteTarget? = sourcePsi.useSiteTarget?.getAnnotationUseSiteTarget() override fun resolve(): PsiClass? { return baseResolveProviderService.resolveToClass(sourcePsi, this) diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUAnonymousClass.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUAnonymousClass.kt index ee678fa50fdc..48aa7b90e443 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUAnonymousClass.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUAnonymousClass.kt @@ -26,7 +26,7 @@ class KotlinUAnonymousClass( override val sourcePsi: KtClassOrObject? = ktClass - override fun getSourceElement() = sourcePsi ?: this + override fun getSourceElement(): PsiElement = sourcePsi ?: this override fun getOriginalElement(): PsiElement? = super.getOriginalElement() diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUClass.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUClass.kt index 6f0874392af7..47509fa754fe 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUClass.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUClass.kt @@ -18,15 +18,15 @@ class KotlinUClass( ) : AbstractKotlinUClass(givenParent), PsiClass by psi { private val uastAnchorPart = UastLazyPart() - override val ktClass = psi.kotlinOrigin + override val ktClass: KtClassOrObject? = psi.kotlinOrigin override val javaPsi: KtLightClass = psi override val sourcePsi: KtClassOrObject? = ktClass - override val psi = unwrap(psi) + override val psi: PsiClass = unwrap(psi) - override fun getSourceElement() = sourcePsi ?: this + override fun getSourceElement(): PsiElement = sourcePsi ?: this override fun getOriginalElement(): PsiElement? = super.getOriginalElement() diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUEnumConstant.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUEnumConstant.kt index 7d70cb3c444d..b620a48a9ab9 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUEnumConstant.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUEnumConstant.kt @@ -32,9 +32,9 @@ class KotlinUEnumConstant( override fun getOriginalElement(): PsiElement? = super.getOriginalElement() - override val javaPsi = unwrap(psi) + override val javaPsi: PsiEnumConstant = unwrap(psi) - override val psi = javaPsi + override val psi: PsiEnumConstant = javaPsi override fun getContainingFile(): PsiFile { return super.getContainingFile() @@ -82,7 +82,7 @@ class KotlinUEnumConstant( override val returnType: PsiType? get() = uastParent?.getAsJavaPsiElement(PsiClass::class.java)?.let { PsiTypesUtil.getClassType(it) } - override fun resolve() = psi.resolveMethod() + override fun resolve(): PsiMethod? = psi.resolveMethod() override val methodName: String? get() = null diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUField.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUField.kt index ccfb62724c7b..69460436361d 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUField.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUField.kt @@ -18,11 +18,11 @@ open class KotlinUField( override val sourcePsi: KtElement?, givenParent: UElement? ) : AbstractKotlinUVariable(givenParent), UFieldEx, PsiField by psi { - override fun getSourceElement() = sourcePsi ?: this + override fun getSourceElement(): NavigatablePsiElement = sourcePsi ?: this - override val javaPsi = unwrap(psi) + override val javaPsi: PsiField = unwrap(psi) - override val psi = javaPsi + override val psi: PsiField = javaPsi override fun getType(): PsiType { val type = delegateExpression?.getExpressionType() diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinULocalVariable.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinULocalVariable.kt index e199dcb0a986..fa2fb2b6635b 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinULocalVariable.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinULocalVariable.kt @@ -21,9 +21,9 @@ open class KotlinULocalVariable( givenParent: UElement? ) : AbstractKotlinUVariable(givenParent), ULocalVariableEx, PsiLocalVariable by psi { - override val javaPsi = unwrap(psi) + override val javaPsi: PsiLocalVariable = unwrap(psi) - override val psi = javaPsi + override val psi: PsiLocalVariable = javaPsi private val uAnnotationsPart = UastLazyPart>() diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUMethod.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUMethod.kt index 851f0a5bc051..4605497f2c6f 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUMethod.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUMethod.kt @@ -57,9 +57,9 @@ open class KotlinUMethod( override val psi: PsiMethod = unwrap(psi) - override val javaPsi = psi + override val javaPsi: PsiMethod = psi - override fun getSourceElement() = sourcePsi ?: this + override fun getSourceElement(): NavigatablePsiElement = sourcePsi ?: this private val kotlinOrigin = getKotlinMemberOrigin(psi.originalElement) ?: sourcePsi @@ -68,7 +68,7 @@ open class KotlinUMethod( return unwrapFakeFileForLightClass(psi.containingFile) } - override fun getNameIdentifier() = UastLightIdentifier(psi, kotlinOrigin) + override fun getNameIdentifier(): UastLightIdentifier = UastLightIdentifier(psi, kotlinOrigin) override val uAnnotations: List get() = uAnnotationsPart.getOrBuild { diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUParameter.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUParameter.kt index 344c1f7e9b2f..ee58388191eb 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUParameter.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUParameter.kt @@ -16,9 +16,9 @@ open class KotlinUParameter( private val isLightConstructorParamLazy = UastLazyPart() private val isKtConstructorParamLazy = UastLazyPart() - final override val javaPsi = unwrap(psi) + final override val javaPsi: PsiParameter = unwrap(psi) - override val psi = javaPsi + override val psi: PsiParameter = javaPsi override fun getInitializer(): PsiExpression? { return super.getInitializer() diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUVariable.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUVariable.kt index 2d90e9e6711e..3dfa27c8ca25 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUVariable.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/declarations/KotlinUVariable.kt @@ -14,9 +14,9 @@ class KotlinUVariable( givenParent: UElement? ) : AbstractKotlinUVariable(givenParent), UVariable, PsiVariable by psi { - override val javaPsi = unwrap(psi) + override val javaPsi: PsiVariable = unwrap(psi) - override val psi = javaPsi + override val psi: PsiVariable = javaPsi override fun getInitializer(): PsiExpression? { return super.getInitializer() diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinDocUQualifiedReferenceExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinDocUQualifiedReferenceExpression.kt index f960a4b18080..8890a6643679 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinDocUQualifiedReferenceExpression.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinDocUQualifiedReferenceExpression.kt @@ -30,7 +30,7 @@ class KotlinDocUQualifiedReferenceExpression( createKDocNameSimpleNameReference(parentKDocName = sourcePsi, givenParent = this) ?: UastEmptyExpression(this) } - override val accessType = UastQualifiedExpressionAccessType.SIMPLE + override val accessType: UastQualifiedExpressionAccessType = UastQualifiedExpressionAccessType.SIMPLE override fun resolve(): PsiElement? = sourcePsi.reference?.resolve() diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinLocalFunctionUVariable.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinLocalFunctionUVariable.kt index 5a2819790164..f0ff0698f819 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinLocalFunctionUVariable.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinLocalFunctionUVariable.kt @@ -18,7 +18,7 @@ class KotlinLocalFunctionUVariable( private val uastInitializerPart = UastLazyPart() - override val psi get() = javaPsi + override val psi: PsiVariable get() = javaPsi override val sourcePsi: PsiElement = (javaPsi as? UastKotlinPsiVariable?)?.ktElement ?: javaPsi override val uastInitializer: UExpression? diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinStringTemplateUPolyadicExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinStringTemplateUPolyadicExpression.kt index a3c56280056e..9d1979dfd657 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinStringTemplateUPolyadicExpression.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinStringTemplateUPolyadicExpression.kt @@ -33,7 +33,7 @@ class KotlinStringTemplateUPolyadicExpression( }.takeIf { it.isNotEmpty() } ?: listOf(KotlinStringULiteralExpression(sourcePsi, this, "")) } - override val operator = UastBinaryOperator.PLUS + override val operator: UastBinaryOperator.ArithmeticOperator = UastBinaryOperator.PLUS override val psiLanguageInjectionHost: PsiLanguageInjectionHost get() = sourcePsi override val isString: Boolean get() = true diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinStringULiteralExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinStringULiteralExpression.kt index 03924f79d251..238e3eb564fe 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinStringULiteralExpression.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinStringULiteralExpression.kt @@ -23,7 +23,7 @@ class KotlinStringULiteralExpression( override val value: String get() = text - override fun evaluate() = value + override fun evaluate(): String = value override fun getExpressionType(): PsiType = PsiType.getJavaLangString(sourcePsi.manager, sourcePsi.resolveScope) diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinStringUSimpleReferenceExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinStringUSimpleReferenceExpression.kt index 473fdac647e8..4e0e2151af07 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinStringUSimpleReferenceExpression.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinStringUSimpleReferenceExpression.kt @@ -25,7 +25,7 @@ class KotlinStringUSimpleReferenceExpression( private val resolved: PsiElement? get() = resolvedPart.getOrBuild { referenceAnchor?.references?.singleOrNull()?.resolve() } - override fun resolve() = resolved + override fun resolve(): PsiElement? = resolved override val resolvedName: String get() = (resolved as? PsiNamedElement)?.name ?: identifier diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUBinaryExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUBinaryExpression.kt index 4117a9bacd04..69c4f00650c0 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUBinaryExpression.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUBinaryExpression.kt @@ -18,7 +18,7 @@ class KotlinUBinaryExpression( UMultiResolvable { companion object { - val BITWISE_OPERATORS = mapOf( + val BITWISE_OPERATORS: Map = mapOf( "or" to UastBinaryOperator.BITWISE_OR, "and" to UastBinaryOperator.BITWISE_AND, "xor" to UastBinaryOperator.BITWISE_XOR, diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUBinaryExpressionWithType.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUBinaryExpressionWithType.kt index d500df93ffa7..1f3c74942fec 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUBinaryExpressionWithType.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUBinaryExpressionWithType.kt @@ -36,7 +36,7 @@ class KotlinUBinaryExpressionWithType( } } - override val operationKind = when (sourcePsi.operationReference.getReferencedNameElementType()) { + override val operationKind: UastBinaryExpressionWithTypeKind = when (sourcePsi.operationReference.getReferencedNameElementType()) { KtTokens.AS_KEYWORD -> UastBinaryExpressionWithTypeKind.TypeCast.INSTANCE KtTokens.AS_SAFE -> KotlinBinaryExpressionWithTypeKinds.SAFE_TYPE_CAST else -> UastBinaryExpressionWithTypeKind.UNKNOWN diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUDestructuringDeclarationExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUDestructuringDeclarationExpression.kt index 11241dd7e364..75f47e0b4951 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUDestructuringDeclarationExpression.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUDestructuringDeclarationExpression.kt @@ -4,6 +4,7 @@ package org.jetbrains.uast.kotlin import com.intellij.psi.PsiElement import org.jetbrains.annotations.ApiStatus +import org.jetbrains.uast.UDeclaration import org.jetbrains.uast.UElement @ApiStatus.Internal @@ -12,5 +13,5 @@ class KotlinUDestructuringDeclarationExpression( psiAnchor: PsiElement, ) : KotlinUDeclarationsExpression(null, givenParent, psiAnchor) { - val tempVarAssignment get() = declarations.first() + val tempVarAssignment: UDeclaration get() = declarations.first() } diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUObjectLiteralExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUObjectLiteralExpression.kt index b5db62a403a0..fdcfedd86262 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUObjectLiteralExpression.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUObjectLiteralExpression.kt @@ -3,6 +3,7 @@ package org.jetbrains.uast.kotlin import com.intellij.psi.PsiElement +import com.intellij.psi.PsiMethod import com.intellij.psi.PsiType import org.jetbrains.annotations.ApiStatus import org.jetbrains.kotlin.asJava.toLightClass @@ -30,7 +31,7 @@ class KotlinUObjectLiteralExpression( ?: KotlinInvalidUClass("", sourcePsi, this) } - override fun getExpressionType() = + override fun getExpressionType(): PsiType = sourcePsi.objectDeclaration.toPsiType() private val superClassConstructorCall: KtSuperTypeCallEntry? @@ -63,7 +64,7 @@ class KotlinUObjectLiteralExpression( } } - override fun resolve() = + override fun resolve(): PsiMethod? = superClassConstructorCall?.let { baseResolveProviderService.resolveCall(it) } override fun getArgumentForParameter(i: Int): UExpression? = diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUPostfixExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUPostfixExpression.kt index 8a53cb53148e..f2ff559f6af6 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUPostfixExpression.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUPostfixExpression.kt @@ -25,7 +25,7 @@ class KotlinUPostfixExpression( baseResolveProviderService.baseKotlinConverter.convertOrEmpty(sourcePsi.baseExpression, this) } - override val operator = when (sourcePsi.operationToken) { + override val operator: UastPostfixOperator = when (sourcePsi.operationToken) { KtTokens.PLUSPLUS -> UastPostfixOperator.INC KtTokens.MINUSMINUS -> UastPostfixOperator.DEC KtTokens.EXCLEXCL -> KotlinPostfixOperators.EXCLEXCL diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUPrefixExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUPrefixExpression.kt index 42a4ab0c78aa..6ea26fab066f 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUPrefixExpression.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUPrefixExpression.kt @@ -31,7 +31,7 @@ class KotlinUPrefixExpression( override fun resolveOperator(): PsiMethod? = baseResolveProviderService.resolveCall(sourcePsi) - override val operator = when (sourcePsi.operationToken) { + override val operator: UastPrefixOperator = when (sourcePsi.operationToken) { KtTokens.EXCL -> UastPrefixOperator.LOGICAL_NOT KtTokens.PLUS -> UastPrefixOperator.UNARY_PLUS KtTokens.MINUS -> UastPrefixOperator.UNARY_MINUS diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUQualifiedReferenceExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUQualifiedReferenceExpression.kt index b11683c7540c..2b7cffcf8f40 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUQualifiedReferenceExpression.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUQualifiedReferenceExpression.kt @@ -41,7 +41,7 @@ class KotlinUQualifiedReferenceExpression( return selectorPart as UExpression } - override val accessType = UastQualifiedExpressionAccessType.SIMPLE + override val accessType: UastQualifiedExpressionAccessType = UastQualifiedExpressionAccessType.SIMPLE override fun resolve(): PsiElement? = sourcePsi.selectorExpression?.let { baseResolveProviderService.resolveToDeclaration(it) } diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUSafeQualifiedExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUSafeQualifiedExpression.kt index c8b493e264b9..4942bcb54bca 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUSafeQualifiedExpression.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUSafeQualifiedExpression.kt @@ -36,7 +36,7 @@ class KotlinUSafeQualifiedExpression( ) } - override val accessType = KotlinQualifiedExpressionAccessTypes.SAFE + override val accessType: UastQualifiedExpressionAccessType = KotlinQualifiedExpressionAccessTypes.SAFE override val resolvedName: String? get() = (resolve() as? PsiNamedElement)?.name diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUSimpleReferenceExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUSimpleReferenceExpression.kt index 535bb8788095..34a7c62e9fdc 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUSimpleReferenceExpression.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUSimpleReferenceExpression.kt @@ -39,9 +39,9 @@ class KotlinUSimpleReferenceExpression( return resolvedDeclarationPart as PsiElement? } - override val identifier get() = sourcePsi.getReferencedName() + override val identifier: String get() = sourcePsi.getReferencedName() - override fun resolve() = resolvedDeclaration + override fun resolve(): PsiElement? = resolvedDeclaration override val resolvedName: String? get() = (resolvedDeclaration as? PsiNamedElement)?.name diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUSuperExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUSuperExpression.kt index 647e84e7c39f..8472d5cf3dfa 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUSuperExpression.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUSuperExpression.kt @@ -2,6 +2,7 @@ package org.jetbrains.uast.kotlin +import com.intellij.psi.PsiElement import org.jetbrains.annotations.ApiStatus import org.jetbrains.kotlin.psi.KtSuperExpression import org.jetbrains.uast.UElement @@ -20,6 +21,6 @@ class KotlinUSuperExpression( override val labelIdentifier: UIdentifier? get() = sourcePsi.getTargetLabel()?.let { KotlinUIdentifier(it, this) } - override fun resolve() = + override fun resolve(): PsiElement? = baseResolveProviderService.resolveToDeclaration(sourcePsi) } diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUThisExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUThisExpression.kt index 4d5535aee4d3..afc2d9d6f442 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUThisExpression.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUThisExpression.kt @@ -2,6 +2,7 @@ package org.jetbrains.uast.kotlin +import com.intellij.psi.PsiElement import org.jetbrains.annotations.ApiStatus import org.jetbrains.kotlin.psi.KtThisExpression import org.jetbrains.uast.UElement @@ -20,6 +21,6 @@ class KotlinUThisExpression( override val labelIdentifier: UIdentifier? get() = sourcePsi.getTargetLabel()?.let { KotlinUIdentifier(it, this) } - override fun resolve() = + override fun resolve(): PsiElement? = baseResolveProviderService.resolveToDeclaration(sourcePsi) } diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUTypeCheckExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUTypeCheckExpression.kt index 3ef392f945cb..0014d5605305 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUTypeCheckExpression.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUTypeCheckExpression.kt @@ -36,7 +36,7 @@ class KotlinUTypeCheckExpression( } } - override val operationKind = + override val operationKind: UastBinaryExpressionWithTypeKind.InstanceCheck = if (sourcePsi.isNegated) KotlinBinaryExpressionWithTypeKinds.NEGATED_INSTANCE_CHECK else diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUVarargExpression.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUVarargExpression.kt index 88606bb4c178..c71f8981d120 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUVarargExpression.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUVarargExpression.kt @@ -54,7 +54,7 @@ class KotlinUVarargExpression( override val returnType: PsiType? get() = null - override fun resolve() = null + override fun resolve(): Nothing? = null override val receiver: UExpression? get() = null diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/internal/converterUtils.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/internal/converterUtils.kt index 9345f068327f..e6245f83945a 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/internal/converterUtils.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/internal/converterUtils.kt @@ -5,6 +5,7 @@ package org.jetbrains.uast.kotlin import com.intellij.psi.PsiElement import com.intellij.psi.PsiMethod import org.jetbrains.kotlin.kdoc.psi.impl.KDocName +import org.jetbrains.kotlin.lexer.KtToken import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.psi.KtBlockExpression import org.jetbrains.kotlin.psi.KtExpression @@ -15,13 +16,13 @@ import org.jetbrains.uast.* import org.jetbrains.uast.kotlin.internal.KotlinFakeUElement import org.jetbrains.uast.kotlin.psi.UastKotlinPsiVariable -fun expressionTypes(requiredType: Class?) = +fun expressionTypes(requiredType: Class?): Array> = requiredType?.let { arrayOf(it) } ?: DEFAULT_EXPRESSION_TYPES_LIST -fun elementTypes(requiredType: Class?) = +fun elementTypes(requiredType: Class?): Array> = requiredType?.let { arrayOf(it) } ?: DEFAULT_TYPES_LIST -fun Array>.nonEmptyOr(default: Array>) = +fun Array>.nonEmptyOr(default: Array>): Array> = takeIf { it.isNotEmpty() } ?: default inline fun Array>.el(f: () -> UElement?): UElement? { @@ -32,9 +33,9 @@ inline fun Array>.expr(f: ( return if (isAssignableFrom(ActualT::class.java)) f() else null } -fun Array>.isAssignableFrom(cls: Class<*>) = any { it.isAssignableFrom(cls) } +fun Array>.isAssignableFrom(cls: Class<*>): Boolean = any { it.isAssignableFrom(cls) } -val identifiersTokens = setOf( +val identifiersTokens: Set = setOf( KtTokens.IDENTIFIER, KtTokens.CONSTRUCTOR_KEYWORD, KtTokens.OBJECT_KEYWORD, KtTokens.THIS_KEYWORD, KtTokens.SUPER_KEYWORD, KtTokens.GET_KEYWORD, KtTokens.SET_KEYWORD diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinBinaryExpressionWithTypeKinds.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinBinaryExpressionWithTypeKinds.kt index 628405f1cd81..5d48a9070319 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinBinaryExpressionWithTypeKinds.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinBinaryExpressionWithTypeKinds.kt @@ -8,8 +8,8 @@ import org.jetbrains.uast.UastBinaryExpressionWithTypeKind @ApiStatus.Internal object KotlinBinaryExpressionWithTypeKinds { @JvmField - val NEGATED_INSTANCE_CHECK = UastBinaryExpressionWithTypeKind.InstanceCheck("!is") + val NEGATED_INSTANCE_CHECK: UastBinaryExpressionWithTypeKind.InstanceCheck = UastBinaryExpressionWithTypeKind.InstanceCheck("!is") @JvmField - val SAFE_TYPE_CAST = UastBinaryExpressionWithTypeKind.TypeCast("as?") + val SAFE_TYPE_CAST: UastBinaryExpressionWithTypeKind.TypeCast = UastBinaryExpressionWithTypeKind.TypeCast("as?") } diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinBinaryOperators.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinBinaryOperators.kt index 34339faecddf..6504fdc55f0e 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinBinaryOperators.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinBinaryOperators.kt @@ -8,11 +8,11 @@ import org.jetbrains.uast.UastBinaryOperator @ApiStatus.Internal object KotlinBinaryOperators { @JvmField - val IN = UastBinaryOperator("in") + val IN: UastBinaryOperator = UastBinaryOperator("in") @JvmField - val NOT_IN = UastBinaryOperator("!in") + val NOT_IN: UastBinaryOperator = UastBinaryOperator("!in") @JvmField - val RANGE_TO = UastBinaryOperator("..") + val RANGE_TO: UastBinaryOperator = UastBinaryOperator("..") } diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinPostfixOperators.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinPostfixOperators.kt index bea6ed28a684..30ac3468ae5c 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinPostfixOperators.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinPostfixOperators.kt @@ -8,5 +8,5 @@ import org.jetbrains.uast.UastPostfixOperator @ApiStatus.Internal object KotlinPostfixOperators { @JvmField - val EXCLEXCL = UastPostfixOperator("!!") + val EXCLEXCL: UastPostfixOperator = UastPostfixOperator("!!") } diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinQualifiedExpressionAccessTypes.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinQualifiedExpressionAccessTypes.kt index 9006e9e8edde..897a1e4e59a1 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinQualifiedExpressionAccessTypes.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinQualifiedExpressionAccessTypes.kt @@ -8,5 +8,5 @@ import org.jetbrains.uast.UastQualifiedExpressionAccessType @ApiStatus.Internal object KotlinQualifiedExpressionAccessTypes { @JvmField - val SAFE = UastQualifiedExpressionAccessType("?.") + val SAFE: UastQualifiedExpressionAccessType = UastQualifiedExpressionAccessType("?.") } diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinSpecialExpressionKinds.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinSpecialExpressionKinds.kt index 3fe677382c14..fcd493c3bfb2 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinSpecialExpressionKinds.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/kinds/KotlinSpecialExpressionKinds.kt @@ -8,17 +8,17 @@ import org.jetbrains.uast.UastSpecialExpressionKind @ApiStatus.Internal object KotlinSpecialExpressionKinds { @JvmField - val WHEN = UastSpecialExpressionKind("when") + val WHEN: UastSpecialExpressionKind = UastSpecialExpressionKind("when") @JvmField - val WHEN_ENTRY = UastSpecialExpressionKind("when_entry") + val WHEN_ENTRY: UastSpecialExpressionKind = UastSpecialExpressionKind("when_entry") @JvmField - val CLASS_BODY = UastSpecialExpressionKind("class_body") + val CLASS_BODY: UastSpecialExpressionKind = UastSpecialExpressionKind("class_body") @JvmField - val ELVIS = UastSpecialExpressionKind("elvis") + val ELVIS: UastSpecialExpressionKind = UastSpecialExpressionKind("elvis") @JvmField - val SUPER_DELEGATION = UastSpecialExpressionKind("super_delegation") + val SUPER_DELEGATION: UastSpecialExpressionKind = UastSpecialExpressionKind("super_delegation") } diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/psi/UastFakeLightNullabilityAnnotation.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/psi/UastFakeLightNullabilityAnnotation.kt index f20f793a10dd..29096bce02e3 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/psi/UastFakeLightNullabilityAnnotation.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/psi/UastFakeLightNullabilityAnnotation.kt @@ -38,7 +38,7 @@ class UastFakeLightNullabilityAnnotation( KaTypeNullability.UNKNOWN -> null } - override fun toString() = "@$qualifiedName" + override fun toString(): String = "@$qualifiedName" override fun setDeclaredAttributeValue(attributeName: String?, value: T?): T = cannotModify() } \ No newline at end of file diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/psi/UastKotlinPsiParameterBase.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/psi/UastKotlinPsiParameterBase.kt index 0a67a21c79d4..8c4f42c9172c 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/psi/UastKotlinPsiParameterBase.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/psi/UastKotlinPsiParameterBase.kt @@ -21,7 +21,7 @@ open class UastKotlinPsiParameterBase( val ktDefaultValue: KtExpression? = null, typeProvider: () -> PsiType, ) : LightParameter(name, parent, typeProvider, KotlinLanguage.INSTANCE, isVarArgs) { - protected val typePart = UastLazyPart() + protected val typePart: UastLazyPart = UastLazyPart() override fun getType(): PsiType { return typePart.getOrBuild { super.type } diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/psi/UastKotlinPsiVariable.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/psi/UastKotlinPsiVariable.kt index 5107f86b13c8..f9e64ca236e2 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/psi/UastKotlinPsiVariable.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/psi/UastKotlinPsiVariable.kt @@ -60,15 +60,15 @@ class UastKotlinPsiVariable private constructor( override fun getTextRange(): TextRange = ktElement.textRange - override fun getParent() = psiParent + override fun getParent(): PsiElement? = psiParent - override fun hasInitializer() = ktInitializer != null + override fun hasInitializer(): Boolean = ktInitializer != null override fun getInitializer(): PsiExpression? = psiInitializer - override fun getTypeElement() = psiTypeElement + override fun getTypeElement(): PsiTypeElement = psiTypeElement - override fun setInitializer(initializer: PsiExpression?) = throw NotImplementedError() + override fun setInitializer(initializer: PsiExpression?): Nothing = throw NotImplementedError() override fun getContainingFile(): PsiFile? = ktElement.containingFile @@ -80,7 +80,7 @@ class UastKotlinPsiVariable private constructor( override fun isEquivalentTo(another: PsiElement?): Boolean = this == another || ktElement.isEquivalentTo(another) - override fun hashCode() = ktElement.hashCode() + override fun hashCode(): Int = ktElement.hashCode() companion object { fun create( diff --git a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/psi/kotlinPsiUtils.kt b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/psi/kotlinPsiUtils.kt index f8c7b4228aa9..10e58551b3e6 100644 --- a/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/psi/kotlinPsiUtils.kt +++ b/plugins/kotlin/uast/uast-kotlin-base/src/org/jetbrains/uast/kotlin/psi/kotlinPsiUtils.kt @@ -5,5 +5,5 @@ import com.intellij.psi.PsiArrayType import com.intellij.psi.PsiEllipsisType import com.intellij.psi.PsiType -fun PsiType.toEllipsisTypeIfNeeded(isVarargs: Boolean) = +fun PsiType.toEllipsisTypeIfNeeded(isVarargs: Boolean): PsiType = if (isVarargs && this is PsiArrayType) PsiEllipsisType(componentType, annotationProvider) else this \ No newline at end of file diff --git a/plugins/kotlin/uast/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinConverter.kt b/plugins/kotlin/uast/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinConverter.kt index e645b842dd91..349c85c54934 100644 --- a/plugins/kotlin/uast/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinConverter.kt +++ b/plugins/kotlin/uast/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinConverter.kt @@ -10,7 +10,7 @@ import org.jetbrains.uast.UastLanguagePlugin @ApiStatus.Internal object KotlinConverter : BaseKotlinConverter {override val languagePlugin: UastLanguagePlugin get() = kotlinUastPlugin - var forceUInjectionHost = Registry.`is`("kotlin.uast.force.uinjectionhost", true) + var forceUInjectionHost: Boolean = Registry.`is`("kotlin.uast.force.uinjectionhost", true) @TestOnly set(value) { field = value diff --git a/plugins/kotlin/uast/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt b/plugins/kotlin/uast/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt index daad64b63238..67c06916fa9f 100644 --- a/plugins/kotlin/uast/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt +++ b/plugins/kotlin/uast/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt @@ -26,7 +26,7 @@ import org.jetbrains.uast.util.ClassSetsWrapper @InternalIgnoreDependencyViolation class KotlinUastLanguagePlugin : UastLanguagePlugin { - override val priority = 10 + override val priority: Int = 10 override val language: Language get() = KotlinLanguage.INSTANCE diff --git a/plugins/kotlin/uast/uast-kotlin/src/org/jetbrains/uast/kotlin/internal/CliKotlinUastResolveProviderService.kt b/plugins/kotlin/uast/uast-kotlin/src/org/jetbrains/uast/kotlin/internal/CliKotlinUastResolveProviderService.kt index e2b9ac4e3879..83282674864e 100644 --- a/plugins/kotlin/uast/uast-kotlin/src/org/jetbrains/uast/kotlin/internal/CliKotlinUastResolveProviderService.kt +++ b/plugins/kotlin/uast/uast-kotlin/src/org/jetbrains/uast/kotlin/internal/CliKotlinUastResolveProviderService.kt @@ -47,9 +47,9 @@ class UastAnalysisHandlerExtension : AnalysisHandlerExtension { private var typeMapper: KotlinTypeMapper? = null private var languageVersionSettings: LanguageVersionSettings? = null - fun getBindingContext() = context + fun getBindingContext(): BindingContext? = context - fun getLanguageVersionSettings() = languageVersionSettings + fun getLanguageVersionSettings(): LanguageVersionSettings? = languageVersionSettings override fun doAnalysis( project: Project,