diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtExpressionTypeProvider.kt b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtExpressionTypeProvider.kt index 81a8af85532..3ce6f076960 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtExpressionTypeProvider.kt +++ b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/components/KtExpressionTypeProvider.kt @@ -6,13 +6,16 @@ package org.jetbrains.kotlin.idea.frontend.api.components import com.intellij.psi.PsiElement +import com.intellij.psi.PsiType import org.jetbrains.kotlin.idea.frontend.api.types.KtType +import org.jetbrains.kotlin.load.kotlin.TypeMappingMode import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtExpression abstract class KtExpressionTypeProvider : KtAnalysisSessionComponent() { abstract fun getReturnTypeForKtDeclaration(declaration: KtDeclaration): KtType abstract fun getKtExpressionType(expression: KtExpression): KtType + abstract fun getPsiTypeForKtExpression(expression: KtExpression, mode: TypeMappingMode): PsiType abstract fun getExpectedType(expression: PsiElement): KtType? abstract fun isDefinitelyNull(expression: KtExpression): Boolean abstract fun isDefinitelyNotNull(expression: KtExpression): Boolean @@ -22,6 +25,9 @@ interface KtExpressionTypeProviderMixIn : KtAnalysisSessionMixIn { fun KtExpression.getKtType(): KtType = analysisSession.expressionTypeProvider.getKtExpressionType(this) + fun KtExpression.getPsiType(mode: TypeMappingMode = TypeMappingMode.DEFAULT): PsiType = + analysisSession.expressionTypeProvider.getPsiTypeForKtExpression(this, mode) + fun KtDeclaration.getReturnKtType(): KtType = analysisSession.expressionTypeProvider.getReturnTypeForKtDeclaration(this) diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/firLightUtils.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/firLightUtils.kt index cc70380ff97..26c176c3e9e 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/firLightUtils.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/asJava/firLightUtils.kt @@ -110,8 +110,7 @@ private class AnonymousTypesSubstitutor( } } - -private fun ConeKotlinType.asPsiType( +fun ConeKotlinType.asPsiType( session: FirSession, state: FirModuleResolveState, mode: TypeMappingMode, diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirExpressionTypeProvider.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirExpressionTypeProvider.kt index 90c675c17d2..a87d2af142e 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirExpressionTypeProvider.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirExpressionTypeProvider.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.idea.frontend.api.fir.components import com.intellij.psi.PsiElement +import com.intellij.psi.PsiType import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.psi @@ -17,6 +18,7 @@ import org.jetbrains.kotlin.fir.typeContext import org.jetbrains.kotlin.fir.types.ConeClassErrorType import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.coneType +import org.jetbrains.kotlin.idea.asJava.asPsiType import org.jetbrains.kotlin.idea.fir.low.level.api.api.getOrBuildFir import org.jetbrains.kotlin.idea.fir.low.level.api.api.getOrBuildFirOfType import org.jetbrains.kotlin.idea.fir.low.level.api.api.getOrBuildFirSafe @@ -28,6 +30,7 @@ import org.jetbrains.kotlin.idea.frontend.api.types.KtType import org.jetbrains.kotlin.idea.frontend.api.withValidityAssertion import org.jetbrains.kotlin.idea.references.FirReferenceResolveHelper import org.jetbrains.kotlin.lexer.KtTokens +import org.jetbrains.kotlin.load.kotlin.TypeMappingMode import org.jetbrains.kotlin.psi.* internal class KtFirExpressionTypeProvider( @@ -48,6 +51,21 @@ internal class KtFirExpressionTypeProvider( } } + override fun getPsiTypeForKtExpression( + expression: KtExpression, + mode: TypeMappingMode, + ): PsiType = withValidityAssertion { + when (val fir = expression.getOrBuildFir(firResolveState)) { + is FirExpression -> fir.typeRef.coneType.asPsiType(mode, expression) + is FirNamedReference -> fir.getReferencedElementType().asPsiType(mode, expression) + is FirStatement -> PsiType.VOID + else -> error("Unexpected ${fir::class}") + } + } + + private fun ConeKotlinType.asPsiType(mode: TypeMappingMode, psiContext: PsiElement) = + asPsiType(rootModuleSession, analysisSession.firResolveState, mode, psiContext) + private fun FirNamedReference.getReferencedElementType(): ConeKotlinType { val symbols = when (this) { is FirResolvedNamedReference -> listOf(resolvedSymbol) diff --git a/plugins/uast-kotlin-fir/build.gradle.kts b/plugins/uast-kotlin-fir/build.gradle.kts index 602003963fd..084f380ec33 100644 --- a/plugins/uast-kotlin-fir/build.gradle.kts +++ b/plugins/uast-kotlin-fir/build.gradle.kts @@ -53,6 +53,7 @@ runtimeJar(tasks.register("shadowJar")) { testsJar () projectTest(parallel = true) { + dependsOn(":dist") workingDir = rootDir val useFirIdeaPlugin = kotlinBuildProperties.useFirIdeaPlugin doFirst { diff --git a/plugins/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/FirKotlinUastResolveProviderService.kt b/plugins/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/FirKotlinUastResolveProviderService.kt index 9f17177edf8..9d255b5cb8c 100644 --- a/plugins/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/FirKotlinUastResolveProviderService.kt +++ b/plugins/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/FirKotlinUastResolveProviderService.kt @@ -10,6 +10,7 @@ import com.intellij.psi.PsiType import org.jetbrains.kotlin.idea.frontend.api.analyseWithCustomToken import org.jetbrains.kotlin.idea.frontend.api.tokens.AlwaysAccessibleValidityTokenFactory import org.jetbrains.kotlin.idea.references.mainReference +import org.jetbrains.kotlin.load.kotlin.TypeMappingMode import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.psi.KtReferenceExpression import org.jetbrains.uast.UElement @@ -36,8 +37,10 @@ interface FirKotlinUastResolveProviderService : BaseKotlinUastResolveProviderSer } override fun getExpressionType(uExpression: UExpression): PsiType? { - // TODO("Not yet implemented") - return null + val ktExpression = uExpression.sourcePsi as? KtExpression ?: return null + analyseWithCustomToken(ktExpression, AlwaysAccessibleValidityTokenFactory) { + return ktExpression.getPsiType(TypeMappingMode.DEFAULT_UAST) + } } override fun evaluate(uExpression: UExpression): Any? { diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/AnnotatedExpressions.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/AnnotatedExpressions.types.fir.txt index fe7759d4d2f..3f26b0e02cc 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/AnnotatedExpressions.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/AnnotatedExpressions.types.fir.txt @@ -1,7 +1,7 @@ UFile (package = ) [public final class AnnotatedExpressionsKt {...] UClass (name = AnnotatedExpressionsKt) [public final class AnnotatedExpressionsKt {...}] UMethod (name = foo) [public static final fun foo() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (ANNOTATED_EXPRESSION) [[!] UnknownKotlinExpression (ANNOTATED_EXPRESSION)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/AnnotationParameters.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/AnnotationParameters.types.fir.txt index fa796e744f3..efdea5526a8 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/AnnotationParameters.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/AnnotationParameters.types.fir.txt @@ -3,7 +3,7 @@ UFile (package = ) [public final class AnnotationParametersKt {...] UMethod (name = foo) [public static final fun foo() : int {...}] UBlockExpression [{...}] UReturnExpression [return "not-yet-compile-time-constant"] - ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] + ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] : PsiType:int UMethod (name = bar) [public static final fun bar() : void {...}] UBlockExpression [{...}] UReturnExpression [return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] @@ -11,11 +11,11 @@ UFile (package = ) [public final class AnnotationParametersKt {...] UMethod (name = fooWithArrLiteral) [public static final fun fooWithArrLiteral() : int {...}] UBlockExpression [{...}] UReturnExpression [return "not-yet-compile-time-constant"] - ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] + ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] : PsiType:int UMethod (name = fooWithStrArrLiteral) [public static final fun fooWithStrArrLiteral() : int {...}] UBlockExpression [{...}] UReturnExpression [return "not-yet-compile-time-constant"] - ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] + ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] : PsiType:int UClass (name = IntRange) [public abstract annotation IntRange {...}] UMethod (name = from) [public abstract fun from() : long = UastEmptyExpression] UMethod (name = to) [public abstract fun to() : long = UastEmptyExpression] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/Anonymous.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/Anonymous.types.fir.txt index ff4c8115724..2dc96e9d2ef 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/Anonymous.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/Anonymous.types.fir.txt @@ -3,7 +3,7 @@ UFile (package = ) [import java.io.Closeable...] UImportStatement (isOnDemand = false) [import java.io.InputStream] UClass (name = AnonymousKt) [public final class AnonymousKt {...}] UMethod (name = foo) [public static final fun foo() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] @@ -11,5 +11,5 @@ UFile (package = ) [import java.io.Closeable...] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] UMethod (name = withErr) [public static final fun withErr() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/Assertion.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/Assertion.types.fir.txt index 4f6b64da8ba..7b0f61c21d7 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/Assertion.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/Assertion.types.fir.txt @@ -1,7 +1,7 @@ UFile (package = ) [public final class AssertionKt {...] UClass (name = AssertionKt) [public final class AssertionKt {...}] UMethod (name = foo) [public static final fun foo() : java.lang.String {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Void [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] - UReturnExpression [return [!] UnknownKotlinExpression (POSTFIX_EXPRESSION)] + UReturnExpression [return [!] UnknownKotlinExpression (POSTFIX_EXPRESSION)] : PsiType:Void [!] UnknownKotlinExpression (POSTFIX_EXPRESSION) [[!] UnknownKotlinExpression (POSTFIX_EXPRESSION)] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/Bitwise.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/Bitwise.types.fir.txt index 2fe202e431f..befaef34f66 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/Bitwise.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/Bitwise.types.fir.txt @@ -1,7 +1,7 @@ UFile (package = ) [public final class BitwiseKt {...] UClass (name = BitwiseKt) [public final class BitwiseKt {...}] UMethod (name = foo) [public static final fun foo() : int {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Void [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] @@ -10,10 +10,10 @@ UFile (package = ) [public final class BitwiseKt {...] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] - UReturnExpression [return [!] UnknownKotlinExpression (BINARY_EXPRESSION)] + UReturnExpression [return [!] UnknownKotlinExpression (BINARY_EXPRESSION)] : PsiType:Void [!] UnknownKotlinExpression (BINARY_EXPRESSION) [[!] UnknownKotlinExpression (BINARY_EXPRESSION)] UMethod (name = bar) [public static final fun bar() : long {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Void [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] @@ -22,5 +22,5 @@ UFile (package = ) [public final class BitwiseKt {...] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] - UReturnExpression [return [!] UnknownKotlinExpression (BINARY_EXPRESSION)] + UReturnExpression [return [!] UnknownKotlinExpression (BINARY_EXPRESSION)] : PsiType:Void [!] UnknownKotlinExpression (BINARY_EXPRESSION) [[!] UnknownKotlinExpression (BINARY_EXPRESSION)] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/BrokenMethod.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/BrokenMethod.types.fir.txt index 293146f1506..520c376502f 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/BrokenMethod.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/BrokenMethod.types.fir.txt @@ -2,5 +2,5 @@ UFile (package = ) [public final class BrokenMethodKt {...] UClass (name = BrokenMethodKt) [public final class BrokenMethodKt {...}] UMethod (name = main) [public static final fun main(args: java.lang.String[]) : void {...}] UParameter (name = args) [var args: java.lang.String[]] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (CLASS) [[!] UnknownKotlinExpression (CLASS)] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/ConstructorDelegate.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/ConstructorDelegate.types.fir.txt index 97fc44b0e28..ba70c1c636a 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/ConstructorDelegate.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/ConstructorDelegate.types.fir.txt @@ -2,8 +2,8 @@ UFile (package = ) [public final class ConstructorDelegateKt {...] UClass (name = ConstructorDelegateKt) [public final class ConstructorDelegateKt {...}] UMethod (name = createBase) [public static final fun createBase(i: int) : Base {...}] UParameter (name = i) [var i: int] - UBlockExpression [{...}] - UReturnExpression [return [!] UnknownKotlinExpression (CALL_EXPRESSION)] + UBlockExpression [{...}] : PsiType:Void + UReturnExpression [return [!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:Void [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] UClass (name = Base) [public abstract interface Base {...}] UMethod (name = print) [public abstract fun print() : void = UastEmptyExpression] @@ -13,7 +13,7 @@ UFile (package = ) [public final class ConstructorDelegateKt {...] UParameter (name = x) [var x: int] UMethod (name = getX) [public final fun getX() : int = UastEmptyExpression] UMethod (name = print) [public fun print() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] UClass (name = Derived) [public final class Derived : null, null {...}] UMethod (name = Derived) [public fun Derived(b: Base) = UastEmptyExpression] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/Constructors.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/Constructors.types.fir.txt index 76066ca950d..d8998f3fbaa 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/Constructors.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/Constructors.types.fir.txt @@ -26,11 +26,11 @@ UFile (package = ) [public final class A {...] UField (name = a) [private var a: java.lang.String] UMethod (name = AWithSecondary) [public fun AWithSecondary(i: int) {...}] UParameter (name = i) [var i: int] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (BINARY_EXPRESSION) [[!] UnknownKotlinExpression (BINARY_EXPRESSION)] UMethod (name = AWithSecondary) [public fun AWithSecondary(s: java.lang.String) {...}] UParameter (name = s) [var s: java.lang.String] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (BINARY_EXPRESSION) [[!] UnknownKotlinExpression (BINARY_EXPRESSION)] UMethod (name = getA) [public final fun getA() : java.lang.String = UastEmptyExpression] UMethod (name = setA) [public final fun setA(value: java.lang.String) : void = UastEmptyExpression] @@ -39,11 +39,11 @@ UFile (package = ) [public final class A {...] UField (name = a) [private var a: java.lang.String] UMethod (name = AWithSecondaryInit) [public fun AWithSecondaryInit(i: int) {...}] UParameter (name = i) [var i: int] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (BINARY_EXPRESSION) [[!] UnknownKotlinExpression (BINARY_EXPRESSION)] UMethod (name = AWithSecondaryInit) [public fun AWithSecondaryInit(s: java.lang.String) {...}] UParameter (name = s) [var s: java.lang.String] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:String [!] UnknownKotlinExpression (BINARY_EXPRESSION) [[!] UnknownKotlinExpression (BINARY_EXPRESSION)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/DefaultParameterValues.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/DefaultParameterValues.types.fir.txt index dfde2e5bbc4..f5c0571d321 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/DefaultParameterValues.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/DefaultParameterValues.types.fir.txt @@ -2,7 +2,7 @@ UFile (package = ) [public final class DefaultParameterValuesKt {...] UClass (name = DefaultParameterValuesKt) [public final class DefaultParameterValuesKt {...}] UMethod (name = foo) [public static final fun foo(a: int, foo: java.lang.String) : void {...}] UParameter (name = a) [var a: int = "not-yet-compile-time-constant"] - ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] + ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] : PsiType:int UParameter (name = foo) [var foo: java.lang.String = "not-yet-compile-time-constant"] - ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] - UBlockExpression [{...}] + ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] : PsiType:Void + UBlockExpression [{...}] : PsiType:Unit diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/DeprecatedHidden.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/DeprecatedHidden.types.fir.txt index 1c87ddb8c79..3f9164435d6 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/DeprecatedHidden.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/DeprecatedHidden.types.fir.txt @@ -2,4 +2,4 @@ UFile (package = test.pkg) [package test.pkg...] UClass (name = Test) [public final class Test {...}] UMethod (name = Test) [public fun Test() = UastEmptyExpression] UMethod (name = test1) [public final fun test1() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/DestructuringDeclaration.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/DestructuringDeclaration.types.fir.txt index f96d0b10119..76296ae347d 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/DestructuringDeclaration.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/DestructuringDeclaration.types.fir.txt @@ -2,6 +2,6 @@ UFile (package = ) [public final class DestructuringDeclarationKt {...] UClass (name = DestructuringDeclarationKt) [public final class DestructuringDeclarationKt {...}] UMethod (name = foo) [public static final fun foo(data: java.lang.Object) : void {...}] UParameter (name = data) [var data: java.lang.Object] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (DESTRUCTURING_DECLARATION) [[!] UnknownKotlinExpression (DESTRUCTURING_DECLARATION)] [!] UnknownKotlinExpression (DESTRUCTURING_DECLARATION) [[!] UnknownKotlinExpression (DESTRUCTURING_DECLARATION)] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/Elvis.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/Elvis.types.fir.txt index baffa3816cd..373ede52234 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/Elvis.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/Elvis.types.fir.txt @@ -4,12 +4,12 @@ UFile (package = ) [public final class ElvisKt {...] UParameter (name = bar) [var bar: java.lang.String] UBlockExpression [{...}] UReturnExpression [return "not-yet-compile-time-constant"] - ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] + ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] : PsiType:Void UMethod (name = bar) [public static final fun bar() : int {...}] UBlockExpression [{...}] UReturnExpression [return "not-yet-compile-time-constant"] - ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] + ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] : PsiType:int UMethod (name = baz) [public static final fun baz() : java.lang.String {...}] - UBlockExpression [{...}] - UReturnExpression [return [!] UnknownKotlinExpression (BINARY_EXPRESSION)] + UBlockExpression [{...}] : PsiType:Void + UReturnExpression [return [!] UnknownKotlinExpression (BINARY_EXPRESSION)] : PsiType:Void [!] UnknownKotlinExpression (BINARY_EXPRESSION) [[!] UnknownKotlinExpression (BINARY_EXPRESSION)] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/ElvisType.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/ElvisType.types.fir.txt index dddb6015e5a..a6c04647ac2 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/ElvisType.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/ElvisType.types.fir.txt @@ -7,4 +7,4 @@ UFile (package = ) [public final class ElvisTypeKt {...] [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] UMethod (name = bar) [public static final fun bar(o: java.lang.Object) : void {...}] UParameter (name = o) [var o: java.lang.Object] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/IfStatement.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/IfStatement.types.fir.txt index 869e31e784c..b4cf73a2ed3 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/IfStatement.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/IfStatement.types.fir.txt @@ -1,5 +1,5 @@ UFile (package = ) [public final class IfStatementKt {...] UClass (name = IfStatementKt) [public final class IfStatementKt {...}] UMethod (name = foo) [public static final fun foo() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/In.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/In.types.fir.txt index 150143fcbcb..789638371e7 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/In.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/In.types.fir.txt @@ -1,8 +1,8 @@ UFile (package = ) [public final class InKt {...] UClass (name = InKt) [public final class InKt {...}] UMethod (name = foo) [public static final fun foo() : boolean {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Void [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] - UReturnExpression [return [!] UnknownKotlinExpression (BINARY_EXPRESSION)] + UReturnExpression [return [!] UnknownKotlinExpression (BINARY_EXPRESSION)] : PsiType:Void [!] UnknownKotlinExpression (BINARY_EXPRESSION) [[!] UnknownKotlinExpression (BINARY_EXPRESSION)] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/InnerNonFixedTypeVariable.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/InnerNonFixedTypeVariable.types.fir.txt index 97c1aef2412..b51ad0dc3fb 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/InnerNonFixedTypeVariable.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/InnerNonFixedTypeVariable.types.fir.txt @@ -2,7 +2,7 @@ UFile (package = ) [public final class InnerNonFixedTypeVariableKt {...] UClass (name = InnerNonFixedTypeVariableKt) [public final class InnerNonFixedTypeVariableKt {...}] UMethod (name = test) [public static final fun test(list: java.util.List) : void {...}] UParameter (name = list) [var list: java.util.List] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Set [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] UClass (name = Some) [public final class Some {...}] UMethod (name = Some) [public fun Some() = UastEmptyExpression] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/LambdaReturn.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/LambdaReturn.types.fir.txt index 98e5d6d391b..04fd793b4c5 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/LambdaReturn.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/LambdaReturn.types.fir.txt @@ -1,7 +1,7 @@ UFile (package = org.jetbrains.uast.kotlin) [package org.jetbrains.uast.kotlin...] UClass (name = LambdaReturnKt) [public final class LambdaReturnKt {...}] UMethod (name = foo) [public static final fun foo() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/Lambdas.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/Lambdas.types.fir.txt index ccb76aa37af..97cb5248dcd 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/Lambdas.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/Lambdas.types.fir.txt @@ -2,16 +2,16 @@ UFile (package = ) [import java.util.stream.Stream...] UImportStatement (isOnDemand = false) [import java.util.stream.Stream] UClass (name = LambdasKt) [public final class LambdasKt {...}] UMethod (name = foo) [public static final fun foo() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:NonExistentClass [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] UMethod (name = doSelectItem) [public static final fun doSelectItem(selectItemFunction: kotlin.jvm.functions.Function0) : void {...}] UParameter (name = selectItemFunction) [var selectItemFunction: kotlin.jvm.functions.Function0] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:NonExistentClass [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] UMethod (name = lambdaInPlaceCall) [public static final fun lambdaInPlaceCall() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit UWhileExpression [while ([!] UnknownKotlinExpression (CALL_EXPRESSION)) {...}] [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/LocalDeclarations.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/LocalDeclarations.types.fir.txt index 1d66737de23..492ee960f68 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/LocalDeclarations.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/LocalDeclarations.types.fir.txt @@ -1,10 +1,10 @@ UFile (package = ) [public final class LocalDeclarationsKt {...] UClass (name = LocalDeclarationsKt) [public final class LocalDeclarationsKt {...}] UMethod (name = foo) [public static final fun foo() : boolean {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Void [!] UnknownKotlinExpression (CLASS) [[!] UnknownKotlinExpression (CLASS)] [!] UnknownKotlinExpression (FUN) [[!] UnknownKotlinExpression (FUN)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (FUN) [[!] UnknownKotlinExpression (FUN)] - UReturnExpression [return [!] UnknownKotlinExpression (BINARY_EXPRESSION)] + UReturnExpression [return [!] UnknownKotlinExpression (BINARY_EXPRESSION)] : PsiType:Void [!] UnknownKotlinExpression (BINARY_EXPRESSION) [[!] UnknownKotlinExpression (BINARY_EXPRESSION)] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/LocalVariableWithAnnotation.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/LocalVariableWithAnnotation.types.fir.txt index 834341067cf..8340c7bd0ae 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/LocalVariableWithAnnotation.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/LocalVariableWithAnnotation.types.fir.txt @@ -1,6 +1,6 @@ UFile (package = ) [public final class LocalVariableWithAnnotationKt {...] UClass (name = LocalVariableWithAnnotationKt) [public final class LocalVariableWithAnnotationKt {...}] UMethod (name = foo) [public static final fun foo() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] UClass (name = TestAnnotation) [public abstract annotation TestAnnotation {...}] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/ManyAlternatives.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/ManyAlternatives.types.fir.txt index cd8e04bb528..7f41a706ea9 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/ManyAlternatives.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/ManyAlternatives.types.fir.txt @@ -2,7 +2,7 @@ UFile (package = ) [public final class ClassA {...] UClass (name = ClassA) [public final class ClassA {...}] UField (name = paramAndProp) [private final var paramAndProp: java.lang.String] UField (name = writebleProp) [private var writebleProp: int = "not-yet-compile-time-constant"] - ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] + ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] : PsiType:int UMethod (name = ClassA) [public fun ClassA(justParam: int, paramAndProp: java.lang.String) = UastEmptyExpression] UParameter (name = justParam) [var justParam: int] UParameter (name = paramAndProp) [var paramAndProp: java.lang.String] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/MethodReference.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/MethodReference.types.fir.txt index 24a48046837..b7738183593 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/MethodReference.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/MethodReference.types.fir.txt @@ -6,4 +6,4 @@ UFile (package = ) [public final class MethodReferenceKt {...] UClass (name = Foo) [public final class Foo {...}] UMethod (name = Foo) [public fun Foo() = UastEmptyExpression] UMethod (name = bar) [public final fun bar() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/NameContainingFile.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/NameContainingFile.types.fir.txt index c4c010c703b..9f985981b1f 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/NameContainingFile.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/NameContainingFile.types.fir.txt @@ -1,9 +1,9 @@ UFile (package = ) [public final class NameContainingFileKt {...] UClass (name = NameContainingFileKt) [public final class NameContainingFileKt {...}] UField (name = xyzzy) [private static final var xyzzy: int = "not-yet-compile-time-constant"] - ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] + ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] : PsiType:int UMethod (name = bar) [public static final fun bar() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit UMethod (name = getXyzzy) [public static final fun getXyzzy() : int = UastEmptyExpression] UClass (name = Foo) [public final class Foo {...}] UMethod (name = Foo) [public fun Foo() = UastEmptyExpression] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/NonTrivialIdentifiers.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/NonTrivialIdentifiers.types.fir.txt index b64c6f40de8..7d397b9bfee 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/NonTrivialIdentifiers.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/NonTrivialIdentifiers.types.fir.txt @@ -2,15 +2,15 @@ UFile (package = ) [public final class NonTrivialIdentifiersKt {...] UClass (name = NonTrivialIdentifiersKt) [public final class NonTrivialIdentifiersKt {...}] UMethod (name = main) [public static final fun main(a: A) : void {...}] UParameter (name = a) [var a: A] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] UClass (name = A) [public final class A {...}] UMethod (name = A) [public fun A() = UastEmptyExpression] UMethod (name = invoke) [public final fun invoke() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] UMethod (name = invoke) [public final fun invoke(f: kotlin.jvm.functions.Function0) : void {...}] UParameter (name = f) [var f: kotlin.jvm.functions.Function0] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/ParametersDisorder.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/ParametersDisorder.types.fir.txt index 7124bce5111..334dd048ae4 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/ParametersDisorder.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/ParametersDisorder.types.fir.txt @@ -3,20 +3,20 @@ UFile (package = ) [public final class ParametersDisorderKt {...] UMethod (name = global) [public static final fun global(a: int, b: float) : void {...}] UParameter (name = a) [var a: int] UParameter (name = b) [var b: float] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit UMethod (name = withDefault) [public static final fun withDefault(c: int, d: java.lang.String) : void {...}] UParameter (name = c) [var c: int = "not-yet-compile-time-constant"] - ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] + ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] : PsiType:int UParameter (name = d) [var d: java.lang.String = "aaa"] ULiteralExpression (value = "aaa") ["aaa"] : PsiType:String - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit UMethod (name = withReceiver) [public static final fun withReceiver($this$withReceiver: java.lang.String, a: int, b: float) : void {...}] UParameter (name = $this$withReceiver) [var $this$withReceiver: java.lang.String] UParameter (name = a) [var a: int] UParameter (name = b) [var b: float] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit UMethod (name = call) [public static final fun call() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] @@ -28,7 +28,7 @@ UFile (package = ) [public final class ParametersDisorderKt {...] [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] UMethod (name = objectLiteral) [public static final fun objectLiteral() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Parent [!] UnknownKotlinExpression (OBJECT_LITERAL) [[!] UnknownKotlinExpression (OBJECT_LITERAL)] UClass (name = A) [public final class A {...}] UMethod (name = A) [public fun A() = UastEmptyExpression] @@ -36,7 +36,7 @@ UFile (package = ) [public final class ParametersDisorderKt {...] UParameter (name = $this$with2Receivers) [var $this$with2Receivers: java.lang.String] UParameter (name = a) [var a: int] UParameter (name = b) [var b: float] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit UClass (name = Parent) [public class Parent {...}] UMethod (name = Parent) [public fun Parent(a: java.lang.String, b: int) = UastEmptyExpression] UParameter (name = a) [var a: java.lang.String] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/ParametersWithDefaultValues.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/ParametersWithDefaultValues.types.fir.txt index 78ee768f3a8..d7009b9bd5b 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/ParametersWithDefaultValues.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/ParametersWithDefaultValues.types.fir.txt @@ -4,7 +4,7 @@ UFile (package = ) [public final class ParametersWithDefaultValuesKt {...] UParameter (name = a) [var a: int] UParameter (name = b) [var b: java.lang.String] UParameter (name = c) [var c: int = "not-yet-compile-time-constant"] - ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] + ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] : PsiType:int UParameter (name = flag) [var flag: boolean = "not-yet-compile-time-constant"] - ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] - UBlockExpression [{...}] + ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] : PsiType:boolean + UBlockExpression [{...}] : PsiType:Unit diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyAccessors.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyAccessors.types.fir.txt index e40bf203584..99019ea30d3 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyAccessors.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyAccessors.types.fir.txt @@ -7,8 +7,8 @@ UFile (package = ) [public final class PropertyTest {...] [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] UMethod (name = setStringRepresentation) [public final fun setStringRepresentation(value: java.lang.String) : void {...}] UParameter (name = value) [var value: java.lang.String] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] UMethod (name = setDataFromString) [public final fun setDataFromString(data: java.lang.String) : void {...}] UParameter (name = data) [var data: java.lang.String] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyDelegate.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyDelegate.types.fir.txt index f557c1ab8fd..c9687966690 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyDelegate.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyDelegate.types.fir.txt @@ -2,6 +2,6 @@ UFile (package = ) [public final class PropertyDelegateKt {...] UClass (name = PropertyDelegateKt) [public final class PropertyDelegateKt {...}] UMethod (name = getSdCardPath) [public static final fun getSdCardPath() : java.lang.String = UastEmptyExpression] UMethod (name = localPropertyTest) [public static final fun localPropertyTest() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] UMethod (name = getAnnotatedDelegate) [public static final fun getAnnotatedDelegate() : int = UastEmptyExpression] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyInitializer.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyInitializer.types.fir.txt index 87a7e4eb815..d153d544ff6 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyInitializer.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyInitializer.types.fir.txt @@ -7,5 +7,5 @@ UFile (package = ) [public final class TestPropertyInitializer {...] [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] UMethod (name = setWithSetter) [public final fun setWithSetter(p: java.lang.String) : void {...}] UParameter (name = p) [var p: java.lang.String] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (BINARY_EXPRESSION) [[!] UnknownKotlinExpression (BINARY_EXPRESSION)] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyReferences.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyReferences.types.fir.txt index 1c19c43e928..dd529ca9387 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyReferences.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyReferences.types.fir.txt @@ -1,7 +1,7 @@ UFile (package = ) [public final class PropertyReferencesKt {...] UClass (name = PropertyReferencesKt) [public final class PropertyReferencesKt {...}] UMethod (name = properties) [public static final fun properties() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:int [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (BINARY_EXPRESSION) [[!] UnknownKotlinExpression (BINARY_EXPRESSION)] @@ -10,7 +10,7 @@ UFile (package = ) [public final class PropertyReferencesKt {...] [!] UnknownKotlinExpression (POSTFIX_EXPRESSION) [[!] UnknownKotlinExpression (POSTFIX_EXPRESSION)] UMethod (name = ext) [public static final fun ext($this$ext: A) : void {...}] UParameter (name = $this$ext) [var $this$ext: A] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:int [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (BINARY_EXPRESSION) [[!] UnknownKotlinExpression (BINARY_EXPRESSION)] [!] UnknownKotlinExpression (BINARY_EXPRESSION) [[!] UnknownKotlinExpression (BINARY_EXPRESSION)] @@ -18,7 +18,7 @@ UFile (package = ) [public final class PropertyReferencesKt {...] [!] UnknownKotlinExpression (POSTFIX_EXPRESSION) [[!] UnknownKotlinExpression (POSTFIX_EXPRESSION)] UClass (name = A) [public final class A {...}] UField (name = privateProp) [private var privateProp: int = "not-yet-compile-time-constant"] - ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] + ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] : PsiType:int UField (name = mutableProp) [private var mutableProp: int] UMethod (name = A) [public fun A(init: int) = UastEmptyExpression] UParameter (name = init) [var init: int] @@ -27,8 +27,8 @@ UFile (package = ) [public final class PropertyReferencesKt {...] UParameter (name = value) [var value: int] UMethod (name = add) [public final fun add(x: int) : int {...}] UParameter (name = x) [var x: int] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Void [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (BINARY_EXPRESSION) [[!] UnknownKotlinExpression (BINARY_EXPRESSION)] - UReturnExpression [return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UReturnExpression [return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:Void [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyWithAnnotation.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyWithAnnotation.types.fir.txt index 74f9822fcf5..e53318d4b26 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyWithAnnotation.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyWithAnnotation.types.fir.txt @@ -1,18 +1,18 @@ UFile (package = ) [public final class PropertyWithAnnotationKt {...] UClass (name = PropertyWithAnnotationKt) [public final class PropertyWithAnnotationKt {...}] UField (name = prop1) [private static final var prop1: int = "not-yet-compile-time-constant"] - ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] + ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] : PsiType:int UMethod (name = getProp1) [public static final fun getProp1() : int = UastEmptyExpression] UMethod (name = getProp2) [public static final fun getProp2() : int {...}] UBlockExpression [{...}] UReturnExpression [return "not-yet-compile-time-constant"] - ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] + ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] : PsiType:int UMethod (name = getProp3) [public static final fun getProp3() : int {...}] UBlockExpression [{...}] UReturnExpression [return "not-yet-compile-time-constant"] - ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] + ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] : PsiType:int UMethod (name = setProp3) [public static final fun setProp3(value: int) : void {...}] UParameter (name = value) [var value: int] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (BINARY_EXPRESSION) [[!] UnknownKotlinExpression (BINARY_EXPRESSION)] UClass (name = TestAnnotation) [public abstract annotation TestAnnotation {...}] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/QualifiedConstructorCall.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/QualifiedConstructorCall.types.fir.txt index b9b9c417e6c..fce9b4c140c 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/QualifiedConstructorCall.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/QualifiedConstructorCall.types.fir.txt @@ -4,6 +4,6 @@ UFile (package = A.B.C) [package A.B.C...] UClass (name = Bar) [public final class Bar {...}] UMethod (name = Bar) [public fun Bar() = UastEmptyExpression] UMethod (name = getFoo) [public final fun getFoo() : A.B.C.Foo {...}] - UBlockExpression [{...}] - UReturnExpression [return [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] + UBlockExpression [{...}] : PsiType:Void + UReturnExpression [return [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] : PsiType:Void [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/ReceiverFun.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/ReceiverFun.types.fir.txt index 154061ba474..4a0faf74c47 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/ReceiverFun.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/ReceiverFun.types.fir.txt @@ -7,8 +7,8 @@ UFile (package = ) [public final class ReceiverFunKt {...] [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] UMethod (name = getRx) [public static final fun getRx($this$rx: java.lang.String) : kotlin.text.Regex {...}] UParameter (name = $this$rx) [var $this$rx: java.lang.String] - UBlockExpression [{...}] - UReturnExpression [return [!] UnknownKotlinExpression (CALL_EXPRESSION)] + UBlockExpression [{...}] : PsiType:Regex + UReturnExpression [return [!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:Void [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] UClass (name = MyReceiverAnnotation) [public abstract annotation MyReceiverAnnotation {...}] UMethod (name = name) [public abstract fun name() : java.lang.String = UastEmptyExpression] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/ReifiedResolve.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/ReifiedResolve.types.fir.txt index 076f62720ca..65af0cb6e68 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/ReifiedResolve.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/ReifiedResolve.types.fir.txt @@ -1,7 +1,7 @@ UFile (package = ) [public final class ReifiedResolveKt {...] UClass (name = ReifiedResolveKt) [public final class ReifiedResolveKt {...}] UMethod (name = resolve) [public static final fun resolve() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/ReifiedReturnType.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/ReifiedReturnType.types.fir.txt index 8f21a909a3b..e19e03e3f3c 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/ReifiedReturnType.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/ReifiedReturnType.types.fir.txt @@ -4,8 +4,8 @@ UFile (package = ) [public final class ReifiedReturnTypeKt {...] UParameter (name = list) [var list: java.util.List] UParameter (name = threshold) [var threshold: T] UParameter (name = threshold2) [var threshold2: B] - UBlockExpression [{...}] - UReturnExpression [return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UBlockExpression [{...}] : PsiType:Void + UReturnExpression [return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:Void [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] UClass (name = Foo) [public final class Foo {...}] UMethod (name = Foo) [public fun Foo() = UastEmptyExpression] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/Resolve.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/Resolve.types.fir.txt index 82d2be2a0aa..636554deda5 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/Resolve.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/Resolve.types.fir.txt @@ -1,7 +1,7 @@ UFile (package = ) [public final class ResolveKt {...] UClass (name = ResolveKt) [public final class ResolveKt {...}] UMethod (name = bar) [public static final fun bar() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:IntRange [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] @@ -17,14 +17,14 @@ UFile (package = ) [public final class ResolveKt {...] [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] UMethod (name = barT) [public static final fun barT(t: T) : void {...}] UParameter (name = t) [var t: T] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] UMethod (name = barTL) [public static final fun barTL(listT: T) : void {...}] UParameter (name = listT) [var listT: T] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] [!] UnknownKotlinExpression (FOR) [[!] UnknownKotlinExpression (FOR)] UClass (name = A) [public class A {...}] UMethod (name = A) [public fun A() = UastEmptyExpression] UMethod (name = foo) [public final fun foo() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/SAM.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/SAM.types.fir.txt index dfc5932e999..ce0f9925700 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/SAM.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/SAM.types.fir.txt @@ -15,11 +15,11 @@ UFile (package = ) [import java.lang.Thread...] UMethod (name = setFoo) [public static final fun setFoo(value: java.lang.Runnable) : void = UastEmptyExpression] UParameter (name = value) [var value: java.lang.Runnable] UMethod (name = bar) [public static final fun bar() : java.lang.Runnable {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Void [!] UnknownKotlinExpression (BINARY_EXPRESSION) [[!] UnknownKotlinExpression (BINARY_EXPRESSION)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] - UReturnExpression [return [!] UnknownKotlinExpression (LAMBDA_EXPRESSION)] + UReturnExpression [return [!] UnknownKotlinExpression (LAMBDA_EXPRESSION)] : PsiType:Void [!] UnknownKotlinExpression (LAMBDA_EXPRESSION) [[!] UnknownKotlinExpression (LAMBDA_EXPRESSION)] UMethod (name = getBaz) [public static final fun getBaz() : java.lang.Runnable = UastEmptyExpression] UMethod (name = runRunnable) [public static final fun runRunnable(r: java.lang.Runnable) : error.NonExistentClass {...}] @@ -28,13 +28,13 @@ UFile (package = ) [import java.lang.Thread...] UReturnExpression [return [!] UnknownKotlinExpression (CALL_EXPRESSION)] [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] UMethod (name = test1) [public static final fun test1() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] UMethod (name = test2) [public static final fun test2() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] UMethod (name = test3) [public static final fun test3() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:String [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] UMethod (name = ambiguousSamAcceptor) [public static final fun ambiguousSamAcceptor(s: java.util.function.Supplier) : java.lang.String {...}] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/Simple.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/Simple.types.fir.txt index 4cce95df2c3..0f1153b8e58 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/Simple.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/Simple.types.fir.txt @@ -4,6 +4,6 @@ UFile (package = ) [public final class Simple {...] ULiteralExpression (value = "Mary") ["Mary"] : PsiType:String UMethod (name = Simple) [public fun Simple() = UastEmptyExpression] UMethod (name = method) [public final fun method() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] UMethod (name = getProperty) [public final fun getProperty() : java.lang.String = UastEmptyExpression] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/SimpleAnnotated.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/SimpleAnnotated.types.fir.txt index fe563a9b2f8..ac99218258d 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/SimpleAnnotated.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/SimpleAnnotated.types.fir.txt @@ -4,6 +4,6 @@ UFile (package = ) [public final class SimpleAnnotated {...] ULiteralExpression (value = "Mary") ["Mary"] : PsiType:String UMethod (name = SimpleAnnotated) [public fun SimpleAnnotated() = UastEmptyExpression] UMethod (name = method) [public final fun method() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] UMethod (name = getProperty) [public final fun getProperty() : java.lang.String = UastEmptyExpression] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplate.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplate.types.fir.txt index f2f53aa2d6e..0ead733aebb 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplate.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplate.types.fir.txt @@ -7,7 +7,7 @@ UFile (package = ) [public final class StringTemplateKt {...] UField (name = baz) [private static final var baz: java.lang.String = "dolor"] ULiteralExpression (value = "dolor") ["dolor"] : PsiType:String UField (name = foobarbaz) [private static final var foobarbaz: java.lang.String = [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + " " + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + " " + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] - UPolyadicExpression (operator = +) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + " " + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + " " + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UPolyadicExpression (operator = +) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + " " + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + " " + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:String [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] ULiteralExpression (value = " ") [" "] : PsiType:String [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplateComplex.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplateComplex.types.fir.txt index 42874d1e853..298d013bd57 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplateComplex.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplateComplex.types.fir.txt @@ -3,26 +3,26 @@ UFile (package = ) [public final class StringTemplateComplexKt {...] UField (name = muchRecur) [private static final var muchRecur: java.lang.String = "abc"] ULiteralExpression (value = "abc") ["abc"] : PsiType:String UField (name = case4) [private static final var case4: java.lang.String = "a " + "literal" + " z"] - UPolyadicExpression (operator = +) ["a " + "literal" + " z"] + UPolyadicExpression (operator = +) ["a " + "literal" + " z"] : PsiType:String ULiteralExpression (value = "a ") ["a "] : PsiType:String ULiteralExpression (value = "literal") ["literal"] : PsiType:String ULiteralExpression (value = " z") [" z"] : PsiType:String UField (name = case5) [private static final var case5: java.lang.String = "a " + "literal" + " " + "literal" + " z"] - UPolyadicExpression (operator = +) ["a " + "literal" + " " + "literal" + " z"] + UPolyadicExpression (operator = +) ["a " + "literal" + " " + "literal" + " z"] : PsiType:String ULiteralExpression (value = "a ") ["a "] : PsiType:String ULiteralExpression (value = "literal") ["literal"] : PsiType:String ULiteralExpression (value = " ") [" "] : PsiType:String ULiteralExpression (value = "literal") ["literal"] : PsiType:String ULiteralExpression (value = " z") [" z"] : PsiType:String UField (name = literalInLiteral) [private static final var literalInLiteral: java.lang.String = "a " + "literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + " z"] - UPolyadicExpression (operator = +) ["a " + "literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + " z"] + UPolyadicExpression (operator = +) ["a " + "literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + " z"] : PsiType:String ULiteralExpression (value = "a ") ["a "] : PsiType:String - UPolyadicExpression (operator = +) ["literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UPolyadicExpression (operator = +) ["literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:String ULiteralExpression (value = "literal") ["literal"] : PsiType:String [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] ULiteralExpression (value = " z") [" z"] : PsiType:String UField (name = literalInLiteral2) [private static final var literalInLiteral2: java.lang.String = "a " + [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + " z"] - UPolyadicExpression (operator = +) ["a " + [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + " z"] + UPolyadicExpression (operator = +) ["a " + [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + " z"] : PsiType:String ULiteralExpression (value = "a ") ["a "] : PsiType:String [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] ULiteralExpression (value = " z") [" z"] : PsiType:String @@ -36,12 +36,12 @@ UFile (package = ) [public final class StringTemplateComplexKt {...] UMethod (name = getEmpty) [public static final fun getEmpty() : java.lang.String = UastEmptyExpression] UMethod (name = simpleForTemplate) [public static final fun simpleForTemplate(i: int) : java.lang.String {...}] UParameter (name = i) [var i: int = "not-yet-compile-time-constant"] - ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] + ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] : PsiType:int UBlockExpression [{...}] UReturnExpression [return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] UMethod (name = foo) [public static final fun foo() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplateComplexForUInjectionHost.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplateComplexForUInjectionHost.types.fir.txt index a5a7a7f6d99..1ab45cce83e 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplateComplexForUInjectionHost.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplateComplexForUInjectionHost.types.fir.txt @@ -3,26 +3,26 @@ UFile (package = ) [public final class StringTemplateComplexForUInjectionHostKt UField (name = muchRecur) [private static final var muchRecur: java.lang.String = "abc"] ULiteralExpression (value = "abc") ["abc"] : PsiType:String UField (name = case4) [private static final var case4: java.lang.String = "a " + "literal" + " z"] - UPolyadicExpression (operator = +) ["a " + "literal" + " z"] + UPolyadicExpression (operator = +) ["a " + "literal" + " z"] : PsiType:String ULiteralExpression (value = "a ") ["a "] : PsiType:String ULiteralExpression (value = "literal") ["literal"] : PsiType:String ULiteralExpression (value = " z") [" z"] : PsiType:String UField (name = case5) [private static final var case5: java.lang.String = "a " + "literal" + " " + "literal" + " z"] - UPolyadicExpression (operator = +) ["a " + "literal" + " " + "literal" + " z"] + UPolyadicExpression (operator = +) ["a " + "literal" + " " + "literal" + " z"] : PsiType:String ULiteralExpression (value = "a ") ["a "] : PsiType:String ULiteralExpression (value = "literal") ["literal"] : PsiType:String ULiteralExpression (value = " ") [" "] : PsiType:String ULiteralExpression (value = "literal") ["literal"] : PsiType:String ULiteralExpression (value = " z") [" z"] : PsiType:String UField (name = literalInLiteral) [private static final var literalInLiteral: java.lang.String = "a " + "literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + " z"] - UPolyadicExpression (operator = +) ["a " + "literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + " z"] + UPolyadicExpression (operator = +) ["a " + "literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + " z"] : PsiType:String ULiteralExpression (value = "a ") ["a "] : PsiType:String - UPolyadicExpression (operator = +) ["literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UPolyadicExpression (operator = +) ["literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:String ULiteralExpression (value = "literal") ["literal"] : PsiType:String [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] ULiteralExpression (value = " z") [" z"] : PsiType:String UField (name = literalInLiteral2) [private static final var literalInLiteral2: java.lang.String = "a " + [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + " z"] - UPolyadicExpression (operator = +) ["a " + [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + " z"] + UPolyadicExpression (operator = +) ["a " + [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + " z"] : PsiType:String ULiteralExpression (value = "a ") ["a "] : PsiType:String [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] ULiteralExpression (value = " z") [" z"] : PsiType:String @@ -36,12 +36,12 @@ UFile (package = ) [public final class StringTemplateComplexForUInjectionHostKt UMethod (name = getEmpty) [public static final fun getEmpty() : java.lang.String = UastEmptyExpression] UMethod (name = simpleForTemplate) [public static final fun simpleForTemplate(i: int) : java.lang.String {...}] UParameter (name = i) [var i: int = "not-yet-compile-time-constant"] - ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] + ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] : PsiType:int UBlockExpression [{...}] UReturnExpression [return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] UMethod (name = foo) [public static final fun foo() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplateWithVar.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplateWithVar.types.fir.txt index c96104349f2..e50ccc6d4df 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplateWithVar.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplateWithVar.types.fir.txt @@ -3,7 +3,7 @@ UFile (package = ) [public final class StringTemplateWithVarKt {...] UField (name = bar) [private static final var bar: java.lang.String = "bar"] ULiteralExpression (value = "bar") ["bar"] : PsiType:String UField (name = f) [private static final var f: java.lang.String = "foo" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] - UPolyadicExpression (operator = +) ["foo" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UPolyadicExpression (operator = +) ["foo" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:String ULiteralExpression (value = "foo") ["foo"] : PsiType:String [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] UMethod (name = getBar) [public static final fun getBar() : java.lang.String = UastEmptyExpression] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/SuperCalls.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/SuperCalls.types.fir.txt index c683a0790d2..a5c7941d0f1 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/SuperCalls.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/SuperCalls.types.fir.txt @@ -5,7 +5,7 @@ UFile (package = ) [public final class SuperCallsKt {...] UMethod (name = getAnon) [public static final fun getAnon() : A = UastEmptyExpression] UMethod (name = cons) [public static final fun cons(a: A) : void {...}] UParameter (name = a) [var a: A] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit UClass (name = A) [public class A {...}] UField (name = str) [private final var str: java.lang.String] UMethod (name = A) [public fun A(str: java.lang.String) = UastEmptyExpression] @@ -15,7 +15,7 @@ UFile (package = ) [public final class SuperCallsKt {...] UMethod (name = getStr) [public final fun getStr() : java.lang.String = UastEmptyExpression] UMethod (name = foo) [public fun foo(a: long) : void {...}] UParameter (name = a) [var a: long] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit UClass (name = B) [public final class B : null {...}] UMethod (name = B) [public fun B(param: java.lang.String) = UastEmptyExpression] UParameter (name = param) [var param: java.lang.String] @@ -24,11 +24,11 @@ UFile (package = ) [public final class SuperCallsKt {...] UParameter (name = p) [var p: java.lang.String] UMethod (name = C) [public fun C(i: int) {...}] UParameter (name = i) [var i: int] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] UMethod (name = foo) [public fun foo(a: long) : void {...}] UParameter (name = a) [var a: long] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] UClass (name = O) [public final class O : null {...}] UField (name = INSTANCE) [public static final var INSTANCE: O] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/TryCatch.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/TryCatch.types.fir.txt index d80c83fbf4d..c24142bdb98 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/TryCatch.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/TryCatch.types.fir.txt @@ -2,22 +2,22 @@ UFile (package = ) [public final class TryCatch {...] UClass (name = TryCatch) [public final class TryCatch {...}] UMethod (name = TryCatch) [public fun TryCatch() = UastEmptyExpression] UMethod (name = catches) [public final fun catches() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (TRY) [[!] UnknownKotlinExpression (TRY)] UMethod (name = body) [public final fun body() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit UMethod (name = catcher) [public final fun catcher() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit UMethod (name = finalizer) [public final fun finalizer() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit UClass (name = TryCatchAnnotations) [public final class TryCatchAnnotations {...}] UMethod (name = TryCatchAnnotations) [public fun TryCatchAnnotations() = UastEmptyExpression] UMethod (name = catches) [public final fun catches() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (TRY) [[!] UnknownKotlinExpression (TRY)] UMethod (name = body) [public final fun body() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit UMethod (name = catcher) [public final fun catcher() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit UMethod (name = finalizer) [public final fun finalizer() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/TypeAliasExpansionWithOtherAliasInArgument.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/TypeAliasExpansionWithOtherAliasInArgument.types.fir.txt index fabfbed2933..5e9e14ba2cb 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/TypeAliasExpansionWithOtherAliasInArgument.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/TypeAliasExpansionWithOtherAliasInArgument.types.fir.txt @@ -5,10 +5,10 @@ UFile (package = ) [public final class TypeAliasExpansionWithOtherAliasInArgumen UParameter (name = x) [var x: kotlin.jvm.functions.Function1] UBlockExpression [{...}] UReturnExpression [return "not-yet-compile-time-constant"] - ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] + ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] : PsiType:Void UMethod (name = bar) [public static final fun bar($this$bar: java.util.Map, x: java.util.Map) : java.util.Map {...}] UParameter (name = $this$bar) [var $this$bar: java.util.Map] UParameter (name = x) [var x: java.util.Map] UBlockExpression [{...}] UReturnExpression [return "not-yet-compile-time-constant"] - ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] + ULiteralExpression (value = "not-yet-compile-time-constant") ["not-yet-compile-time-constant"] : PsiType:Void diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/TypeInAnnotation.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/TypeInAnnotation.types.fir.txt index 081d8902d87..439b2474881 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/TypeInAnnotation.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/TypeInAnnotation.types.fir.txt @@ -2,4 +2,4 @@ UFile (package = ) [public final class C {...] UClass (name = C) [public final class C {...}] UMethod (name = C) [public fun C() = UastEmptyExpression] UMethod (name = foo) [public final fun foo() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/TypeReferences.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/TypeReferences.types.fir.txt index f5e2a3a74bd..9e066dbfdda 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/TypeReferences.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/TypeReferences.types.fir.txt @@ -2,15 +2,15 @@ UFile (package = ) [public final class TypeReferencesKt {...] UClass (name = TypeReferencesKt) [public final class TypeReferencesKt {...}] UMethod (name = foo) [public static final fun foo(parameter: int) : java.lang.String {...}] UParameter (name = parameter) [var parameter: int] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Void [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] - UReturnExpression [return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UReturnExpression [return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:Void [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] UMethod (name = parameterizedFoo) [public static final fun parameterizedFoo(arg: T) : void {...}] UParameter (name = arg) [var arg: T] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/UnexpectedContainerException.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/UnexpectedContainerException.types.fir.txt index ccfcf429c7e..4d7bf583355 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/UnexpectedContainerException.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/UnexpectedContainerException.types.fir.txt @@ -7,6 +7,6 @@ UFile (package = ) [public abstract interface Callback {...] UMethod (name = crashMe) [public final fun crashMe(clazz: java.lang.Class, factory: kotlin.jvm.functions.Function0) : void {...}] UParameter (name = clazz) [var clazz: java.lang.Class] UParameter (name = factory) [var factory: kotlin.jvm.functions.Function0] - UBlockExpression [{...}] - UThrowExpression [throw [!] UnknownKotlinExpression (CALL_EXPRESSION)] + UBlockExpression [{...}] : PsiType:Void + UThrowExpression [throw [!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:Void [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/WhenAndDestructing.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/WhenAndDestructing.types.fir.txt index 74bc6db56af..c1f59394a4a 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/WhenAndDestructing.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/WhenAndDestructing.types.fir.txt @@ -2,6 +2,6 @@ UFile (package = ) [public final class WhenAndDestructingKt {...] UClass (name = WhenAndDestructingKt) [public final class WhenAndDestructingKt {...}] UMethod (name = getElementsAdditionalResolve) [public static final fun getElementsAdditionalResolve(string: java.lang.String) : java.lang.String {...}] UParameter (name = string) [var string: java.lang.String] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (WHEN) [[!] UnknownKotlinExpression (WHEN)] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/WhenStringLiteral.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/WhenStringLiteral.types.fir.txt index 51464d463ea..fadd76fd4cc 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/WhenStringLiteral.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/WhenStringLiteral.types.fir.txt @@ -7,6 +7,6 @@ UFile (package = ) [public final class WhenStringLiteralKt {...] UMethod (name = getA) [public static final fun getA() : java.lang.String = UastEmptyExpression] UMethod (name = getB) [public static final fun getB() : int = UastEmptyExpression] UMethod (name = ) [public static final fun () : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:String ULiteralExpression (value = "abc1") ["abc1"] : PsiType:String ULiteralExpression (value = "def1") ["def1"] : PsiType:String diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/ea101715.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/ea101715.types.fir.txt index bdcb3c7e0bb..a6b35126873 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/ea101715.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/ea101715.types.fir.txt @@ -1,7 +1,7 @@ UFile (package = ) [public final class Ea101715Kt {...] UClass (name = Ea101715Kt) [public final class Ea101715Kt {...}] UMethod (name = a) [public static final fun a() : void {...}] - UBlockExpression [{...}] + UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] UClass (name = Obj) [public final class Obj {...}] UField (name = INSTANCE) [public static final var INSTANCE: Obj]