diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUQualifiedReferenceExpression.kt b/plugins/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUQualifiedReferenceExpression.kt similarity index 53% rename from plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUQualifiedReferenceExpression.kt rename to plugins/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUQualifiedReferenceExpression.kt index dc1ef51a262..43b3d537819 100644 --- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUQualifiedReferenceExpression.kt +++ b/plugins/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinUQualifiedReferenceExpression.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ package org.jetbrains.uast.kotlin @@ -26,12 +15,12 @@ import org.jetbrains.uast.UastQualifiedExpressionAccessType import org.jetbrains.uast.kotlin.internal.DelegatedMultiResolve class KotlinUQualifiedReferenceExpression( - override val sourcePsi: KtDotQualifiedExpression, - givenParent: UElement? + override val sourcePsi: KtDotQualifiedExpression, + givenParent: UElement? ) : KotlinAbstractUExpression(givenParent), UQualifiedReferenceExpression, DelegatedMultiResolve, - KotlinUElementWithType, KotlinEvaluatableUElement { - override val receiver by lz { KotlinConverter.convertOrEmpty(sourcePsi.receiverExpression, this) } - override val selector by lz { KotlinConverter.convertOrEmpty(sourcePsi.selectorExpression, this) } + KotlinUElementWithType, KotlinEvaluatableUElement { + override val receiver by lz { baseResolveProviderService.baseKotlinConverter.convertOrEmpty(sourcePsi.receiverExpression, this) } + override val selector by lz { baseResolveProviderService.baseKotlinConverter.convertOrEmpty(sourcePsi.selectorExpression, this) } override val accessType = UastQualifiedExpressionAccessType.SIMPLE override fun resolve(): PsiElement? = sourcePsi.selectorExpression?.let { baseResolveProviderService.resolveToDeclaration(it) } diff --git a/plugins/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/FirKotlinConverter.kt b/plugins/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/FirKotlinConverter.kt index 17c233367c5..e5b12bdb1c3 100644 --- a/plugins/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/FirKotlinConverter.kt +++ b/plugins/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/FirKotlinConverter.kt @@ -309,6 +309,8 @@ internal object FirKotlinConverter : BaseKotlinConverter { is KtArrayAccessExpression -> expr(build(::FirKotlinUArrayAccessExpression)) + is KtDotQualifiedExpression -> expr(build(::KotlinUQualifiedReferenceExpression)) + else -> expr(build(::UnknownKotlinExpression)) } } diff --git a/plugins/uast-kotlin-fir/testData/declaration/objects.log.fir.txt b/plugins/uast-kotlin-fir/testData/declaration/objects.log.fir.txt index 35946820bb2..24e8a8ce3c4 100644 --- a/plugins/uast-kotlin-fir/testData/declaration/objects.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/declaration/objects.log.fir.txt @@ -7,8 +7,12 @@ UFile (package = ) UMethod (name = getTopRunnable) UMethod (name = main) UBlockExpression - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + UQualifiedReferenceExpression + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION) + UQualifiedReferenceExpression + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION) UClass (name = RunnableManager) UField (name = INSTANCE) UField (name = tasks) @@ -18,7 +22,9 @@ UFile (package = ) UMethod (name = register) UParameter (name = runnable) UBlockExpression - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + UQualifiedReferenceExpression + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION) UMethod (name = runAll) UBlockExpression [!] UnknownKotlinExpression (FOR) diff --git a/plugins/uast-kotlin-fir/testData/declaration/objects.render.fir.txt b/plugins/uast-kotlin-fir/testData/declaration/objects.render.fir.txt index 2553bfcfa46..808cce6c522 100644 --- a/plugins/uast-kotlin-fir/testData/declaration/objects.render.fir.txt +++ b/plugins/uast-kotlin-fir/testData/declaration/objects.render.fir.txt @@ -5,8 +5,8 @@ public final class ObjectsKt { private static final var topRunnable: java.lang.Runnable = [!] UnknownKotlinExpression (OBJECT_LITERAL) public static final fun getTopRunnable() : java.lang.Runnable = UastEmptyExpression public static final fun main() : void { - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) } } @@ -16,7 +16,7 @@ public final class RunnableManager { private fun RunnableManager() = UastEmptyExpression public final fun getTasks() : java.util.List = UastEmptyExpression public final fun register(runnable: java.lang.Runnable) : void { - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) } public final fun runAll() : void { [!] UnknownKotlinExpression (FOR) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotatedExpressions.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotatedExpressions.refNames.fir.txt new file mode 100644 index 00000000000..eb43a44ab12 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotatedExpressions.refNames.fir.txt @@ -0,0 +1,2 @@ +isBlank() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +isNotEmpty() -> UQualifiedReferenceExpression from KtDotQualifiedExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Anonymous.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Anonymous.refNames.fir.txt new file mode 100644 index 00000000000..7584ceafb66 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Anonymous.refNames.fir.txt @@ -0,0 +1,6 @@ +Closeable -> UQualifiedReferenceExpression from KtDotQualifiedExpression +io -> UQualifiedReferenceExpression from KtDotQualifiedExpression +InputStream -> UQualifiedReferenceExpression from KtDotQualifiedExpression +io -> UQualifiedReferenceExpression from KtDotQualifiedExpression +run() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +run() -> UQualifiedReferenceExpression from KtDotQualifiedExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Constructors.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Constructors.refNames.fir.txt new file mode 100644 index 00000000000..00f4dae20f3 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Constructors.refNames.fir.txt @@ -0,0 +1,7 @@ +toString() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +toString() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +toString() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +toString() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +toString() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +toString() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +toString() -> UQualifiedReferenceExpression from KtDotQualifiedExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DeprecatedHidden.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DeprecatedHidden.refNames.fir.txt new file mode 100644 index 00000000000..75c11cf59ef --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DeprecatedHidden.refNames.fir.txt @@ -0,0 +1,2 @@ +pkg -> UQualifiedReferenceExpression from KtDotQualifiedExpression +HIDDEN -> UQualifiedReferenceExpression from KtDotQualifiedExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Elvis.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Elvis.refNames.fir.txt new file mode 100644 index 00000000000..af67d56d9cf --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Elvis.refNames.fir.txt @@ -0,0 +1 @@ +toString() -> UQualifiedReferenceExpression from KtDotQualifiedExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Imports.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Imports.refNames.fir.txt new file mode 100644 index 00000000000..1621cd100cd --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Imports.refNames.fir.txt @@ -0,0 +1,17 @@ +currentThread -> UQualifiedReferenceExpression from KtDotQualifiedExpression +Thread -> UQualifiedReferenceExpression from KtDotQualifiedExpression +lang -> UQualifiedReferenceExpression from KtDotQualifiedExpression +NORM_PRIORITY -> UQualifiedReferenceExpression from KtDotQualifiedExpression +Thread -> UQualifiedReferenceExpression from KtDotQualifiedExpression +lang -> UQualifiedReferenceExpression from KtDotQualifiedExpression +UncaughtExceptionHandler -> UQualifiedReferenceExpression from KtDotQualifiedExpression +Thread -> UQualifiedReferenceExpression from KtDotQualifiedExpression +lang -> UQualifiedReferenceExpression from KtDotQualifiedExpression +sleep -> UQualifiedReferenceExpression from KtDotQualifiedExpression +Thread -> UQualifiedReferenceExpression from KtDotQualifiedExpression +lang -> UQualifiedReferenceExpression from KtDotQualifiedExpression +emptyList -> UQualifiedReferenceExpression from KtDotQualifiedExpression +collections -> UQualifiedReferenceExpression from KtDotQualifiedExpression +SIZE_BYTES -> UQualifiedReferenceExpression from KtDotQualifiedExpression +Companion -> UQualifiedReferenceExpression from KtDotQualifiedExpression +Int -> UQualifiedReferenceExpression from KtDotQualifiedExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InnerNonFixedTypeVariable.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InnerNonFixedTypeVariable.refNames.fir.txt new file mode 100644 index 00000000000..4e38ee25f75 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InnerNonFixedTypeVariable.refNames.fir.txt @@ -0,0 +1,4 @@ +mapTo(mutableSetOf()) { + + } -> UQualifiedReferenceExpression from KtDotQualifiedExpression +filterIsInstance() -> UQualifiedReferenceExpression from KtDotQualifiedExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LambdaReturn.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LambdaReturn.refNames.fir.txt new file mode 100644 index 00000000000..4d685dc64ed --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LambdaReturn.refNames.fir.txt @@ -0,0 +1,3 @@ +kotlin -> UQualifiedReferenceExpression from KtDotQualifiedExpression +uast -> UQualifiedReferenceExpression from KtDotQualifiedExpression +jetbrains -> UQualifiedReferenceExpression from KtDotQualifiedExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Lambdas.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Lambdas.refNames.fir.txt new file mode 100644 index 00000000000..a7ebffbb54b --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Lambdas.refNames.fir.txt @@ -0,0 +1,6 @@ +Stream -> UQualifiedReferenceExpression from KtDotQualifiedExpression +stream -> UQualifiedReferenceExpression from KtDotQualifiedExpression +util -> UQualifiedReferenceExpression from KtDotQualifiedExpression +filter { it.isEmpty() } -> UQualifiedReferenceExpression from KtDotQualifiedExpression +empty() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +isEmpty() -> UQualifiedReferenceExpression from KtDotQualifiedExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersDisorder.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersDisorder.refNames.fir.txt new file mode 100644 index 00000000000..b97b1449c6e --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersDisorder.refNames.fir.txt @@ -0,0 +1,17 @@ +withReceiver(1, 1.2F) -> UQualifiedReferenceExpression from KtDotQualifiedExpression +atan2(1.3, 3.4) -> UQualifiedReferenceExpression from KtDotQualifiedExpression +format("%i %i %i", 1, 2, 3) -> UQualifiedReferenceExpression from KtDotQualifiedExpression +String -> UQualifiedReferenceExpression from KtDotQualifiedExpression +lang -> UQualifiedReferenceExpression from KtDotQualifiedExpression +format("%i %i %i", arrayOf(1, 2, 3)) -> UQualifiedReferenceExpression from KtDotQualifiedExpression +String -> UQualifiedReferenceExpression from KtDotQualifiedExpression +lang -> UQualifiedReferenceExpression from KtDotQualifiedExpression +format("%i %i %i", arrayOf(1, 2, 3), arrayOf(4, 5, 6)) -> UQualifiedReferenceExpression from KtDotQualifiedExpression +String -> UQualifiedReferenceExpression from KtDotQualifiedExpression +lang -> UQualifiedReferenceExpression from KtDotQualifiedExpression +format("%i %i %i", *"".chunked(2).toTypedArray()) -> UQualifiedReferenceExpression from KtDotQualifiedExpression +String -> UQualifiedReferenceExpression from KtDotQualifiedExpression +lang -> UQualifiedReferenceExpression from KtDotQualifiedExpression +toTypedArray() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +chunked(2) -> UQualifiedReferenceExpression from KtDotQualifiedExpression +with2Receivers(8, 7.0F) -> UQualifiedReferenceExpression from KtDotQualifiedExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyAccessors.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyAccessors.refNames.fir.txt new file mode 100644 index 00000000000..af67d56d9cf --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyAccessors.refNames.fir.txt @@ -0,0 +1 @@ +toString() -> UQualifiedReferenceExpression from KtDotQualifiedExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyReferences.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyReferences.refNames.fir.txt new file mode 100644 index 00000000000..f0515d276ea --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyReferences.refNames.fir.txt @@ -0,0 +1,5 @@ +mutableProp -> UQualifiedReferenceExpression from KtDotQualifiedExpression +mutableProp -> UQualifiedReferenceExpression from KtDotQualifiedExpression +mutableProp -> UQualifiedReferenceExpression from KtDotQualifiedExpression +mutableProp -> UQualifiedReferenceExpression from KtDotQualifiedExpression +mutableProp -> UQualifiedReferenceExpression from KtDotQualifiedExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/QualifiedConstructorCall.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/QualifiedConstructorCall.refNames.fir.txt new file mode 100644 index 00000000000..af64d3f446c --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/QualifiedConstructorCall.refNames.fir.txt @@ -0,0 +1,5 @@ +C -> UQualifiedReferenceExpression from KtDotQualifiedExpression +B -> UQualifiedReferenceExpression from KtDotQualifiedExpression +Foo() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +C -> UQualifiedReferenceExpression from KtDotQualifiedExpression +B -> UQualifiedReferenceExpression from KtDotQualifiedExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReceiverFun.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReceiverFun.refNames.fir.txt new file mode 100644 index 00000000000..b6a2ef7731f --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReceiverFun.refNames.fir.txt @@ -0,0 +1 @@ +length -> UQualifiedReferenceExpression from KtDotQualifiedExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Reified.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Reified.refNames.fir.txt new file mode 100644 index 00000000000..cfff358506f --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Reified.refNames.fir.txt @@ -0,0 +1,5 @@ +pkg -> UQualifiedReferenceExpression from KtDotQualifiedExpression +java -> UQualifiedReferenceExpression from KtDotQualifiedExpression +java -> UQualifiedReferenceExpression from KtDotQualifiedExpression +java -> UQualifiedReferenceExpression from KtDotQualifiedExpression +java -> UQualifiedReferenceExpression from KtDotQualifiedExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedResolve.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedResolve.refNames.fir.txt new file mode 100644 index 00000000000..8d938c501da --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedResolve.refNames.fir.txt @@ -0,0 +1 @@ +filterIsInstance() -> UQualifiedReferenceExpression from KtDotQualifiedExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Resolve.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Resolve.refNames.fir.txt new file mode 100644 index 00000000000..2a0ab05ebbf --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Resolve.refNames.fir.txt @@ -0,0 +1,17 @@ +foo() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +inlineFoo() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +forEach { println(it) } -> UQualifiedReferenceExpression from KtDotQualifiedExpression +joinToString() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +size -> UQualifiedReferenceExpression from KtDotQualifiedExpression +indices -> UQualifiedReferenceExpression from KtDotQualifiedExpression +Date() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +util -> UQualifiedReferenceExpression from KtDotQualifiedExpression +time -> UQualifiedReferenceExpression from KtDotQualifiedExpression +last() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +setValue("123") -> UQualifiedReferenceExpression from KtDotQualifiedExpression +first() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +entries -> UQualifiedReferenceExpression from KtDotQualifiedExpression +contains(2 as Int) -> UQualifiedReferenceExpression from KtDotQualifiedExpression +foo() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +isEmpty() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +foo() -> UQualifiedReferenceExpression from KtDotQualifiedExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SAM.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SAM.refNames.fir.txt new file mode 100644 index 00000000000..87b0e42bd6d --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SAM.refNames.fir.txt @@ -0,0 +1,12 @@ +Thread -> UQualifiedReferenceExpression from KtDotQualifiedExpression +lang -> UQualifiedReferenceExpression from KtDotQualifiedExpression +Runnable -> UQualifiedReferenceExpression from KtDotQualifiedExpression +lang -> UQualifiedReferenceExpression from KtDotQualifiedExpression +Callable -> UQualifiedReferenceExpression from KtDotQualifiedExpression +concurrent -> UQualifiedReferenceExpression from KtDotQualifiedExpression +util -> UQualifiedReferenceExpression from KtDotQualifiedExpression +Supplier -> UQualifiedReferenceExpression from KtDotQualifiedExpression +function -> UQualifiedReferenceExpression from KtDotQualifiedExpression +util -> UQualifiedReferenceExpression from KtDotQualifiedExpression +Runnable { /* SAM */ } -> UQualifiedReferenceExpression from KtDotQualifiedExpression +lang -> UQualifiedReferenceExpression from KtDotQualifiedExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateComplex.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateComplex.refNames.fir.txt new file mode 100644 index 00000000000..c83294bb5b2 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateComplex.refNames.fir.txt @@ -0,0 +1,2 @@ +repeat(4) -> UQualifiedReferenceExpression from KtBlockStringTemplateEntry +repeat(4) -> UQualifiedReferenceExpression from KtDotQualifiedExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateComplexForUInjectionHost.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateComplexForUInjectionHost.refNames.fir.txt new file mode 100644 index 00000000000..c83294bb5b2 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateComplexForUInjectionHost.refNames.fir.txt @@ -0,0 +1,2 @@ +repeat(4) -> UQualifiedReferenceExpression from KtBlockStringTemplateEntry +repeat(4) -> UQualifiedReferenceExpression from KtDotQualifiedExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateInClass.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateInClass.refNames.fir.txt new file mode 100644 index 00000000000..2be96582c75 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateInClass.refNames.fir.txt @@ -0,0 +1 @@ +bar("lorem") -> UQualifiedReferenceExpression from KtDotQualifiedExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SuperCalls.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SuperCalls.refNames.fir.txt new file mode 100644 index 00000000000..092c4725d40 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SuperCalls.refNames.fir.txt @@ -0,0 +1,2 @@ +toString() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +foo(a) -> UQualifiedReferenceExpression from KtDotQualifiedExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Suspend.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Suspend.refNames.fir.txt new file mode 100644 index 00000000000..0a52e2c93be --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Suspend.refNames.fir.txt @@ -0,0 +1,2 @@ +pkg -> UQualifiedReferenceExpression from KtDotQualifiedExpression +inner() -> UQualifiedReferenceExpression from KtDotQualifiedExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeReferences.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeReferences.refNames.fir.txt new file mode 100644 index 00000000000..4f3fd5f461e --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeReferences.refNames.fir.txt @@ -0,0 +1,2 @@ +map { it.toString() } -> UQualifiedReferenceExpression from KtDotQualifiedExpression +toString() -> UQualifiedReferenceExpression from KtDotQualifiedExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/UnexpectedContainerException.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/UnexpectedContainerException.refNames.fir.txt new file mode 100644 index 00000000000..a7271ce9989 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/UnexpectedContainerException.refNames.fir.txt @@ -0,0 +1 @@ +java -> UQualifiedReferenceExpression from KtDotQualifiedExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/Anonymous.log.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/Anonymous.log.fir.txt index b591ba44f4c..1e68d9a0d38 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/Anonymous.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/Anonymous.log.fir.txt @@ -5,9 +5,13 @@ UFile (package = ) UMethod (name = foo) UBlockExpression [!] UnknownKotlinExpression (PROPERTY) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + UQualifiedReferenceExpression + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION) [!] UnknownKotlinExpression (PROPERTY) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + UQualifiedReferenceExpression + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION) [!] UnknownKotlinExpression (PROPERTY) [!] UnknownKotlinExpression (PROPERTY) UMethod (name = withErr) diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/Anonymous.render.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/Anonymous.render.fir.txt index cf2c47f618f..0b73de6d15d 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/Anonymous.render.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/Anonymous.render.fir.txt @@ -4,9 +4,9 @@ import java.io.InputStream public final class AnonymousKt { public static final fun foo() : void { [!] UnknownKotlinExpression (PROPERTY) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) [!] UnknownKotlinExpression (PROPERTY) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) [!] UnknownKotlinExpression (PROPERTY) [!] UnknownKotlinExpression (PROPERTY) } diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/Constructors.log.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/Constructors.log.fir.txt index cbc48fb637e..817fa4a86c7 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/Constructors.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/Constructors.log.fir.txt @@ -66,7 +66,9 @@ UFile (package = ) UastEmptyExpression [!] UnknownKotlinExpression (BINARY_EXPRESSION) [!] UnknownKotlinExpression (PROPERTY) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + UQualifiedReferenceExpression + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION) UMethod (name = getA) UMethod (name = setA) UParameter (name = value) diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/Constructors.render.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/Constructors.render.fir.txt index 23654f82bb0..37283520b1a 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/Constructors.render.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/Constructors.render.fir.txt @@ -67,7 +67,7 @@ public final class AWithSecondaryInit { UastEmptyExpression [!] UnknownKotlinExpression (BINARY_EXPRESSION) [!] UnknownKotlinExpression (PROPERTY) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) } public final fun getA() : java.lang.String = UastEmptyExpression public final fun setA(value: java.lang.String) : void = UastEmptyExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/InnerNonFixedTypeVariable.log.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/InnerNonFixedTypeVariable.log.fir.txt index 48dc0f11727..633c5d56232 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/InnerNonFixedTypeVariable.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/InnerNonFixedTypeVariable.log.fir.txt @@ -3,6 +3,10 @@ UFile (package = ) UMethod (name = test) UParameter (name = list) UBlockExpression - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + UQualifiedReferenceExpression + UQualifiedReferenceExpression + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION) UClass (name = Some) UMethod (name = Some) diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/InnerNonFixedTypeVariable.render.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/InnerNonFixedTypeVariable.render.fir.txt index 8f565d4ef1a..c36651a3839 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/InnerNonFixedTypeVariable.render.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/InnerNonFixedTypeVariable.render.fir.txt @@ -1,6 +1,6 @@ public final class InnerNonFixedTypeVariableKt { public static final fun test(list: java.util.List) : void { - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) } } diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/Lambdas.log.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/Lambdas.log.fir.txt index f8797bc30de..36f46396c9a 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/Lambdas.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/Lambdas.log.fir.txt @@ -3,7 +3,11 @@ UFile (package = ) UClass (name = LambdasKt) UMethod (name = foo) UBlockExpression - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + UQualifiedReferenceExpression + UQualifiedReferenceExpression + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION) UMethod (name = doSelectItem) UParameter (name = selectItemFunction) UBlockExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/Lambdas.render.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/Lambdas.render.fir.txt index c7056b4a782..d5a34880329 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/Lambdas.render.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/Lambdas.render.fir.txt @@ -2,7 +2,7 @@ import java.util.stream.Stream public final class LambdasKt { public static final fun foo() : void { - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) } public static final fun doSelectItem(selectItemFunction: kotlin.jvm.functions.Function0) : void { [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/ParametersDisorder.log.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/ParametersDisorder.log.fir.txt index b21cb2b8ec3..caea049634c 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/ParametersDisorder.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/ParametersDisorder.log.fir.txt @@ -19,13 +19,41 @@ UFile (package = ) UBlockExpression [!] UnknownKotlinExpression (CALL_EXPRESSION) [!] UnknownKotlinExpression (CALL_EXPRESSION) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + UQualifiedReferenceExpression + ULiteralExpression (value = "abc") + [!] UnknownKotlinExpression (CALL_EXPRESSION) + UQualifiedReferenceExpression + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION) [!] UnknownKotlinExpression (CALL_EXPRESSION) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + UQualifiedReferenceExpression + UQualifiedReferenceExpression + UQualifiedReferenceExpression + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION) + UQualifiedReferenceExpression + UQualifiedReferenceExpression + UQualifiedReferenceExpression + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION) + UQualifiedReferenceExpression + UQualifiedReferenceExpression + UQualifiedReferenceExpression + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION) + UQualifiedReferenceExpression + UQualifiedReferenceExpression + UQualifiedReferenceExpression + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION) [!] UnknownKotlinExpression (CALL_EXPRESSION) UMethod (name = objectLiteral) UBlockExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/ParametersDisorder.render.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/ParametersDisorder.render.fir.txt index ca8104212dc..67b4e9a7eeb 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/ParametersDisorder.render.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/ParametersDisorder.render.fir.txt @@ -8,13 +8,13 @@ public final class ParametersDisorderKt { public static final fun call() : void { [!] UnknownKotlinExpression (CALL_EXPRESSION) [!] UnknownKotlinExpression (CALL_EXPRESSION) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + "abc".[!] UnknownKotlinExpression (CALL_EXPRESSION) + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) [!] UnknownKotlinExpression (CALL_EXPRESSION) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) [!] UnknownKotlinExpression (CALL_EXPRESSION) } public static final fun objectLiteral() : void { diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/PropertyAccessors.log.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/PropertyAccessors.log.fir.txt index 9ddfdb0fe46..addb7476fd9 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/PropertyAccessors.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/PropertyAccessors.log.fir.txt @@ -4,7 +4,9 @@ UFile (package = ) UMethod (name = getStringRepresentation) UBlockExpression UReturnExpression - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + UQualifiedReferenceExpression + [!] UnknownKotlinExpression (THIS_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION) UMethod (name = setStringRepresentation) UParameter (name = value) UBlockExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/PropertyAccessors.render.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/PropertyAccessors.render.fir.txt index 3187c0da199..f65fec5c987 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/PropertyAccessors.render.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/PropertyAccessors.render.fir.txt @@ -1,7 +1,7 @@ public final class PropertyTest { public fun PropertyTest() = UastEmptyExpression public final fun getStringRepresentation() : java.lang.String { - return [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + return [!] UnknownKotlinExpression (THIS_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) } public final fun setStringRepresentation(value: java.lang.String) : void { [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/QualifiedConstructorCall.log.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/QualifiedConstructorCall.log.fir.txt index 3785f1937cc..59d33e4a750 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/QualifiedConstructorCall.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/QualifiedConstructorCall.log.fir.txt @@ -6,4 +6,10 @@ UFile (package = A.B.C) UMethod (name = getFoo) UBlockExpression UReturnExpression - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + UQualifiedReferenceExpression + UQualifiedReferenceExpression + UQualifiedReferenceExpression + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/QualifiedConstructorCall.render.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/QualifiedConstructorCall.render.fir.txt index 8257ab14906..f8c053182df 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/QualifiedConstructorCall.render.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/QualifiedConstructorCall.render.fir.txt @@ -7,6 +7,6 @@ public final class Foo { public final class Bar { public fun Bar() = UastEmptyExpression public final fun getFoo() : A.B.C.Foo { - return [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) } } diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/ReceiverFun.log.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/ReceiverFun.log.fir.txt index 3b65b1f227a..f41d56a92c6 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/ReceiverFun.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/ReceiverFun.log.fir.txt @@ -4,7 +4,9 @@ UFile (package = ) UParameter (name = $this$foo) UBlockExpression UReturnExpression - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + UQualifiedReferenceExpression + [!] UnknownKotlinExpression (THIS_EXPRESSION) + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) UMethod (name = getRx) UParameter (name = $this$rx) UBlockExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/ReceiverFun.render.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/ReceiverFun.render.fir.txt index b4b8fbd14ad..f271f3b69d1 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/ReceiverFun.render.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/ReceiverFun.render.fir.txt @@ -1,6 +1,6 @@ public final class ReceiverFunKt { public static final fun foo($this$foo: java.lang.String) : int { - return [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + return [!] UnknownKotlinExpression (THIS_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION) } public static final fun getRx($this$rx: java.lang.String) : kotlin.text.Regex { return [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/Resolve.log.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/Resolve.log.fir.txt index f032d2e16bc..dbf8f116824 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/Resolve.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/Resolve.log.fir.txt @@ -2,27 +2,53 @@ UFile (package = ) UClass (name = ResolveKt) UMethod (name = bar) UBlockExpression - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + UQualifiedReferenceExpression + [!] UnknownKotlinExpression (CALL_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION) + UQualifiedReferenceExpression + [!] UnknownKotlinExpression (CALL_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION) + UQualifiedReferenceExpression + [!] UnknownKotlinExpression (CALL_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION) + UQualifiedReferenceExpression + [!] UnknownKotlinExpression (CALL_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION) + UQualifiedReferenceExpression + [!] UnknownKotlinExpression (CALL_EXPRESSION) + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + UQualifiedReferenceExpression + [!] UnknownKotlinExpression (CALL_EXPRESSION) + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [!] UnknownKotlinExpression (PROPERTY) [!] UnknownKotlinExpression (BINARY_EXPRESSION) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + UQualifiedReferenceExpression + [!] UnknownKotlinExpression (CALL_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION) + UQualifiedReferenceExpression + UQualifiedReferenceExpression + UQualifiedReferenceExpression + [!] UnknownKotlinExpression (CALL_EXPRESSION) + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION) [!] UnknownKotlinExpression (PROPERTY) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + UQualifiedReferenceExpression + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION) [!] UnknownKotlinExpression (CALL_EXPRESSION) UMethod (name = barT) UParameter (name = t) UBlockExpression - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + UQualifiedReferenceExpression + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION) UMethod (name = barTL) UParameter (name = listT) UBlockExpression - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + UQualifiedReferenceExpression + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION) [!] UnknownKotlinExpression (FOR) UClass (name = A) UMethod (name = A) diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/Resolve.render.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/Resolve.render.fir.txt index c7f700a0db3..0d1b8e0a1ff 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/Resolve.render.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/Resolve.render.fir.txt @@ -1,24 +1,24 @@ public final class ResolveKt { public static final fun bar() : void { - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [!] UnknownKotlinExpression (PROPERTY) [!] UnknownKotlinExpression (BINARY_EXPRESSION) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) [!] UnknownKotlinExpression (PROPERTY) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) [!] UnknownKotlinExpression (CALL_EXPRESSION) } public static final fun barT(t: T) : void { - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) } public static final fun barTL(listT: T) : void { - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) [!] UnknownKotlinExpression (FOR) } } diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/SAM.log.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/SAM.log.fir.txt index f38e8f6fc82..58df83df847 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/SAM.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/SAM.log.fir.txt @@ -9,7 +9,11 @@ UFile (package = ) UField (name = foo) [!] UnknownKotlinExpression (LAMBDA_EXPRESSION) UField (name = baz) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + UQualifiedReferenceExpression + UQualifiedReferenceExpression + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION) UMethod (name = getNotSam) UMethod (name = getFoo) UMethod (name = setFoo) diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/SAM.render.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/SAM.render.fir.txt index bb4a455cb49..089c5d6082a 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/SAM.render.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/SAM.render.fir.txt @@ -6,7 +6,7 @@ import java.util.function.Supplier public final class SAMKt { private static final var notSam: kotlin.jvm.functions.Function0 = [!] UnknownKotlinExpression (LAMBDA_EXPRESSION) private static var foo: java.lang.Runnable = [!] UnknownKotlinExpression (LAMBDA_EXPRESSION) - private static final var baz: java.lang.Runnable = [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + private static final var baz: java.lang.Runnable = [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) public static final fun getNotSam() : kotlin.jvm.functions.Function0 = UastEmptyExpression public static final fun getFoo() : java.lang.Runnable = UastEmptyExpression public static final fun setFoo(value: java.lang.Runnable) : void = UastEmptyExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateComplex.log.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateComplex.log.fir.txt index 7794c276c41..ff1af43f2e7 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateComplex.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateComplex.log.fir.txt @@ -24,7 +24,11 @@ UFile (package = ) UField (name = literalInLiteral2) UPolyadicExpression (operator = +) ULiteralExpression (value = "a ") - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + UQualifiedReferenceExpression + UPolyadicExpression (operator = +) + ULiteralExpression (value = "literal") + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION) ULiteralExpression (value = " z") UField (name = empty) ULiteralExpression (value = "") diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateComplex.render.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateComplex.render.fir.txt index 91c5cba0143..305a0d6cdd8 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateComplex.render.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateComplex.render.fir.txt @@ -3,7 +3,7 @@ public final class StringTemplateComplexKt { private static final var case4: java.lang.String = "a " + "literal" + " z" private static final var case5: java.lang.String = "a " + "literal" + " " + "literal" + " z" private static final var literalInLiteral: java.lang.String = "a " + "literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + " z" - private static final var literalInLiteral2: java.lang.String = "a " + [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + " z" + private static final var literalInLiteral2: java.lang.String = "a " + "literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + " z" private static final var empty: java.lang.String = "" public static final fun getMuchRecur() : java.lang.String = UastEmptyExpression public static final fun getCase4() : java.lang.String = UastEmptyExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateComplexForUInjectionHost.log.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateComplexForUInjectionHost.log.fir.txt index b054b6535c7..476d49f49ba 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateComplexForUInjectionHost.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateComplexForUInjectionHost.log.fir.txt @@ -24,7 +24,11 @@ UFile (package = ) UField (name = literalInLiteral2) UPolyadicExpression (operator = +) ULiteralExpression (value = "a ") - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + UQualifiedReferenceExpression + UPolyadicExpression (operator = +) + ULiteralExpression (value = "literal") + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION) ULiteralExpression (value = " z") UField (name = empty) ULiteralExpression (value = "") diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateComplexForUInjectionHost.render.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateComplexForUInjectionHost.render.fir.txt index 1dd84e67b66..7d5e4f6e39c 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateComplexForUInjectionHost.render.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateComplexForUInjectionHost.render.fir.txt @@ -3,7 +3,7 @@ public final class StringTemplateComplexForUInjectionHostKt { private static final var case4: java.lang.String = "a " + "literal" + " z" private static final var case5: java.lang.String = "a " + "literal" + " " + "literal" + " z" private static final var literalInLiteral: java.lang.String = "a " + "literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + " z" - private static final var literalInLiteral2: java.lang.String = "a " + [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + " z" + private static final var literalInLiteral2: java.lang.String = "a " + "literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + " z" private static final var empty: java.lang.String = "" public static final fun getMuchRecur() : java.lang.String = UastEmptyExpression public static final fun getCase4() : java.lang.String = UastEmptyExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateInClass.log.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateInClass.log.fir.txt index 53ca1320451..6eacbf5edbf 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateInClass.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateInClass.log.fir.txt @@ -1,6 +1,8 @@ UFile (package = ) UClass (name = Demo) UField (name = foo) - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + UQualifiedReferenceExpression + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION) UMethod (name = Demo) UMethod (name = getFoo) diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateInClass.render.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateInClass.render.fir.txt index 18848ab1a9e..a7aad070325 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateInClass.render.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateInClass.render.fir.txt @@ -1,5 +1,5 @@ public final class Demo { - private final var foo: error.NonExistentClass = [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + private final var foo: error.NonExistentClass = [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) public fun Demo() = UastEmptyExpression public final fun getFoo() : error.NonExistentClass = UastEmptyExpression } diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/SuperCalls.log.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/SuperCalls.log.fir.txt index 3eced4e46ed..4880e44a670 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/SuperCalls.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/SuperCalls.log.fir.txt @@ -36,7 +36,9 @@ UFile (package = ) UMethod (name = foo) UParameter (name = a) UBlockExpression - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + UQualifiedReferenceExpression + [!] UnknownKotlinExpression (SUPER_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION) UClass (name = O) UField (name = INSTANCE) UMethod (name = O) diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/SuperCalls.render.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/SuperCalls.render.fir.txt index 5d7b928c99c..2c036e7a4a2 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/SuperCalls.render.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/SuperCalls.render.fir.txt @@ -31,7 +31,7 @@ public final class C : A { [!] UnknownKotlinExpression (CALL_EXPRESSION) } public fun foo(a: long) : void { - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + [!] UnknownKotlinExpression (SUPER_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) } } diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/Suspend.log.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/Suspend.log.fir.txt index cff6b3ecb1f..dcd9671c6ba 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/Suspend.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/Suspend.log.fir.txt @@ -3,7 +3,9 @@ UFile (package = test.pkg) UMethod (name = top) UBlockExpression UReturnExpression - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + UQualifiedReferenceExpression + [!] UnknownKotlinExpression (CALL_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION) UClass (name = Context) UMethod (name = Context) UMethod (name = inner) diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/Suspend.render.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/Suspend.render.fir.txt index 8e460c57858..758b71a65d4 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/Suspend.render.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/Suspend.render.fir.txt @@ -2,7 +2,7 @@ package test.pkg public final class SuspendKt { public static final fun top() : int { - return [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) + return [!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) } } 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 2dc96e9d2ef..7e14de544ee 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/Anonymous.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/Anonymous.types.fir.txt @@ -5,9 +5,13 @@ UFile (package = ) [import java.io.Closeable...] UMethod (name = foo) [public static final fun foo() : void {...}] UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:Unit + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:Unit + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] UMethod (name = withErr) [public static final fun withErr() : void {...}] 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 75cbfa8af90..3da3709ddc1 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/Constructors.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/Constructors.types.fir.txt @@ -66,7 +66,9 @@ UFile (package = ) [public final class A {...] UastEmptyExpression [UastEmptyExpression] [!] UnknownKotlinExpression (BINARY_EXPRESSION) [[!] UnknownKotlinExpression (BINARY_EXPRESSION)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:String + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_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] UParameter (name = value) [var value: java.lang.String] 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 b51ad0dc3fb..0e82995db48 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/InnerNonFixedTypeVariable.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/InnerNonFixedTypeVariable.types.fir.txt @@ -3,6 +3,10 @@ UFile (package = ) [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 [{...}] : PsiType:Set - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:Set + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:NonExistentClass + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] UClass (name = Some) [public final class Some {...}] UMethod (name = Some) [public fun Some() = UastEmptyExpression] 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 6fe9fe140ef..70f994c437f 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/ParametersDisorder.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/ParametersDisorder.types.fir.txt @@ -19,13 +19,41 @@ UFile (package = ) [public final class ParametersDisorderKt {...] UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] + UQualifiedReferenceExpression ["abc".[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:Unit + ULiteralExpression (value = "abc") ["abc"] : PsiType:String + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:double + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:NonExistentClass + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:Unit + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:Unit + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:NonExistentClass + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:Unit + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:Unit + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:NonExistentClass + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:Unit + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:Unit + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:NonExistentClass + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:Unit + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:Unit + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] UMethod (name = objectLiteral) [public static final fun objectLiteral() : void {...}] UBlockExpression [{...}] : PsiType:Parent 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 99019ea30d3..dc5aad6bffc 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyAccessors.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyAccessors.types.fir.txt @@ -3,8 +3,10 @@ UFile (package = ) [public final class PropertyTest {...] UMethod (name = PropertyTest) [public fun PropertyTest() = UastEmptyExpression] UMethod (name = getStringRepresentation) [public final fun getStringRepresentation() : java.lang.String {...}] UBlockExpression [{...}] - UReturnExpression [return [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] + UReturnExpression [return [!] UnknownKotlinExpression (THIS_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (THIS_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:String + [!] UnknownKotlinExpression (THIS_EXPRESSION) [[!] UnknownKotlinExpression (THIS_EXPRESSION)] + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] UMethod (name = setStringRepresentation) [public final fun setStringRepresentation(value: java.lang.String) : void {...}] UParameter (name = value) [var value: java.lang.String] UBlockExpression [{...}] : PsiType:Unit 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 fce9b4c140c..872fe5ca996 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/QualifiedConstructorCall.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/QualifiedConstructorCall.types.fir.txt @@ -5,5 +5,11 @@ UFile (package = A.B.C) [package A.B.C...] UMethod (name = Bar) [public fun Bar() = UastEmptyExpression] UMethod (name = getFoo) [public final fun getFoo() : A.B.C.Foo {...}] UBlockExpression [{...}] : PsiType:Void - UReturnExpression [return [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] : PsiType:Void - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] + UReturnExpression [return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:Void + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:Foo + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:Unit + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:Unit + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_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 73e56d4cce6..9e8de03fb50 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/ReceiverFun.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/ReceiverFun.types.fir.txt @@ -3,8 +3,10 @@ UFile (package = ) [public final class ReceiverFunKt {...] UMethod (name = foo) [public static final fun foo($this$foo: java.lang.String) : int {...}] UParameter (name = $this$foo) [var $this$foo: java.lang.String] UBlockExpression [{...}] - UReturnExpression [return [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] + UReturnExpression [return [!] UnknownKotlinExpression (THIS_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (THIS_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:int + [!] UnknownKotlinExpression (THIS_EXPRESSION) [[!] UnknownKotlinExpression (THIS_EXPRESSION)] + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_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 [{...}] : PsiType:Regex 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 636554deda5..72b813a1090 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/Resolve.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/Resolve.types.fir.txt @@ -2,27 +2,53 @@ UFile (package = ) [public final class ResolveKt {...] UClass (name = ResolveKt) [public final class ResolveKt {...}] UMethod (name = bar) [public static final fun bar() : void {...}] 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)] - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:Unit + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:Unit + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:Unit + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:String + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:int + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:IntRange + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (BINARY_EXPRESSION) [[!] UnknownKotlinExpression (BINARY_EXPRESSION)] - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:String + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:String + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:Entry + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:Set> + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:boolean + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] UMethod (name = barT) [public static final fun barT(t: T) : void {...}] UParameter (name = t) [var t: T] UBlockExpression [{...}] : PsiType:Unit - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:Unit + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] UMethod (name = barTL) [public static final fun barTL(listT: T) : void {...}] UParameter (name = listT) [var listT: T] UBlockExpression [{...}] : PsiType:Unit - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:boolean + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] [!] UnknownKotlinExpression (FOR) [[!] UnknownKotlinExpression (FOR)] UClass (name = A) [public class A {...}] UMethod (name = A) [public fun A() = UastEmptyExpression] 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 ce0f9925700..d906602dd9f 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/SAM.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/SAM.types.fir.txt @@ -8,8 +8,12 @@ UFile (package = ) [import java.lang.Thread...] [!] UnknownKotlinExpression (LAMBDA_EXPRESSION) [[!] UnknownKotlinExpression (LAMBDA_EXPRESSION)] UField (name = foo) [private static var foo: java.lang.Runnable = [!] UnknownKotlinExpression (LAMBDA_EXPRESSION)] [!] UnknownKotlinExpression (LAMBDA_EXPRESSION) [[!] UnknownKotlinExpression (LAMBDA_EXPRESSION)] - UField (name = baz) [private static final var baz: java.lang.Runnable = [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] + UField (name = baz) [private static final var baz: java.lang.Runnable = [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:Runnable + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:Unit + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] UMethod (name = getNotSam) [public static final fun getNotSam() : kotlin.jvm.functions.Function0 = UastEmptyExpression] UMethod (name = getFoo) [public static final fun getFoo() : java.lang.Runnable = UastEmptyExpression] UMethod (name = setFoo) [public static final fun setFoo(value: java.lang.Runnable) : void = UastEmptyExpression] 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 a081bbb0451..0efe6c2712a 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplateComplex.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplateComplex.types.fir.txt @@ -21,10 +21,14 @@ UFile (package = ) [public final class StringTemplateComplexKt {...] 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"] : PsiType:String + UField (name = literalInLiteral2) [private static final var literalInLiteral2: java.lang.String = "a " + "literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + " z"] + UPolyadicExpression (operator = +) ["a " + "literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + " z"] : PsiType:String ULiteralExpression (value = "a ") ["a "] : PsiType:String - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] + UQualifiedReferenceExpression ["literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:String + UPolyadicExpression (operator = +) ["literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:String + ULiteralExpression (value = "literal") ["literal"] : PsiType:String + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] ULiteralExpression (value = " z") [" z"] : PsiType:String UField (name = empty) [private static final var empty: java.lang.String = ""] ULiteralExpression (value = "") [""] : PsiType:String 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 3ba5cb0635b..2c755417c36 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplateComplexForUInjectionHost.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplateComplexForUInjectionHost.types.fir.txt @@ -21,10 +21,14 @@ UFile (package = ) [public final class StringTemplateComplexForUInjectionHostKt 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"] : PsiType:String + UField (name = literalInLiteral2) [private static final var literalInLiteral2: java.lang.String = "a " + "literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + " z"] + UPolyadicExpression (operator = +) ["a " + "literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + " z"] : PsiType:String ULiteralExpression (value = "a ") ["a "] : PsiType:String - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] + UQualifiedReferenceExpression ["literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:String + UPolyadicExpression (operator = +) ["literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:String + ULiteralExpression (value = "literal") ["literal"] : PsiType:String + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] ULiteralExpression (value = " z") [" z"] : PsiType:String UField (name = empty) [private static final var empty: java.lang.String = ""] ULiteralExpression (value = "") [""] : PsiType:String diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplateInClass.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplateInClass.types.fir.txt index 6c2125cb21f..a03d4851230 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplateInClass.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplateInClass.types.fir.txt @@ -1,6 +1,8 @@ UFile (package = ) [public final class Demo {...] UClass (name = Demo) [public final class Demo {...}] - UField (name = foo) [private final var foo: error.NonExistentClass = [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] + UField (name = foo) [private final var foo: error.NonExistentClass = [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:NonExistentClass + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] UMethod (name = Demo) [public fun Demo() = UastEmptyExpression] UMethod (name = getFoo) [public final fun getFoo() : error.NonExistentClass = 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 67610c434dd..92076d0ab9d 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/SuperCalls.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/SuperCalls.types.fir.txt @@ -36,7 +36,9 @@ UFile (package = ) [public final class SuperCallsKt {...] UMethod (name = foo) [public fun foo(a: long) : void {...}] UParameter (name = a) [var a: long] UBlockExpression [{...}] : PsiType:Unit - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (SUPER_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:Unit + [!] UnknownKotlinExpression (SUPER_EXPRESSION) [[!] UnknownKotlinExpression (SUPER_EXPRESSION)] + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] UClass (name = O) [public final class O : A {...}] UField (name = INSTANCE) [public static final var INSTANCE: O] UMethod (name = O) [private fun O() = UastEmptyExpression] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/Suspend.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/Suspend.types.fir.txt index d07e275ee3a..1bf3caa6647 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/Suspend.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/Suspend.types.fir.txt @@ -2,8 +2,10 @@ UFile (package = test.pkg) [package test.pkg...] UClass (name = SuspendKt) [public final class SuspendKt {...}] UMethod (name = top) [public static final fun top() : int {...}] UBlockExpression [{...}] - UReturnExpression [return [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] + UReturnExpression [return [!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:int + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] UClass (name = Context) [public final class Context {...}] UMethod (name = Context) [public fun Context() = UastEmptyExpression] UMethod (name = inner) [public final fun inner() : int {...}] diff --git a/plugins/uast-kotlin-fir/testData/legacyValues/Anonymous.values.fir.txt b/plugins/uast-kotlin-fir/testData/legacyValues/Anonymous.values.fir.txt index a416ae97e11..9b18738f0d9 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/Anonymous.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/Anonymous.values.fir.txt @@ -5,9 +5,13 @@ UFile (package = ) [import java.io.Closeable...] UMethod (name = foo) [public static final fun foo() : void {...}] UBlockExpression [{...}] = Undetermined [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] = Undetermined - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] = Undetermined - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] = Undetermined [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] = Undetermined UMethod (name = withErr) [public static final fun withErr() : void {...}] diff --git a/plugins/uast-kotlin-fir/testData/legacyValues/Constructors.values.fir.txt b/plugins/uast-kotlin-fir/testData/legacyValues/Constructors.values.fir.txt index c2a3e51d41c..4edc98a584e 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/Constructors.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/Constructors.values.fir.txt @@ -66,7 +66,9 @@ UFile (package = ) [public final class A {...] UastEmptyExpression [UastEmptyExpression] = Undetermined [!] UnknownKotlinExpression (BINARY_EXPRESSION) [[!] UnknownKotlinExpression (BINARY_EXPRESSION)] = Undetermined [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] = Undetermined - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined UMethod (name = getA) [public final fun getA() : java.lang.String = UastEmptyExpression] UMethod (name = setA) [public final fun setA(value: java.lang.String) : void = UastEmptyExpression] UParameter (name = value) [var value: java.lang.String] diff --git a/plugins/uast-kotlin-fir/testData/legacyValues/InnerNonFixedTypeVariable.values.fir.txt b/plugins/uast-kotlin-fir/testData/legacyValues/InnerNonFixedTypeVariable.values.fir.txt index a51b4149916..7bb980b1c2f 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/InnerNonFixedTypeVariable.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/InnerNonFixedTypeVariable.values.fir.txt @@ -3,6 +3,10 @@ UFile (package = ) [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 [{...}] = Undetermined - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined UClass (name = Some) [public final class Some {...}] UMethod (name = Some) [public fun Some() = UastEmptyExpression] diff --git a/plugins/uast-kotlin-fir/testData/legacyValues/Lambdas.values.fir.txt b/plugins/uast-kotlin-fir/testData/legacyValues/Lambdas.values.fir.txt index 1753e23de45..b39a542cc30 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/Lambdas.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/Lambdas.values.fir.txt @@ -3,7 +3,11 @@ UFile (package = ) [import java.util.stream.Stream...] UClass (name = LambdasKt) [public final class LambdasKt {...}] UMethod (name = foo) [public static final fun foo() : void {...}] UBlockExpression [{...}] = Undetermined - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined UMethod (name = doSelectItem) [public static final fun doSelectItem(selectItemFunction: kotlin.jvm.functions.Function0) : void {...}] UParameter (name = selectItemFunction) [var selectItemFunction: kotlin.jvm.functions.Function0] UBlockExpression [{...}] = Undetermined diff --git a/plugins/uast-kotlin-fir/testData/legacyValues/ParametersDisorder.values.fir.txt b/plugins/uast-kotlin-fir/testData/legacyValues/ParametersDisorder.values.fir.txt index f1ee1465983..ca10c0cf040 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/ParametersDisorder.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/ParametersDisorder.values.fir.txt @@ -19,13 +19,41 @@ UFile (package = ) [public final class ParametersDisorderKt {...] UBlockExpression [{...}] = Undetermined [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Undetermined - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression ["abc".[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + ULiteralExpression (value = "abc") ["abc"] = "abc" + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Undetermined - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Undetermined - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Undetermined - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined UMethod (name = objectLiteral) [public static final fun objectLiteral() : void {...}] UBlockExpression [{...}] = Undetermined diff --git a/plugins/uast-kotlin-fir/testData/legacyValues/PropertyAccessors.values.fir.txt b/plugins/uast-kotlin-fir/testData/legacyValues/PropertyAccessors.values.fir.txt index 9dd36afe3c0..622a053ca36 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/PropertyAccessors.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/PropertyAccessors.values.fir.txt @@ -3,8 +3,10 @@ UFile (package = ) [public final class PropertyTest {...] UMethod (name = PropertyTest) [public fun PropertyTest() = UastEmptyExpression] UMethod (name = getStringRepresentation) [public final fun getStringRepresentation() : java.lang.String {...}] UBlockExpression [{...}] = Nothing - UReturnExpression [return [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Nothing - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Undetermined + UReturnExpression [return [!] UnknownKotlinExpression (THIS_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Nothing + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (THIS_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (THIS_EXPRESSION) [[!] UnknownKotlinExpression (THIS_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined UMethod (name = setStringRepresentation) [public final fun setStringRepresentation(value: java.lang.String) : void {...}] UParameter (name = value) [var value: java.lang.String] UBlockExpression [{...}] = Undetermined diff --git a/plugins/uast-kotlin-fir/testData/legacyValues/QualifiedConstructorCall.values.fir.txt b/plugins/uast-kotlin-fir/testData/legacyValues/QualifiedConstructorCall.values.fir.txt index 973d91fd1a3..e378c93d924 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/QualifiedConstructorCall.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/QualifiedConstructorCall.values.fir.txt @@ -5,5 +5,11 @@ UFile (package = A.B.C) [package A.B.C...] UMethod (name = Bar) [public fun Bar() = UastEmptyExpression] UMethod (name = getFoo) [public final fun getFoo() : A.B.C.Foo {...}] UBlockExpression [{...}] = Nothing - UReturnExpression [return [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Nothing - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Undetermined + UReturnExpression [return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Nothing + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined diff --git a/plugins/uast-kotlin-fir/testData/legacyValues/ReceiverFun.values.fir.txt b/plugins/uast-kotlin-fir/testData/legacyValues/ReceiverFun.values.fir.txt index 3ba653b900e..b831056a603 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/ReceiverFun.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/ReceiverFun.values.fir.txt @@ -3,8 +3,10 @@ UFile (package = ) [public final class ReceiverFunKt {...] UMethod (name = foo) [public static final fun foo($this$foo: java.lang.String) : int {...}] UParameter (name = $this$foo) [var $this$foo: java.lang.String] UBlockExpression [{...}] = Nothing - UReturnExpression [return [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Nothing - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Undetermined + UReturnExpression [return [!] UnknownKotlinExpression (THIS_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Nothing + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (THIS_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (THIS_EXPRESSION) [[!] UnknownKotlinExpression (THIS_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined 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 [{...}] = Nothing diff --git a/plugins/uast-kotlin-fir/testData/legacyValues/Resolve.values.fir.txt b/plugins/uast-kotlin-fir/testData/legacyValues/Resolve.values.fir.txt index afc7fc96a26..6877603d551 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/Resolve.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/Resolve.values.fir.txt @@ -2,27 +2,53 @@ UFile (package = ) [public final class ResolveKt {...] UClass (name = ResolveKt) [public final class ResolveKt {...}] UMethod (name = bar) [public static final fun bar() : void {...}] UBlockExpression [{...}] = Undetermined - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Undetermined - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Undetermined - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Undetermined - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Undetermined - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Undetermined - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] = Undetermined [!] UnknownKotlinExpression (BINARY_EXPRESSION) [[!] UnknownKotlinExpression (BINARY_EXPRESSION)] = Undetermined - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Undetermined - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] = Undetermined - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined UMethod (name = barT) [public static final fun barT(t: T) : void {...}] UParameter (name = t) [var t: T] UBlockExpression [{...}] = Undetermined - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined UMethod (name = barTL) [public static final fun barTL(listT: T) : void {...}] UParameter (name = listT) [var listT: T] UBlockExpression [{...}] = Undetermined - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined [!] UnknownKotlinExpression (FOR) [[!] UnknownKotlinExpression (FOR)] = Undetermined UClass (name = A) [public class A {...}] UMethod (name = A) [public fun A() = UastEmptyExpression] diff --git a/plugins/uast-kotlin-fir/testData/legacyValues/SAM.values.fir.txt b/plugins/uast-kotlin-fir/testData/legacyValues/SAM.values.fir.txt index b83503ffea4..cf11803be02 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/SAM.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/SAM.values.fir.txt @@ -8,8 +8,12 @@ UFile (package = ) [import java.lang.Thread...] [!] UnknownKotlinExpression (LAMBDA_EXPRESSION) [[!] UnknownKotlinExpression (LAMBDA_EXPRESSION)] = Undetermined UField (name = foo) [private static var foo: java.lang.Runnable = [!] UnknownKotlinExpression (LAMBDA_EXPRESSION)] [!] UnknownKotlinExpression (LAMBDA_EXPRESSION) [[!] UnknownKotlinExpression (LAMBDA_EXPRESSION)] = Undetermined - UField (name = baz) [private static final var baz: java.lang.Runnable = [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Undetermined + UField (name = baz) [private static final var baz: java.lang.Runnable = [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined UMethod (name = getNotSam) [public static final fun getNotSam() : kotlin.jvm.functions.Function0 = UastEmptyExpression] UMethod (name = getFoo) [public static final fun getFoo() : java.lang.Runnable = UastEmptyExpression] UMethod (name = setFoo) [public static final fun setFoo(value: java.lang.Runnable) : void = UastEmptyExpression] diff --git a/plugins/uast-kotlin-fir/testData/legacyValues/StringTemplateComplex.values.fir.txt b/plugins/uast-kotlin-fir/testData/legacyValues/StringTemplateComplex.values.fir.txt index f08d81f836d..ebf9049e650 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/StringTemplateComplex.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/StringTemplateComplex.values.fir.txt @@ -21,10 +21,14 @@ UFile (package = ) [public final class StringTemplateComplexKt {...] ULiteralExpression (value = "literal") ["literal"] = "literal" [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined ULiteralExpression (value = " z") [" z"] = " z" - 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"] = Undetermined + UField (name = literalInLiteral2) [private static final var literalInLiteral2: java.lang.String = "a " + "literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + " z"] + UPolyadicExpression (operator = +) ["a " + "literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + " z"] = Undetermined ULiteralExpression (value = "a ") ["a "] = "a " - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression ["literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + UPolyadicExpression (operator = +) ["literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + ULiteralExpression (value = "literal") ["literal"] = "literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined ULiteralExpression (value = " z") [" z"] = " z" UField (name = empty) [private static final var empty: java.lang.String = ""] ULiteralExpression (value = "") [""] = "" diff --git a/plugins/uast-kotlin-fir/testData/legacyValues/StringTemplateComplexForUInjectionHost.values.fir.txt b/plugins/uast-kotlin-fir/testData/legacyValues/StringTemplateComplexForUInjectionHost.values.fir.txt index 95347666668..22a7464cd78 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/StringTemplateComplexForUInjectionHost.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/StringTemplateComplexForUInjectionHost.values.fir.txt @@ -21,10 +21,14 @@ UFile (package = ) [public final class StringTemplateComplexForUInjectionHostKt ULiteralExpression (value = "literal") ["literal"] = "literal" [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined ULiteralExpression (value = " z") [" z"] = " z" - 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"] = Undetermined + UField (name = literalInLiteral2) [private static final var literalInLiteral2: java.lang.String = "a " + "literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + " z"] + UPolyadicExpression (operator = +) ["a " + "literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + " z"] = Undetermined ULiteralExpression (value = "a ") ["a "] = "a " - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression ["literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + UPolyadicExpression (operator = +) ["literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + ULiteralExpression (value = "literal") ["literal"] = "literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined ULiteralExpression (value = " z") [" z"] = " z" UField (name = empty) [private static final var empty: java.lang.String = ""] ULiteralExpression (value = "") [""] = "" diff --git a/plugins/uast-kotlin-fir/testData/legacyValues/StringTemplateInClass.values.fir.txt b/plugins/uast-kotlin-fir/testData/legacyValues/StringTemplateInClass.values.fir.txt index 2ed828ac21a..75f7ac93d67 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/StringTemplateInClass.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/StringTemplateInClass.values.fir.txt @@ -1,6 +1,8 @@ UFile (package = ) [public final class Demo {...] UClass (name = Demo) [public final class Demo {...}] - UField (name = foo) [private final var foo: error.NonExistentClass = [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Undetermined + UField (name = foo) [private final var foo: error.NonExistentClass = [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined UMethod (name = Demo) [public fun Demo() = UastEmptyExpression] UMethod (name = getFoo) [public final fun getFoo() : error.NonExistentClass = UastEmptyExpression] diff --git a/plugins/uast-kotlin-fir/testData/legacyValues/SuperCalls.values.fir.txt b/plugins/uast-kotlin-fir/testData/legacyValues/SuperCalls.values.fir.txt index 85172325596..70d13b174fc 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/SuperCalls.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/SuperCalls.values.fir.txt @@ -36,7 +36,9 @@ UFile (package = ) [public final class SuperCallsKt {...] UMethod (name = foo) [public fun foo(a: long) : void {...}] UParameter (name = a) [var a: long] UBlockExpression [{...}] = Undetermined - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (SUPER_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (SUPER_EXPRESSION) [[!] UnknownKotlinExpression (SUPER_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined UClass (name = O) [public final class O : A {...}] UField (name = INSTANCE) [public static final var INSTANCE: O] UMethod (name = O) [private fun O() = UastEmptyExpression] diff --git a/plugins/uast-kotlin-fir/testData/legacyValues/Suspend.values.fir.txt b/plugins/uast-kotlin-fir/testData/legacyValues/Suspend.values.fir.txt index 7b3cbd7bc96..388cf9c82b6 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/Suspend.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/Suspend.values.fir.txt @@ -2,8 +2,10 @@ UFile (package = test.pkg) [package test.pkg...] UClass (name = SuspendKt) [public final class SuspendKt {...}] UMethod (name = top) [public static final fun top() : int {...}] UBlockExpression [{...}] = Nothing - UReturnExpression [return [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Nothing - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] = Undetermined + UReturnExpression [return [!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Nothing + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined UClass (name = Context) [public final class Context {...}] UMethod (name = Context) [public fun Context() = UastEmptyExpression] UMethod (name = inner) [public final fun inner() : int {...}] diff --git a/plugins/uast-kotlin-fir/testData/type/typeCheck.types.fir.txt b/plugins/uast-kotlin-fir/testData/type/typeCheck.types.fir.txt index 12646e1945a..e5eb8941f15 100644 --- a/plugins/uast-kotlin-fir/testData/type/typeCheck.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/type/typeCheck.types.fir.txt @@ -3,10 +3,12 @@ UFile (package = ) [public final class TypeCheckKt {...] UMethod (name = asString) [public static final fun asString($this$asString: java.lang.Object) : java.lang.String {...}] UParameter (name = $this$asString) [var $this$asString: java.lang.Object] UBlockExpression [{...}] : PsiType:Void - UReturnExpression [return if ([!] UnknownKotlinExpression (REFERENCE_EXPRESSION) !is java.lang.String) [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) else [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:Void - UIfExpression [if ([!] UnknownKotlinExpression (REFERENCE_EXPRESSION) !is java.lang.String) [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) else [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:String + UReturnExpression [return if ([!] UnknownKotlinExpression (REFERENCE_EXPRESSION) !is java.lang.String) [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) else [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:Void + UIfExpression [if ([!] UnknownKotlinExpression (REFERENCE_EXPRESSION) !is java.lang.String) [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) else [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:String UBinaryExpressionWithType [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION) !is java.lang.String] : PsiType:boolean [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] UTypeReferenceExpression (name = java.lang.String) [java.lang.String] - [!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION) [[!] UnknownKotlinExpression (DOT_QUALIFIED_EXPRESSION)] + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:String + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] diff --git a/plugins/uast-kotlin-fir/tests/org/jetbrains/uast/test/common/kotlin/FirUastTypesTestBase.kt b/plugins/uast-kotlin-fir/tests/org/jetbrains/uast/test/common/kotlin/FirUastTypesTestBase.kt index 6a38ed8fd8b..f86359aaf96 100644 --- a/plugins/uast-kotlin-fir/tests/org/jetbrains/uast/test/common/kotlin/FirUastTypesTestBase.kt +++ b/plugins/uast-kotlin-fir/tests/org/jetbrains/uast/test/common/kotlin/FirUastTypesTestBase.kt @@ -6,6 +6,7 @@ package org.jetbrains.uast.test.common.kotlin import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.KtAssert import org.jetbrains.uast.UFile import org.jetbrains.uast.test.common.kotlin.FirUastTestSuffix.TXT import java.io.File @@ -21,10 +22,22 @@ interface FirUastTypesTestBase : FirUastPluginSelection, FirUastFileComparisonTe return getTypesFile(filePath, "$pluginSuffix$TXT") } + // TODO: ideally, we don't want this kind of whitelist. + fun isExpectedToFail(filePath: String): Boolean { + return false + } + fun check(filePath: String, file: UFile) { val typesFile = getPluginTypesFile(filePath) - KotlinTestUtils.assertEqualsToFile(typesFile, file.asLogTypes()) + try { + KotlinTestUtils.assertEqualsToFile(typesFile, file.asLogTypes()) + if (isExpectedToFail(filePath)) { + KtAssert.fail("This test seems not fail anymore. Drop this from the white-list and re-run the test.") + } + } catch (e: Exception) { + if (!isExpectedToFail(filePath)) throw e + } cleanUpIdenticalFile( typesFile, diff --git a/plugins/uast-kotlin-fir/tests/org/jetbrains/uast/test/kotlin/AbstractFirLegacyUastTypesTest.kt b/plugins/uast-kotlin-fir/tests/org/jetbrains/uast/test/kotlin/AbstractFirLegacyUastTypesTest.kt index 62ec62855f4..351f07ac472 100644 --- a/plugins/uast-kotlin-fir/tests/org/jetbrains/uast/test/kotlin/AbstractFirLegacyUastTypesTest.kt +++ b/plugins/uast-kotlin-fir/tests/org/jetbrains/uast/test/kotlin/AbstractFirLegacyUastTypesTest.kt @@ -7,4 +7,12 @@ package org.jetbrains.uast.test.kotlin import org.jetbrains.uast.test.common.kotlin.FirLegacyUastTypesTestBase -abstract class AbstractFirLegacyUastTypesTest : AbstractFirUastTypesTest(), FirLegacyUastTypesTestBase +abstract class AbstractFirLegacyUastTypesTest : AbstractFirUastTypesTest(), FirLegacyUastTypesTestBase { + private val whitelist : Set = setOf( + // TODO: not able to map Stream + "plugins/uast-kotlin/testData/Lambdas.kt", + ) + override fun isExpectedToFail(filePath: String): Boolean { + return filePath in whitelist + } +}