diff --git a/plugins/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinAbstractUSimpleReferenceExpression.kt b/plugins/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinAbstractUSimpleReferenceExpression.kt new file mode 100644 index 00000000000..bdbf7ed5160 --- /dev/null +++ b/plugins/uast-kotlin-base/src/org/jetbrains/uast/kotlin/expressions/KotlinAbstractUSimpleReferenceExpression.kt @@ -0,0 +1,39 @@ +/* + * 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 + +import com.intellij.psi.PsiElement +import com.intellij.psi.PsiNamedElement +import org.jetbrains.kotlin.psi.KtSimpleNameExpression +import org.jetbrains.uast.UElement +import org.jetbrains.uast.USimpleNameReferenceExpression +import org.jetbrains.uast.internal.acceptList +import org.jetbrains.uast.toUElement +import org.jetbrains.uast.visitor.UastVisitor + +abstract class KotlinAbstractUSimpleReferenceExpression( + override val sourcePsi: KtSimpleNameExpression, + givenParent: UElement? +) : KotlinAbstractUExpression(givenParent), USimpleNameReferenceExpression, KotlinUElementWithType, KotlinEvaluatableUElement { + protected val resolvedDeclaration: PsiElement? by lz { baseResolveProviderService.resolveToDeclaration(sourcePsi) } + + override val identifier get() = sourcePsi.getReferencedName() + + override fun resolve() = resolvedDeclaration + + override val resolvedName: String? + get() = (resolvedDeclaration as? PsiNamedElement)?.name + + override fun accept(visitor: UastVisitor) { + visitor.visitSimpleNameReferenceExpression(this) + + uAnnotations.acceptList(visitor) + + visitor.afterVisitSimpleNameReferenceExpression(this) + } + + override val referenceNameElement: UElement? by lz { sourcePsi.getIdentifier()?.toUElement() } +} 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 e5b12bdb1c3..4fc7c40716f 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 @@ -310,6 +310,7 @@ internal object FirKotlinConverter : BaseKotlinConverter { is KtArrayAccessExpression -> expr(build(::FirKotlinUArrayAccessExpression)) is KtDotQualifiedExpression -> expr(build(::KotlinUQualifiedReferenceExpression)) + is KtSimpleNameExpression -> expr(build(::FirKotlinUSimpleReferenceExpression)) else -> expr(build(::UnknownKotlinExpression)) } diff --git a/plugins/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/expressions/FirKotlinUSimpleReferenceExpression.kt b/plugins/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/expressions/FirKotlinUSimpleReferenceExpression.kt new file mode 100644 index 00000000000..911eb8aca4d --- /dev/null +++ b/plugins/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/expressions/FirKotlinUSimpleReferenceExpression.kt @@ -0,0 +1,16 @@ +/* + * 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 + +import org.jetbrains.kotlin.psi.KtSimpleNameExpression +import org.jetbrains.uast.UElement + +class FirKotlinUSimpleReferenceExpression( + override val sourcePsi: KtSimpleNameExpression, + givenParent: UElement? +) : KotlinAbstractUSimpleReferenceExpression(sourcePsi, givenParent) { + // TODO: handle destructuring declaration differently or commonize it +} diff --git a/plugins/uast-kotlin-fir/testData/declaration/if.log.fir.txt b/plugins/uast-kotlin-fir/testData/declaration/if.log.fir.txt index 8f7b3a66556..80acc450cf4 100644 --- a/plugins/uast-kotlin-fir/testData/declaration/if.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/declaration/if.log.fir.txt @@ -5,7 +5,7 @@ UFile (package = ) UBlockExpression UReturnExpression UIfExpression - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = b) UParenthesizedExpression [!] UnknownKotlinExpression (BINARY_EXPRESSION) ULiteralExpression (value = "42") diff --git a/plugins/uast-kotlin-fir/testData/declaration/if.render.fir.txt b/plugins/uast-kotlin-fir/testData/declaration/if.render.fir.txt index 5ae99f1a16c..9b5521a6985 100644 --- a/plugins/uast-kotlin-fir/testData/declaration/if.render.fir.txt +++ b/plugins/uast-kotlin-fir/testData/declaration/if.render.fir.txt @@ -1,5 +1,5 @@ public final class IfKt { public static final fun test(b: boolean) : java.lang.Object { - return if ([!] UnknownKotlinExpression (REFERENCE_EXPRESSION)) ([!] UnknownKotlinExpression (BINARY_EXPRESSION)) else "42" + return if (b) ([!] UnknownKotlinExpression (BINARY_EXPRESSION)) else "42" } } 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 24e8a8ce3c4..b13326e3265 100644 --- a/plugins/uast-kotlin-fir/testData/declaration/objects.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/declaration/objects.log.fir.txt @@ -8,10 +8,10 @@ UFile (package = ) UMethod (name = main) UBlockExpression UQualifiedReferenceExpression - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = RunnableManager) [!] UnknownKotlinExpression (CALL_EXPRESSION) UQualifiedReferenceExpression - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = RunnableManager) [!] UnknownKotlinExpression (CALL_EXPRESSION) UClass (name = RunnableManager) UField (name = INSTANCE) @@ -23,7 +23,7 @@ UFile (package = ) UParameter (name = runnable) UBlockExpression UQualifiedReferenceExpression - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = tasks) [!] UnknownKotlinExpression (CALL_EXPRESSION) UMethod (name = runAll) UBlockExpression 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 808cce6c522..d91caaf1ba4 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 (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + RunnableManager.[!] UnknownKotlinExpression (CALL_EXPRESSION) + RunnableManager.[!] 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 (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + tasks.[!] UnknownKotlinExpression (CALL_EXPRESSION) } public final fun runAll() : void { [!] UnknownKotlinExpression (FOR) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotatedExpressions.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotatedExpressions.identifiers.fir.txt index 85cfc1a851d..dc6b518aca2 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotatedExpressions.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotatedExpressions.identifiers.fir.txt @@ -1,30 +1,30 @@ foo -> UMethod (name = foo) - Suppress -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Suppress -> USimpleNameReferenceExpression (identifier = Suppress) foo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - Suppress -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Suppress -> USimpleNameReferenceExpression (identifier = Suppress) a -> [!] UnknownKotlinExpression (PROPERTY) - Suppress -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Suppress -> USimpleNameReferenceExpression (identifier = Suppress) b -> [!] UnknownKotlinExpression (PROPERTY) - Suppress -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - b -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - = -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - Suppress -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - > -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - b -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Suppress -> USimpleNameReferenceExpression (identifier = Suppress) + b -> USimpleNameReferenceExpression (identifier = b) + = -> USimpleNameReferenceExpression (identifier = =) + a -> USimpleNameReferenceExpression (identifier = a) + Suppress -> USimpleNameReferenceExpression (identifier = Suppress) + a -> USimpleNameReferenceExpression (identifier = a) + > -> USimpleNameReferenceExpression (identifier = >) + a -> USimpleNameReferenceExpression (identifier = a) + b -> USimpleNameReferenceExpression (identifier = b) c -> [!] UnknownKotlinExpression (PROPERTY) - Suppress -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - ?: -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - b -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Suppress -> USimpleNameReferenceExpression (identifier = Suppress) + a -> USimpleNameReferenceExpression (identifier = a) + ?: -> USimpleNameReferenceExpression (identifier = ?:) + b -> USimpleNameReferenceExpression (identifier = b) annotatedSwitch -> UMethod (name = annotatedSwitch) str -> UParameter (name = str) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Suppress -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -str -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) +Suppress -> USimpleNameReferenceExpression (identifier = Suppress) +str -> USimpleNameReferenceExpression (identifier = str) isBlank -> [!] UnknownKotlinExpression (CALL_EXPRESSION) -str -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +str -> USimpleNameReferenceExpression (identifier = str) isNotEmpty -> [!] UnknownKotlinExpression (CALL_EXPRESSION) -!= -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) +!= -> USimpleNameReferenceExpression (identifier = !=) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotatedExpressions.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotatedExpressions.refNames.fir.txt index eb43a44ab12..2f2ba8b9d20 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotatedExpressions.refNames.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotatedExpressions.refNames.fir.txt @@ -1,2 +1,22 @@ +Suppress -> USimpleNameReferenceExpression (identifier = Suppress) from KtNameReferenceExpression +foo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Suppress -> USimpleNameReferenceExpression (identifier = Suppress) from KtNameReferenceExpression +Suppress -> USimpleNameReferenceExpression (identifier = Suppress) from KtNameReferenceExpression +Suppress -> USimpleNameReferenceExpression (identifier = Suppress) from KtNameReferenceExpression +b -> USimpleNameReferenceExpression (identifier = b) from KtNameReferenceExpression +a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression +Suppress -> USimpleNameReferenceExpression (identifier = Suppress) from KtNameReferenceExpression +a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression +a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression +b -> USimpleNameReferenceExpression (identifier = b) from KtNameReferenceExpression +Suppress -> USimpleNameReferenceExpression (identifier = Suppress) from KtNameReferenceExpression +a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression +b -> USimpleNameReferenceExpression (identifier = b) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +Suppress -> USimpleNameReferenceExpression (identifier = Suppress) from KtNameReferenceExpression isBlank() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +str -> USimpleNameReferenceExpression (identifier = str) from KtNameReferenceExpression +isBlank -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression isNotEmpty() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +str -> USimpleNameReferenceExpression (identifier = str) from KtNameReferenceExpression +isNotEmpty -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotationComplex.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotationComplex.identifiers.fir.txt index 9fbe8738f54..6c50bce7ff7 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotationComplex.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotationComplex.identifiers.fir.txt @@ -1,28 +1,28 @@ Annotation -> UClass (name = Annotation) strings -> UAnnotationMethod (name = strings) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Annotation -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) +Annotation -> USimpleNameReferenceExpression (identifier = Annotation) A -> UClass (name = A) AnnotationInner -> UClass (name = AnnotationInner) value -> UAnnotationMethod (name = value) -Annotation -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -AnnotationArray -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Annotation -> USimpleNameReferenceExpression (identifier = Annotation) +AnnotationArray -> USimpleNameReferenceExpression (identifier = AnnotationArray) Annotation -> [!] UnknownKotlinExpression (CALL_EXPRESSION) B1 -> UClass (name = B1) -AnnotationArray -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -value -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +AnnotationArray -> USimpleNameReferenceExpression (identifier = AnnotationArray) +value -> USimpleNameReferenceExpression (identifier = value) Annotation -> [!] UnknownKotlinExpression (CALL_EXPRESSION) B2 -> UClass (name = B2) AnnotationArray -> UClass (name = AnnotationArray) value -> UAnnotationMethod (name = value) -Annotation -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -AnnotationArray -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Annotation -> USimpleNameReferenceExpression (identifier = Annotation) +AnnotationArray -> USimpleNameReferenceExpression (identifier = AnnotationArray) Annotation -> [!] UnknownKotlinExpression (CALL_EXPRESSION) -strings -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +strings -> USimpleNameReferenceExpression (identifier = strings) arrayOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) C -> UClass (name = C) -AnnotationArray -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +AnnotationArray -> USimpleNameReferenceExpression (identifier = AnnotationArray) Annotation -> [!] UnknownKotlinExpression (CALL_EXPRESSION) -strings -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +strings -> USimpleNameReferenceExpression (identifier = strings) [ -> UCallExpression (kind = UastCallKind(name='array_initializer'), argCount = 2)) C2 -> UClass (name = C2) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotationComplex.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotationComplex.refNames.fir.txt new file mode 100644 index 00000000000..eb8e320458c --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotationComplex.refNames.fir.txt @@ -0,0 +1,16 @@ +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +Annotation -> USimpleNameReferenceExpression (identifier = Annotation) from KtNameReferenceExpression +Annotation -> USimpleNameReferenceExpression (identifier = Annotation) from KtNameReferenceExpression +AnnotationArray -> USimpleNameReferenceExpression (identifier = AnnotationArray) from KtNameReferenceExpression +Annotation -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +AnnotationArray -> USimpleNameReferenceExpression (identifier = AnnotationArray) from KtNameReferenceExpression +value -> USimpleNameReferenceExpression (identifier = value) from KtNameReferenceExpression +Annotation -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Annotation -> USimpleNameReferenceExpression (identifier = Annotation) from KtNameReferenceExpression +AnnotationArray -> USimpleNameReferenceExpression (identifier = AnnotationArray) from KtNameReferenceExpression +Annotation -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +strings -> USimpleNameReferenceExpression (identifier = strings) from KtNameReferenceExpression +arrayOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +AnnotationArray -> USimpleNameReferenceExpression (identifier = AnnotationArray) from KtNameReferenceExpression +Annotation -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +strings -> USimpleNameReferenceExpression (identifier = strings) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotationParameters.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotationParameters.identifiers.fir.txt index 79b16c8e192..9647fe34f77 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotationParameters.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotationParameters.identifiers.fir.txt @@ -1,42 +1,42 @@ IntRange -> UClass (name = IntRange) from -> UAnnotationMethod (name = from) -Long -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Long -> USimpleNameReferenceExpression (identifier = Long) to -> UAnnotationMethod (name = to) -Long -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Long -> USimpleNameReferenceExpression (identifier = Long) RequiresPermission -> UClass (name = RequiresPermission) anyOf -> UAnnotationMethod (name = anyOf) -IntArray -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +IntArray -> USimpleNameReferenceExpression (identifier = IntArray) RequiresStrPermission -> UClass (name = RequiresStrPermission) strs -> UAnnotationMethod (name = strs) -Array -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Array -> USimpleNameReferenceExpression (identifier = Array) +String -> USimpleNameReferenceExpression (identifier = String) WithDefaultValue -> UClass (name = WithDefaultValue) value -> UAnnotationMethod (name = value) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) SuppressLint -> UClass (name = SuppressLint) value -> UAnnotationMethod (name = value) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -RequiresPermission -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -anyOf -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) +RequiresPermission -> USimpleNameReferenceExpression (identifier = RequiresPermission) +anyOf -> USimpleNameReferenceExpression (identifier = anyOf) intArrayOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) -IntRange -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -from -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -to -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -WithDefaultValue -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -SuppressLint -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +IntRange -> USimpleNameReferenceExpression (identifier = IntRange) +from -> USimpleNameReferenceExpression (identifier = from) +to -> USimpleNameReferenceExpression (identifier = to) +WithDefaultValue -> USimpleNameReferenceExpression (identifier = WithDefaultValue) +SuppressLint -> USimpleNameReferenceExpression (identifier = SuppressLint) foo -> UMethod (name = foo) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -IntRange -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -SuppressLint -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) +IntRange -> USimpleNameReferenceExpression (identifier = IntRange) +SuppressLint -> USimpleNameReferenceExpression (identifier = SuppressLint) bar -> UMethod (name = bar) -Unit -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -RequiresPermission -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -anyOf -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Unit -> USimpleNameReferenceExpression (identifier = Unit) +RequiresPermission -> USimpleNameReferenceExpression (identifier = RequiresPermission) +anyOf -> USimpleNameReferenceExpression (identifier = anyOf) [ -> UCallExpression (kind = UastCallKind(name='array_initializer'), argCount = 3)) fooWithArrLiteral -> UMethod (name = fooWithArrLiteral) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -RequiresStrPermission -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -strs -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) +RequiresStrPermission -> USimpleNameReferenceExpression (identifier = RequiresStrPermission) +strs -> USimpleNameReferenceExpression (identifier = strs) [ -> UCallExpression (kind = UastCallKind(name='array_initializer'), argCount = 3)) fooWithStrArrLiteral -> UMethod (name = fooWithStrArrLiteral) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotationParameters.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotationParameters.refNames.fir.txt new file mode 100644 index 00000000000..876a29947ba --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotationParameters.refNames.fir.txt @@ -0,0 +1,25 @@ +Long -> USimpleNameReferenceExpression (identifier = Long) from KtNameReferenceExpression +Long -> USimpleNameReferenceExpression (identifier = Long) from KtNameReferenceExpression +IntArray -> USimpleNameReferenceExpression (identifier = IntArray) from KtNameReferenceExpression +Array -> USimpleNameReferenceExpression (identifier = Array) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +RequiresPermission -> USimpleNameReferenceExpression (identifier = RequiresPermission) from KtNameReferenceExpression +anyOf -> USimpleNameReferenceExpression (identifier = anyOf) from KtNameReferenceExpression +intArrayOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +IntRange -> USimpleNameReferenceExpression (identifier = IntRange) from KtNameReferenceExpression +from -> USimpleNameReferenceExpression (identifier = from) from KtNameReferenceExpression +to -> USimpleNameReferenceExpression (identifier = to) from KtNameReferenceExpression +WithDefaultValue -> USimpleNameReferenceExpression (identifier = WithDefaultValue) from KtNameReferenceExpression +SuppressLint -> USimpleNameReferenceExpression (identifier = SuppressLint) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +IntRange -> USimpleNameReferenceExpression (identifier = IntRange) from KtNameReferenceExpression +SuppressLint -> USimpleNameReferenceExpression (identifier = SuppressLint) from KtNameReferenceExpression +Unit -> USimpleNameReferenceExpression (identifier = Unit) from KtNameReferenceExpression +RequiresPermission -> USimpleNameReferenceExpression (identifier = RequiresPermission) from KtNameReferenceExpression +anyOf -> USimpleNameReferenceExpression (identifier = anyOf) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +RequiresStrPermission -> USimpleNameReferenceExpression (identifier = RequiresStrPermission) from KtNameReferenceExpression +strs -> USimpleNameReferenceExpression (identifier = strs) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Anonymous.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Anonymous.identifiers.fir.txt index 81792c1522d..aa310151654 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Anonymous.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Anonymous.identifiers.fir.txt @@ -1,33 +1,33 @@ -java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -io -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Closeable -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -io -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -InputStream -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +java -> USimpleNameReferenceExpression (identifier = java) +io -> USimpleNameReferenceExpression (identifier = io) +Closeable -> USimpleNameReferenceExpression (identifier = Closeable) +java -> USimpleNameReferenceExpression (identifier = java) +io -> USimpleNameReferenceExpression (identifier = io) +InputStream -> USimpleNameReferenceExpression (identifier = InputStream) foo -> UMethod (name = foo) runnable -> [!] UnknownKotlinExpression (PROPERTY) object -> UClass (name = null) - Runnable -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Runnable -> USimpleNameReferenceExpression (identifier = Runnable) run -> UMethod (name = run) - runnable -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + runnable -> USimpleNameReferenceExpression (identifier = runnable) run -> [!] UnknownKotlinExpression (CALL_EXPRESSION) runnable2 -> [!] UnknownKotlinExpression (PROPERTY) Runnable -> [!] UnknownKotlinExpression (CALL_EXPRESSION) println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - runnable2 -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + runnable2 -> USimpleNameReferenceExpression (identifier = runnable2) run -> [!] UnknownKotlinExpression (CALL_EXPRESSION) closeableRunnable -> [!] UnknownKotlinExpression (PROPERTY) object -> UClass (name = null) - Runnable -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - Closeable -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Runnable -> USimpleNameReferenceExpression (identifier = Runnable) + Closeable -> USimpleNameReferenceExpression (identifier = Closeable) close -> UMethod (name = close) run -> UMethod (name = run) runnableIs -> [!] UnknownKotlinExpression (PROPERTY) object -> UClass (name = null) - InputStream -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - Runnable -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + InputStream -> USimpleNameReferenceExpression (identifier = InputStream) + Runnable -> USimpleNameReferenceExpression (identifier = Runnable) read -> UMethod (name = read) - Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Int -> USimpleNameReferenceExpression (identifier = Int) run -> UMethod (name = run) withErr -> UMethod (name = withErr) runnable -> [!] UnknownKotlinExpression (PROPERTY) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Anonymous.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Anonymous.refNames.fir.txt index 7584ceafb66..78d225cfa9a 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Anonymous.refNames.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Anonymous.refNames.fir.txt @@ -1,6 +1,24 @@ -Closeable -> UQualifiedReferenceExpression from KtDotQualifiedExpression -io -> UQualifiedReferenceExpression from KtDotQualifiedExpression -InputStream -> UQualifiedReferenceExpression from KtDotQualifiedExpression -io -> UQualifiedReferenceExpression from KtDotQualifiedExpression +Closeable -> USimpleNameReferenceExpression (identifier = Closeable) from KtDotQualifiedExpression +io -> USimpleNameReferenceExpression (identifier = io) from KtDotQualifiedExpression +java -> USimpleNameReferenceExpression (identifier = java) from KtNameReferenceExpression +io -> USimpleNameReferenceExpression (identifier = io) from KtNameReferenceExpression +Closeable -> USimpleNameReferenceExpression (identifier = Closeable) from KtNameReferenceExpression +InputStream -> USimpleNameReferenceExpression (identifier = InputStream) from KtDotQualifiedExpression +io -> USimpleNameReferenceExpression (identifier = io) from KtDotQualifiedExpression +java -> USimpleNameReferenceExpression (identifier = java) from KtNameReferenceExpression +io -> USimpleNameReferenceExpression (identifier = io) from KtNameReferenceExpression +InputStream -> USimpleNameReferenceExpression (identifier = InputStream) from KtNameReferenceExpression +Runnable -> USimpleNameReferenceExpression (identifier = Runnable) from KtNameReferenceExpression run() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +runnable -> USimpleNameReferenceExpression (identifier = runnable) from KtNameReferenceExpression +run -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Runnable -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression run() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +runnable2 -> USimpleNameReferenceExpression (identifier = runnable2) from KtNameReferenceExpression +run -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Runnable -> USimpleNameReferenceExpression (identifier = Runnable) from KtNameReferenceExpression +Closeable -> USimpleNameReferenceExpression (identifier = Closeable) from KtNameReferenceExpression +InputStream -> USimpleNameReferenceExpression (identifier = InputStream) from KtNameReferenceExpression +Runnable -> USimpleNameReferenceExpression (identifier = Runnable) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Assertion.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Assertion.identifiers.fir.txt index a25006bcf0a..48edc7285f6 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Assertion.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Assertion.identifiers.fir.txt @@ -1,6 +1,6 @@ foo -> UMethod (name = foo) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) s -> [!] UnknownKotlinExpression (PROPERTY) - String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - s -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - !! -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + String -> USimpleNameReferenceExpression (identifier = String) + s -> USimpleNameReferenceExpression (identifier = s) + !! -> USimpleNameReferenceExpression (identifier = !!) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Assertion.refNames.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Assertion.refNames.txt similarity index 92% rename from plugins/uast-kotlin-fir/testData/legacyIdentifiers/Assertion.refNames.fe10.txt rename to plugins/uast-kotlin-fir/testData/legacyIdentifiers/Assertion.refNames.txt index 346e40d6062..cfba6885676 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Assertion.refNames.fe10.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Assertion.refNames.txt @@ -1,3 +1,3 @@ String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression -s -> USimpleNameReferenceExpression (identifier = s) from KtNameReferenceExpression +s -> USimpleNameReferenceExpression (identifier = s) from KtNameReferenceExpression \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Bitwise.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Bitwise.identifiers.fir.txt index 6259c6557b1..1238e3e953f 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Bitwise.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Bitwise.identifiers.fir.txt @@ -1,72 +1,72 @@ foo -> UMethod (name = foo) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) mask -> [!] UnknownKotlinExpression (PROPERTY) - Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Int -> USimpleNameReferenceExpression (identifier = Int) x -> [!] UnknownKotlinExpression (PROPERTY) - Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Int -> USimpleNameReferenceExpression (identifier = Int) pos -> [!] UnknownKotlinExpression (PROPERTY) - x -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - and -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - mask -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + x -> USimpleNameReferenceExpression (identifier = x) + and -> USimpleNameReferenceExpression (identifier = and) + mask -> USimpleNameReferenceExpression (identifier = mask) max -> [!] UnknownKotlinExpression (PROPERTY) - x -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - or -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - mask -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + x -> USimpleNameReferenceExpression (identifier = x) + or -> USimpleNameReferenceExpression (identifier = or) + mask -> USimpleNameReferenceExpression (identifier = mask) zebra -> [!] UnknownKotlinExpression (PROPERTY) - x -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - xor -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - mask -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + x -> USimpleNameReferenceExpression (identifier = x) + xor -> USimpleNameReferenceExpression (identifier = xor) + mask -> USimpleNameReferenceExpression (identifier = mask) signed -> [!] UnknownKotlinExpression (PROPERTY) - x -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - shr -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + x -> USimpleNameReferenceExpression (identifier = x) + shr -> USimpleNameReferenceExpression (identifier = shr) one -> [!] UnknownKotlinExpression (PROPERTY) - x -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - ushr -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + x -> USimpleNameReferenceExpression (identifier = x) + ushr -> USimpleNameReferenceExpression (identifier = ushr) zero -> [!] UnknownKotlinExpression (PROPERTY) - x -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - shl -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - pos -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - + -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - zero -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - - -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - zebra -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - * -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - signed -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - / -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - one -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + x -> USimpleNameReferenceExpression (identifier = x) + shl -> USimpleNameReferenceExpression (identifier = shl) + pos -> USimpleNameReferenceExpression (identifier = pos) + + -> USimpleNameReferenceExpression (identifier = +) + zero -> USimpleNameReferenceExpression (identifier = zero) + - -> USimpleNameReferenceExpression (identifier = -) + zebra -> USimpleNameReferenceExpression (identifier = zebra) + * -> USimpleNameReferenceExpression (identifier = *) + signed -> USimpleNameReferenceExpression (identifier = signed) + / -> USimpleNameReferenceExpression (identifier = /) + one -> USimpleNameReferenceExpression (identifier = one) bar -> UMethod (name = bar) -Long -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Long -> USimpleNameReferenceExpression (identifier = Long) mask -> [!] UnknownKotlinExpression (PROPERTY) - Long -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Long -> USimpleNameReferenceExpression (identifier = Long) x -> [!] UnknownKotlinExpression (PROPERTY) - Long -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Long -> USimpleNameReferenceExpression (identifier = Long) pos -> [!] UnknownKotlinExpression (PROPERTY) - x -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - and -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - mask -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + x -> USimpleNameReferenceExpression (identifier = x) + and -> USimpleNameReferenceExpression (identifier = and) + mask -> USimpleNameReferenceExpression (identifier = mask) max -> [!] UnknownKotlinExpression (PROPERTY) - x -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - or -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - mask -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + x -> USimpleNameReferenceExpression (identifier = x) + or -> USimpleNameReferenceExpression (identifier = or) + mask -> USimpleNameReferenceExpression (identifier = mask) zebra -> [!] UnknownKotlinExpression (PROPERTY) - x -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - xor -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - mask -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + x -> USimpleNameReferenceExpression (identifier = x) + xor -> USimpleNameReferenceExpression (identifier = xor) + mask -> USimpleNameReferenceExpression (identifier = mask) signed -> [!] UnknownKotlinExpression (PROPERTY) - x -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - shr -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + x -> USimpleNameReferenceExpression (identifier = x) + shr -> USimpleNameReferenceExpression (identifier = shr) one -> [!] UnknownKotlinExpression (PROPERTY) - x -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - ushr -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + x -> USimpleNameReferenceExpression (identifier = x) + ushr -> USimpleNameReferenceExpression (identifier = ushr) zero -> [!] UnknownKotlinExpression (PROPERTY) - x -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - shl -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - pos -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - + -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - zero -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - - -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - zebra -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - * -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - signed -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - / -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - one -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + x -> USimpleNameReferenceExpression (identifier = x) + shl -> USimpleNameReferenceExpression (identifier = shl) + pos -> USimpleNameReferenceExpression (identifier = pos) + + -> USimpleNameReferenceExpression (identifier = +) + zero -> USimpleNameReferenceExpression (identifier = zero) + - -> USimpleNameReferenceExpression (identifier = -) + zebra -> USimpleNameReferenceExpression (identifier = zebra) + * -> USimpleNameReferenceExpression (identifier = *) + signed -> USimpleNameReferenceExpression (identifier = signed) + / -> USimpleNameReferenceExpression (identifier = /) + one -> USimpleNameReferenceExpression (identifier = one) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Bitwise.refNames.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Bitwise.refNames.txt similarity index 99% rename from plugins/uast-kotlin-fir/testData/legacyIdentifiers/Bitwise.refNames.fe10.txt rename to plugins/uast-kotlin-fir/testData/legacyIdentifiers/Bitwise.refNames.txt index d360744b7bb..51b753d2027 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Bitwise.refNames.fe10.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Bitwise.refNames.txt @@ -43,4 +43,4 @@ pos -> USimpleNameReferenceExpression (identifier = pos) from KtNameReferenceExp zero -> USimpleNameReferenceExpression (identifier = zero) from KtNameReferenceExpression zebra -> USimpleNameReferenceExpression (identifier = zebra) from KtNameReferenceExpression signed -> USimpleNameReferenceExpression (identifier = signed) from KtNameReferenceExpression -one -> USimpleNameReferenceExpression (identifier = one) from KtNameReferenceExpression +one -> USimpleNameReferenceExpression (identifier = one) from KtNameReferenceExpression \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/BrokenMethod.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/BrokenMethod.identifiers.fir.txt index 23a2d4c73cb..a2698bd3429 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/BrokenMethod.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/BrokenMethod.identifiers.fir.txt @@ -1,15 +1,15 @@ main -> UMethod (name = main) args -> UParameter (name = args) -Array -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Array -> USimpleNameReferenceExpression (identifier = Array) +String -> USimpleNameReferenceExpression (identifier = String) TestUsed -> UClass (name = TestUsed) parameter -> UParameter (name = parameter) - CharSequence -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + CharSequence -> USimpleNameReferenceExpression (identifier = CharSequence) Used -> UClass (name = Used) parameter -> UParameter (name = parameter) - Any -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Any -> USimpleNameReferenceExpression (identifier = Any) object -> UClass (name = Companion) - Any -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Any -> USimpleNameReferenceExpression (identifier = Any) doStuff1 -> UMethod (name = doStuff1) Used -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - this -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + this -> USimpleNameReferenceExpression (identifier = this) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/BrokenMethod.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/BrokenMethod.refNames.fir.txt new file mode 100644 index 00000000000..45572ab8ad3 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/BrokenMethod.refNames.fir.txt @@ -0,0 +1,6 @@ +Array -> USimpleNameReferenceExpression (identifier = Array) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +CharSequence -> USimpleNameReferenceExpression (identifier = CharSequence) from KtNameReferenceExpression +Any -> USimpleNameReferenceExpression (identifier = Any) from KtNameReferenceExpression +Any -> USimpleNameReferenceExpression (identifier = Any) from KtNameReferenceExpression +Used -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ClassAnnotation.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ClassAnnotation.identifiers.fir.txt index aabf6e4a05f..0c9c67fd80c 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ClassAnnotation.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ClassAnnotation.identifiers.fir.txt @@ -1,13 +1,13 @@ -Test -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Test -> USimpleNameReferenceExpression (identifier = Test) A -> UClass (name = A) MyAnnotation -> UClass (name = MyAnnotation) text -> UAnnotationMethod (name = text) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -MyAnnotation -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) +MyAnnotation -> USimpleNameReferenceExpression (identifier = MyAnnotation) B -> UClass (name = B) -MyAnnotation -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +MyAnnotation -> USimpleNameReferenceExpression (identifier = MyAnnotation) InB -> UClass (name = InB) -MyAnnotation -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +MyAnnotation -> USimpleNameReferenceExpression (identifier = MyAnnotation) object -> UClass (name = Companion) -MyAnnotation -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +MyAnnotation -> USimpleNameReferenceExpression (identifier = MyAnnotation) Obj -> UClass (name = Obj) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ClassAnnotation.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ClassAnnotation.refNames.fir.txt new file mode 100644 index 00000000000..a7c91e79682 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ClassAnnotation.refNames.fir.txt @@ -0,0 +1,6 @@ +Test -> USimpleNameReferenceExpression (identifier = Test) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +MyAnnotation -> USimpleNameReferenceExpression (identifier = MyAnnotation) from KtNameReferenceExpression +MyAnnotation -> USimpleNameReferenceExpression (identifier = MyAnnotation) from KtNameReferenceExpression +MyAnnotation -> USimpleNameReferenceExpression (identifier = MyAnnotation) from KtNameReferenceExpression +MyAnnotation -> USimpleNameReferenceExpression (identifier = MyAnnotation) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ConstructorDelegate.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ConstructorDelegate.identifiers.fir.txt index 4ee4aa3d184..bb59f02fbd0 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ConstructorDelegate.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ConstructorDelegate.identifiers.fir.txt @@ -2,20 +2,20 @@ Base -> UClass (name = Base) print -> UMethod (name = print) BaseImpl -> UClass (name = BaseImpl) x -> UParameter (name = x) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Base -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) +Base -> USimpleNameReferenceExpression (identifier = Base) print -> UMethod (name = print) print -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - x -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + x -> USimpleNameReferenceExpression (identifier = x) Derived -> UClass (name = Derived) b -> UParameter (name = b) -Base -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Base -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Base -> USimpleNameReferenceExpression (identifier = Base) +Base -> USimpleNameReferenceExpression (identifier = Base) createBase -> [!] UnknownKotlinExpression (CALL_EXPRESSION) -CharSequence -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +CharSequence -> USimpleNameReferenceExpression (identifier = CharSequence) createBase -> UMethod (name = createBase) i -> UParameter (name = i) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Base -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) +Base -> USimpleNameReferenceExpression (identifier = Base) BaseImpl -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - i -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + i -> USimpleNameReferenceExpression (identifier = i) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ConstructorDelegate.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ConstructorDelegate.refNames.fir.txt new file mode 100644 index 00000000000..6e8dc79583f --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ConstructorDelegate.refNames.fir.txt @@ -0,0 +1,12 @@ +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +Base -> USimpleNameReferenceExpression (identifier = Base) from KtNameReferenceExpression +print -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +x -> USimpleNameReferenceExpression (identifier = x) from KtNameReferenceExpression +Base -> USimpleNameReferenceExpression (identifier = Base) from KtNameReferenceExpression +Base -> USimpleNameReferenceExpression (identifier = Base) from KtNameReferenceExpression +createBase -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +CharSequence -> USimpleNameReferenceExpression (identifier = CharSequence) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +Base -> USimpleNameReferenceExpression (identifier = Base) from KtNameReferenceExpression +BaseImpl -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +i -> USimpleNameReferenceExpression (identifier = i) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Constructors.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Constructors.identifiers.fir.txt index c35288f631e..0c47684d56a 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Constructors.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Constructors.identifiers.fir.txt @@ -1,80 +1,80 @@ A -> UClass (name = A) str -> UParameter (name = str) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) constructor -> UMethod (name = A) i -> UParameter (name = i) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) this -> [!] UnknownKotlinExpression (CONSTRUCTOR_DELEGATION_REFERENCE) -i -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +i -> USimpleNameReferenceExpression (identifier = i) toString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) AWithInit -> UClass (name = AWithInit) str -> UParameter (name = str) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) constructor -> UMethod (name = AWithInit) i -> UParameter (name = i) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) this -> [!] UnknownKotlinExpression (CONSTRUCTOR_DELEGATION_REFERENCE) -i -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +i -> USimpleNameReferenceExpression (identifier = i) toString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) AWith2Init -> UClass (name = AWith2Init) str -> UParameter (name = str) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) constructor -> UMethod (name = AWith2Init) i -> UParameter (name = i) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) this -> [!] UnknownKotlinExpression (CONSTRUCTOR_DELEGATION_REFERENCE) -i -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +i -> USimpleNameReferenceExpression (identifier = i) toString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) AOnlyInit -> UClass (name = AOnlyInit) println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) AWithSecondary -> UClass (name = AWithSecondary) a -> UField (name = a) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) constructor -> UMethod (name = AWithSecondary) i -> UParameter (name = i) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - = -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - i -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) + a -> USimpleNameReferenceExpression (identifier = a) + = -> USimpleNameReferenceExpression (identifier = =) + i -> USimpleNameReferenceExpression (identifier = i) toString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) constructor -> UMethod (name = AWithSecondary) s -> UParameter (name = s) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - = -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - s -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) + a -> USimpleNameReferenceExpression (identifier = a) + = -> USimpleNameReferenceExpression (identifier = =) + s -> USimpleNameReferenceExpression (identifier = s) AWithSecondaryInit -> UClass (name = AWithSecondaryInit) a -> UField (name = a) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) constructor -> UMethod (name = AWithSecondaryInit) i -> UParameter (name = i) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - = -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - i -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) + a -> USimpleNameReferenceExpression (identifier = a) + = -> USimpleNameReferenceExpression (identifier = =) + i -> USimpleNameReferenceExpression (identifier = i) toString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) constructor -> UMethod (name = AWithSecondaryInit) s -> UParameter (name = s) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - = -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - s -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) + a -> USimpleNameReferenceExpression (identifier = a) + = -> USimpleNameReferenceExpression (identifier = =) + s -> USimpleNameReferenceExpression (identifier = s) local -> [!] UnknownKotlinExpression (PROPERTY) - String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - s -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - local -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + String -> USimpleNameReferenceExpression (identifier = String) + s -> USimpleNameReferenceExpression (identifier = s) + local -> USimpleNameReferenceExpression (identifier = local) toString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) AWithFieldInit -> UClass (name = AWithFieldInit) i -> UParameter (name = i) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) a -> UField (name = a) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - = -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - i -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) + a -> USimpleNameReferenceExpression (identifier = a) + = -> USimpleNameReferenceExpression (identifier = =) + i -> USimpleNameReferenceExpression (identifier = i) toString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Constructors.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Constructors.refNames.fir.txt index 00f4dae20f3..3078763ebcc 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Constructors.refNames.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Constructors.refNames.fir.txt @@ -1,7 +1,50 @@ +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression toString() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +i -> USimpleNameReferenceExpression (identifier = i) from KtNameReferenceExpression +toString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression toString() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +i -> USimpleNameReferenceExpression (identifier = i) from KtNameReferenceExpression +toString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression toString() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +i -> USimpleNameReferenceExpression (identifier = i) from KtNameReferenceExpression +toString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression toString() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +i -> USimpleNameReferenceExpression (identifier = i) from KtNameReferenceExpression +toString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression +s -> USimpleNameReferenceExpression (identifier = s) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression toString() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +i -> USimpleNameReferenceExpression (identifier = i) from KtNameReferenceExpression +toString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression +s -> USimpleNameReferenceExpression (identifier = s) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +s -> USimpleNameReferenceExpression (identifier = s) from KtNameReferenceExpression toString() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +local -> USimpleNameReferenceExpression (identifier = local) from KtNameReferenceExpression +toString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression toString() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +i -> USimpleNameReferenceExpression (identifier = i) from KtNameReferenceExpression +toString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/CycleInTypeParameters.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/CycleInTypeParameters.identifiers.fir.txt deleted file mode 100644 index 65a3e7bee41..00000000000 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/CycleInTypeParameters.identifiers.fir.txt +++ /dev/null @@ -1,7 +0,0 @@ -Device -> UClass (name = Device) -D -> [!] UnknownKotlinExpression (TYPE_PARAMETER) -Device -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -D -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -a -> UField (name = a) -as? -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) -Device -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/CycleInTypeParameters.identifiers.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/CycleInTypeParameters.identifiers.txt similarity index 81% rename from plugins/uast-kotlin-fir/testData/legacyIdentifiers/CycleInTypeParameters.identifiers.fe10.txt rename to plugins/uast-kotlin-fir/testData/legacyIdentifiers/CycleInTypeParameters.identifiers.txt index bd0964396b4..f0bc74c0482 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/CycleInTypeParameters.identifiers.fe10.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/CycleInTypeParameters.identifiers.txt @@ -4,4 +4,4 @@ Device -> USimpleNameReferenceExpression (identifier = Device) D -> USimpleNameReferenceExpression (identifier = D) a -> UField (name = a) as? -> USimpleNameReferenceExpression (identifier = as?) -Device -> USimpleNameReferenceExpression (identifier = Device) +Device -> USimpleNameReferenceExpression (identifier = Device) \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/CycleInTypeParameters.refNames.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/CycleInTypeParameters.refNames.txt similarity index 88% rename from plugins/uast-kotlin-fir/testData/legacyIdentifiers/CycleInTypeParameters.refNames.fe10.txt rename to plugins/uast-kotlin-fir/testData/legacyIdentifiers/CycleInTypeParameters.refNames.txt index d73dd3a236f..19130dd239f 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/CycleInTypeParameters.refNames.fe10.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/CycleInTypeParameters.refNames.txt @@ -1,3 +1,3 @@ Device -> USimpleNameReferenceExpression (identifier = Device) from KtNameReferenceExpression D -> USimpleNameReferenceExpression (identifier = D) from KtNameReferenceExpression -Device -> USimpleNameReferenceExpression (identifier = Device) from KtNameReferenceExpression +Device -> USimpleNameReferenceExpression (identifier = Device) from KtNameReferenceExpression \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultImpls.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultImpls.identifiers.fir.txt deleted file mode 100644 index 261d7b0c074..00000000000 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultImpls.identifiers.fir.txt +++ /dev/null @@ -1,4 +0,0 @@ -Foo -> UClass (name = Foo) -bar -> UMethod (name = bar) -Baz -> UClass (name = Baz) -Foo -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultImpls.identifiers.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultImpls.identifiers.txt similarity index 58% rename from plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultImpls.identifiers.fe10.txt rename to plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultImpls.identifiers.txt index 5ee318a9374..7800c882693 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultImpls.identifiers.fe10.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultImpls.identifiers.txt @@ -1,4 +1,4 @@ Foo -> UClass (name = Foo) bar -> UMethod (name = bar) Baz -> UClass (name = Baz) -Foo -> USimpleNameReferenceExpression (identifier = Foo) +Foo -> USimpleNameReferenceExpression (identifier = Foo) \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultImpls.refNames.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultImpls.refNames.txt similarity index 72% rename from plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultImpls.refNames.fe10.txt rename to plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultImpls.refNames.txt index 83b7dd2624d..4d105a52733 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultImpls.refNames.fe10.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultImpls.refNames.txt @@ -1 +1 @@ -Foo -> USimpleNameReferenceExpression (identifier = Foo) from KtNameReferenceExpression +Foo -> USimpleNameReferenceExpression (identifier = Foo) from KtNameReferenceExpression \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultParameterValues.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultParameterValues.identifiers.fir.txt deleted file mode 100644 index 10a2bd44bb4..00000000000 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultParameterValues.identifiers.fir.txt +++ /dev/null @@ -1,5 +0,0 @@ -foo -> UMethod (name = foo) -a -> UParameter (name = a) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -foo -> UParameter (name = foo) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultParameterValues.identifiers.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultParameterValues.identifiers.txt similarity index 69% rename from plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultParameterValues.identifiers.fe10.txt rename to plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultParameterValues.identifiers.txt index c08debfd852..d980542a5d3 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultParameterValues.identifiers.fe10.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultParameterValues.identifiers.txt @@ -2,4 +2,4 @@ foo -> UMethod (name = foo) a -> UParameter (name = a) Int -> USimpleNameReferenceExpression (identifier = Int) foo -> UParameter (name = foo) -String -> USimpleNameReferenceExpression (identifier = String) +String -> USimpleNameReferenceExpression (identifier = String) \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultParameterValues.refNames.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultParameterValues.refNames.txt similarity index 83% rename from plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultParameterValues.refNames.fe10.txt rename to plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultParameterValues.refNames.txt index 123cc30c4d4..d0595f2ab7e 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultParameterValues.refNames.fe10.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultParameterValues.refNames.txt @@ -1,2 +1,2 @@ Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression -String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Delegate.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Delegate.identifiers.fir.txt index a9a6c971478..eb272ae8f4f 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Delegate.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Delegate.identifiers.fir.txt @@ -1,10 +1,10 @@ MyColor -> UClass (name = MyColor) x -> UParameter (name = x) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) y -> UParameter (name = y) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) z -> UParameter (name = z) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) Some -> UClass (name = Some) delegate -> UMethod (name = getDelegate) lazy -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Delegate.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Delegate.refNames.fir.txt new file mode 100644 index 00000000000..95f0396e8b2 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Delegate.refNames.fir.txt @@ -0,0 +1,8 @@ +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +lazy -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +MyColor -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +lazy -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +MyColor -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +MyColor -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DeprecatedHidden.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DeprecatedHidden.identifiers.fir.txt index 26335ed7933..6ef812e1e8b 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DeprecatedHidden.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DeprecatedHidden.identifiers.fir.txt @@ -1,10 +1,10 @@ -test -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -pkg -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +test -> USimpleNameReferenceExpression (identifier = test) +pkg -> USimpleNameReferenceExpression (identifier = pkg) Test -> UClass (name = Test) test1 -> UMethod (name = test1) -Deprecated -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -level -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -DeprecationLevel -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -HIDDEN -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -message -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Deprecated -> USimpleNameReferenceExpression (identifier = Deprecated) +level -> USimpleNameReferenceExpression (identifier = level) +DeprecationLevel -> USimpleNameReferenceExpression (identifier = DeprecationLevel) +HIDDEN -> USimpleNameReferenceExpression (identifier = HIDDEN) +message -> USimpleNameReferenceExpression (identifier = message) test2 -> [!] UnknownKotlinExpression (FUN) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DeprecatedHidden.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DeprecatedHidden.refNames.fir.txt index 75c11cf59ef..044c3fe608b 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DeprecatedHidden.refNames.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DeprecatedHidden.refNames.fir.txt @@ -1,2 +1,9 @@ -pkg -> UQualifiedReferenceExpression from KtDotQualifiedExpression -HIDDEN -> UQualifiedReferenceExpression from KtDotQualifiedExpression +pkg -> USimpleNameReferenceExpression (identifier = pkg) from KtDotQualifiedExpression +test -> USimpleNameReferenceExpression (identifier = test) from KtNameReferenceExpression +pkg -> USimpleNameReferenceExpression (identifier = pkg) from KtNameReferenceExpression +Deprecated -> USimpleNameReferenceExpression (identifier = Deprecated) from KtNameReferenceExpression +level -> USimpleNameReferenceExpression (identifier = level) from KtNameReferenceExpression +HIDDEN -> USimpleNameReferenceExpression (identifier = HIDDEN) from KtDotQualifiedExpression +DeprecationLevel -> USimpleNameReferenceExpression (identifier = DeprecationLevel) from KtNameReferenceExpression +HIDDEN -> USimpleNameReferenceExpression (identifier = HIDDEN) from KtNameReferenceExpression +message -> USimpleNameReferenceExpression (identifier = message) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DestructuringDeclaration.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DestructuringDeclaration.identifiers.fir.txt index 24e03f8a5c9..8988e8d4b89 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DestructuringDeclaration.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DestructuringDeclaration.identifiers.fir.txt @@ -1,14 +1,14 @@ foo -> UMethod (name = foo) data -> UParameter (name = data) -Any -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Any -> USimpleNameReferenceExpression (identifier = Any) a -> [!] UnknownKotlinExpression (DESTRUCTURING_DECLARATION_ENTRY) b -> [!] UnknownKotlinExpression (DESTRUCTURING_DECLARATION_ENTRY) - to -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - Suppress -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + to -> USimpleNameReferenceExpression (identifier = to) + Suppress -> USimpleNameReferenceExpression (identifier = Suppress) k -> [!] UnknownKotlinExpression (DESTRUCTURING_DECLARATION_ENTRY) v -> [!] UnknownKotlinExpression (DESTRUCTURING_DECLARATION_ENTRY) - data -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - as -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - Pair -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + data -> USimpleNameReferenceExpression (identifier = data) + as -> USimpleNameReferenceExpression (identifier = as) + Pair -> USimpleNameReferenceExpression (identifier = Pair) + String -> USimpleNameReferenceExpression (identifier = String) + String -> USimpleNameReferenceExpression (identifier = String) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DestructuringDeclaration.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DestructuringDeclaration.refNames.fir.txt new file mode 100644 index 00000000000..ec71a270213 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DestructuringDeclaration.refNames.fir.txt @@ -0,0 +1,7 @@ +Any -> USimpleNameReferenceExpression (identifier = Any) from KtNameReferenceExpression +to -> USimpleNameReferenceExpression (identifier = to) from KtOperationReferenceExpression +Suppress -> USimpleNameReferenceExpression (identifier = Suppress) from KtNameReferenceExpression +data -> USimpleNameReferenceExpression (identifier = data) from KtNameReferenceExpression +Pair -> USimpleNameReferenceExpression (identifier = Pair) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Elvis.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Elvis.identifiers.fir.txt index a2a60c3256b..46c3fc1e2e2 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Elvis.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Elvis.identifiers.fir.txt @@ -1,13 +1,13 @@ foo -> UMethod (name = foo) bar -> UParameter (name = bar) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) +String -> USimpleNameReferenceExpression (identifier = String) bar -> UMethod (name = bar) baz -> UMethod (name = baz) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) foo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - ?: -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + ?: -> USimpleNameReferenceExpression (identifier = ?:) foo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - ?: -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + ?: -> USimpleNameReferenceExpression (identifier = ?:) bar -> [!] UnknownKotlinExpression (CALL_EXPRESSION) toString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Elvis.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Elvis.refNames.fir.txt index af67d56d9cf..fcdcce69053 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Elvis.refNames.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Elvis.refNames.fir.txt @@ -1 +1,8 @@ +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +foo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +foo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression toString() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +bar -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +toString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ElvisType.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ElvisType.identifiers.fir.txt index cc73f438a1d..230691b3cc8 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ElvisType.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ElvisType.identifiers.fir.txt @@ -1,9 +1,9 @@ foo -> UMethod (name = foo) text -> UParameter (name = text) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) bar -> [!] UnknownKotlinExpression (CALL_EXPRESSION) -text -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -?: -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) +text -> USimpleNameReferenceExpression (identifier = text) +?: -> USimpleNameReferenceExpression (identifier = ?:) bar -> UMethod (name = bar) o -> UParameter (name = o) -Any -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Any -> USimpleNameReferenceExpression (identifier = Any) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ElvisType.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ElvisType.refNames.fir.txt new file mode 100644 index 00000000000..8bced053ab8 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ElvisType.refNames.fir.txt @@ -0,0 +1,4 @@ +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +bar -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +text -> USimpleNameReferenceExpression (identifier = text) from KtNameReferenceExpression +Any -> USimpleNameReferenceExpression (identifier = Any) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/EnumValuesConstructors.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/EnumValuesConstructors.identifiers.fir.txt index 9773dd23127..9d3dc21fffb 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/EnumValuesConstructors.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/EnumValuesConstructors.identifiers.fir.txt @@ -1,6 +1,6 @@ Style -> UClass (name = Style) value -> UParameter (name = value) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) SYSTEM -> [!] UnknownKotlinExpression (ENUM_ENTRY) USER -> [!] UnknownKotlinExpression (ENUM_ENTRY) INTERNAL -> [!] UnknownKotlinExpression (ENUM_ENTRY) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/EnumValuesConstructors.refNames.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/EnumValuesConstructors.refNames.txt similarity index 96% rename from plugins/uast-kotlin-fir/testData/legacyIdentifiers/EnumValuesConstructors.refNames.fe10.txt rename to plugins/uast-kotlin-fir/testData/legacyIdentifiers/EnumValuesConstructors.refNames.txt index c3b23a5a3cd..c51b8f0f211 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/EnumValuesConstructors.refNames.fe10.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/EnumValuesConstructors.refNames.txt @@ -2,4 +2,4 @@ String -> USimpleNameReferenceExpression (identifier = String) from KtNameRefere Style -> UClass (name = Style) from KtEnumEntrySuperclassReferenceExpression Style -> UClass (name = Style) from KtEnumEntrySuperclassReferenceExpression Style -> UClass (name = Style) from KtEnumEntrySuperclassReferenceExpression -Style -> UClass (name = Style) from KtEnumEntrySuperclassReferenceExpression +Style -> UClass (name = Style) from KtEnumEntrySuperclassReferenceExpression \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/IfStatement.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/IfStatement.identifiers.fir.txt index 28cc36e199a..05f4454feff 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/IfStatement.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/IfStatement.identifiers.fir.txt @@ -1,3 +1,3 @@ foo -> UMethod (name = foo) x -> [!] UnknownKotlinExpression (PROPERTY) - != -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + != -> USimpleNameReferenceExpression (identifier = !=) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Imports.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Imports.identifiers.fir.txt deleted file mode 100644 index 1bd382b79c9..00000000000 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Imports.identifiers.fir.txt +++ /dev/null @@ -1,23 +0,0 @@ -java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -lang -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Thread -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -currentThread -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -lang -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Thread -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -NORM_PRIORITY -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -lang -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Thread -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -UncaughtExceptionHandler -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -lang -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Thread -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -sleep -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -kotlin -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -collections -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -emptyList -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -kotlin -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Companion -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -SIZE_BYTES -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Imports.identifiers.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Imports.identifiers.txt similarity index 99% rename from plugins/uast-kotlin-fir/testData/legacyIdentifiers/Imports.identifiers.fe10.txt rename to plugins/uast-kotlin-fir/testData/legacyIdentifiers/Imports.identifiers.txt index 7ab1ecf5e6b..df8aa730d3f 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Imports.identifiers.fe10.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Imports.identifiers.txt @@ -20,4 +20,4 @@ emptyList -> USimpleNameReferenceExpression (identifier = emptyList) kotlin -> USimpleNameReferenceExpression (identifier = kotlin) Int -> USimpleNameReferenceExpression (identifier = Int) Companion -> USimpleNameReferenceExpression (identifier = Companion) -SIZE_BYTES -> USimpleNameReferenceExpression (identifier = SIZE_BYTES) +SIZE_BYTES -> USimpleNameReferenceExpression (identifier = SIZE_BYTES) \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Imports.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Imports.refNames.fir.txt deleted file mode 100644 index 1621cd100cd..00000000000 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Imports.refNames.fir.txt +++ /dev/null @@ -1,17 +0,0 @@ -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/Imports.refNames.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Imports.refNames.txt similarity index 99% rename from plugins/uast-kotlin-fir/testData/legacyIdentifiers/Imports.refNames.fe10.txt rename to plugins/uast-kotlin-fir/testData/legacyIdentifiers/Imports.refNames.txt index 57f127596e0..1c88bf44650 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Imports.refNames.fe10.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Imports.refNames.txt @@ -37,4 +37,4 @@ Int -> USimpleNameReferenceExpression (identifier = Int) from KtDotQualifiedExpr kotlin -> USimpleNameReferenceExpression (identifier = kotlin) from KtNameReferenceExpression Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression Companion -> USimpleNameReferenceExpression (identifier = Companion) from KtNameReferenceExpression -SIZE_BYTES -> USimpleNameReferenceExpression (identifier = SIZE_BYTES) from KtNameReferenceExpression +SIZE_BYTES -> USimpleNameReferenceExpression (identifier = SIZE_BYTES) from KtNameReferenceExpression \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/In.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/In.identifiers.fir.txt index bc1965b00f9..b83665d0d86 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/In.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/In.identifiers.fir.txt @@ -1,11 +1,11 @@ foo -> UMethod (name = foo) -Boolean -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Boolean -> USimpleNameReferenceExpression (identifier = Boolean) x -> [!] UnknownKotlinExpression (PROPERTY) y -> [!] UnknownKotlinExpression (PROPERTY) - x -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - in -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - .. -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - && -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - y -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - !in -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - .. -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + x -> USimpleNameReferenceExpression (identifier = x) + in -> USimpleNameReferenceExpression (identifier = in) + .. -> USimpleNameReferenceExpression (identifier = ..) + && -> USimpleNameReferenceExpression (identifier = &&) + y -> USimpleNameReferenceExpression (identifier = y) + !in -> USimpleNameReferenceExpression (identifier = !in) + .. -> USimpleNameReferenceExpression (identifier = ..) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/In.refNames.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/In.refNames.txt similarity index 92% rename from plugins/uast-kotlin-fir/testData/legacyIdentifiers/In.refNames.fe10.txt rename to plugins/uast-kotlin-fir/testData/legacyIdentifiers/In.refNames.txt index 3ec2f19726c..acc20305bdf 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/In.refNames.fe10.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/In.refNames.txt @@ -1,3 +1,3 @@ Boolean -> USimpleNameReferenceExpression (identifier = Boolean) from KtNameReferenceExpression x -> USimpleNameReferenceExpression (identifier = x) from KtNameReferenceExpression -y -> USimpleNameReferenceExpression (identifier = y) from KtNameReferenceExpression +y -> USimpleNameReferenceExpression (identifier = y) from KtNameReferenceExpression \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InferenceInsideUnresolvedConstructor.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InferenceInsideUnresolvedConstructor.identifiers.fir.txt index e7bba36c2f1..dc330bec4bf 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InferenceInsideUnresolvedConstructor.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InferenceInsideUnresolvedConstructor.identifiers.fir.txt @@ -1,11 +1,11 @@ bar -> [!] UnknownKotlinExpression (PROPERTY) -Any -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Any -> USimpleNameReferenceExpression (identifier = Any) get -> [!] UnknownKotlinExpression (PROPERTY_ACCESSOR) Unresolved -> [!] UnknownKotlinExpression (CALL_EXPRESSION) id -> [!] UnknownKotlinExpression (CALL_EXPRESSION) T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) id -> UMethod (name = id) x -> UParameter (name = x) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -x -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> USimpleNameReferenceExpression (identifier = T) +T -> USimpleNameReferenceExpression (identifier = T) +x -> USimpleNameReferenceExpression (identifier = x) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InferenceInsideUnresolvedConstructor.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InferenceInsideUnresolvedConstructor.refNames.fir.txt new file mode 100644 index 00000000000..844a6925068 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InferenceInsideUnresolvedConstructor.refNames.fir.txt @@ -0,0 +1,6 @@ +Any -> USimpleNameReferenceExpression (identifier = Any) from KtNameReferenceExpression +Unresolved -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +id -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +x -> USimpleNameReferenceExpression (identifier = x) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InnerClasses.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InnerClasses.identifiers.fir.txt deleted file mode 100644 index 7cd411e0b7e..00000000000 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InnerClasses.identifiers.fir.txt +++ /dev/null @@ -1,13 +0,0 @@ -Foo -> UClass (name = Foo) -Bar -> UClass (name = Bar) -a -> UParameter (name = a) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -b -> UParameter (name = b) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -getAPlusB -> UMethod (name = getAPlusB) -a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -+ -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) -b -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Baz -> UClass (name = Baz) -doNothing -> UMethod (name = doNothing) -Unit -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InnerClasses.identifiers.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InnerClasses.identifiers.txt similarity index 89% rename from plugins/uast-kotlin-fir/testData/legacyIdentifiers/InnerClasses.identifiers.fe10.txt rename to plugins/uast-kotlin-fir/testData/legacyIdentifiers/InnerClasses.identifiers.txt index 2e6171b5dd4..a3aebad15b2 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InnerClasses.identifiers.fe10.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InnerClasses.identifiers.txt @@ -10,4 +10,4 @@ a -> USimpleNameReferenceExpression (identifier = a) b -> USimpleNameReferenceExpression (identifier = b) Baz -> UClass (name = Baz) doNothing -> UMethod (name = doNothing) -Unit -> USimpleNameReferenceExpression (identifier = Unit) +Unit -> USimpleNameReferenceExpression (identifier = Unit) \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InnerClasses.refNames.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InnerClasses.refNames.txt similarity index 94% rename from plugins/uast-kotlin-fir/testData/legacyIdentifiers/InnerClasses.refNames.fe10.txt rename to plugins/uast-kotlin-fir/testData/legacyIdentifiers/InnerClasses.refNames.txt index 986b9d3b6c6..542accd4ee4 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InnerClasses.refNames.fe10.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InnerClasses.refNames.txt @@ -2,4 +2,4 @@ Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExp Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression b -> USimpleNameReferenceExpression (identifier = b) from KtNameReferenceExpression -Unit -> USimpleNameReferenceExpression (identifier = Unit) from KtNameReferenceExpression +Unit -> USimpleNameReferenceExpression (identifier = Unit) from KtNameReferenceExpression \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InnerNonFixedTypeVariable.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InnerNonFixedTypeVariable.identifiers.fir.txt index dabc981a943..c384e5d9d5a 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InnerNonFixedTypeVariable.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InnerNonFixedTypeVariable.identifiers.fir.txt @@ -1,13 +1,13 @@ Some -> UClass (name = Some) T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) -Some -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Some -> USimpleNameReferenceExpression (identifier = Some) +T -> USimpleNameReferenceExpression (identifier = T) test -> UMethod (name = test) list -> UParameter (name = list) -List -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Any -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - list -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +List -> USimpleNameReferenceExpression (identifier = List) +Any -> USimpleNameReferenceExpression (identifier = Any) + list -> USimpleNameReferenceExpression (identifier = list) filterIsInstance -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - Some -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Some -> USimpleNameReferenceExpression (identifier = Some) mapTo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) mutableSetOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InnerNonFixedTypeVariable.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InnerNonFixedTypeVariable.refNames.fir.txt index 4e38ee25f75..2b04a5cd816 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InnerNonFixedTypeVariable.refNames.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InnerNonFixedTypeVariable.refNames.fir.txt @@ -1,4 +1,13 @@ +Some -> USimpleNameReferenceExpression (identifier = Some) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +List -> USimpleNameReferenceExpression (identifier = List) from KtNameReferenceExpression +Any -> USimpleNameReferenceExpression (identifier = Any) from KtNameReferenceExpression mapTo(mutableSetOf()) { } -> UQualifiedReferenceExpression from KtDotQualifiedExpression filterIsInstance() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +list -> USimpleNameReferenceExpression (identifier = list) from KtNameReferenceExpression +filterIsInstance -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Some -> USimpleNameReferenceExpression (identifier = Some) from KtNameReferenceExpression +mapTo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +mutableSetOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LambdaReturn.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LambdaReturn.identifiers.fir.txt index 1fed04fc603..1dac1b78a2f 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LambdaReturn.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LambdaReturn.identifiers.fir.txt @@ -1,66 +1,66 @@ -org -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -jetbrains -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -uast -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -kotlin -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +org -> USimpleNameReferenceExpression (identifier = org) +jetbrains -> USimpleNameReferenceExpression (identifier = jetbrains) +uast -> USimpleNameReferenceExpression (identifier = uast) +kotlin -> USimpleNameReferenceExpression (identifier = kotlin) foo -> UMethod (name = foo) lam1 -> [!] UnknownKotlinExpression (PROPERTY) a -> [!] UnknownKotlinExpression (VALUE_PARAMETER) - Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Int -> USimpleNameReferenceExpression (identifier = Int) b -> [!] UnknownKotlinExpression (PROPERTY) - a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - + -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - b -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + a -> USimpleNameReferenceExpression (identifier = a) + + -> USimpleNameReferenceExpression (identifier = +) + b -> USimpleNameReferenceExpression (identifier = b) lam2 -> [!] UnknownKotlinExpression (PROPERTY) a -> [!] UnknownKotlinExpression (VALUE_PARAMETER) - Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Int -> USimpleNameReferenceExpression (identifier = Int) c -> [!] UnknownKotlinExpression (PROPERTY) - a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - > -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - + -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - c -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - - -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - c -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + a -> USimpleNameReferenceExpression (identifier = a) + > -> USimpleNameReferenceExpression (identifier = >) + a -> USimpleNameReferenceExpression (identifier = a) + + -> USimpleNameReferenceExpression (identifier = +) + c -> USimpleNameReferenceExpression (identifier = c) + a -> USimpleNameReferenceExpression (identifier = a) + - -> USimpleNameReferenceExpression (identifier = -) + c -> USimpleNameReferenceExpression (identifier = c) lam3 -> [!] UnknownKotlinExpression (PROPERTY) - lbd -> [!] UnknownKotlinExpression (LABEL) + lbd -> USimpleNameReferenceExpression (identifier = lbd) a -> [!] UnknownKotlinExpression (VALUE_PARAMETER) - Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Int -> USimpleNameReferenceExpression (identifier = Int) d -> [!] UnknownKotlinExpression (PROPERTY) - lbd -> [!] UnknownKotlinExpression (LABEL) - a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - + -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - d -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + lbd -> USimpleNameReferenceExpression (identifier = lbd) + a -> USimpleNameReferenceExpression (identifier = a) + + -> USimpleNameReferenceExpression (identifier = +) + d -> USimpleNameReferenceExpression (identifier = d) lam4 -> [!] UnknownKotlinExpression (PROPERTY) a -> [!] UnknownKotlinExpression (VALUE_PARAMETER) - Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - < -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - > -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + Int -> USimpleNameReferenceExpression (identifier = Int) + String -> USimpleNameReferenceExpression (identifier = String) + a -> USimpleNameReferenceExpression (identifier = a) + < -> USimpleNameReferenceExpression (identifier = <) + a -> USimpleNameReferenceExpression (identifier = a) + > -> USimpleNameReferenceExpression (identifier = >) lam5 -> [!] UnknownKotlinExpression (PROPERTY) a -> [!] UnknownKotlinExpression (VALUE_PARAMETER) - Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - + -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Int -> USimpleNameReferenceExpression (identifier = Int) + + -> USimpleNameReferenceExpression (identifier = +) + a -> USimpleNameReferenceExpression (identifier = a) bar -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - it -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - > -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + it -> USimpleNameReferenceExpression (identifier = it) + > -> USimpleNameReferenceExpression (identifier = >) b -> [!] UnknownKotlinExpression (PROPERTY) - it -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - + -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - b -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + it -> USimpleNameReferenceExpression (identifier = it) + + -> USimpleNameReferenceExpression (identifier = +) + b -> USimpleNameReferenceExpression (identifier = b) x -> [!] UnknownKotlinExpression (PROPERTY) - Unit -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Unit -> USimpleNameReferenceExpression (identifier = Unit) a -> [!] UnknownKotlinExpression (DESTRUCTURING_DECLARATION_ENTRY) b -> [!] UnknownKotlinExpression (DESTRUCTURING_DECLARATION_ENTRY) listOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) y -> [!] UnknownKotlinExpression (PROPERTY) - Unit -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Unit -> USimpleNameReferenceExpression (identifier = Unit) listOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) bar -> [!] UnknownKotlinExpression (FUN) lmbd -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) +Int -> USimpleNameReferenceExpression (identifier = Int) lmbd -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LambdaReturn.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LambdaReturn.refNames.fir.txt index 4d685dc64ed..9416edb98e1 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LambdaReturn.refNames.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LambdaReturn.refNames.fir.txt @@ -1,3 +1,38 @@ -kotlin -> UQualifiedReferenceExpression from KtDotQualifiedExpression -uast -> UQualifiedReferenceExpression from KtDotQualifiedExpression -jetbrains -> UQualifiedReferenceExpression from KtDotQualifiedExpression +kotlin -> USimpleNameReferenceExpression (identifier = kotlin) from KtDotQualifiedExpression +uast -> USimpleNameReferenceExpression (identifier = uast) from KtDotQualifiedExpression +jetbrains -> USimpleNameReferenceExpression (identifier = jetbrains) from KtDotQualifiedExpression +org -> USimpleNameReferenceExpression (identifier = org) from KtNameReferenceExpression +jetbrains -> USimpleNameReferenceExpression (identifier = jetbrains) from KtNameReferenceExpression +uast -> USimpleNameReferenceExpression (identifier = uast) from KtNameReferenceExpression +kotlin -> USimpleNameReferenceExpression (identifier = kotlin) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression +b -> USimpleNameReferenceExpression (identifier = b) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression +a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression +c -> USimpleNameReferenceExpression (identifier = c) from KtNameReferenceExpression +a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression +c -> USimpleNameReferenceExpression (identifier = c) from KtNameReferenceExpression +lbd -> USimpleNameReferenceExpression (identifier = lbd) from KtLabelReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +lbd -> USimpleNameReferenceExpression (identifier = lbd) from KtLabelReferenceExpression +a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression +d -> USimpleNameReferenceExpression (identifier = d) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression +a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression +bar -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +it -> USimpleNameReferenceExpression (identifier = it) from KtNameReferenceExpression +it -> USimpleNameReferenceExpression (identifier = it) from KtNameReferenceExpression +b -> USimpleNameReferenceExpression (identifier = b) from KtNameReferenceExpression +Unit -> USimpleNameReferenceExpression (identifier = Unit) from KtNameReferenceExpression +listOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Unit -> USimpleNameReferenceExpression (identifier = Unit) from KtNameReferenceExpression +listOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +lmbd -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Lambdas.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Lambdas.identifiers.fir.txt index 93827b8f775..52e1a7277ba 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Lambdas.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Lambdas.identifiers.fir.txt @@ -1,17 +1,17 @@ -java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -util -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -stream -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Stream -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +java -> USimpleNameReferenceExpression (identifier = java) +util -> USimpleNameReferenceExpression (identifier = util) +stream -> USimpleNameReferenceExpression (identifier = stream) +Stream -> USimpleNameReferenceExpression (identifier = Stream) foo -> UMethod (name = foo) - Stream -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Stream -> USimpleNameReferenceExpression (identifier = Stream) empty -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + String -> USimpleNameReferenceExpression (identifier = String) filter -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - it -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + it -> USimpleNameReferenceExpression (identifier = it) isEmpty -> [!] UnknownKotlinExpression (CALL_EXPRESSION) doSelectItem -> UMethod (name = doSelectItem) selectItemFunction -> UParameter (name = selectItemFunction) -Unit -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Unit -> USimpleNameReferenceExpression (identifier = Unit) selectItemFunction -> [!] UnknownKotlinExpression (CALL_EXPRESSION) baz -> [!] UnknownKotlinExpression (PROPERTY) Local -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Lambdas.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Lambdas.refNames.fir.txt index a7ebffbb54b..b4e599eeddd 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Lambdas.refNames.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Lambdas.refNames.fir.txt @@ -1,6 +1,20 @@ -Stream -> UQualifiedReferenceExpression from KtDotQualifiedExpression -stream -> UQualifiedReferenceExpression from KtDotQualifiedExpression -util -> UQualifiedReferenceExpression from KtDotQualifiedExpression +Stream -> USimpleNameReferenceExpression (identifier = Stream) from KtDotQualifiedExpression +stream -> USimpleNameReferenceExpression (identifier = stream) from KtDotQualifiedExpression +util -> USimpleNameReferenceExpression (identifier = util) from KtDotQualifiedExpression +java -> USimpleNameReferenceExpression (identifier = java) from KtNameReferenceExpression +util -> USimpleNameReferenceExpression (identifier = util) from KtNameReferenceExpression +stream -> USimpleNameReferenceExpression (identifier = stream) from KtNameReferenceExpression +Stream -> USimpleNameReferenceExpression (identifier = Stream) from KtNameReferenceExpression filter { it.isEmpty() } -> UQualifiedReferenceExpression from KtDotQualifiedExpression empty() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +Stream -> USimpleNameReferenceExpression (identifier = Stream) from KtNameReferenceExpression +empty -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +filter -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression isEmpty() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +it -> USimpleNameReferenceExpression (identifier = it) from KtNameReferenceExpression +isEmpty -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Unit -> USimpleNameReferenceExpression (identifier = Unit) from KtNameReferenceExpression +selectItemFunction -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Local -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +baz -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LocalDeclarations.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LocalDeclarations.identifiers.fir.txt index 1c102589f3f..d83fab044f4 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LocalDeclarations.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LocalDeclarations.identifiers.fir.txt @@ -1,14 +1,14 @@ foo -> UMethod (name = foo) -Boolean -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Boolean -> USimpleNameReferenceExpression (identifier = Boolean) Local -> UClass (name = Local) bar -> [!] UnknownKotlinExpression (FUN) Local -> [!] UnknownKotlinExpression (CALL_EXPRESSION) baz -> [!] UnknownKotlinExpression (PROPERTY) Local -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Int -> USimpleNameReferenceExpression (identifier = Int) someLocalFun -> [!] UnknownKotlinExpression (FUN) text -> [!] UnknownKotlinExpression (VALUE_PARAMETER) - String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + String -> USimpleNameReferenceExpression (identifier = String) bar -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - == -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + == -> USimpleNameReferenceExpression (identifier = ==) Local -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LocalDeclarations.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LocalDeclarations.refNames.fir.txt new file mode 100644 index 00000000000..cc0b68d2f89 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LocalDeclarations.refNames.fir.txt @@ -0,0 +1,7 @@ +Boolean -> USimpleNameReferenceExpression (identifier = Boolean) from KtNameReferenceExpression +Local -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Local -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +bar -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Local -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LocalVariableWithAnnotation.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LocalVariableWithAnnotation.identifiers.fir.txt index b7978e2872d..1654162309c 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LocalVariableWithAnnotation.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LocalVariableWithAnnotation.identifiers.fir.txt @@ -1,4 +1,4 @@ TestAnnotation -> UClass (name = TestAnnotation) foo -> UMethod (name = foo) - TestAnnotation -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + TestAnnotation -> USimpleNameReferenceExpression (identifier = TestAnnotation) bar -> [!] UnknownKotlinExpression (PROPERTY) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LocalVariableWithAnnotation.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LocalVariableWithAnnotation.refNames.fir.txt new file mode 100644 index 00000000000..3fd7757013b --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LocalVariableWithAnnotation.refNames.fir.txt @@ -0,0 +1 @@ +TestAnnotation -> USimpleNameReferenceExpression (identifier = TestAnnotation) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ManyAlternatives.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ManyAlternatives.identifiers.fir.txt deleted file mode 100644 index 85205210d22..00000000000 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ManyAlternatives.identifiers.fir.txt +++ /dev/null @@ -1,7 +0,0 @@ -ClassA -> UClass (name = ClassA) -justParam -> UParameter (name = justParam) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -paramAndProp -> UParameter (name = paramAndProp) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -writebleProp -> UField (name = writebleProp) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ManyAlternatives.identifiers.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ManyAlternatives.identifiers.txt similarity index 83% rename from plugins/uast-kotlin-fir/testData/legacyIdentifiers/ManyAlternatives.identifiers.fe10.txt rename to plugins/uast-kotlin-fir/testData/legacyIdentifiers/ManyAlternatives.identifiers.txt index 5c8baad5adf..c73b824d711 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ManyAlternatives.identifiers.fe10.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ManyAlternatives.identifiers.txt @@ -4,4 +4,4 @@ Int -> USimpleNameReferenceExpression (identifier = Int) paramAndProp -> UParameter (name = paramAndProp) String -> USimpleNameReferenceExpression (identifier = String) writebleProp -> UField (name = writebleProp) -Int -> USimpleNameReferenceExpression (identifier = Int) +Int -> USimpleNameReferenceExpression (identifier = Int) \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ManyAlternatives.refNames.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ManyAlternatives.refNames.txt similarity index 91% rename from plugins/uast-kotlin-fir/testData/legacyIdentifiers/ManyAlternatives.refNames.fe10.txt rename to plugins/uast-kotlin-fir/testData/legacyIdentifiers/ManyAlternatives.refNames.txt index e9bc8aa1c73..f3b4a86a468 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ManyAlternatives.refNames.fe10.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ManyAlternatives.refNames.txt @@ -1,3 +1,3 @@ Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression -Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/MethodReference.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/MethodReference.identifiers.fir.txt deleted file mode 100644 index e129a586467..00000000000 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/MethodReference.identifiers.fir.txt +++ /dev/null @@ -1,5 +0,0 @@ -Foo -> UClass (name = Foo) -bar -> UMethod (name = bar) -x -> UField (name = x) -Foo -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -bar -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/MethodReference.identifiers.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/MethodReference.identifiers.txt similarity index 70% rename from plugins/uast-kotlin-fir/testData/legacyIdentifiers/MethodReference.identifiers.fe10.txt rename to plugins/uast-kotlin-fir/testData/legacyIdentifiers/MethodReference.identifiers.txt index 744f1b27c2c..94fa9c4f2ea 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/MethodReference.identifiers.fe10.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/MethodReference.identifiers.txt @@ -2,4 +2,4 @@ Foo -> UClass (name = Foo) bar -> UMethod (name = bar) x -> UField (name = x) Foo -> USimpleNameReferenceExpression (identifier = Foo) -bar -> USimpleNameReferenceExpression (identifier = bar) +bar -> USimpleNameReferenceExpression (identifier = bar) \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/MethodReference.refNames.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/MethodReference.refNames.txt similarity index 86% rename from plugins/uast-kotlin-fir/testData/legacyIdentifiers/MethodReference.refNames.fe10.txt rename to plugins/uast-kotlin-fir/testData/legacyIdentifiers/MethodReference.refNames.txt index 81cac641133..903b49d0861 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/MethodReference.refNames.fe10.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/MethodReference.refNames.txt @@ -1,2 +1,2 @@ Foo -> USimpleNameReferenceExpression (identifier = Foo) from KtNameReferenceExpression -bar -> USimpleNameReferenceExpression (identifier = bar) from KtNameReferenceExpression +bar -> USimpleNameReferenceExpression (identifier = bar) from KtNameReferenceExpression \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/NameContainingFile.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/NameContainingFile.identifiers.fir.txt deleted file mode 100644 index 43db1cf25c6..00000000000 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/NameContainingFile.identifiers.fir.txt +++ /dev/null @@ -1,4 +0,0 @@ -Foo -> UClass (name = Foo) -bar -> UMethod (name = bar) -xyzzy -> UField (name = xyzzy) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/NameContainingFile.identifiers.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/NameContainingFile.identifiers.txt similarity index 60% rename from plugins/uast-kotlin-fir/testData/legacyIdentifiers/NameContainingFile.identifiers.fe10.txt rename to plugins/uast-kotlin-fir/testData/legacyIdentifiers/NameContainingFile.identifiers.txt index e674a8142bc..bc9f7a3bf09 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/NameContainingFile.identifiers.fe10.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/NameContainingFile.identifiers.txt @@ -1,4 +1,4 @@ Foo -> UClass (name = Foo) bar -> UMethod (name = bar) xyzzy -> UField (name = xyzzy) -Int -> USimpleNameReferenceExpression (identifier = Int) +Int -> USimpleNameReferenceExpression (identifier = Int) \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/NameContainingFile.refNames.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/NameContainingFile.refNames.txt similarity index 72% rename from plugins/uast-kotlin-fir/testData/legacyIdentifiers/NameContainingFile.refNames.fe10.txt rename to plugins/uast-kotlin-fir/testData/legacyIdentifiers/NameContainingFile.refNames.txt index df4b104019e..6b866d8aa40 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/NameContainingFile.refNames.fe10.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/NameContainingFile.refNames.txt @@ -1 +1 @@ -Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/NonTrivialIdentifiers.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/NonTrivialIdentifiers.identifiers.fir.txt index 157dee615a7..ae3dca83e76 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/NonTrivialIdentifiers.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/NonTrivialIdentifiers.identifiers.fir.txt @@ -1,17 +1,17 @@ A -> UClass (name = A) invoke -> UMethod (name = invoke) - this -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + this -> USimpleNameReferenceExpression (identifier = this) invoke -> UMethod (name = invoke) f -> UParameter (name = f) -Unit -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Unit -> USimpleNameReferenceExpression (identifier = Unit) main -> UMethod (name = main) a -> UParameter (name = a) -A -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - !! -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) +A -> USimpleNameReferenceExpression (identifier = A) + a -> USimpleNameReferenceExpression (identifier = a) + !! -> USimpleNameReferenceExpression (identifier = !!) p -> [!] UnknownKotlinExpression (PROPERTY) A -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - !! -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + a -> USimpleNameReferenceExpression (identifier = a) + !! -> USimpleNameReferenceExpression (identifier = !!) p -> [!] UnknownKotlinExpression (CALL_EXPRESSION) A -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/NonTrivialIdentifiers.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/NonTrivialIdentifiers.refNames.fir.txt new file mode 100644 index 00000000000..d2355700146 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/NonTrivialIdentifiers.refNames.fir.txt @@ -0,0 +1,7 @@ +Unit -> USimpleNameReferenceExpression (identifier = Unit) from KtNameReferenceExpression +A -> USimpleNameReferenceExpression (identifier = A) from KtNameReferenceExpression +a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression +A -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression +p -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +A -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParameterPropertyWithAnnotation.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParameterPropertyWithAnnotation.identifiers.fir.txt index 19a68174c09..fdee03def6f 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParameterPropertyWithAnnotation.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParameterPropertyWithAnnotation.identifiers.fir.txt @@ -4,16 +4,16 @@ MyAnnotation3 -> UClass (name = MyAnnotation3) MyAnnotation4 -> UClass (name = MyAnnotation4) MyAnnotation5 -> UClass (name = MyAnnotation5) Test1 -> UClass (name = Test1) -MyAnnotation -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +MyAnnotation -> USimpleNameReferenceExpression (identifier = MyAnnotation) bar -> UParameter (name = bar) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) Test2 -> UClass (name = Test2) get -> null -MyAnnotation -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +MyAnnotation -> USimpleNameReferenceExpression (identifier = MyAnnotation) set -> null -MyAnnotation2 -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -MyAnnotation3 -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -MyAnnotation4 -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -MyAnnotation5 -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +MyAnnotation2 -> USimpleNameReferenceExpression (identifier = MyAnnotation2) +MyAnnotation3 -> USimpleNameReferenceExpression (identifier = MyAnnotation3) +MyAnnotation4 -> USimpleNameReferenceExpression (identifier = MyAnnotation4) +MyAnnotation5 -> USimpleNameReferenceExpression (identifier = MyAnnotation5) bar -> UParameter (name = bar) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParameterPropertyWithAnnotation.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParameterPropertyWithAnnotation.refNames.fir.txt new file mode 100644 index 00000000000..2ae35aad3d6 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParameterPropertyWithAnnotation.refNames.fir.txt @@ -0,0 +1,8 @@ +MyAnnotation -> USimpleNameReferenceExpression (identifier = MyAnnotation) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +MyAnnotation -> USimpleNameReferenceExpression (identifier = MyAnnotation) from KtNameReferenceExpression +MyAnnotation2 -> USimpleNameReferenceExpression (identifier = MyAnnotation2) from KtNameReferenceExpression +MyAnnotation3 -> USimpleNameReferenceExpression (identifier = MyAnnotation3) from KtNameReferenceExpression +MyAnnotation4 -> USimpleNameReferenceExpression (identifier = MyAnnotation4) from KtNameReferenceExpression +MyAnnotation5 -> USimpleNameReferenceExpression (identifier = MyAnnotation5) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersDisorder.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersDisorder.identifiers.fir.txt index eda750044d9..9078b941db4 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersDisorder.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersDisorder.identifiers.fir.txt @@ -1,47 +1,47 @@ global -> UMethod (name = global) a -> UParameter (name = a) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) b -> UParameter (name = b) -Float -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Float -> USimpleNameReferenceExpression (identifier = Float) withDefault -> UMethod (name = withDefault) c -> UParameter (name = c) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) d -> UParameter (name = d) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) +String -> USimpleNameReferenceExpression (identifier = String) withReceiver -> UMethod (name = withReceiver) a -> UParameter (name = a) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) b -> UParameter (name = b) -Float -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Float -> USimpleNameReferenceExpression (identifier = Float) call -> UMethod (name = call) global -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - b -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + b -> USimpleNameReferenceExpression (identifier = b) + a -> USimpleNameReferenceExpression (identifier = a) withDefault -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - d -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + d -> USimpleNameReferenceExpression (identifier = d) withReceiver -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - Math -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Math -> USimpleNameReferenceExpression (identifier = Math) atan2 -> [!] UnknownKotlinExpression (CALL_EXPRESSION) unresolvedMethod -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - lang -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + java -> USimpleNameReferenceExpression (identifier = java) + lang -> USimpleNameReferenceExpression (identifier = lang) + String -> USimpleNameReferenceExpression (identifier = String) format -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - lang -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + java -> USimpleNameReferenceExpression (identifier = java) + lang -> USimpleNameReferenceExpression (identifier = lang) + String -> USimpleNameReferenceExpression (identifier = String) format -> [!] UnknownKotlinExpression (CALL_EXPRESSION) arrayOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - lang -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + java -> USimpleNameReferenceExpression (identifier = java) + lang -> USimpleNameReferenceExpression (identifier = lang) + String -> USimpleNameReferenceExpression (identifier = String) format -> [!] UnknownKotlinExpression (CALL_EXPRESSION) arrayOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) arrayOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - lang -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + java -> USimpleNameReferenceExpression (identifier = java) + lang -> USimpleNameReferenceExpression (identifier = lang) + String -> USimpleNameReferenceExpression (identifier = String) format -> [!] UnknownKotlinExpression (CALL_EXPRESSION) chunked -> [!] UnknownKotlinExpression (CALL_EXPRESSION) toTypedArray -> [!] UnknownKotlinExpression (CALL_EXPRESSION) @@ -49,19 +49,19 @@ call -> UMethod (name = call) A -> [!] UnknownKotlinExpression (CALL_EXPRESSION) with2Receivers -> [!] UnknownKotlinExpression (CALL_EXPRESSION) A -> UClass (name = A) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) with2Receivers -> UMethod (name = with2Receivers) a -> UParameter (name = a) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) b -> UParameter (name = b) -Float -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Float -> USimpleNameReferenceExpression (identifier = Float) Parent -> UClass (name = Parent) a -> UParameter (name = a) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) b -> UParameter (name = b) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) objectLiteral -> UMethod (name = objectLiteral) object -> UClass (name = null) - Parent -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - b -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Parent -> USimpleNameReferenceExpression (identifier = Parent) + b -> USimpleNameReferenceExpression (identifier = b) + a -> USimpleNameReferenceExpression (identifier = a) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersDisorder.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersDisorder.refNames.fir.txt index b97b1449c6e..9335962e99d 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersDisorder.refNames.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersDisorder.refNames.fir.txt @@ -1,17 +1,65 @@ +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +Float -> USimpleNameReferenceExpression (identifier = Float) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +Float -> USimpleNameReferenceExpression (identifier = Float) from KtNameReferenceExpression +global -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +b -> USimpleNameReferenceExpression (identifier = b) from KtNameReferenceExpression +a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression +withDefault -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +d -> USimpleNameReferenceExpression (identifier = d) from KtNameReferenceExpression withReceiver(1, 1.2F) -> UQualifiedReferenceExpression from KtDotQualifiedExpression +withReceiver -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression atan2(1.3, 3.4) -> UQualifiedReferenceExpression from KtDotQualifiedExpression +Math -> USimpleNameReferenceExpression (identifier = Math) from KtNameReferenceExpression +atan2 -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +unresolvedMethod -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression format("%i %i %i", 1, 2, 3) -> UQualifiedReferenceExpression from KtDotQualifiedExpression -String -> UQualifiedReferenceExpression from KtDotQualifiedExpression -lang -> UQualifiedReferenceExpression from KtDotQualifiedExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtDotQualifiedExpression +lang -> USimpleNameReferenceExpression (identifier = lang) from KtDotQualifiedExpression +java -> USimpleNameReferenceExpression (identifier = java) from KtNameReferenceExpression +lang -> USimpleNameReferenceExpression (identifier = lang) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +format -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression format("%i %i %i", arrayOf(1, 2, 3)) -> UQualifiedReferenceExpression from KtDotQualifiedExpression -String -> UQualifiedReferenceExpression from KtDotQualifiedExpression -lang -> UQualifiedReferenceExpression from KtDotQualifiedExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtDotQualifiedExpression +lang -> USimpleNameReferenceExpression (identifier = lang) from KtDotQualifiedExpression +java -> USimpleNameReferenceExpression (identifier = java) from KtNameReferenceExpression +lang -> USimpleNameReferenceExpression (identifier = lang) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +format -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +arrayOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression format("%i %i %i", arrayOf(1, 2, 3), arrayOf(4, 5, 6)) -> UQualifiedReferenceExpression from KtDotQualifiedExpression -String -> UQualifiedReferenceExpression from KtDotQualifiedExpression -lang -> UQualifiedReferenceExpression from KtDotQualifiedExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtDotQualifiedExpression +lang -> USimpleNameReferenceExpression (identifier = lang) from KtDotQualifiedExpression +java -> USimpleNameReferenceExpression (identifier = java) from KtNameReferenceExpression +lang -> USimpleNameReferenceExpression (identifier = lang) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +format -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +arrayOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +arrayOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression format("%i %i %i", *"".chunked(2).toTypedArray()) -> UQualifiedReferenceExpression from KtDotQualifiedExpression -String -> UQualifiedReferenceExpression from KtDotQualifiedExpression -lang -> UQualifiedReferenceExpression from KtDotQualifiedExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtDotQualifiedExpression +lang -> USimpleNameReferenceExpression (identifier = lang) from KtDotQualifiedExpression +java -> USimpleNameReferenceExpression (identifier = java) from KtNameReferenceExpression +lang -> USimpleNameReferenceExpression (identifier = lang) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +format -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression toTypedArray() -> UQualifiedReferenceExpression from KtDotQualifiedExpression chunked(2) -> UQualifiedReferenceExpression from KtDotQualifiedExpression +chunked -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +toTypedArray -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +with -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +A -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression with2Receivers(8, 7.0F) -> UQualifiedReferenceExpression from KtDotQualifiedExpression +with2Receivers -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +Float -> USimpleNameReferenceExpression (identifier = Float) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +Parent -> USimpleNameReferenceExpression (identifier = Parent) from KtNameReferenceExpression +b -> USimpleNameReferenceExpression (identifier = b) from KtNameReferenceExpression +a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersWithDefaultValues.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersWithDefaultValues.identifiers.fir.txt deleted file mode 100644 index 4dc9b39c541..00000000000 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersWithDefaultValues.identifiers.fir.txt +++ /dev/null @@ -1,9 +0,0 @@ -foo -> UMethod (name = foo) -a -> UParameter (name = a) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -b -> UParameter (name = b) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -c -> UParameter (name = c) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -flag -> UParameter (name = flag) -Boolean -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersWithDefaultValues.identifiers.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersWithDefaultValues.identifiers.txt similarity index 99% rename from plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersWithDefaultValues.identifiers.fe10.txt rename to plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersWithDefaultValues.identifiers.txt index 4b8b3f5f507..9da22719a6e 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersWithDefaultValues.identifiers.fe10.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersWithDefaultValues.identifiers.txt @@ -6,4 +6,4 @@ String -> USimpleNameReferenceExpression (identifier = String) c -> UParameter (name = c) Int -> USimpleNameReferenceExpression (identifier = Int) flag -> UParameter (name = flag) -Boolean -> USimpleNameReferenceExpression (identifier = Boolean) +Boolean -> USimpleNameReferenceExpression (identifier = Boolean) \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersWithDefaultValues.refNames.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersWithDefaultValues.refNames.txt similarity index 91% rename from plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersWithDefaultValues.refNames.fe10.txt rename to plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersWithDefaultValues.refNames.txt index b440f77eeaf..f664c30a226 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersWithDefaultValues.refNames.fe10.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersWithDefaultValues.refNames.txt @@ -1,4 +1,4 @@ Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression -Boolean -> USimpleNameReferenceExpression (identifier = Boolean) from KtNameReferenceExpression +Boolean -> USimpleNameReferenceExpression (identifier = Boolean) from KtNameReferenceExpression \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyAccessors.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyAccessors.identifiers.fir.txt index 3cc06029b58..0a501bc5115 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyAccessors.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyAccessors.identifiers.fir.txt @@ -1,13 +1,13 @@ PropertyTest -> UClass (name = PropertyTest) stringRepresentation -> [!] UnknownKotlinExpression (PROPERTY) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) get -> [!] UnknownKotlinExpression (PROPERTY_ACCESSOR) -this -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +this -> USimpleNameReferenceExpression (identifier = this) toString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) set -> [!] UnknownKotlinExpression (PROPERTY_ACCESSOR) value -> [!] UnknownKotlinExpression (VALUE_PARAMETER) setDataFromString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - value -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + value -> USimpleNameReferenceExpression (identifier = value) setDataFromString -> UMethod (name = setDataFromString) data -> UParameter (name = data) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyAccessors.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyAccessors.refNames.fir.txt index af67d56d9cf..d9a6d4dd9c4 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyAccessors.refNames.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyAccessors.refNames.fir.txt @@ -1 +1,6 @@ +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression toString() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +toString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +setDataFromString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +value -> USimpleNameReferenceExpression (identifier = value) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyDelegate.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyDelegate.identifiers.fir.txt index 301b1281513..887136d1062 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyDelegate.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyDelegate.identifiers.fir.txt @@ -3,7 +3,7 @@ lazy -> [!] UnknownKotlinExpression (CALL_EXPRESSION) localPropertyTest -> UMethod (name = localPropertyTest) sdCardPathLocal -> [!] UnknownKotlinExpression (PROPERTY) lazy -> [!] UnknownKotlinExpression (CALL_EXPRESSION) -Suppress -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Suppress -> USimpleNameReferenceExpression (identifier = Suppress) annotatedDelegate -> UMethod (name = getAnnotatedDelegate) lazy -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - + -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + + -> USimpleNameReferenceExpression (identifier = +) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyDelegate.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyDelegate.refNames.fir.txt new file mode 100644 index 00000000000..0e46a215fd9 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyDelegate.refNames.fir.txt @@ -0,0 +1,4 @@ +lazy -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +lazy -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Suppress -> USimpleNameReferenceExpression (identifier = Suppress) from KtNameReferenceExpression +lazy -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyInitializer.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyInitializer.identifiers.fir.txt index 08feaf267e1..f5bed683bbc 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyInitializer.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyInitializer.identifiers.fir.txt @@ -1,9 +1,9 @@ TestPropertyInitializer -> UClass (name = TestPropertyInitializer) withSetter -> [!] UnknownKotlinExpression (PROPERTY) get -> [!] UnknownKotlinExpression (PROPERTY_ACCESSOR) -field -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +field -> USimpleNameReferenceExpression (identifier = field) set -> [!] UnknownKotlinExpression (PROPERTY_ACCESSOR) p -> [!] UnknownKotlinExpression (VALUE_PARAMETER) - field -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - = -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - p -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + field -> USimpleNameReferenceExpression (identifier = field) + = -> USimpleNameReferenceExpression (identifier = =) + p -> USimpleNameReferenceExpression (identifier = p) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyInitializer.refNames.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyInitializer.refNames.txt similarity index 92% rename from plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyInitializer.refNames.fe10.txt rename to plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyInitializer.refNames.txt index e8fceeca040..e98becf9b27 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyInitializer.refNames.fe10.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyInitializer.refNames.txt @@ -1,3 +1,3 @@ field -> USimpleNameReferenceExpression (identifier = field) from KtNameReferenceExpression field -> USimpleNameReferenceExpression (identifier = field) from KtNameReferenceExpression -p -> USimpleNameReferenceExpression (identifier = p) from KtNameReferenceExpression +p -> USimpleNameReferenceExpression (identifier = p) from KtNameReferenceExpression \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyInitializerWithoutSetter.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyInitializerWithoutSetter.identifiers.fir.txt index 17a6b85d052..9b040f2451b 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyInitializerWithoutSetter.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyInitializerWithoutSetter.identifiers.fir.txt @@ -1,3 +1,3 @@ withoutSetter -> UField (name = withoutSetter) get -> [!] UnknownKotlinExpression (PROPERTY_ACCESSOR) -field -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +field -> USimpleNameReferenceExpression (identifier = field) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyInitializerWithoutSetter.refNames.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyInitializerWithoutSetter.refNames.txt similarity index 69% rename from plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyInitializerWithoutSetter.refNames.fe10.txt rename to plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyInitializerWithoutSetter.refNames.txt index e98b02946a9..0f6df095f3f 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyInitializerWithoutSetter.refNames.fe10.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyInitializerWithoutSetter.refNames.txt @@ -1 +1 @@ -field -> USimpleNameReferenceExpression (identifier = field) from KtNameReferenceExpression +field -> USimpleNameReferenceExpression (identifier = field) from KtNameReferenceExpression \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyReferences.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyReferences.identifiers.fir.txt index eeea8977c02..c7d7b02b253 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyReferences.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyReferences.identifiers.fir.txt @@ -1,53 +1,53 @@ A -> UClass (name = A) init -> UParameter (name = init) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) privateProp -> UField (name = privateProp) mutableProp -> UField (name = mutableProp) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - mutableProp -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - = -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - init -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) + mutableProp -> USimpleNameReferenceExpression (identifier = mutableProp) + = -> USimpleNameReferenceExpression (identifier = =) + init -> USimpleNameReferenceExpression (identifier = init) add -> UMethod (name = add) x -> UParameter (name = x) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) +Int -> USimpleNameReferenceExpression (identifier = Int) result -> [!] UnknownKotlinExpression (PROPERTY) - privateProp -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - privateProp -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - = -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - x -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - privateProp -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + privateProp -> USimpleNameReferenceExpression (identifier = privateProp) + privateProp -> USimpleNameReferenceExpression (identifier = privateProp) + = -> USimpleNameReferenceExpression (identifier = =) + x -> USimpleNameReferenceExpression (identifier = x) + privateProp -> USimpleNameReferenceExpression (identifier = privateProp) properties -> UMethod (name = properties) a -> [!] UnknownKotlinExpression (PROPERTY) A -> [!] UnknownKotlinExpression (CALL_EXPRESSION) x -> [!] UnknownKotlinExpression (PROPERTY) - - -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - mutableProp -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - mutableProp -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - = -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - mutableProp -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - += -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - x -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - ++ -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - mutableProp -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - mutableProp -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - -- -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) -A -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + - -> USimpleNameReferenceExpression (identifier = -) + a -> USimpleNameReferenceExpression (identifier = a) + mutableProp -> USimpleNameReferenceExpression (identifier = mutableProp) + a -> USimpleNameReferenceExpression (identifier = a) + mutableProp -> USimpleNameReferenceExpression (identifier = mutableProp) + = -> USimpleNameReferenceExpression (identifier = =) + a -> USimpleNameReferenceExpression (identifier = a) + mutableProp -> USimpleNameReferenceExpression (identifier = mutableProp) + += -> USimpleNameReferenceExpression (identifier = +=) + x -> USimpleNameReferenceExpression (identifier = x) + ++ -> USimpleNameReferenceExpression (identifier = ++) + a -> USimpleNameReferenceExpression (identifier = a) + mutableProp -> USimpleNameReferenceExpression (identifier = mutableProp) + a -> USimpleNameReferenceExpression (identifier = a) + mutableProp -> USimpleNameReferenceExpression (identifier = mutableProp) + -- -> USimpleNameReferenceExpression (identifier = --) +A -> USimpleNameReferenceExpression (identifier = A) ext -> UMethod (name = ext) x -> [!] UnknownKotlinExpression (PROPERTY) - - -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - mutableProp -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - mutableProp -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - = -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - mutableProp -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - += -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - x -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - ++ -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - mutableProp -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - mutableProp -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - -- -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + - -> USimpleNameReferenceExpression (identifier = -) + mutableProp -> USimpleNameReferenceExpression (identifier = mutableProp) + mutableProp -> USimpleNameReferenceExpression (identifier = mutableProp) + = -> USimpleNameReferenceExpression (identifier = =) + mutableProp -> USimpleNameReferenceExpression (identifier = mutableProp) + += -> USimpleNameReferenceExpression (identifier = +=) + x -> USimpleNameReferenceExpression (identifier = x) + ++ -> USimpleNameReferenceExpression (identifier = ++) + mutableProp -> USimpleNameReferenceExpression (identifier = mutableProp) + mutableProp -> USimpleNameReferenceExpression (identifier = mutableProp) + -- -> USimpleNameReferenceExpression (identifier = --) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyReferences.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyReferences.refNames.fir.txt index f0515d276ea..b5a90705e09 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyReferences.refNames.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyReferences.refNames.fir.txt @@ -1,5 +1,34 @@ -mutableProp -> UQualifiedReferenceExpression from KtDotQualifiedExpression -mutableProp -> UQualifiedReferenceExpression from KtDotQualifiedExpression -mutableProp -> UQualifiedReferenceExpression from KtDotQualifiedExpression -mutableProp -> UQualifiedReferenceExpression from KtDotQualifiedExpression -mutableProp -> UQualifiedReferenceExpression from KtDotQualifiedExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +mutableProp -> USimpleNameReferenceExpression (identifier = mutableProp) from KtNameReferenceExpression +init -> USimpleNameReferenceExpression (identifier = init) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +privateProp -> USimpleNameReferenceExpression (identifier = privateProp) from KtNameReferenceExpression +privateProp -> USimpleNameReferenceExpression (identifier = privateProp) from KtNameReferenceExpression +x -> USimpleNameReferenceExpression (identifier = x) from KtNameReferenceExpression +privateProp -> USimpleNameReferenceExpression (identifier = privateProp) from KtNameReferenceExpression +A -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +mutableProp -> USimpleNameReferenceExpression (identifier = mutableProp) from KtDotQualifiedExpression +a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression +mutableProp -> USimpleNameReferenceExpression (identifier = mutableProp) from KtNameReferenceExpression +mutableProp -> USimpleNameReferenceExpression (identifier = mutableProp) from KtDotQualifiedExpression +a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression +mutableProp -> USimpleNameReferenceExpression (identifier = mutableProp) from KtNameReferenceExpression +mutableProp -> USimpleNameReferenceExpression (identifier = mutableProp) from KtDotQualifiedExpression +a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression +mutableProp -> USimpleNameReferenceExpression (identifier = mutableProp) from KtNameReferenceExpression +x -> USimpleNameReferenceExpression (identifier = x) from KtNameReferenceExpression +mutableProp -> USimpleNameReferenceExpression (identifier = mutableProp) from KtDotQualifiedExpression +a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression +mutableProp -> USimpleNameReferenceExpression (identifier = mutableProp) from KtNameReferenceExpression +mutableProp -> USimpleNameReferenceExpression (identifier = mutableProp) from KtDotQualifiedExpression +a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression +mutableProp -> USimpleNameReferenceExpression (identifier = mutableProp) from KtNameReferenceExpression +A -> USimpleNameReferenceExpression (identifier = A) from KtNameReferenceExpression +mutableProp -> USimpleNameReferenceExpression (identifier = mutableProp) from KtNameReferenceExpression +mutableProp -> USimpleNameReferenceExpression (identifier = mutableProp) from KtNameReferenceExpression +mutableProp -> USimpleNameReferenceExpression (identifier = mutableProp) from KtNameReferenceExpression +x -> USimpleNameReferenceExpression (identifier = x) from KtNameReferenceExpression +mutableProp -> USimpleNameReferenceExpression (identifier = mutableProp) from KtNameReferenceExpression +mutableProp -> USimpleNameReferenceExpression (identifier = mutableProp) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyWithAnnotation.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyWithAnnotation.identifiers.fir.txt index 5229081030e..2d64de1d89a 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyWithAnnotation.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyWithAnnotation.identifiers.fir.txt @@ -1,19 +1,19 @@ TestAnnotation -> UClass (name = TestAnnotation) -TestAnnotation -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +TestAnnotation -> USimpleNameReferenceExpression (identifier = TestAnnotation) prop1 -> UField (name = prop1) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) get -> null -TestAnnotation -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +TestAnnotation -> USimpleNameReferenceExpression (identifier = TestAnnotation) prop2 -> [!] UnknownKotlinExpression (PROPERTY) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) get -> [!] UnknownKotlinExpression (PROPERTY_ACCESSOR) set -> null -TestAnnotation -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +TestAnnotation -> USimpleNameReferenceExpression (identifier = TestAnnotation) prop3 -> [!] UnknownKotlinExpression (PROPERTY) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) get -> [!] UnknownKotlinExpression (PROPERTY_ACCESSOR) set -> [!] UnknownKotlinExpression (PROPERTY_ACCESSOR) value -> [!] UnknownKotlinExpression (VALUE_PARAMETER) - field -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - = -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - value -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + field -> USimpleNameReferenceExpression (identifier = field) + = -> USimpleNameReferenceExpression (identifier = =) + value -> USimpleNameReferenceExpression (identifier = value) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyWithAnnotation.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyWithAnnotation.refNames.fir.txt new file mode 100644 index 00000000000..ba3d83d1062 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyWithAnnotation.refNames.fir.txt @@ -0,0 +1,8 @@ +TestAnnotation -> USimpleNameReferenceExpression (identifier = TestAnnotation) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +TestAnnotation -> USimpleNameReferenceExpression (identifier = TestAnnotation) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +TestAnnotation -> USimpleNameReferenceExpression (identifier = TestAnnotation) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +field -> USimpleNameReferenceExpression (identifier = field) from KtNameReferenceExpression +value -> USimpleNameReferenceExpression (identifier = value) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/QualifiedConstructorCall.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/QualifiedConstructorCall.identifiers.fir.txt index 480ba6e6716..bf8cbb19dd0 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/QualifiedConstructorCall.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/QualifiedConstructorCall.identifiers.fir.txt @@ -1,11 +1,11 @@ -A -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -B -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -C -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +A -> USimpleNameReferenceExpression (identifier = A) +B -> USimpleNameReferenceExpression (identifier = B) +C -> USimpleNameReferenceExpression (identifier = C) Foo -> UClass (name = Foo) Bar -> UClass (name = Bar) getFoo -> UMethod (name = getFoo) -Foo -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - A -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - B -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - C -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Foo -> USimpleNameReferenceExpression (identifier = Foo) + A -> USimpleNameReferenceExpression (identifier = A) + B -> USimpleNameReferenceExpression (identifier = B) + C -> USimpleNameReferenceExpression (identifier = C) Foo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/QualifiedConstructorCall.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/QualifiedConstructorCall.refNames.fir.txt index af64d3f446c..cd90d514af1 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/QualifiedConstructorCall.refNames.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/QualifiedConstructorCall.refNames.fir.txt @@ -1,5 +1,13 @@ -C -> UQualifiedReferenceExpression from KtDotQualifiedExpression -B -> UQualifiedReferenceExpression from KtDotQualifiedExpression +C -> USimpleNameReferenceExpression (identifier = C) from KtDotQualifiedExpression +B -> USimpleNameReferenceExpression (identifier = B) from KtDotQualifiedExpression +A -> USimpleNameReferenceExpression (identifier = A) from KtNameReferenceExpression +B -> USimpleNameReferenceExpression (identifier = B) from KtNameReferenceExpression +C -> USimpleNameReferenceExpression (identifier = C) from KtNameReferenceExpression +Foo -> USimpleNameReferenceExpression (identifier = Foo) from KtNameReferenceExpression Foo() -> UQualifiedReferenceExpression from KtDotQualifiedExpression -C -> UQualifiedReferenceExpression from KtDotQualifiedExpression -B -> UQualifiedReferenceExpression from KtDotQualifiedExpression +C -> USimpleNameReferenceExpression (identifier = C) from KtDotQualifiedExpression +B -> USimpleNameReferenceExpression (identifier = B) from KtDotQualifiedExpression +A -> USimpleNameReferenceExpression (identifier = A) from KtNameReferenceExpression +B -> USimpleNameReferenceExpression (identifier = B) from KtNameReferenceExpression +C -> USimpleNameReferenceExpression (identifier = C) from KtNameReferenceExpression +Foo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReceiverFun.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReceiverFun.identifiers.fir.txt index 32fd4235e82..97211a1e664 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReceiverFun.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReceiverFun.identifiers.fir.txt @@ -1,14 +1,14 @@ MyReceiverAnnotation -> UClass (name = MyReceiverAnnotation) name -> UAnnotationMethod (name = name) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -MyReceiverAnnotation -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) +MyReceiverAnnotation -> USimpleNameReferenceExpression (identifier = MyReceiverAnnotation) +String -> USimpleNameReferenceExpression (identifier = String) foo -> UMethod (name = foo) -this -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -length -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -MyReceiverAnnotation -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +this -> USimpleNameReferenceExpression (identifier = this) +length -> USimpleNameReferenceExpression (identifier = length) +MyReceiverAnnotation -> USimpleNameReferenceExpression (identifier = MyReceiverAnnotation) +String -> USimpleNameReferenceExpression (identifier = String) rx -> [!] UnknownKotlinExpression (PROPERTY) -Regex -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Regex -> USimpleNameReferenceExpression (identifier = Regex) get -> [!] UnknownKotlinExpression (PROPERTY_ACCESSOR) toRegex -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReceiverFun.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReceiverFun.refNames.fir.txt index b6a2ef7731f..291fc0666fe 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReceiverFun.refNames.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReceiverFun.refNames.fir.txt @@ -1 +1,9 @@ -length -> UQualifiedReferenceExpression from KtDotQualifiedExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +MyReceiverAnnotation -> USimpleNameReferenceExpression (identifier = MyReceiverAnnotation) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +length -> USimpleNameReferenceExpression (identifier = length) from KtDotQualifiedExpression +length -> USimpleNameReferenceExpression (identifier = length) from KtNameReferenceExpression +MyReceiverAnnotation -> USimpleNameReferenceExpression (identifier = MyReceiverAnnotation) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +Regex -> USimpleNameReferenceExpression (identifier = Regex) from KtNameReferenceExpression +toRegex -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Reified.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Reified.identifiers.fir.txt index c39649beba8..9b7ff4091ec 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Reified.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Reified.identifiers.fir.txt @@ -1,23 +1,23 @@ -test -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -pkg -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +test -> USimpleNameReferenceExpression (identifier = test) +pkg -> USimpleNameReferenceExpression (identifier = pkg) Context -> UClass (name = Context) T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) ownSystemService1 -> [!] UnknownKotlinExpression (FUN) getSystemService -> [!] UnknownKotlinExpression (CALL_EXPRESSION) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> USimpleNameReferenceExpression (identifier = T) +java -> USimpleNameReferenceExpression (identifier = java) ownSystemService2 -> [!] UnknownKotlinExpression (FUN) getSystemService -> [!] UnknownKotlinExpression (CALL_EXPRESSION) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) +java -> USimpleNameReferenceExpression (identifier = java) T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) -Context -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Context -> USimpleNameReferenceExpression (identifier = Context) systemService1 -> [!] UnknownKotlinExpression (FUN) getSystemService -> [!] UnknownKotlinExpression (CALL_EXPRESSION) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Context -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> USimpleNameReferenceExpression (identifier = T) +java -> USimpleNameReferenceExpression (identifier = java) +Context -> USimpleNameReferenceExpression (identifier = Context) systemService2 -> [!] UnknownKotlinExpression (FUN) getSystemService -> [!] UnknownKotlinExpression (CALL_EXPRESSION) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) +java -> USimpleNameReferenceExpression (identifier = java) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Reified.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Reified.refNames.fir.txt index cfff358506f..c5b049dce39 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Reified.refNames.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Reified.refNames.fir.txt @@ -1,5 +1,21 @@ -pkg -> UQualifiedReferenceExpression from KtDotQualifiedExpression -java -> UQualifiedReferenceExpression from KtDotQualifiedExpression -java -> UQualifiedReferenceExpression from KtDotQualifiedExpression -java -> UQualifiedReferenceExpression from KtDotQualifiedExpression -java -> UQualifiedReferenceExpression from KtDotQualifiedExpression +pkg -> USimpleNameReferenceExpression (identifier = pkg) from KtDotQualifiedExpression +test -> USimpleNameReferenceExpression (identifier = test) from KtNameReferenceExpression +pkg -> USimpleNameReferenceExpression (identifier = pkg) from KtNameReferenceExpression +getSystemService -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +java -> USimpleNameReferenceExpression (identifier = java) from KtDotQualifiedExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +java -> USimpleNameReferenceExpression (identifier = java) from KtNameReferenceExpression +getSystemService -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +java -> USimpleNameReferenceExpression (identifier = java) from KtDotQualifiedExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +java -> USimpleNameReferenceExpression (identifier = java) from KtNameReferenceExpression +Context -> USimpleNameReferenceExpression (identifier = Context) from KtNameReferenceExpression +getSystemService -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +java -> USimpleNameReferenceExpression (identifier = java) from KtDotQualifiedExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +java -> USimpleNameReferenceExpression (identifier = java) from KtNameReferenceExpression +Context -> USimpleNameReferenceExpression (identifier = Context) from KtNameReferenceExpression +getSystemService -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +java -> USimpleNameReferenceExpression (identifier = java) from KtDotQualifiedExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +java -> USimpleNameReferenceExpression (identifier = java) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedParameters.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedParameters.identifiers.fir.txt index 7b994d71f8a..95ab654deda 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedParameters.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedParameters.identifiers.fir.txt @@ -1,47 +1,47 @@ T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) functionWithLambda -> [!] UnknownKotlinExpression (FUN) t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> USimpleNameReferenceExpression (identifier = T) process -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> USimpleNameReferenceExpression (identifier = T) +Int -> USimpleNameReferenceExpression (identifier = Int) +Int -> USimpleNameReferenceExpression (identifier = Int) process -> [!] UnknownKotlinExpression (CALL_EXPRESSION) -t -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +t -> USimpleNameReferenceExpression (identifier = t) T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) functionWithVararg -> [!] UnknownKotlinExpression (FUN) i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -t -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> USimpleNameReferenceExpression (identifier = T) +T -> USimpleNameReferenceExpression (identifier = T) +t -> USimpleNameReferenceExpression (identifier = t) T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> USimpleNameReferenceExpression (identifier = T) functionWithReceiver -> [!] UnknownKotlinExpression (FUN) i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -this -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) +T -> USimpleNameReferenceExpression (identifier = T) +this -> USimpleNameReferenceExpression (identifier = this) T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> USimpleNameReferenceExpression (identifier = T) `name with spaces` -> [!] UnknownKotlinExpression (FUN) i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -this -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) +T -> USimpleNameReferenceExpression (identifier = T) +this -> USimpleNameReferenceExpression (identifier = this) T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) functionWithParamAnnotation -> [!] UnknownKotlinExpression (FUN) -Suppress -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Suppress -> USimpleNameReferenceExpression (identifier = Suppress) t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -t -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> USimpleNameReferenceExpression (identifier = T) +T -> USimpleNameReferenceExpression (identifier = T) +t -> USimpleNameReferenceExpression (identifier = t) T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) functionUnresolved -> [!] UnknownKotlinExpression (FUN) -Suppress -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Suppress -> USimpleNameReferenceExpression (identifier = Suppress) t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -Unresolved -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -t -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Unresolved -> USimpleNameReferenceExpression (identifier = Unresolved) +T -> USimpleNameReferenceExpression (identifier = T) +T -> USimpleNameReferenceExpression (identifier = T) +t -> USimpleNameReferenceExpression (identifier = t) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedParameters.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedParameters.refNames.fir.txt new file mode 100644 index 00000000000..3e0de703bf1 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedParameters.refNames.fir.txt @@ -0,0 +1,25 @@ +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +process -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +t -> USimpleNameReferenceExpression (identifier = t) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +t -> USimpleNameReferenceExpression (identifier = t) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +Suppress -> USimpleNameReferenceExpression (identifier = Suppress) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +t -> USimpleNameReferenceExpression (identifier = t) from KtNameReferenceExpression +Suppress -> USimpleNameReferenceExpression (identifier = Suppress) from KtNameReferenceExpression +Unresolved -> USimpleNameReferenceExpression (identifier = Unresolved) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +t -> USimpleNameReferenceExpression (identifier = t) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedResolve.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedResolve.identifiers.fir.txt index f4a6ae7ba58..a8c71fde547 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedResolve.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedResolve.identifiers.fir.txt @@ -1,31 +1,31 @@ T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) -Any -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Any -> USimpleNameReferenceExpression (identifier = Any) foo -> [!] UnknownKotlinExpression (FUN) init -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Unit -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> USimpleNameReferenceExpression (identifier = T) +Unit -> USimpleNameReferenceExpression (identifier = Unit) +T -> USimpleNameReferenceExpression (identifier = T) TODO -> [!] UnknownKotlinExpression (CALL_EXPRESSION) T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) -Any -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Any -> USimpleNameReferenceExpression (identifier = Any) bar -> [!] UnknownKotlinExpression (FUN) init -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Unit -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> USimpleNameReferenceExpression (identifier = T) +Unit -> USimpleNameReferenceExpression (identifier = Unit) +T -> USimpleNameReferenceExpression (identifier = T) TODO -> [!] UnknownKotlinExpression (CALL_EXPRESSION) resolve -> UMethod (name = resolve) foo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + String -> USimpleNameReferenceExpression (identifier = String) x -> [!] UnknownKotlinExpression (PROPERTY) - String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + String -> USimpleNameReferenceExpression (identifier = String) foo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) bar -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + String -> USimpleNameReferenceExpression (identifier = String) y -> [!] UnknownKotlinExpression (PROPERTY) - String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + String -> USimpleNameReferenceExpression (identifier = String) bar -> [!] UnknownKotlinExpression (CALL_EXPRESSION) z -> [!] UnknownKotlinExpression (PROPERTY) listOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) filterIsInstance -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + String -> USimpleNameReferenceExpression (identifier = String) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedResolve.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedResolve.refNames.fir.txt index 8d938c501da..daef7946abf 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedResolve.refNames.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedResolve.refNames.fir.txt @@ -1 +1,22 @@ +Any -> USimpleNameReferenceExpression (identifier = Any) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +Unit -> USimpleNameReferenceExpression (identifier = Unit) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +TODO -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Any -> USimpleNameReferenceExpression (identifier = Any) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +Unit -> USimpleNameReferenceExpression (identifier = Unit) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +TODO -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +foo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +foo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +bar -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +bar -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression filterIsInstance() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +listOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +filterIsInstance -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedReturnType.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedReturnType.identifiers.fir.txt index 7173437328d..9a5761ca563 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedReturnType.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedReturnType.identifiers.fir.txt @@ -1,171 +1,171 @@ T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) function1 -> [!] UnknownKotlinExpression (FUN) t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> USimpleNameReferenceExpression (identifier = T) i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) s -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) function2 -> [!] UnknownKotlinExpression (FUN) t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> USimpleNameReferenceExpression (identifier = T) i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) s -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -t -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) +T -> USimpleNameReferenceExpression (identifier = T) +t -> USimpleNameReferenceExpression (identifier = t) T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) -CharSequence -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +CharSequence -> USimpleNameReferenceExpression (identifier = CharSequence) function2CharSequence -> [!] UnknownKotlinExpression (FUN) t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> USimpleNameReferenceExpression (identifier = T) i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) s -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -t -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) +T -> USimpleNameReferenceExpression (identifier = T) +t -> USimpleNameReferenceExpression (identifier = t) T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) function3 -> [!] UnknownKotlinExpression (FUN) t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> USimpleNameReferenceExpression (identifier = T) i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) s -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) function4 -> [!] UnknownKotlinExpression (FUN) t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> USimpleNameReferenceExpression (identifier = T) i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) s -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -t -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) +T -> USimpleNameReferenceExpression (identifier = T) +t -> USimpleNameReferenceExpression (identifier = t) T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) function5 -> [!] UnknownKotlinExpression (FUN) t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> USimpleNameReferenceExpression (identifier = T) i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) s -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) +Int -> USimpleNameReferenceExpression (identifier = Int) T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) -Activity -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Activity -> USimpleNameReferenceExpression (identifier = Activity) +T -> USimpleNameReferenceExpression (identifier = T) function6 -> [!] UnknownKotlinExpression (FUN) t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> USimpleNameReferenceExpression (identifier = T) i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) s -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -t -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) +T -> USimpleNameReferenceExpression (identifier = T) +t -> USimpleNameReferenceExpression (identifier = t) T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) function7 -> [!] UnknownKotlinExpression (FUN) t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> USimpleNameReferenceExpression (identifier = T) i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) s -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -t -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) +T -> USimpleNameReferenceExpression (identifier = T) +t -> USimpleNameReferenceExpression (identifier = t) T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) function8 -> [!] UnknownKotlinExpression (FUN) t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> USimpleNameReferenceExpression (identifier = T) i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) s -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -t -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) +T -> USimpleNameReferenceExpression (identifier = T) +t -> USimpleNameReferenceExpression (identifier = t) T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) function9 -> [!] UnknownKotlinExpression (FUN) t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> USimpleNameReferenceExpression (identifier = T) i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) s -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -t -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) +T -> USimpleNameReferenceExpression (identifier = T) +t -> USimpleNameReferenceExpression (identifier = t) T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) function10 -> [!] UnknownKotlinExpression (FUN) t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> USimpleNameReferenceExpression (identifier = T) i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) s -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -t -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) +T -> USimpleNameReferenceExpression (identifier = T) +t -> USimpleNameReferenceExpression (identifier = t) T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> USimpleNameReferenceExpression (identifier = T) function11 -> [!] UnknownKotlinExpression (FUN) t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> USimpleNameReferenceExpression (identifier = T) i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) s -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -t -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) +T -> USimpleNameReferenceExpression (identifier = T) +t -> USimpleNameReferenceExpression (identifier = t) T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) -CharSequence -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +CharSequence -> USimpleNameReferenceExpression (identifier = CharSequence) +T -> USimpleNameReferenceExpression (identifier = T) function11CharSequence -> [!] UnknownKotlinExpression (FUN) t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> USimpleNameReferenceExpression (identifier = T) i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) s -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -t -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) +T -> USimpleNameReferenceExpression (identifier = T) +t -> USimpleNameReferenceExpression (identifier = t) T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) -CharSequence -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +CharSequence -> USimpleNameReferenceExpression (identifier = CharSequence) B -> [!] UnknownKotlinExpression (TYPE_PARAMETER) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> USimpleNameReferenceExpression (identifier = T) +T -> USimpleNameReferenceExpression (identifier = T) function12CharSequence -> [!] UnknownKotlinExpression (FUN) t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -B -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +B -> USimpleNameReferenceExpression (identifier = B) i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> USimpleNameReferenceExpression (identifier = T) s -> [!] UnknownKotlinExpression (VALUE_PARAMETER) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -B -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -t -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) +B -> USimpleNameReferenceExpression (identifier = B) +t -> USimpleNameReferenceExpression (identifier = t) T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) B -> [!] UnknownKotlinExpression (TYPE_PARAMETER) copyWhenGreater -> UMethod (name = copyWhenGreater) list -> UParameter (name = list) -List -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +List -> USimpleNameReferenceExpression (identifier = List) +T -> USimpleNameReferenceExpression (identifier = T) threshold -> UParameter (name = threshold) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> USimpleNameReferenceExpression (identifier = T) threshold2 -> UParameter (name = threshold2) -B -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -B -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -CharSequence -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Comparable -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -B -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - threshold2 -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +B -> USimpleNameReferenceExpression (identifier = B) +B -> USimpleNameReferenceExpression (identifier = B) +T -> USimpleNameReferenceExpression (identifier = T) +CharSequence -> USimpleNameReferenceExpression (identifier = CharSequence) +T -> USimpleNameReferenceExpression (identifier = T) +Comparable -> USimpleNameReferenceExpression (identifier = Comparable) +T -> USimpleNameReferenceExpression (identifier = T) +B -> USimpleNameReferenceExpression (identifier = B) +T -> USimpleNameReferenceExpression (identifier = T) + threshold2 -> USimpleNameReferenceExpression (identifier = threshold2) Foo -> UClass (name = Foo) T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) Z -> [!] UnknownKotlinExpression (TYPE_PARAMETER) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> USimpleNameReferenceExpression (identifier = T) foo -> [!] UnknownKotlinExpression (FUN) -Z -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Z -> USimpleNameReferenceExpression (identifier = Z) TODO -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedReturnType.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedReturnType.refNames.fir.txt new file mode 100644 index 00000000000..a3b080cdb9f --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedReturnType.refNames.fir.txt @@ -0,0 +1,90 @@ +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +t -> USimpleNameReferenceExpression (identifier = t) from KtNameReferenceExpression +CharSequence -> USimpleNameReferenceExpression (identifier = CharSequence) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +t -> USimpleNameReferenceExpression (identifier = t) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +t -> USimpleNameReferenceExpression (identifier = t) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +Activity -> USimpleNameReferenceExpression (identifier = Activity) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +t -> USimpleNameReferenceExpression (identifier = t) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +t -> USimpleNameReferenceExpression (identifier = t) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +t -> USimpleNameReferenceExpression (identifier = t) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +t -> USimpleNameReferenceExpression (identifier = t) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +t -> USimpleNameReferenceExpression (identifier = t) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +t -> USimpleNameReferenceExpression (identifier = t) from KtNameReferenceExpression +CharSequence -> USimpleNameReferenceExpression (identifier = CharSequence) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +t -> USimpleNameReferenceExpression (identifier = t) from KtNameReferenceExpression +CharSequence -> USimpleNameReferenceExpression (identifier = CharSequence) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +B -> USimpleNameReferenceExpression (identifier = B) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +B -> USimpleNameReferenceExpression (identifier = B) from KtNameReferenceExpression +t -> USimpleNameReferenceExpression (identifier = t) from KtNameReferenceExpression +List -> USimpleNameReferenceExpression (identifier = List) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +B -> USimpleNameReferenceExpression (identifier = B) from KtNameReferenceExpression +B -> USimpleNameReferenceExpression (identifier = B) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +CharSequence -> USimpleNameReferenceExpression (identifier = CharSequence) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +Comparable -> USimpleNameReferenceExpression (identifier = Comparable) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +B -> USimpleNameReferenceExpression (identifier = B) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +threshold2 -> USimpleNameReferenceExpression (identifier = threshold2) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +Z -> USimpleNameReferenceExpression (identifier = Z) from KtNameReferenceExpression +TODO -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Resolve.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Resolve.identifiers.fir.txt index f2324f3dbff..9ac2c66e9e0 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Resolve.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Resolve.identifiers.fir.txt @@ -10,53 +10,53 @@ bar -> UMethod (name = bar) A -> [!] UnknownKotlinExpression (CALL_EXPRESSION) forEach -> [!] UnknownKotlinExpression (CALL_EXPRESSION) println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - it -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + it -> USimpleNameReferenceExpression (identifier = it) listOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) joinToString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) listOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - size -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + size -> USimpleNameReferenceExpression (identifier = size) listOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - indices -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + indices -> USimpleNameReferenceExpression (identifier = indices) date -> [!] UnknownKotlinExpression (PROPERTY) - java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - util -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - Date -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - util -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + java -> USimpleNameReferenceExpression (identifier = java) + util -> USimpleNameReferenceExpression (identifier = util) + Date -> USimpleNameReferenceExpression (identifier = Date) + java -> USimpleNameReferenceExpression (identifier = java) + util -> USimpleNameReferenceExpression (identifier = util) Date -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - date -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - time -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - = -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + date -> USimpleNameReferenceExpression (identifier = date) + time -> USimpleNameReferenceExpression (identifier = time) + = -> USimpleNameReferenceExpression (identifier = =) listOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) last -> [!] UnknownKotlinExpression (CALL_EXPRESSION) mutableMapOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - to -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - entries -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + to -> USimpleNameReferenceExpression (identifier = to) + entries -> USimpleNameReferenceExpression (identifier = entries) first -> [!] UnknownKotlinExpression (CALL_EXPRESSION) setValue -> [!] UnknownKotlinExpression (CALL_EXPRESSION) intRange -> [!] UnknownKotlinExpression (PROPERTY) - .. -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - intRange -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + .. -> USimpleNameReferenceExpression (identifier = ..) + intRange -> USimpleNameReferenceExpression (identifier = intRange) contains -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - as -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + as -> USimpleNameReferenceExpression (identifier = as) + Int -> USimpleNameReferenceExpression (identifier = Int) IntRange -> [!] UnknownKotlinExpression (CALL_EXPRESSION) T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) -A -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +A -> USimpleNameReferenceExpression (identifier = A) barT -> UMethod (name = barT) t -> UParameter (name = t) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - t -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> USimpleNameReferenceExpression (identifier = T) + t -> USimpleNameReferenceExpression (identifier = t) foo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) -List -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -A -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +List -> USimpleNameReferenceExpression (identifier = List) +A -> USimpleNameReferenceExpression (identifier = A) barTL -> UMethod (name = barTL) listT -> UParameter (name = listT) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - listT -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> USimpleNameReferenceExpression (identifier = T) + listT -> USimpleNameReferenceExpression (identifier = listT) isEmpty -> [!] UnknownKotlinExpression (CALL_EXPRESSION) a -> [!] UnknownKotlinExpression (VALUE_PARAMETER) - listT -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + listT -> USimpleNameReferenceExpression (identifier = listT) + a -> USimpleNameReferenceExpression (identifier = a) foo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Resolve.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Resolve.refNames.fir.txt index 2a0ab05ebbf..6b3cb9d5628 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Resolve.refNames.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Resolve.refNames.fir.txt @@ -1,17 +1,63 @@ foo() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +A -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +foo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression inlineFoo() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +A -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +inlineFoo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression forEach { println(it) } -> UQualifiedReferenceExpression from KtDotQualifiedExpression +listOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +A -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +forEach -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +it -> USimpleNameReferenceExpression (identifier = it) from KtNameReferenceExpression joinToString() -> UQualifiedReferenceExpression from KtDotQualifiedExpression -size -> UQualifiedReferenceExpression from KtDotQualifiedExpression -indices -> UQualifiedReferenceExpression from KtDotQualifiedExpression +listOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +joinToString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +size -> USimpleNameReferenceExpression (identifier = size) from KtDotQualifiedExpression +listOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +size -> USimpleNameReferenceExpression (identifier = size) from KtNameReferenceExpression +indices -> USimpleNameReferenceExpression (identifier = indices) from KtDotQualifiedExpression +listOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +indices -> USimpleNameReferenceExpression (identifier = indices) from KtNameReferenceExpression +java -> USimpleNameReferenceExpression (identifier = java) from KtNameReferenceExpression +util -> USimpleNameReferenceExpression (identifier = util) from KtNameReferenceExpression +Date -> USimpleNameReferenceExpression (identifier = Date) from KtNameReferenceExpression Date() -> UQualifiedReferenceExpression from KtDotQualifiedExpression -util -> UQualifiedReferenceExpression from KtDotQualifiedExpression -time -> UQualifiedReferenceExpression from KtDotQualifiedExpression +util -> USimpleNameReferenceExpression (identifier = util) from KtDotQualifiedExpression +java -> USimpleNameReferenceExpression (identifier = java) from KtNameReferenceExpression +util -> USimpleNameReferenceExpression (identifier = util) from KtNameReferenceExpression +Date -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +time -> USimpleNameReferenceExpression (identifier = time) from KtDotQualifiedExpression +date -> USimpleNameReferenceExpression (identifier = date) from KtNameReferenceExpression +time -> USimpleNameReferenceExpression (identifier = time) from KtNameReferenceExpression last() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +listOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +last -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression setValue("123") -> UQualifiedReferenceExpression from KtDotQualifiedExpression first() -> UQualifiedReferenceExpression from KtDotQualifiedExpression -entries -> UQualifiedReferenceExpression from KtDotQualifiedExpression +entries -> USimpleNameReferenceExpression (identifier = entries) from KtDotQualifiedExpression +mutableMapOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +to -> USimpleNameReferenceExpression (identifier = to) from KtOperationReferenceExpression +entries -> USimpleNameReferenceExpression (identifier = entries) from KtNameReferenceExpression +first -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +setValue -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression contains(2 as Int) -> UQualifiedReferenceExpression from KtDotQualifiedExpression +intRange -> USimpleNameReferenceExpression (identifier = intRange) from KtNameReferenceExpression +contains -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +IntRange -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +A -> USimpleNameReferenceExpression (identifier = A) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression foo() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +t -> USimpleNameReferenceExpression (identifier = t) from KtNameReferenceExpression +foo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +List -> USimpleNameReferenceExpression (identifier = List) from KtNameReferenceExpression +A -> USimpleNameReferenceExpression (identifier = A) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression isEmpty() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +listT -> USimpleNameReferenceExpression (identifier = listT) from KtNameReferenceExpression +isEmpty -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +listT -> USimpleNameReferenceExpression (identifier = listT) from KtNameReferenceExpression foo() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression +foo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SAM.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SAM.identifiers.fir.txt index 3c2d07c2a99..df58fbb3444 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SAM.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SAM.identifiers.fir.txt @@ -1,43 +1,43 @@ -java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -lang -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Thread -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -lang -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Runnable -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -util -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -concurrent -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Callable -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -util -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -function -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Supplier -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +java -> USimpleNameReferenceExpression (identifier = java) +lang -> USimpleNameReferenceExpression (identifier = lang) +Thread -> USimpleNameReferenceExpression (identifier = Thread) +java -> USimpleNameReferenceExpression (identifier = java) +lang -> USimpleNameReferenceExpression (identifier = lang) +Runnable -> USimpleNameReferenceExpression (identifier = Runnable) +java -> USimpleNameReferenceExpression (identifier = java) +util -> USimpleNameReferenceExpression (identifier = util) +concurrent -> USimpleNameReferenceExpression (identifier = concurrent) +Callable -> USimpleNameReferenceExpression (identifier = Callable) +java -> USimpleNameReferenceExpression (identifier = java) +util -> USimpleNameReferenceExpression (identifier = util) +function -> USimpleNameReferenceExpression (identifier = function) +Supplier -> USimpleNameReferenceExpression (identifier = Supplier) notSam -> UField (name = notSam) foo -> UField (name = foo) -java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -lang -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Runnable -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +java -> USimpleNameReferenceExpression (identifier = java) +lang -> USimpleNameReferenceExpression (identifier = lang) +Runnable -> USimpleNameReferenceExpression (identifier = Runnable) bar -> UMethod (name = bar) -java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -lang -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Runnable -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - foo -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - = -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) +java -> USimpleNameReferenceExpression (identifier = java) +lang -> USimpleNameReferenceExpression (identifier = lang) +Runnable -> USimpleNameReferenceExpression (identifier = Runnable) + foo -> USimpleNameReferenceExpression (identifier = foo) + = -> USimpleNameReferenceExpression (identifier = =) a -> [!] UnknownKotlinExpression (PROPERTY) - as -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - lang -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - Runnable -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + as -> USimpleNameReferenceExpression (identifier = as) + java -> USimpleNameReferenceExpression (identifier = java) + lang -> USimpleNameReferenceExpression (identifier = lang) + Runnable -> USimpleNameReferenceExpression (identifier = Runnable) runRunnable -> [!] UnknownKotlinExpression (CALL_EXPRESSION) baz -> UField (name = baz) -java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -lang -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +java -> USimpleNameReferenceExpression (identifier = java) +lang -> USimpleNameReferenceExpression (identifier = lang) Runnable -> [!] UnknownKotlinExpression (CALL_EXPRESSION) runRunnable -> UMethod (name = runRunnable) r -> UParameter (name = r) -java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -lang -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Runnable -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +java -> USimpleNameReferenceExpression (identifier = java) +lang -> USimpleNameReferenceExpression (identifier = lang) +Runnable -> USimpleNameReferenceExpression (identifier = Runnable) r -> [!] UnknownKotlinExpression (CALL_EXPRESSION) test1 -> UMethod (name = test1) thread1 -> [!] UnknownKotlinExpression (PROPERTY) @@ -55,13 +55,13 @@ test3 -> UMethod (name = test3) Callable -> [!] UnknownKotlinExpression (CALL_EXPRESSION) ambiguousSamAcceptor -> UMethod (name = ambiguousSamAcceptor) s -> UParameter (name = s) -Supplier -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Supplier -> USimpleNameReferenceExpression (identifier = Supplier) +String -> USimpleNameReferenceExpression (identifier = String) +String -> USimpleNameReferenceExpression (identifier = String) TODO -> [!] UnknownKotlinExpression (CALL_EXPRESSION) ambiguousSamAcceptor -> UMethod (name = ambiguousSamAcceptor) s -> UParameter (name = s) -Callable -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Callable -> USimpleNameReferenceExpression (identifier = Callable) +String -> USimpleNameReferenceExpression (identifier = String) +String -> USimpleNameReferenceExpression (identifier = String) TODO -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SAM.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SAM.refNames.fir.txt index 87b0e42bd6d..197321584fe 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SAM.refNames.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SAM.refNames.fir.txt @@ -1,12 +1,61 @@ -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 +Thread -> USimpleNameReferenceExpression (identifier = Thread) from KtDotQualifiedExpression +lang -> USimpleNameReferenceExpression (identifier = lang) from KtDotQualifiedExpression +java -> USimpleNameReferenceExpression (identifier = java) from KtNameReferenceExpression +lang -> USimpleNameReferenceExpression (identifier = lang) from KtNameReferenceExpression +Thread -> USimpleNameReferenceExpression (identifier = Thread) from KtNameReferenceExpression +Runnable -> USimpleNameReferenceExpression (identifier = Runnable) from KtDotQualifiedExpression +lang -> USimpleNameReferenceExpression (identifier = lang) from KtDotQualifiedExpression +java -> USimpleNameReferenceExpression (identifier = java) from KtNameReferenceExpression +lang -> USimpleNameReferenceExpression (identifier = lang) from KtNameReferenceExpression +Runnable -> USimpleNameReferenceExpression (identifier = Runnable) from KtNameReferenceExpression +Callable -> USimpleNameReferenceExpression (identifier = Callable) from KtDotQualifiedExpression +concurrent -> USimpleNameReferenceExpression (identifier = concurrent) from KtDotQualifiedExpression +util -> USimpleNameReferenceExpression (identifier = util) from KtDotQualifiedExpression +java -> USimpleNameReferenceExpression (identifier = java) from KtNameReferenceExpression +util -> USimpleNameReferenceExpression (identifier = util) from KtNameReferenceExpression +concurrent -> USimpleNameReferenceExpression (identifier = concurrent) from KtNameReferenceExpression +Callable -> USimpleNameReferenceExpression (identifier = Callable) from KtNameReferenceExpression +Supplier -> USimpleNameReferenceExpression (identifier = Supplier) from KtDotQualifiedExpression +function -> USimpleNameReferenceExpression (identifier = function) from KtDotQualifiedExpression +util -> USimpleNameReferenceExpression (identifier = util) from KtDotQualifiedExpression +java -> USimpleNameReferenceExpression (identifier = java) from KtNameReferenceExpression +util -> USimpleNameReferenceExpression (identifier = util) from KtNameReferenceExpression +function -> USimpleNameReferenceExpression (identifier = function) from KtNameReferenceExpression +Supplier -> USimpleNameReferenceExpression (identifier = Supplier) from KtNameReferenceExpression +java -> USimpleNameReferenceExpression (identifier = java) from KtNameReferenceExpression +lang -> USimpleNameReferenceExpression (identifier = lang) from KtNameReferenceExpression +Runnable -> USimpleNameReferenceExpression (identifier = Runnable) from KtNameReferenceExpression +java -> USimpleNameReferenceExpression (identifier = java) from KtNameReferenceExpression +lang -> USimpleNameReferenceExpression (identifier = lang) from KtNameReferenceExpression +Runnable -> USimpleNameReferenceExpression (identifier = Runnable) from KtNameReferenceExpression +foo -> USimpleNameReferenceExpression (identifier = foo) from KtNameReferenceExpression +java -> USimpleNameReferenceExpression (identifier = java) from KtNameReferenceExpression +lang -> USimpleNameReferenceExpression (identifier = lang) from KtNameReferenceExpression +Runnable -> USimpleNameReferenceExpression (identifier = Runnable) from KtNameReferenceExpression +runRunnable -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression Runnable { /* SAM */ } -> UQualifiedReferenceExpression from KtDotQualifiedExpression -lang -> UQualifiedReferenceExpression from KtDotQualifiedExpression +lang -> USimpleNameReferenceExpression (identifier = lang) from KtDotQualifiedExpression +java -> USimpleNameReferenceExpression (identifier = java) from KtNameReferenceExpression +lang -> USimpleNameReferenceExpression (identifier = lang) from KtNameReferenceExpression +Runnable -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +java -> USimpleNameReferenceExpression (identifier = java) from KtNameReferenceExpression +lang -> USimpleNameReferenceExpression (identifier = lang) from KtNameReferenceExpression +Runnable -> USimpleNameReferenceExpression (identifier = Runnable) from KtNameReferenceExpression +r -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Thread -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Thread -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Runnable -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +ambiguousSamAcceptor -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Supplier -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +ambiguousSamAcceptor -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Callable -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Supplier -> USimpleNameReferenceExpression (identifier = Supplier) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +TODO -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Callable -> USimpleNameReferenceExpression (identifier = Callable) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +TODO -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Simple.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Simple.identifiers.fir.txt index f3a8634d973..0225db25af2 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Simple.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Simple.identifiers.fir.txt @@ -2,4 +2,4 @@ Simple -> UClass (name = Simple) method -> UMethod (name = method) println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) property -> UField (name = property) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Simple.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Simple.refNames.fir.txt new file mode 100644 index 00000000000..b71c8182d25 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Simple.refNames.fir.txt @@ -0,0 +1,2 @@ +println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SimpleAnnotated.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SimpleAnnotated.identifiers.fir.txt index e96e331efd9..a653b6537cf 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SimpleAnnotated.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SimpleAnnotated.identifiers.fir.txt @@ -1,8 +1,8 @@ SimpleAnnotated -> UClass (name = SimpleAnnotated) -Suppress -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Suppress -> USimpleNameReferenceExpression (identifier = Suppress) method -> UMethod (name = method) println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) -kotlin -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -SinceKotlin -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +kotlin -> USimpleNameReferenceExpression (identifier = kotlin) +SinceKotlin -> USimpleNameReferenceExpression (identifier = SinceKotlin) property -> UField (name = property) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SimpleAnnotated.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SimpleAnnotated.refNames.fir.txt new file mode 100644 index 00000000000..5fd0a920e3b --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SimpleAnnotated.refNames.fir.txt @@ -0,0 +1,5 @@ +Suppress -> USimpleNameReferenceExpression (identifier = Suppress) from KtNameReferenceExpression +println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +kotlin -> USimpleNameReferenceExpression (identifier = kotlin) from KtNameReferenceExpression +SinceKotlin -> USimpleNameReferenceExpression (identifier = SinceKotlin) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplate.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplate.identifiers.fir.txt deleted file mode 100644 index 55ff759d9c3..00000000000 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplate.identifiers.fir.txt +++ /dev/null @@ -1,7 +0,0 @@ -foo -> UField (name = foo) -bar -> UField (name = bar) -baz -> UField (name = baz) -foobarbaz -> UField (name = foobarbaz) -foo -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -bar -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -baz -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplate.identifiers.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplate.identifiers.txt similarity index 80% rename from plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplate.identifiers.fe10.txt rename to plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplate.identifiers.txt index 3c0f277d671..4ea80a7ea80 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplate.identifiers.fe10.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplate.identifiers.txt @@ -4,4 +4,4 @@ baz -> UField (name = baz) foobarbaz -> UField (name = foobarbaz) foo -> USimpleNameReferenceExpression (identifier = foo) bar -> USimpleNameReferenceExpression (identifier = bar) -baz -> USimpleNameReferenceExpression (identifier = baz) +baz -> USimpleNameReferenceExpression (identifier = baz) \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplate.refNames.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplate.refNames.txt similarity index 95% rename from plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplate.refNames.fe10.txt rename to plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplate.refNames.txt index 2bc1fee6f87..549e350df55 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplate.refNames.fe10.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplate.refNames.txt @@ -3,4 +3,4 @@ foo -> USimpleNameReferenceExpression (identifier = foo) from KtNameReferenceExp bar -> USimpleNameReferenceExpression (identifier = bar) from KtSimpleNameStringTemplateEntry bar -> USimpleNameReferenceExpression (identifier = bar) from KtNameReferenceExpression baz -> USimpleNameReferenceExpression (identifier = baz) from KtSimpleNameStringTemplateEntry -baz -> USimpleNameReferenceExpression (identifier = baz) from KtNameReferenceExpression +baz -> USimpleNameReferenceExpression (identifier = baz) from KtNameReferenceExpression \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateComplex.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateComplex.identifiers.fir.txt index ca004dda2c8..fd1fe858f89 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateComplex.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateComplex.identifiers.fir.txt @@ -2,18 +2,18 @@ muchRecur -> UField (name = muchRecur) case4 -> UField (name = case4) case5 -> UField (name = case5) literalInLiteral -> UField (name = literalInLiteral) -case4 -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +case4 -> USimpleNameReferenceExpression (identifier = case4) literalInLiteral2 -> UField (name = literalInLiteral2) -case4 -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +case4 -> USimpleNameReferenceExpression (identifier = case4) repeat -> [!] UnknownKotlinExpression (CALL_EXPRESSION) empty -> UField (name = empty) simpleForTemplate -> UMethod (name = simpleForTemplate) i -> UParameter (name = i) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -i -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) +i -> USimpleNameReferenceExpression (identifier = i) foo -> UMethod (name = foo) println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - baz -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + baz -> USimpleNameReferenceExpression (identifier = baz) template1 -> [!] UnknownKotlinExpression (PROPERTY) simpleForTemplate -> [!] UnknownKotlinExpression (CALL_EXPRESSION) template2 -> [!] UnknownKotlinExpression (PROPERTY) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateComplex.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateComplex.refNames.fir.txt index c83294bb5b2..5deee345445 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateComplex.refNames.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateComplex.refNames.fir.txt @@ -1,2 +1,15 @@ +case4 -> USimpleNameReferenceExpression (identifier = case4) from KtSimpleNameStringTemplateEntry +case4 -> USimpleNameReferenceExpression (identifier = case4) from KtNameReferenceExpression repeat(4) -> UQualifiedReferenceExpression from KtBlockStringTemplateEntry repeat(4) -> UQualifiedReferenceExpression from KtDotQualifiedExpression +case4 -> USimpleNameReferenceExpression (identifier = case4) from KtSimpleNameStringTemplateEntry +case4 -> USimpleNameReferenceExpression (identifier = case4) from KtNameReferenceExpression +repeat -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +i -> USimpleNameReferenceExpression (identifier = i) from KtSimpleNameStringTemplateEntry +i -> USimpleNameReferenceExpression (identifier = i) from KtNameReferenceExpression +println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +baz -> USimpleNameReferenceExpression (identifier = baz) from KtSimpleNameStringTemplateEntry +baz -> USimpleNameReferenceExpression (identifier = baz) from KtNameReferenceExpression +simpleForTemplate -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +simpleForTemplate -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateComplexForUInjectionHost.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateComplexForUInjectionHost.identifiers.fir.txt index ca004dda2c8..fd1fe858f89 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateComplexForUInjectionHost.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateComplexForUInjectionHost.identifiers.fir.txt @@ -2,18 +2,18 @@ muchRecur -> UField (name = muchRecur) case4 -> UField (name = case4) case5 -> UField (name = case5) literalInLiteral -> UField (name = literalInLiteral) -case4 -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +case4 -> USimpleNameReferenceExpression (identifier = case4) literalInLiteral2 -> UField (name = literalInLiteral2) -case4 -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +case4 -> USimpleNameReferenceExpression (identifier = case4) repeat -> [!] UnknownKotlinExpression (CALL_EXPRESSION) empty -> UField (name = empty) simpleForTemplate -> UMethod (name = simpleForTemplate) i -> UParameter (name = i) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -i -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) +i -> USimpleNameReferenceExpression (identifier = i) foo -> UMethod (name = foo) println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - baz -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + baz -> USimpleNameReferenceExpression (identifier = baz) template1 -> [!] UnknownKotlinExpression (PROPERTY) simpleForTemplate -> [!] UnknownKotlinExpression (CALL_EXPRESSION) template2 -> [!] UnknownKotlinExpression (PROPERTY) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateComplexForUInjectionHost.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateComplexForUInjectionHost.refNames.fir.txt index c83294bb5b2..5deee345445 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateComplexForUInjectionHost.refNames.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateComplexForUInjectionHost.refNames.fir.txt @@ -1,2 +1,15 @@ +case4 -> USimpleNameReferenceExpression (identifier = case4) from KtSimpleNameStringTemplateEntry +case4 -> USimpleNameReferenceExpression (identifier = case4) from KtNameReferenceExpression repeat(4) -> UQualifiedReferenceExpression from KtBlockStringTemplateEntry repeat(4) -> UQualifiedReferenceExpression from KtDotQualifiedExpression +case4 -> USimpleNameReferenceExpression (identifier = case4) from KtSimpleNameStringTemplateEntry +case4 -> USimpleNameReferenceExpression (identifier = case4) from KtNameReferenceExpression +repeat -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +i -> USimpleNameReferenceExpression (identifier = i) from KtSimpleNameStringTemplateEntry +i -> USimpleNameReferenceExpression (identifier = i) from KtNameReferenceExpression +println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +baz -> USimpleNameReferenceExpression (identifier = baz) from KtSimpleNameStringTemplateEntry +baz -> USimpleNameReferenceExpression (identifier = baz) from KtNameReferenceExpression +simpleForTemplate -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +simpleForTemplate -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateInClass.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateInClass.identifiers.fir.txt index 88f16901f7c..096f1a49464 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateInClass.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateInClass.identifiers.fir.txt @@ -1,4 +1,4 @@ Demo -> UClass (name = Demo) foo -> UField (name = foo) -X -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +X -> USimpleNameReferenceExpression (identifier = X) bar -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateInClass.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateInClass.refNames.fir.txt index 2be96582c75..7c99930213e 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateInClass.refNames.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateInClass.refNames.fir.txt @@ -1 +1,3 @@ bar("lorem") -> UQualifiedReferenceExpression from KtDotQualifiedExpression +X -> USimpleNameReferenceExpression (identifier = X) from KtNameReferenceExpression +bar -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateWithVar.identifiers.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateWithVar.identifiers.fe10.txt deleted file mode 100644 index 58a21d800ec..00000000000 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateWithVar.identifiers.fe10.txt +++ /dev/null @@ -1,3 +0,0 @@ -bar -> UField (name = bar) -f -> UField (name = f) -bar -> USimpleNameReferenceExpression (identifier = bar) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateWithVar.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateWithVar.identifiers.fir.txt deleted file mode 100644 index ca3cd008fd9..00000000000 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateWithVar.identifiers.fir.txt +++ /dev/null @@ -1,3 +0,0 @@ -bar -> UField (name = bar) -f -> UField (name = f) -bar -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateWithVar.identifiers.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateWithVar.identifiers.txt new file mode 100644 index 00000000000..23d67aa6fd3 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateWithVar.identifiers.txt @@ -0,0 +1,3 @@ +bar -> UField (name = bar) +f -> UField (name = f) +bar -> USimpleNameReferenceExpression (identifier = bar) \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateWithVar.refNames.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateWithVar.refNames.txt similarity index 86% rename from plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateWithVar.refNames.fe10.txt rename to plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateWithVar.refNames.txt index 530e9ae19ee..50417517fff 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateWithVar.refNames.fe10.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateWithVar.refNames.txt @@ -1,2 +1,2 @@ bar -> USimpleNameReferenceExpression (identifier = bar) from KtSimpleNameStringTemplateEntry -bar -> USimpleNameReferenceExpression (identifier = bar) from KtNameReferenceExpression +bar -> USimpleNameReferenceExpression (identifier = bar) from KtNameReferenceExpression \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SuperCalls.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SuperCalls.identifiers.fir.txt index bf1abc8d169..dddb9b92f7c 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SuperCalls.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SuperCalls.identifiers.fir.txt @@ -1,50 +1,50 @@ A -> UClass (name = A) str -> UParameter (name = str) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) constructor -> UMethod (name = A) i -> UParameter (name = i) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) this -> [!] UnknownKotlinExpression (CONSTRUCTOR_DELEGATION_REFERENCE) -i -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +i -> USimpleNameReferenceExpression (identifier = i) toString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) foo -> UMethod (name = foo) a -> UParameter (name = a) -Long -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Long -> USimpleNameReferenceExpression (identifier = Long) B -> UClass (name = B) param -> UParameter (name = param) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -A -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -param -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) +A -> USimpleNameReferenceExpression (identifier = A) +param -> USimpleNameReferenceExpression (identifier = param) C -> UClass (name = C) -A -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +A -> USimpleNameReferenceExpression (identifier = A) constructor -> UMethod (name = C) p -> UParameter (name = p) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) super -> [!] UnknownKotlinExpression (CONSTRUCTOR_DELEGATION_REFERENCE) -p -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +p -> USimpleNameReferenceExpression (identifier = p) constructor -> UMethod (name = C) i -> UParameter (name = i) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) super -> [!] UnknownKotlinExpression (CONSTRUCTOR_DELEGATION_REFERENCE) -i -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +i -> USimpleNameReferenceExpression (identifier = i) println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) foo -> UMethod (name = foo) a -> UParameter (name = a) -Long -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - super -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Long -> USimpleNameReferenceExpression (identifier = Long) + super -> USimpleNameReferenceExpression (identifier = super) foo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + a -> USimpleNameReferenceExpression (identifier = a) O -> UClass (name = O) -A -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +A -> USimpleNameReferenceExpression (identifier = A) anon -> UField (name = anon) object -> UClass (name = null) -A -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +A -> USimpleNameReferenceExpression (identifier = A) bar -> UMethod (name = bar) cons -> [!] UnknownKotlinExpression (CALL_EXPRESSION) object -> UClass (name = null) - A -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + A -> USimpleNameReferenceExpression (identifier = A) InnerClass -> UClass (name = InnerClass) -A -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +A -> USimpleNameReferenceExpression (identifier = A) cons -> UMethod (name = cons) a -> UParameter (name = a) -A -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +A -> USimpleNameReferenceExpression (identifier = A) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SuperCalls.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SuperCalls.refNames.fir.txt index 092c4725d40..7a73ec348c0 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SuperCalls.refNames.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SuperCalls.refNames.fir.txt @@ -1,2 +1,25 @@ +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression toString() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +i -> USimpleNameReferenceExpression (identifier = i) from KtNameReferenceExpression +toString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Long -> USimpleNameReferenceExpression (identifier = Long) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +A -> USimpleNameReferenceExpression (identifier = A) from KtNameReferenceExpression +param -> USimpleNameReferenceExpression (identifier = param) from KtNameReferenceExpression +A -> USimpleNameReferenceExpression (identifier = A) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +p -> USimpleNameReferenceExpression (identifier = p) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +i -> USimpleNameReferenceExpression (identifier = i) from KtNameReferenceExpression +println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Long -> USimpleNameReferenceExpression (identifier = Long) from KtNameReferenceExpression foo(a) -> UQualifiedReferenceExpression from KtDotQualifiedExpression +foo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression +A -> USimpleNameReferenceExpression (identifier = A) from KtNameReferenceExpression +A -> USimpleNameReferenceExpression (identifier = A) from KtNameReferenceExpression +cons -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +A -> USimpleNameReferenceExpression (identifier = A) from KtNameReferenceExpression +A -> USimpleNameReferenceExpression (identifier = A) from KtNameReferenceExpression +A -> USimpleNameReferenceExpression (identifier = A) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Suspend.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Suspend.identifiers.fir.txt index 92279e184e6..f170dac5a74 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Suspend.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Suspend.identifiers.fir.txt @@ -1,13 +1,13 @@ -test -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -pkg -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +test -> USimpleNameReferenceExpression (identifier = test) +pkg -> USimpleNameReferenceExpression (identifier = pkg) Context -> UClass (name = Context) inner -> UMethod (name = inner) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) suspendPrivate -> [!] UnknownKotlinExpression (CALL_EXPRESSION) suspendPrivate -> UMethod (name = suspendPrivate) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) inner -> [!] UnknownKotlinExpression (CALL_EXPRESSION) top -> UMethod (name = top) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) Context -> [!] UnknownKotlinExpression (CALL_EXPRESSION) inner -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Suspend.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Suspend.refNames.fir.txt index 0a52e2c93be..0f994709cd8 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Suspend.refNames.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Suspend.refNames.fir.txt @@ -1,2 +1,11 @@ -pkg -> UQualifiedReferenceExpression from KtDotQualifiedExpression +pkg -> USimpleNameReferenceExpression (identifier = pkg) from KtDotQualifiedExpression +test -> USimpleNameReferenceExpression (identifier = test) from KtNameReferenceExpression +pkg -> USimpleNameReferenceExpression (identifier = pkg) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +suspendPrivate -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +inner -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression inner() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +Context -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +inner -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TryCatch.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TryCatch.identifiers.fir.txt index efc08f6557d..ca658c45488 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TryCatch.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TryCatch.identifiers.fir.txt @@ -2,23 +2,23 @@ TryCatch -> UClass (name = TryCatch) catches -> UMethod (name = catches) body -> [!] UnknownKotlinExpression (CALL_EXPRESSION) e -> [!] UnknownKotlinExpression (VALUE_PARAMETER) - Throwable -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Throwable -> USimpleNameReferenceExpression (identifier = Throwable) catcher -> [!] UnknownKotlinExpression (CALL_EXPRESSION) finalizer -> [!] UnknownKotlinExpression (CALL_EXPRESSION) body -> UMethod (name = body) catcher -> UMethod (name = catcher) finalizer -> UMethod (name = finalizer) TryCatchAnnotations -> UClass (name = TryCatchAnnotations) -java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -lang -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -SuppressWarnings -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +java -> USimpleNameReferenceExpression (identifier = java) +lang -> USimpleNameReferenceExpression (identifier = lang) +SuppressWarnings -> USimpleNameReferenceExpression (identifier = SuppressWarnings) catches -> UMethod (name = catches) body -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - lang -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - SuppressWarnings -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + java -> USimpleNameReferenceExpression (identifier = java) + lang -> USimpleNameReferenceExpression (identifier = lang) + SuppressWarnings -> USimpleNameReferenceExpression (identifier = SuppressWarnings) e -> [!] UnknownKotlinExpression (VALUE_PARAMETER) - Throwable -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Throwable -> USimpleNameReferenceExpression (identifier = Throwable) catcher -> [!] UnknownKotlinExpression (CALL_EXPRESSION) finalizer -> [!] UnknownKotlinExpression (CALL_EXPRESSION) body -> UMethod (name = body) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TryCatch.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TryCatch.refNames.fir.txt new file mode 100644 index 00000000000..83e967d9403 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TryCatch.refNames.fir.txt @@ -0,0 +1,14 @@ +body -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Throwable -> USimpleNameReferenceExpression (identifier = Throwable) from KtNameReferenceExpression +catcher -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +finalizer -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +java -> USimpleNameReferenceExpression (identifier = java) from KtNameReferenceExpression +lang -> USimpleNameReferenceExpression (identifier = lang) from KtNameReferenceExpression +SuppressWarnings -> USimpleNameReferenceExpression (identifier = SuppressWarnings) from KtNameReferenceExpression +body -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +java -> USimpleNameReferenceExpression (identifier = java) from KtNameReferenceExpression +lang -> USimpleNameReferenceExpression (identifier = lang) from KtNameReferenceExpression +SuppressWarnings -> USimpleNameReferenceExpression (identifier = SuppressWarnings) from KtNameReferenceExpression +Throwable -> USimpleNameReferenceExpression (identifier = Throwable) from KtNameReferenceExpression +catcher -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +finalizer -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliasExpansionWithOtherAliasInArgument.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliasExpansionWithOtherAliasInArgument.identifiers.fir.txt deleted file mode 100644 index b1eddcce8ab..00000000000 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliasExpansionWithOtherAliasInArgument.identifiers.fir.txt +++ /dev/null @@ -1,23 +0,0 @@ -A -> [!] UnknownKotlinExpression (TYPEALIAS) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -My -> [!] UnknownKotlinExpression (TYPEALIAS) -Map -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -A -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Unit -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -My -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -foo -> UMethod (name = foo) -x -> UParameter (name = x) -My -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -My -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Map -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -A -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -bar -> UMethod (name = bar) -x -> UParameter (name = x) -Map -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -A -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Map -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -A -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliasExpansionWithOtherAliasInArgument.identifiers.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliasExpansionWithOtherAliasInArgument.identifiers.txt similarity index 95% rename from plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliasExpansionWithOtherAliasInArgument.identifiers.fe10.txt rename to plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliasExpansionWithOtherAliasInArgument.identifiers.txt index 5e685693aec..e70ddf722c0 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliasExpansionWithOtherAliasInArgument.identifiers.fe10.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliasExpansionWithOtherAliasInArgument.identifiers.txt @@ -20,4 +20,4 @@ A -> USimpleNameReferenceExpression (identifier = A) Int -> USimpleNameReferenceExpression (identifier = Int) Map -> USimpleNameReferenceExpression (identifier = Map) A -> USimpleNameReferenceExpression (identifier = A) -Int -> USimpleNameReferenceExpression (identifier = Int) +Int -> USimpleNameReferenceExpression (identifier = Int) \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliasExpansionWithOtherAliasInArgument.refNames.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliasExpansionWithOtherAliasInArgument.refNames.txt similarity index 98% rename from plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliasExpansionWithOtherAliasInArgument.refNames.fe10.txt rename to plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliasExpansionWithOtherAliasInArgument.refNames.txt index 1744a49fd51..cb50e77c5b1 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliasExpansionWithOtherAliasInArgument.refNames.fe10.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliasExpansionWithOtherAliasInArgument.refNames.txt @@ -14,4 +14,4 @@ A -> USimpleNameReferenceExpression (identifier = A) from KtNameReferenceExpress Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression Map -> USimpleNameReferenceExpression (identifier = Map) from KtNameReferenceExpression A -> USimpleNameReferenceExpression (identifier = A) from KtNameReferenceExpression -Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliases.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliases.identifiers.fir.txt deleted file mode 100644 index ad5cdf83896..00000000000 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliases.identifiers.fir.txt +++ /dev/null @@ -1,8 +0,0 @@ -A -> UClass (name = A) -F -> [!] UnknownKotlinExpression (TYPEALIAS) -A -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -A -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -A -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -G -> [!] UnknownKotlinExpression (TYPEALIAS) -F -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -F -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliases.identifiers.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliases.identifiers.txt similarity index 85% rename from plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliases.identifiers.fe10.txt rename to plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliases.identifiers.txt index dcb1962cb6a..e5aa702fdfb 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliases.identifiers.fe10.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliases.identifiers.txt @@ -5,4 +5,4 @@ A -> USimpleNameReferenceExpression (identifier = A) A -> USimpleNameReferenceExpression (identifier = A) G -> [!] UnknownKotlinExpression (TYPEALIAS) F -> USimpleNameReferenceExpression (identifier = F) -F -> USimpleNameReferenceExpression (identifier = F) +F -> USimpleNameReferenceExpression (identifier = F) \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliases.refNames.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliases.refNames.txt similarity index 95% rename from plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliases.refNames.fe10.txt rename to plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliases.refNames.txt index cd83ff74871..0b63dd13355 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliases.refNames.fe10.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliases.refNames.txt @@ -2,4 +2,4 @@ A -> USimpleNameReferenceExpression (identifier = A) from KtNameReferenceExpress A -> USimpleNameReferenceExpression (identifier = A) from KtNameReferenceExpression A -> USimpleNameReferenceExpression (identifier = A) from KtNameReferenceExpression F -> USimpleNameReferenceExpression (identifier = F) from KtNameReferenceExpression -F -> USimpleNameReferenceExpression (identifier = F) from KtNameReferenceExpression +F -> USimpleNameReferenceExpression (identifier = F) from KtNameReferenceExpression \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeInAnnotation.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeInAnnotation.identifiers.fir.txt index 1e97b4fb0a8..feaedccc3d6 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeInAnnotation.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeInAnnotation.identifiers.fir.txt @@ -1,3 +1,3 @@ C -> UClass (name = C) -Test -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Test -> USimpleNameReferenceExpression (identifier = Test) foo -> UMethod (name = foo) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeInAnnotation.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeInAnnotation.refNames.fir.txt new file mode 100644 index 00000000000..8c6e179d49b --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeInAnnotation.refNames.fir.txt @@ -0,0 +1 @@ +Test -> USimpleNameReferenceExpression (identifier = Test) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeReferences.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeReferences.identifiers.fir.txt index 2fade3022fb..ccef72342b7 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeReferences.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeReferences.identifiers.fir.txt @@ -1,52 +1,52 @@ foo -> UMethod (name = foo) parameter -> UParameter (name = parameter) -Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> USimpleNameReferenceExpression (identifier = Int) +String -> USimpleNameReferenceExpression (identifier = String) varWithType -> [!] UnknownKotlinExpression (PROPERTY) - String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + String -> USimpleNameReferenceExpression (identifier = String) varWithoutType -> [!] UnknownKotlinExpression (PROPERTY) result -> [!] UnknownKotlinExpression (PROPERTY) - varWithType -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - + -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) - varWithoutType -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - result -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + varWithType -> USimpleNameReferenceExpression (identifier = varWithType) + + -> USimpleNameReferenceExpression (identifier = +) + varWithoutType -> USimpleNameReferenceExpression (identifier = varWithoutType) + result -> USimpleNameReferenceExpression (identifier = result) ListOfLists -> [!] UnknownKotlinExpression (TYPEALIAS) -List -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -List -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +List -> USimpleNameReferenceExpression (identifier = List) +List -> USimpleNameReferenceExpression (identifier = List) +String -> USimpleNameReferenceExpression (identifier = String) T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) parameterizedFoo -> UMethod (name = parameterizedFoo) arg -> UParameter (name = arg) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> USimpleNameReferenceExpression (identifier = T) a -> [!] UnknownKotlinExpression (PROPERTY) - arg -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + arg -> USimpleNameReferenceExpression (identifier = arg) at -> [!] UnknownKotlinExpression (PROPERTY) - T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - arg -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - ?: -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + T -> USimpleNameReferenceExpression (identifier = T) + arg -> USimpleNameReferenceExpression (identifier = arg) + ?: -> USimpleNameReferenceExpression (identifier = ?:) tl -> [!] UnknownKotlinExpression (PROPERTY) - List -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + List -> USimpleNameReferenceExpression (identifier = List) + T -> USimpleNameReferenceExpression (identifier = T) listOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - at -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + at -> USimpleNameReferenceExpression (identifier = at) tsl -> [!] UnknownKotlinExpression (PROPERTY) - List -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - tl -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + List -> USimpleNameReferenceExpression (identifier = List) + String -> USimpleNameReferenceExpression (identifier = String) + tl -> USimpleNameReferenceExpression (identifier = tl) map -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - it -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + it -> USimpleNameReferenceExpression (identifier = it) toString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) lls -> [!] UnknownKotlinExpression (PROPERTY) - List -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - List -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + List -> USimpleNameReferenceExpression (identifier = List) + List -> USimpleNameReferenceExpression (identifier = List) + String -> USimpleNameReferenceExpression (identifier = String) llsAliased -> [!] UnknownKotlinExpression (PROPERTY) - ListOfLists -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + ListOfLists -> USimpleNameReferenceExpression (identifier = ListOfLists) llt -> [!] UnknownKotlinExpression (PROPERTY) - List -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - List -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + List -> USimpleNameReferenceExpression (identifier = List) + List -> USimpleNameReferenceExpression (identifier = List) + T -> USimpleNameReferenceExpression (identifier = T) parameterizedFoo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - List -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + List -> USimpleNameReferenceExpression (identifier = List) + String -> USimpleNameReferenceExpression (identifier = String) emptyList -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeReferences.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeReferences.refNames.fir.txt index 4f3fd5f461e..392a1ba52d1 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeReferences.refNames.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeReferences.refNames.fir.txt @@ -1,2 +1,36 @@ +Int -> USimpleNameReferenceExpression (identifier = Int) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +varWithType -> USimpleNameReferenceExpression (identifier = varWithType) from KtNameReferenceExpression +varWithoutType -> USimpleNameReferenceExpression (identifier = varWithoutType) from KtNameReferenceExpression +result -> USimpleNameReferenceExpression (identifier = result) from KtNameReferenceExpression +List -> USimpleNameReferenceExpression (identifier = List) from KtNameReferenceExpression +List -> USimpleNameReferenceExpression (identifier = List) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +arg -> USimpleNameReferenceExpression (identifier = arg) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +arg -> USimpleNameReferenceExpression (identifier = arg) from KtNameReferenceExpression +List -> USimpleNameReferenceExpression (identifier = List) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +listOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +at -> USimpleNameReferenceExpression (identifier = at) from KtNameReferenceExpression +List -> USimpleNameReferenceExpression (identifier = List) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression map { it.toString() } -> UQualifiedReferenceExpression from KtDotQualifiedExpression +tl -> USimpleNameReferenceExpression (identifier = tl) from KtNameReferenceExpression +map -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression toString() -> UQualifiedReferenceExpression from KtDotQualifiedExpression +it -> USimpleNameReferenceExpression (identifier = it) from KtNameReferenceExpression +toString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +List -> USimpleNameReferenceExpression (identifier = List) from KtNameReferenceExpression +List -> USimpleNameReferenceExpression (identifier = List) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +ListOfLists -> USimpleNameReferenceExpression (identifier = ListOfLists) from KtNameReferenceExpression +List -> USimpleNameReferenceExpression (identifier = List) from KtNameReferenceExpression +List -> USimpleNameReferenceExpression (identifier = List) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +parameterizedFoo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +List -> USimpleNameReferenceExpression (identifier = List) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +emptyList -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/UnexpectedContainerException.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/UnexpectedContainerException.identifiers.fir.txt index f2a7d0a6f84..bb07ba7926a 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/UnexpectedContainerException.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/UnexpectedContainerException.identifiers.fir.txt @@ -1,23 +1,23 @@ Callback -> UClass (name = Callback) onError -> UMethod (name = onError) throwable -> UParameter (name = throwable) -Throwable -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Throwable -> USimpleNameReferenceExpression (identifier = Throwable) Model -> UClass (name = Model) crashMe -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - Callback -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Callback -> USimpleNameReferenceExpression (identifier = Callback) + java -> USimpleNameReferenceExpression (identifier = java) object -> UClass (name = null) - Callback -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Callback -> USimpleNameReferenceExpression (identifier = Callback) onError -> UMethod (name = onError) throwable -> UParameter (name = throwable) - Throwable -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Throwable -> USimpleNameReferenceExpression (identifier = Throwable) UnsupportedOperationException -> [!] UnknownKotlinExpression (CALL_EXPRESSION) T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) -Any -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Any -> USimpleNameReferenceExpression (identifier = Any) crashMe -> UMethod (name = crashMe) clazz -> UParameter (name = clazz) -Class -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Class -> USimpleNameReferenceExpression (identifier = Class) +T -> USimpleNameReferenceExpression (identifier = T) factory -> UParameter (name = factory) -T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> USimpleNameReferenceExpression (identifier = T) UnsupportedOperationException -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/UnexpectedContainerException.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/UnexpectedContainerException.refNames.fir.txt index a7271ce9989..2d396493624 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/UnexpectedContainerException.refNames.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/UnexpectedContainerException.refNames.fir.txt @@ -1 +1,13 @@ -java -> UQualifiedReferenceExpression from KtDotQualifiedExpression +Throwable -> USimpleNameReferenceExpression (identifier = Throwable) from KtNameReferenceExpression +crashMe -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +java -> USimpleNameReferenceExpression (identifier = java) from KtDotQualifiedExpression +Callback -> USimpleNameReferenceExpression (identifier = Callback) from KtNameReferenceExpression +java -> USimpleNameReferenceExpression (identifier = java) from KtNameReferenceExpression +Callback -> USimpleNameReferenceExpression (identifier = Callback) from KtNameReferenceExpression +Throwable -> USimpleNameReferenceExpression (identifier = Throwable) from KtNameReferenceExpression +UnsupportedOperationException -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +Any -> USimpleNameReferenceExpression (identifier = Any) from KtNameReferenceExpression +Class -> USimpleNameReferenceExpression (identifier = Class) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +T -> USimpleNameReferenceExpression (identifier = T) from KtNameReferenceExpression +UnsupportedOperationException -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenAndDestructing.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenAndDestructing.identifiers.fir.txt index 41a8e2436a4..1e1c2d2c0a2 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenAndDestructing.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenAndDestructing.identifiers.fir.txt @@ -1,11 +1,11 @@ getElementsAdditionalResolve -> UMethod (name = getElementsAdditionalResolve) string -> UParameter (name = string) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> USimpleNameReferenceExpression (identifier = String) +String -> USimpleNameReferenceExpression (identifier = String) arr -> [!] UnknownKotlinExpression (PROPERTY) listOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) - string -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + string -> USimpleNameReferenceExpression (identifier = string) bindingContext -> [!] UnknownKotlinExpression (DESTRUCTURING_DECLARATION_ENTRY) statementFilter -> [!] UnknownKotlinExpression (DESTRUCTURING_DECLARATION_ENTRY) - arr -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - bindingContext -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + arr -> USimpleNameReferenceExpression (identifier = arr) + bindingContext -> USimpleNameReferenceExpression (identifier = bindingContext) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenAndDestructing.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenAndDestructing.refNames.fir.txt new file mode 100644 index 00000000000..8be932e2199 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenAndDestructing.refNames.fir.txt @@ -0,0 +1,6 @@ +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +listOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +string -> USimpleNameReferenceExpression (identifier = string) from KtNameReferenceExpression +arr -> USimpleNameReferenceExpression (identifier = arr) from KtNameReferenceExpression +bindingContext -> USimpleNameReferenceExpression (identifier = bindingContext) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenIs.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenIs.identifiers.fir.txt deleted file mode 100644 index 8dcdc61d263..00000000000 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenIs.identifiers.fir.txt +++ /dev/null @@ -1,7 +0,0 @@ -foo -> UMethod (name = foo) -bar -> UParameter (name = bar) -Any -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -bar -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -bar -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) -String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenIs.identifiers.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenIs.identifiers.txt similarity index 82% rename from plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenIs.identifiers.fe10.txt rename to plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenIs.identifiers.txt index 55b20639cb6..f050570ef0c 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenIs.identifiers.fe10.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenIs.identifiers.txt @@ -4,4 +4,4 @@ Any -> USimpleNameReferenceExpression (identifier = Any) bar -> USimpleNameReferenceExpression (identifier = bar) String -> USimpleNameReferenceExpression (identifier = String) bar -> USimpleNameReferenceExpression (identifier = bar) -String -> USimpleNameReferenceExpression (identifier = String) +String -> USimpleNameReferenceExpression (identifier = String) \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenIs.refNames.fe10.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenIs.refNames.txt similarity index 93% rename from plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenIs.refNames.fe10.txt rename to plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenIs.refNames.txt index 19d6e700913..43777c48601 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenIs.refNames.fe10.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenIs.refNames.txt @@ -2,4 +2,4 @@ Any -> USimpleNameReferenceExpression (identifier = Any) from KtNameReferenceExp bar -> USimpleNameReferenceExpression (identifier = bar) from KtNameReferenceExpression String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression bar -> USimpleNameReferenceExpression (identifier = bar) from KtNameReferenceExpression -String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression +String -> USimpleNameReferenceExpression (identifier = String) from KtNameReferenceExpression \ No newline at end of file diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenStringLiteral.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenStringLiteral.identifiers.fir.txt index 99d43ced920..35f8bd52bc2 100644 --- a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenStringLiteral.identifiers.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenStringLiteral.identifiers.fir.txt @@ -1,7 +1,7 @@ a -> UField (name = a) readLine -> [!] UnknownKotlinExpression (CALL_EXPRESSION) b -> UField (name = b) -a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +a -> USimpleNameReferenceExpression (identifier = a) a -> null println -> null println -> null diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenStringLiteral.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenStringLiteral.refNames.fir.txt new file mode 100644 index 00000000000..bae9fa6a627 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenStringLiteral.refNames.fir.txt @@ -0,0 +1,2 @@ +readLine -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression +a -> USimpleNameReferenceExpression (identifier = a) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ea101715.refNames.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ea101715.refNames.fir.txt new file mode 100644 index 00000000000..7da2e580e43 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ea101715.refNames.fir.txt @@ -0,0 +1 @@ +Obj -> [!] UnknownKotlinExpression (CALL_EXPRESSION) from KtNameReferenceExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/AnnotationParameters.log.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/AnnotationParameters.log.fir.txt index dc98c9f9631..ed3dadbbafc 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/AnnotationParameters.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/AnnotationParameters.log.fir.txt @@ -7,7 +7,7 @@ UFile (package = ) UMethod (name = bar) UBlockExpression UReturnExpression - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = Unit) UMethod (name = fooWithArrLiteral) UBlockExpression UReturnExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/AnnotationParameters.render.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/AnnotationParameters.render.fir.txt index 3825595809a..ea601d529b3 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/AnnotationParameters.render.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/AnnotationParameters.render.fir.txt @@ -3,7 +3,7 @@ public final class AnnotationParametersKt { return 5 } public static final fun bar() : void { - return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + return Unit } public static final fun fooWithArrLiteral() : int { return 5 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 1e68d9a0d38..2d6ea061da9 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/Anonymous.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/Anonymous.log.fir.txt @@ -6,11 +6,11 @@ UFile (package = ) UBlockExpression [!] UnknownKotlinExpression (PROPERTY) UQualifiedReferenceExpression - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = runnable) [!] UnknownKotlinExpression (CALL_EXPRESSION) [!] UnknownKotlinExpression (PROPERTY) UQualifiedReferenceExpression - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = runnable2) [!] UnknownKotlinExpression (CALL_EXPRESSION) [!] UnknownKotlinExpression (PROPERTY) [!] UnknownKotlinExpression (PROPERTY) 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 0b73de6d15d..7dc9654e65a 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 (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + runnable.[!] UnknownKotlinExpression (CALL_EXPRESSION) [!] UnknownKotlinExpression (PROPERTY) - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + runnable2.[!] 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 817fa4a86c7..ca1888e5f7a 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/Constructors.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/Constructors.log.fir.txt @@ -67,7 +67,7 @@ UFile (package = ) [!] UnknownKotlinExpression (BINARY_EXPRESSION) [!] UnknownKotlinExpression (PROPERTY) UQualifiedReferenceExpression - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = local) [!] UnknownKotlinExpression (CALL_EXPRESSION) UMethod (name = getA) UMethod (name = setA) 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 37283520b1a..c93495a3d88 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 (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + local.[!] 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/InferenceInsideUnresolvedConstructor.log.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/InferenceInsideUnresolvedConstructor.log.fir.txt index 9348ff42db9..9f7994c35fa 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/InferenceInsideUnresolvedConstructor.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/InferenceInsideUnresolvedConstructor.log.fir.txt @@ -8,4 +8,4 @@ UFile (package = ) UParameter (name = x) UBlockExpression UReturnExpression - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = x) diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/InferenceInsideUnresolvedConstructor.render.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/InferenceInsideUnresolvedConstructor.render.fir.txt index 724cd9b7f48..6074ab89cc0 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/InferenceInsideUnresolvedConstructor.render.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/InferenceInsideUnresolvedConstructor.render.fir.txt @@ -3,6 +3,6 @@ public final class InferenceInsideUnresolvedConstructorKt { return [!] UnknownKotlinExpression (CALL_EXPRESSION) } public static final fun id(x: T) : T { - return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + return x } } diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/InnerClasses.log.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/InnerClasses.log.fir.txt index d27cb78d0cb..7f9ef8e9e73 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/InnerClasses.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/InnerClasses.log.fir.txt @@ -18,4 +18,4 @@ UFile (package = ) UMethod (name = doNothing) UBlockExpression UReturnExpression - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = Unit) diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/InnerClasses.render.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/InnerClasses.render.fir.txt index 28637b02427..0ea47c28347 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/InnerClasses.render.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/InnerClasses.render.fir.txt @@ -12,7 +12,7 @@ public final class Foo { public static final class Baz { public fun Baz() = UastEmptyExpression public final fun doNothing() : void { - return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + return Unit } } } 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 633c5d56232..768f29dba3f 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/InnerNonFixedTypeVariable.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/InnerNonFixedTypeVariable.log.fir.txt @@ -5,7 +5,7 @@ UFile (package = ) UBlockExpression UQualifiedReferenceExpression UQualifiedReferenceExpression - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = list) [!] UnknownKotlinExpression (CALL_EXPRESSION) [!] UnknownKotlinExpression (CALL_EXPRESSION) UClass (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 c36651a3839..2be569a62d5 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 (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + list.[!] 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 36f46396c9a..c65600fa946 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/Lambdas.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/Lambdas.log.fir.txt @@ -5,7 +5,7 @@ UFile (package = ) UBlockExpression UQualifiedReferenceExpression UQualifiedReferenceExpression - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = Stream) [!] UnknownKotlinExpression (CALL_EXPRESSION) [!] UnknownKotlinExpression (CALL_EXPRESSION) UMethod (name = doSelectItem) 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 d5a34880329..35345c1228e 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 (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + Stream.[!] 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 caea049634c..6bd22e41119 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/ParametersDisorder.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/ParametersDisorder.log.fir.txt @@ -23,36 +23,36 @@ UFile (package = ) ULiteralExpression (value = "abc") [!] UnknownKotlinExpression (CALL_EXPRESSION) UQualifiedReferenceExpression - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = Math) [!] UnknownKotlinExpression (CALL_EXPRESSION) [!] UnknownKotlinExpression (CALL_EXPRESSION) UQualifiedReferenceExpression UQualifiedReferenceExpression UQualifiedReferenceExpression - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = java) + USimpleNameReferenceExpression (identifier = lang) + USimpleNameReferenceExpression (identifier = String) [!] UnknownKotlinExpression (CALL_EXPRESSION) UQualifiedReferenceExpression UQualifiedReferenceExpression UQualifiedReferenceExpression - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = java) + USimpleNameReferenceExpression (identifier = lang) + USimpleNameReferenceExpression (identifier = String) [!] UnknownKotlinExpression (CALL_EXPRESSION) UQualifiedReferenceExpression UQualifiedReferenceExpression UQualifiedReferenceExpression - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = java) + USimpleNameReferenceExpression (identifier = lang) + USimpleNameReferenceExpression (identifier = String) [!] UnknownKotlinExpression (CALL_EXPRESSION) UQualifiedReferenceExpression UQualifiedReferenceExpression UQualifiedReferenceExpression - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = java) + USimpleNameReferenceExpression (identifier = lang) + USimpleNameReferenceExpression (identifier = String) [!] UnknownKotlinExpression (CALL_EXPRESSION) [!] UnknownKotlinExpression (CALL_EXPRESSION) UMethod (name = objectLiteral) 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 67b4e9a7eeb..290c523c235 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/ParametersDisorder.render.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/ParametersDisorder.render.fir.txt @@ -9,12 +9,12 @@ public final class ParametersDisorderKt { [!] UnknownKotlinExpression (CALL_EXPRESSION) [!] UnknownKotlinExpression (CALL_EXPRESSION) "abc".[!] UnknownKotlinExpression (CALL_EXPRESSION) - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + Math.[!] UnknownKotlinExpression (CALL_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 (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + java.lang.String.[!] UnknownKotlinExpression (CALL_EXPRESSION) + java.lang.String.[!] UnknownKotlinExpression (CALL_EXPRESSION) + java.lang.String.[!] UnknownKotlinExpression (CALL_EXPRESSION) + java.lang.String.[!] UnknownKotlinExpression (CALL_EXPRESSION) [!] UnknownKotlinExpression (CALL_EXPRESSION) } public static final fun objectLiteral() : void { diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/PropertyInitializer.log.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/PropertyInitializer.log.fir.txt index b17b9cc16a0..27c2163f283 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/PropertyInitializer.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/PropertyInitializer.log.fir.txt @@ -4,7 +4,7 @@ UFile (package = ) UMethod (name = getWithSetter) UBlockExpression UReturnExpression - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = field) UMethod (name = setWithSetter) UParameter (name = p) UBlockExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/PropertyInitializer.render.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/PropertyInitializer.render.fir.txt index 20bf52b83f7..550b8b80711 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/PropertyInitializer.render.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/PropertyInitializer.render.fir.txt @@ -1,7 +1,7 @@ public final class TestPropertyInitializer { public fun TestPropertyInitializer() = UastEmptyExpression public final fun getWithSetter() : java.lang.String { - return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + return field } public final fun setWithSetter(p: java.lang.String) : void { [!] UnknownKotlinExpression (BINARY_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/PropertyInitializerWithoutSetter.log.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/PropertyInitializerWithoutSetter.log.fir.txt index b3e1eb7e9e6..4b11caa02d1 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/PropertyInitializerWithoutSetter.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/PropertyInitializerWithoutSetter.log.fir.txt @@ -5,6 +5,6 @@ UFile (package = ) UMethod (name = getWithoutSetter) UBlockExpression UReturnExpression - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = field) UMethod (name = setWithoutSetter) UParameter (name = value) diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/PropertyInitializerWithoutSetter.render.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/PropertyInitializerWithoutSetter.render.fir.txt index 7a6ef51ce03..25995201159 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/PropertyInitializerWithoutSetter.render.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/PropertyInitializerWithoutSetter.render.fir.txt @@ -1,7 +1,7 @@ public final class PropertyInitializerWithoutSetterKt { private static var withoutSetter: java.lang.String = "/sdcard" public static final fun getWithoutSetter() : java.lang.String { - return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + return field } public static final fun setWithoutSetter(value: java.lang.String) : void = UastEmptyExpression } diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/PropertyReferences.log.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/PropertyReferences.log.fir.txt index 3b20d1a26c9..93c8a293f01 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/PropertyReferences.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/PropertyReferences.log.fir.txt @@ -34,4 +34,4 @@ UFile (package = ) [!] UnknownKotlinExpression (PROPERTY) [!] UnknownKotlinExpression (BINARY_EXPRESSION) UReturnExpression - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = privateProp) diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/PropertyReferences.render.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/PropertyReferences.render.fir.txt index 7644e61a6ec..027b946913a 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/PropertyReferences.render.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/PropertyReferences.render.fir.txt @@ -29,6 +29,6 @@ public final class A { public final fun add(x: int) : int { [!] UnknownKotlinExpression (PROPERTY) [!] UnknownKotlinExpression (BINARY_EXPRESSION) - return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + return privateProp } } 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 59d33e4a750..5e2cabd3209 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/QualifiedConstructorCall.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/QualifiedConstructorCall.log.fir.txt @@ -9,7 +9,7 @@ UFile (package = A.B.C) UQualifiedReferenceExpression UQualifiedReferenceExpression UQualifiedReferenceExpression - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = A) + USimpleNameReferenceExpression (identifier = B) + USimpleNameReferenceExpression (identifier = C) [!] 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 f8c053182df..71b2a4e87ac 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 (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + return A.B.C.[!] 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 f41d56a92c6..ac14b6aaccd 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/ReceiverFun.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/ReceiverFun.log.fir.txt @@ -6,7 +6,7 @@ UFile (package = ) UReturnExpression UQualifiedReferenceExpression [!] UnknownKotlinExpression (THIS_EXPRESSION) - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = length) 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 f271f3b69d1..b8661ad79bc 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 (THIS_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + return [!] UnknownKotlinExpression (THIS_EXPRESSION).length } 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/ReifiedReturnType.log.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/ReifiedReturnType.log.fir.txt index 005fe0ab34a..700832d1ce7 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/ReifiedReturnType.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/ReifiedReturnType.log.fir.txt @@ -6,6 +6,6 @@ UFile (package = ) UParameter (name = threshold2) UBlockExpression UReturnExpression - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = threshold2) UClass (name = Foo) UMethod (name = Foo) diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/ReifiedReturnType.render.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/ReifiedReturnType.render.fir.txt index 130bf7a38f2..d783c11af76 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/ReifiedReturnType.render.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/ReifiedReturnType.render.fir.txt @@ -1,6 +1,6 @@ public final class ReifiedReturnTypeKt { public static final fun copyWhenGreater(list: java.util.List, threshold: T, threshold2: B) : B { - return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + return threshold2 } } 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 dbf8f116824..cd224e29543 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/Resolve.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/Resolve.log.fir.txt @@ -16,10 +16,10 @@ UFile (package = ) [!] UnknownKotlinExpression (CALL_EXPRESSION) UQualifiedReferenceExpression [!] UnknownKotlinExpression (CALL_EXPRESSION) - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = size) UQualifiedReferenceExpression [!] UnknownKotlinExpression (CALL_EXPRESSION) - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = indices) [!] UnknownKotlinExpression (PROPERTY) [!] UnknownKotlinExpression (BINARY_EXPRESSION) UQualifiedReferenceExpression @@ -29,25 +29,25 @@ UFile (package = ) UQualifiedReferenceExpression UQualifiedReferenceExpression [!] UnknownKotlinExpression (CALL_EXPRESSION) - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = entries) [!] UnknownKotlinExpression (CALL_EXPRESSION) [!] UnknownKotlinExpression (CALL_EXPRESSION) [!] UnknownKotlinExpression (PROPERTY) UQualifiedReferenceExpression - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = intRange) [!] UnknownKotlinExpression (CALL_EXPRESSION) [!] UnknownKotlinExpression (CALL_EXPRESSION) UMethod (name = barT) UParameter (name = t) UBlockExpression UQualifiedReferenceExpression - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = t) [!] UnknownKotlinExpression (CALL_EXPRESSION) UMethod (name = barTL) UParameter (name = listT) UBlockExpression UQualifiedReferenceExpression - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = listT) [!] UnknownKotlinExpression (CALL_EXPRESSION) [!] UnknownKotlinExpression (FOR) UClass (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 0d1b8e0a1ff..25e20016c55 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/Resolve.render.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/Resolve.render.fir.txt @@ -4,21 +4,21 @@ public final class ResolveKt { [!] 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 (CALL_EXPRESSION).size + [!] UnknownKotlinExpression (CALL_EXPRESSION).indices [!] UnknownKotlinExpression (PROPERTY) [!] UnknownKotlinExpression (BINARY_EXPRESSION) [!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) - [!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + [!] UnknownKotlinExpression (CALL_EXPRESSION).entries.[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) [!] UnknownKotlinExpression (PROPERTY) - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + intRange.[!] UnknownKotlinExpression (CALL_EXPRESSION) [!] UnknownKotlinExpression (CALL_EXPRESSION) } public static final fun barT(t: T) : void { - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + t.[!] UnknownKotlinExpression (CALL_EXPRESSION) } public static final fun barTL(listT: T) : void { - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + listT.[!] 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 58df83df847..b8e3133faac 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/SAM.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/SAM.log.fir.txt @@ -11,8 +11,8 @@ UFile (package = ) UField (name = baz) UQualifiedReferenceExpression UQualifiedReferenceExpression - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = java) + USimpleNameReferenceExpression (identifier = lang) [!] UnknownKotlinExpression (CALL_EXPRESSION) UMethod (name = getNotSam) UMethod (name = getFoo) 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 089c5d6082a..f18ea2af5ec 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 (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + private static final var baz: java.lang.Runnable = java.lang.[!] 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/StringTemplate.log.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplate.log.fir.txt index 0ecead874b1..99cc3c1fd0b 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplate.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplate.log.fir.txt @@ -8,11 +8,11 @@ UFile (package = ) ULiteralExpression (value = "dolor") UField (name = foobarbaz) UPolyadicExpression (operator = +) - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = foo) ULiteralExpression (value = " ") - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = bar) ULiteralExpression (value = " ") - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = baz) UMethod (name = getFoo) UMethod (name = getBar) UMethod (name = getBaz) diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplate.render.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplate.render.fir.txt index de55272f5b8..2d56a3954b6 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplate.render.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplate.render.fir.txt @@ -2,7 +2,7 @@ public final class StringTemplateKt { private static final var foo: java.lang.String = "lorem" private static final var bar: java.lang.String = "ipsum" private static final var baz: java.lang.String = "dolor" - private static final var foobarbaz: java.lang.String = [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + " " + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + " " + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + private static final var foobarbaz: java.lang.String = foo + " " + bar + " " + baz public static final fun getFoo() : java.lang.String = UastEmptyExpression public static final fun getBar() : java.lang.String = UastEmptyExpression public static final fun getBaz() : java.lang.String = 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 ff1af43f2e7..2a72e7aa091 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateComplex.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateComplex.log.fir.txt @@ -19,7 +19,7 @@ UFile (package = ) ULiteralExpression (value = "a ") UPolyadicExpression (operator = +) ULiteralExpression (value = "literal") - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = case4) ULiteralExpression (value = " z") UField (name = literalInLiteral2) UPolyadicExpression (operator = +) @@ -27,7 +27,7 @@ UFile (package = ) UQualifiedReferenceExpression UPolyadicExpression (operator = +) ULiteralExpression (value = "literal") - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = case4) [!] UnknownKotlinExpression (CALL_EXPRESSION) ULiteralExpression (value = " z") UField (name = empty) @@ -43,7 +43,7 @@ UFile (package = ) ULiteralExpression (value = 0) UBlockExpression UReturnExpression - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = i) UMethod (name = foo) UBlockExpression [!] UnknownKotlinExpression (CALL_EXPRESSION) 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 305a0d6cdd8..1d85d93f0eb 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateComplex.render.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateComplex.render.fir.txt @@ -2,8 +2,8 @@ public final class StringTemplateComplexKt { private static final var muchRecur: java.lang.String = "abc" 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 " + "literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + " z" + private static final var literalInLiteral: java.lang.String = "a " + "literal" + case4 + " z" + private static final var literalInLiteral2: java.lang.String = "a " + "literal" + case4.[!] 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 @@ -12,7 +12,7 @@ public final class StringTemplateComplexKt { public static final fun getLiteralInLiteral2() : java.lang.String = UastEmptyExpression public static final fun getEmpty() : java.lang.String = UastEmptyExpression public static final fun simpleForTemplate(i: int) : java.lang.String { - return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + return i } public static final fun foo() : void { [!] UnknownKotlinExpression (CALL_EXPRESSION) 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 476d49f49ba..f28267f1cd5 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateComplexForUInjectionHost.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateComplexForUInjectionHost.log.fir.txt @@ -19,7 +19,7 @@ UFile (package = ) ULiteralExpression (value = "a ") UPolyadicExpression (operator = +) ULiteralExpression (value = "literal") - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = case4) ULiteralExpression (value = " z") UField (name = literalInLiteral2) UPolyadicExpression (operator = +) @@ -27,7 +27,7 @@ UFile (package = ) UQualifiedReferenceExpression UPolyadicExpression (operator = +) ULiteralExpression (value = "literal") - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = case4) [!] UnknownKotlinExpression (CALL_EXPRESSION) ULiteralExpression (value = " z") UField (name = empty) @@ -43,7 +43,7 @@ UFile (package = ) ULiteralExpression (value = 0) UBlockExpression UReturnExpression - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = i) UMethod (name = foo) UBlockExpression [!] UnknownKotlinExpression (CALL_EXPRESSION) 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 7d5e4f6e39c..5e7516380fe 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateComplexForUInjectionHost.render.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateComplexForUInjectionHost.render.fir.txt @@ -2,8 +2,8 @@ public final class StringTemplateComplexForUInjectionHostKt { private static final var muchRecur: java.lang.String = "abc" 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 " + "literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + " z" + private static final var literalInLiteral: java.lang.String = "a " + "literal" + case4 + " z" + private static final var literalInLiteral2: java.lang.String = "a " + "literal" + case4.[!] 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 @@ -12,7 +12,7 @@ public final class StringTemplateComplexForUInjectionHostKt { public static final fun getLiteralInLiteral2() : java.lang.String = UastEmptyExpression public static final fun getEmpty() : java.lang.String = UastEmptyExpression public static final fun simpleForTemplate(i: int) : java.lang.String { - return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + return i } public static final fun foo() : void { [!] UnknownKotlinExpression (CALL_EXPRESSION) 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 6eacbf5edbf..ac89cba0973 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateInClass.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateInClass.log.fir.txt @@ -2,7 +2,7 @@ UFile (package = ) UClass (name = Demo) UField (name = foo) UQualifiedReferenceExpression - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = X) [!] 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 a7aad070325..6d55087778f 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 (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION) + private final var foo: error.NonExistentClass = X.[!] UnknownKotlinExpression (CALL_EXPRESSION) public fun Demo() = UastEmptyExpression public final fun getFoo() : error.NonExistentClass = UastEmptyExpression } diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateWithVar.log.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateWithVar.log.fir.txt index 936e927c34b..773df8ee4fd 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateWithVar.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateWithVar.log.fir.txt @@ -5,6 +5,6 @@ UFile (package = ) UField (name = f) UPolyadicExpression (operator = +) ULiteralExpression (value = "foo") - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = bar) UMethod (name = getBar) UMethod (name = getF) diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateWithVar.render.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateWithVar.render.fir.txt index 0a106fcbf09..25fb0fd32ab 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateWithVar.render.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/StringTemplateWithVar.render.fir.txt @@ -1,6 +1,6 @@ public final class StringTemplateWithVarKt { private static final var bar: java.lang.String = "bar" - private static final var f: java.lang.String = "foo" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + private static final var f: java.lang.String = "foo" + bar public static final fun getBar() : java.lang.String = UastEmptyExpression public static final fun getF() : java.lang.String = UastEmptyExpression } diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/TypeReferences.log.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/TypeReferences.log.fir.txt index c8c6d0804b6..329bbde2ff0 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/TypeReferences.log.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/TypeReferences.log.fir.txt @@ -7,7 +7,7 @@ UFile (package = ) [!] UnknownKotlinExpression (PROPERTY) [!] UnknownKotlinExpression (PROPERTY) UReturnExpression - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + USimpleNameReferenceExpression (identifier = result) UMethod (name = parameterizedFoo) UParameter (name = arg) UBlockExpression diff --git a/plugins/uast-kotlin-fir/testData/legacyRenderLog/TypeReferences.render.fir.txt b/plugins/uast-kotlin-fir/testData/legacyRenderLog/TypeReferences.render.fir.txt index 636ea3de16e..1665d4e21b1 100644 --- a/plugins/uast-kotlin-fir/testData/legacyRenderLog/TypeReferences.render.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyRenderLog/TypeReferences.render.fir.txt @@ -3,7 +3,7 @@ public final class TypeReferencesKt { [!] UnknownKotlinExpression (PROPERTY) [!] UnknownKotlinExpression (PROPERTY) [!] UnknownKotlinExpression (PROPERTY) - return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + return result } public static final fun parameterizedFoo(arg: T) : void { [!] UnknownKotlinExpression (PROPERTY) diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/AnnotationParameters.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/AnnotationParameters.types.fir.txt index 4a9598c2a90..9e9cc2dc734 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/AnnotationParameters.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/AnnotationParameters.types.fir.txt @@ -6,8 +6,8 @@ UFile (package = ) [public final class AnnotationParametersKt {...] ULiteralExpression (value = 5) [5] : PsiType:int UMethod (name = bar) [public static final fun bar() : void {...}] UBlockExpression [{...}] - UReturnExpression [return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UReturnExpression [return Unit] + USimpleNameReferenceExpression (identifier = Unit) [Unit] : PsiType:Unit UMethod (name = fooWithArrLiteral) [public static final fun fooWithArrLiteral() : int {...}] UBlockExpression [{...}] UReturnExpression [return 5] 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 7e14de544ee..abdb5fe3642 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/Anonymous.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/Anonymous.types.fir.txt @@ -5,12 +5,12 @@ UFile (package = ) [import java.io.Closeable...] UMethod (name = foo) [public static final fun foo() : void {...}] UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] - UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:Unit - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UQualifiedReferenceExpression [runnable.[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:Unit + USimpleNameReferenceExpression (identifier = runnable) [runnable] : PsiType:Object [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] - UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:Unit - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UQualifiedReferenceExpression [runnable2.[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:Unit + USimpleNameReferenceExpression (identifier = runnable2) [runnable2] : PsiType:Runnable [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] 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 3da3709ddc1..510f1285da6 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/Constructors.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/Constructors.types.fir.txt @@ -66,8 +66,8 @@ UFile (package = ) [public final class A {...] UastEmptyExpression [UastEmptyExpression] [!] UnknownKotlinExpression (BINARY_EXPRESSION) [[!] UnknownKotlinExpression (BINARY_EXPRESSION)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] - UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:String - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UQualifiedReferenceExpression [local.[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:String + USimpleNameReferenceExpression (identifier = local) [local] : PsiType:String [!] 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] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/InferenceInsideUnresolvedConstructor.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/InferenceInsideUnresolvedConstructor.types.fir.txt index e51d68634c5..91d19d463c6 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/InferenceInsideUnresolvedConstructor.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/InferenceInsideUnresolvedConstructor.types.fir.txt @@ -7,5 +7,5 @@ UFile (package = ) [public final class InferenceInsideUnresolvedConstructorKt {. UMethod (name = id) [public static final fun id(x: T) : T {...}] UParameter (name = x) [var x: T] UBlockExpression [{...}] - UReturnExpression [return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UReturnExpression [return x] + USimpleNameReferenceExpression (identifier = x) [x] : PsiType:T diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/InnerClasses.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/InnerClasses.types.fir.txt index 8f7af96022e..0afef2a0ca7 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/InnerClasses.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/InnerClasses.types.fir.txt @@ -17,5 +17,5 @@ UFile (package = ) [public final class Foo {...] UMethod (name = Baz) [public fun Baz() = UastEmptyExpression] UMethod (name = doNothing) [public final fun doNothing() : void {...}] UBlockExpression [{...}] - UReturnExpression [return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UReturnExpression [return Unit] + USimpleNameReferenceExpression (identifier = Unit) [Unit] : PsiType:Unit 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 0e82995db48..f704d5866b2 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/InnerNonFixedTypeVariable.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/InnerNonFixedTypeVariable.types.fir.txt @@ -3,9 +3,9 @@ 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 - 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)] + UQualifiedReferenceExpression [list.[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:Set + UQualifiedReferenceExpression [list.[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:NonExistentClass + USimpleNameReferenceExpression (identifier = list) [list] : PsiType:List [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] UClass (name = Some) [public final class Some {...}] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/Lambdas.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/Lambdas.types.fir.txt index 102de597f09..ea7c5a2ff01 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/Lambdas.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/Lambdas.types.fir.txt @@ -3,9 +3,9 @@ UFile (package = ) [import java.util.stream.Stream...] UClass (name = LambdasKt) [public final class LambdasKt {...}] UMethod (name = foo) [public static final fun foo() : void {...}] UBlockExpression [{...}] : PsiType:NonExistentClass - UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:NonExistentClass - UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:Stream - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UQualifiedReferenceExpression [Stream.[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:NonExistentClass + UQualifiedReferenceExpression [Stream.[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:Stream + USimpleNameReferenceExpression (identifier = Stream) [Stream] : PsiType:Unit [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] UMethod (name = doSelectItem) [public static final fun doSelectItem(selectItemFunction: kotlin.jvm.functions.Function0) : void {...}] 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 70f994c437f..c5b6266ae30 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/ParametersDisorder.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/ParametersDisorder.types.fir.txt @@ -22,37 +22,37 @@ UFile (package = ) [public final class ParametersDisorderKt {...] 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)] + UQualifiedReferenceExpression [Math.[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:double + USimpleNameReferenceExpression (identifier = Math) [Math] : PsiType:Unit [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_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)] + UQualifiedReferenceExpression [java.lang.String.[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:NonExistentClass + UQualifiedReferenceExpression [java.lang.String] : PsiType:Unit + UQualifiedReferenceExpression [java.lang] : PsiType:Unit + USimpleNameReferenceExpression (identifier = java) [java] : PsiType:Unit + USimpleNameReferenceExpression (identifier = lang) [lang] : PsiType:Unit + USimpleNameReferenceExpression (identifier = String) [String] : PsiType:Unit [!] 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)] + UQualifiedReferenceExpression [java.lang.String.[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:NonExistentClass + UQualifiedReferenceExpression [java.lang.String] : PsiType:Unit + UQualifiedReferenceExpression [java.lang] : PsiType:Unit + USimpleNameReferenceExpression (identifier = java) [java] : PsiType:Unit + USimpleNameReferenceExpression (identifier = lang) [lang] : PsiType:Unit + USimpleNameReferenceExpression (identifier = String) [String] : PsiType:Unit [!] 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)] + UQualifiedReferenceExpression [java.lang.String.[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:NonExistentClass + UQualifiedReferenceExpression [java.lang.String] : PsiType:Unit + UQualifiedReferenceExpression [java.lang] : PsiType:Unit + USimpleNameReferenceExpression (identifier = java) [java] : PsiType:Unit + USimpleNameReferenceExpression (identifier = lang) [lang] : PsiType:Unit + USimpleNameReferenceExpression (identifier = String) [String] : PsiType:Unit [!] 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)] + UQualifiedReferenceExpression [java.lang.String.[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:NonExistentClass + UQualifiedReferenceExpression [java.lang.String] : PsiType:Unit + UQualifiedReferenceExpression [java.lang] : PsiType:Unit + USimpleNameReferenceExpression (identifier = java) [java] : PsiType:Unit + USimpleNameReferenceExpression (identifier = lang) [lang] : PsiType:Unit + USimpleNameReferenceExpression (identifier = String) [String] : PsiType:Unit [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] UMethod (name = objectLiteral) [public static final fun objectLiteral() : void {...}] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyInitializer.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyInitializer.types.fir.txt index d153d544ff6..49c89308ff6 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyInitializer.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyInitializer.types.fir.txt @@ -3,8 +3,8 @@ UFile (package = ) [public final class TestPropertyInitializer {...] UMethod (name = TestPropertyInitializer) [public fun TestPropertyInitializer() = UastEmptyExpression] UMethod (name = getWithSetter) [public final fun getWithSetter() : java.lang.String {...}] UBlockExpression [{...}] - UReturnExpression [return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UReturnExpression [return field] + USimpleNameReferenceExpression (identifier = field) [field] : PsiType:String UMethod (name = setWithSetter) [public final fun setWithSetter(p: java.lang.String) : void {...}] UParameter (name = p) [var p: java.lang.String] UBlockExpression [{...}] : PsiType:Unit diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyInitializerWithoutSetter.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyInitializerWithoutSetter.types.fir.txt index 52206cb46c0..ce8b18c1eba 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyInitializerWithoutSetter.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyInitializerWithoutSetter.types.fir.txt @@ -4,7 +4,7 @@ UFile (package = ) [public final class PropertyInitializerWithoutSetterKt {...] ULiteralExpression (value = "/sdcard") ["/sdcard"] : PsiType:String UMethod (name = getWithoutSetter) [public static final fun getWithoutSetter() : java.lang.String {...}] UBlockExpression [{...}] - UReturnExpression [return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UReturnExpression [return field] + USimpleNameReferenceExpression (identifier = field) [field] : PsiType:String UMethod (name = setWithoutSetter) [public static final fun setWithoutSetter(value: java.lang.String) : void = UastEmptyExpression] UParameter (name = value) [var value: java.lang.String] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyReferences.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyReferences.types.fir.txt index 4b5f4cdae52..6bdd1d061c6 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyReferences.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/PropertyReferences.types.fir.txt @@ -33,5 +33,5 @@ UFile (package = ) [public final class PropertyReferencesKt {...] UBlockExpression [{...}] : PsiType:Void [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (BINARY_EXPRESSION) [[!] UnknownKotlinExpression (BINARY_EXPRESSION)] - UReturnExpression [return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:Void - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UReturnExpression [return privateProp] : PsiType:Void + USimpleNameReferenceExpression (identifier = privateProp) [privateProp] : PsiType:int 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 872fe5ca996..88d045b9279 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/QualifiedConstructorCall.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/QualifiedConstructorCall.types.fir.txt @@ -5,11 +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 (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)] + UReturnExpression [return A.B.C.[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:Void + UQualifiedReferenceExpression [A.B.C.[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:Foo + UQualifiedReferenceExpression [A.B.C] : PsiType:Unit + UQualifiedReferenceExpression [A.B] : PsiType:Unit + USimpleNameReferenceExpression (identifier = A) [A] : PsiType:Unit + USimpleNameReferenceExpression (identifier = B) [B] : PsiType:Unit + USimpleNameReferenceExpression (identifier = C) [C] : PsiType:Unit [!] 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 9e8de03fb50..1a39dc9aa14 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/ReceiverFun.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/ReceiverFun.types.fir.txt @@ -3,10 +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 (THIS_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] - UQualifiedReferenceExpression [[!] UnknownKotlinExpression (THIS_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:int + UReturnExpression [return [!] UnknownKotlinExpression (THIS_EXPRESSION).length] + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (THIS_EXPRESSION).length] : PsiType:int [!] UnknownKotlinExpression (THIS_EXPRESSION) [[!] UnknownKotlinExpression (THIS_EXPRESSION)] - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + USimpleNameReferenceExpression (identifier = length) [length] : PsiType:int 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/ReifiedReturnType.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/ReifiedReturnType.types.fir.txt index e19e03e3f3c..633b1c3a599 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/ReifiedReturnType.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/ReifiedReturnType.types.fir.txt @@ -5,7 +5,7 @@ UFile (package = ) [public final class ReifiedReturnTypeKt {...] UParameter (name = threshold) [var threshold: T] UParameter (name = threshold2) [var threshold2: B] UBlockExpression [{...}] : PsiType:Void - UReturnExpression [return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:Void - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UReturnExpression [return threshold2] : PsiType:Void + USimpleNameReferenceExpression (identifier = threshold2) [threshold2] : PsiType:B UClass (name = Foo) [public final class Foo {...}] UMethod (name = Foo) [public fun Foo() = UastEmptyExpression] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/Resolve.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/Resolve.types.fir.txt index 72b813a1090..cca9bcb8ece 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/Resolve.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/Resolve.types.fir.txt @@ -14,40 +14,40 @@ UFile (package = ) [public final class ResolveKt {...] 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 + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).size] : PsiType:int [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] - UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:IntRange + USimpleNameReferenceExpression (identifier = size) [size] : PsiType:int + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).indices] : PsiType:IntRange [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + USimpleNameReferenceExpression (identifier = indices) [indices] : PsiType:IntRange [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (BINARY_EXPRESSION) [[!] UnknownKotlinExpression (BINARY_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> + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).entries.[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:String + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).entries.[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:Entry + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).entries] : PsiType:Set> [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + USimpleNameReferenceExpression (identifier = entries) [entries] : PsiType:Set> [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] - UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:boolean - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UQualifiedReferenceExpression [intRange.[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:boolean + USimpleNameReferenceExpression (identifier = intRange) [intRange] : PsiType:LongRange [!] 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 - UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:Unit - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UQualifiedReferenceExpression [t.[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:Unit + USimpleNameReferenceExpression (identifier = t) [t] : PsiType:T [!] 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 - UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:boolean - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UQualifiedReferenceExpression [listT.[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:boolean + USimpleNameReferenceExpression (identifier = listT) [listT] : PsiType:T [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] [!] UnknownKotlinExpression (FOR) [[!] UnknownKotlinExpression (FOR)] UClass (name = A) [public class A {...}] 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 d906602dd9f..7ae412c5d6f 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/SAM.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/SAM.types.fir.txt @@ -8,11 +8,11 @@ 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 (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)] + UField (name = baz) [private static final var baz: java.lang.Runnable = java.lang.[!] UnknownKotlinExpression (CALL_EXPRESSION)] + UQualifiedReferenceExpression [java.lang.[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:Runnable + UQualifiedReferenceExpression [java.lang] : PsiType:Unit + USimpleNameReferenceExpression (identifier = java) [java] : PsiType:Unit + USimpleNameReferenceExpression (identifier = lang) [lang] : PsiType:Unit [!] 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] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplate.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplate.types.fir.txt index 0ead733aebb..72ba037664a 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplate.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplate.types.fir.txt @@ -6,13 +6,13 @@ UFile (package = ) [public final class StringTemplateKt {...] ULiteralExpression (value = "ipsum") ["ipsum"] : PsiType:String UField (name = baz) [private static final var baz: java.lang.String = "dolor"] ULiteralExpression (value = "dolor") ["dolor"] : PsiType:String - UField (name = foobarbaz) [private static final var foobarbaz: java.lang.String = [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + " " + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + " " + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] - UPolyadicExpression (operator = +) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + " " + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + " " + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:String - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UField (name = foobarbaz) [private static final var foobarbaz: java.lang.String = foo + " " + bar + " " + baz] + UPolyadicExpression (operator = +) [foo + " " + bar + " " + baz] : PsiType:String + USimpleNameReferenceExpression (identifier = foo) [foo] : PsiType:String ULiteralExpression (value = " ") [" "] : PsiType:String - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + USimpleNameReferenceExpression (identifier = bar) [bar] : PsiType:String ULiteralExpression (value = " ") [" "] : PsiType:String - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + USimpleNameReferenceExpression (identifier = baz) [baz] : PsiType:String UMethod (name = getFoo) [public static final fun getFoo() : java.lang.String = UastEmptyExpression] UMethod (name = getBar) [public static final fun getBar() : java.lang.String = UastEmptyExpression] UMethod (name = getBaz) [public static final fun getBaz() : java.lang.String = 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 0efe6c2712a..013a1802efd 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplateComplex.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplateComplex.types.fir.txt @@ -14,20 +14,20 @@ UFile (package = ) [public final class StringTemplateComplexKt {...] ULiteralExpression (value = " ") [" "] : PsiType:String ULiteralExpression (value = "literal") ["literal"] : PsiType:String ULiteralExpression (value = " z") [" z"] : PsiType:String - UField (name = literalInLiteral) [private static final var literalInLiteral: java.lang.String = "a " + "literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + " z"] - UPolyadicExpression (operator = +) ["a " + "literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + " z"] : PsiType:String + UField (name = literalInLiteral) [private static final var literalInLiteral: java.lang.String = "a " + "literal" + case4 + " z"] + UPolyadicExpression (operator = +) ["a " + "literal" + case4 + " z"] : PsiType:String ULiteralExpression (value = "a ") ["a "] : PsiType:String - UPolyadicExpression (operator = +) ["literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:String + UPolyadicExpression (operator = +) ["literal" + case4] : PsiType:String ULiteralExpression (value = "literal") ["literal"] : PsiType:String - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + USimpleNameReferenceExpression (identifier = case4) [case4] : PsiType:String ULiteralExpression (value = " z") [" 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 + UField (name = literalInLiteral2) [private static final var literalInLiteral2: java.lang.String = "a " + "literal" + case4.[!] UnknownKotlinExpression (CALL_EXPRESSION) + " z"] + UPolyadicExpression (operator = +) ["a " + "literal" + case4.[!] UnknownKotlinExpression (CALL_EXPRESSION) + " z"] : PsiType:String ULiteralExpression (value = "a ") ["a "] : PsiType:String - UQualifiedReferenceExpression ["literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:String - UPolyadicExpression (operator = +) ["literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:String + UQualifiedReferenceExpression ["literal" + case4.[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:String + UPolyadicExpression (operator = +) ["literal" + case4] : PsiType:String ULiteralExpression (value = "literal") ["literal"] : PsiType:String - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + USimpleNameReferenceExpression (identifier = case4) [case4] : PsiType:String [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] ULiteralExpression (value = " z") [" z"] : PsiType:String UField (name = empty) [private static final var empty: java.lang.String = ""] @@ -42,8 +42,8 @@ UFile (package = ) [public final class StringTemplateComplexKt {...] UParameter (name = i) [var i: int = 0] ULiteralExpression (value = 0) [0] : PsiType:int UBlockExpression [{...}] - UReturnExpression [return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UReturnExpression [return i] + USimpleNameReferenceExpression (identifier = i) [i] : PsiType:int UMethod (name = foo) [public static final fun foo() : void {...}] UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] 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 2c755417c36..6f80432b666 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplateComplexForUInjectionHost.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplateComplexForUInjectionHost.types.fir.txt @@ -14,20 +14,20 @@ UFile (package = ) [public final class StringTemplateComplexForUInjectionHostKt ULiteralExpression (value = " ") [" "] : PsiType:String ULiteralExpression (value = "literal") ["literal"] : PsiType:String ULiteralExpression (value = " z") [" z"] : PsiType:String - UField (name = literalInLiteral) [private static final var literalInLiteral: java.lang.String = "a " + "literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + " z"] - UPolyadicExpression (operator = +) ["a " + "literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + " z"] : PsiType:String + UField (name = literalInLiteral) [private static final var literalInLiteral: java.lang.String = "a " + "literal" + case4 + " z"] + UPolyadicExpression (operator = +) ["a " + "literal" + case4 + " z"] : PsiType:String ULiteralExpression (value = "a ") ["a "] : PsiType:String - UPolyadicExpression (operator = +) ["literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:String + UPolyadicExpression (operator = +) ["literal" + case4] : PsiType:String ULiteralExpression (value = "literal") ["literal"] : PsiType:String - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + USimpleNameReferenceExpression (identifier = case4) [case4] : PsiType:String ULiteralExpression (value = " z") [" 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 + UField (name = literalInLiteral2) [private static final var literalInLiteral2: java.lang.String = "a " + "literal" + case4.[!] UnknownKotlinExpression (CALL_EXPRESSION) + " z"] + UPolyadicExpression (operator = +) ["a " + "literal" + case4.[!] UnknownKotlinExpression (CALL_EXPRESSION) + " z"] : PsiType:String ULiteralExpression (value = "a ") ["a "] : PsiType:String - UQualifiedReferenceExpression ["literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:String - UPolyadicExpression (operator = +) ["literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:String + UQualifiedReferenceExpression ["literal" + case4.[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:String + UPolyadicExpression (operator = +) ["literal" + case4] : PsiType:String ULiteralExpression (value = "literal") ["literal"] : PsiType:String - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + USimpleNameReferenceExpression (identifier = case4) [case4] : PsiType:String [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] ULiteralExpression (value = " z") [" z"] : PsiType:String UField (name = empty) [private static final var empty: java.lang.String = ""] @@ -42,8 +42,8 @@ UFile (package = ) [public final class StringTemplateComplexForUInjectionHostKt UParameter (name = i) [var i: int = 0] ULiteralExpression (value = 0) [0] : PsiType:int UBlockExpression [{...}] - UReturnExpression [return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UReturnExpression [return i] + USimpleNameReferenceExpression (identifier = i) [i] : PsiType:int UMethod (name = foo) [public static final fun foo() : void {...}] UBlockExpression [{...}] : PsiType:Unit [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] 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 a03d4851230..33dc16c7242 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplateInClass.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplateInClass.types.fir.txt @@ -1,8 +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 (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] - UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:NonExistentClass - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UField (name = foo) [private final var foo: error.NonExistentClass = X.[!] UnknownKotlinExpression (CALL_EXPRESSION)] + UQualifiedReferenceExpression [X.[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:NonExistentClass + USimpleNameReferenceExpression (identifier = X) [X] : PsiType:NonExistentClass [!] 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/StringTemplateWithVar.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplateWithVar.types.fir.txt index e50ccc6d4df..d9c8ab53e18 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplateWithVar.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/StringTemplateWithVar.types.fir.txt @@ -2,9 +2,9 @@ UFile (package = ) [public final class StringTemplateWithVarKt {...] UClass (name = StringTemplateWithVarKt) [public final class StringTemplateWithVarKt {...}] UField (name = bar) [private static final var bar: java.lang.String = "bar"] ULiteralExpression (value = "bar") ["bar"] : PsiType:String - UField (name = f) [private static final var f: java.lang.String = "foo" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] - UPolyadicExpression (operator = +) ["foo" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:String + UField (name = f) [private static final var f: java.lang.String = "foo" + bar] + UPolyadicExpression (operator = +) ["foo" + bar] : PsiType:String ULiteralExpression (value = "foo") ["foo"] : PsiType:String - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + USimpleNameReferenceExpression (identifier = bar) [bar] : PsiType:String UMethod (name = getBar) [public static final fun getBar() : java.lang.String = UastEmptyExpression] UMethod (name = getF) [public static final fun getF() : java.lang.String = UastEmptyExpression] diff --git a/plugins/uast-kotlin-fir/testData/legacyTypes/TypeReferences.types.fir.txt b/plugins/uast-kotlin-fir/testData/legacyTypes/TypeReferences.types.fir.txt index 9e066dbfdda..4211288eb00 100644 --- a/plugins/uast-kotlin-fir/testData/legacyTypes/TypeReferences.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyTypes/TypeReferences.types.fir.txt @@ -6,8 +6,8 @@ UFile (package = ) [public final class TypeReferencesKt {...] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] - UReturnExpression [return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:Void - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UReturnExpression [return result] : PsiType:Void + USimpleNameReferenceExpression (identifier = result) [result] : PsiType:String UMethod (name = parameterizedFoo) [public static final fun parameterizedFoo(arg: T) : void {...}] UParameter (name = arg) [var arg: T] UBlockExpression [{...}] : PsiType:Unit diff --git a/plugins/uast-kotlin-fir/testData/legacyValues/AnnotationParameters.values.fir.txt b/plugins/uast-kotlin-fir/testData/legacyValues/AnnotationParameters.values.fir.txt index 94c5dcab046..e60921e50cc 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/AnnotationParameters.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/AnnotationParameters.values.fir.txt @@ -6,8 +6,8 @@ UFile (package = ) [public final class AnnotationParametersKt {...] ULiteralExpression (value = 5) [5] = (long)5 UMethod (name = bar) [public static final fun bar() : void {...}] UBlockExpression [{...}] = Nothing - UReturnExpression [return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Nothing - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + UReturnExpression [return Unit] = Nothing + USimpleNameReferenceExpression (identifier = Unit) [Unit] = external Unit() UMethod (name = fooWithArrLiteral) [public static final fun fooWithArrLiteral() : int {...}] UBlockExpression [{...}] = Nothing UReturnExpression [return 5] = Nothing 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 9b18738f0d9..adcd92cf8da 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/Anonymous.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/Anonymous.values.fir.txt @@ -5,12 +5,12 @@ UFile (package = ) [import java.io.Closeable...] UMethod (name = foo) [public static final fun foo() : void {...}] UBlockExpression [{...}] = Undetermined [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] = Undetermined - UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [runnable.[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + USimpleNameReferenceExpression (identifier = runnable) [runnable] = external runnable() [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] = Undetermined - UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [runnable2.[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + USimpleNameReferenceExpression (identifier = runnable2) [runnable2] = external runnable2() [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] = Undetermined [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] = Undetermined 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 4edc98a584e..3fcdd58c077 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/Constructors.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/Constructors.values.fir.txt @@ -66,8 +66,8 @@ UFile (package = ) [public final class A {...] UastEmptyExpression [UastEmptyExpression] = Undetermined [!] UnknownKotlinExpression (BINARY_EXPRESSION) [[!] UnknownKotlinExpression (BINARY_EXPRESSION)] = Undetermined [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] = Undetermined - UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [local.[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + USimpleNameReferenceExpression (identifier = local) [local] = external local() [!] 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] diff --git a/plugins/uast-kotlin-fir/testData/legacyValues/InferenceInsideUnresolvedConstructor.values.fir.txt b/plugins/uast-kotlin-fir/testData/legacyValues/InferenceInsideUnresolvedConstructor.values.fir.txt index e8d36c8c174..9395556d08d 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/InferenceInsideUnresolvedConstructor.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/InferenceInsideUnresolvedConstructor.values.fir.txt @@ -7,5 +7,5 @@ UFile (package = ) [public final class InferenceInsideUnresolvedConstructorKt {. UMethod (name = id) [public static final fun id(x: T) : T {...}] UParameter (name = x) [var x: T] UBlockExpression [{...}] = Nothing - UReturnExpression [return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Nothing - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + UReturnExpression [return x] = Nothing + USimpleNameReferenceExpression (identifier = x) [x] = Undetermined diff --git a/plugins/uast-kotlin-fir/testData/legacyValues/InnerClasses.values.fir.txt b/plugins/uast-kotlin-fir/testData/legacyValues/InnerClasses.values.fir.txt index eb234c7cee4..bb9b30f3590 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/InnerClasses.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/InnerClasses.values.fir.txt @@ -17,5 +17,5 @@ UFile (package = ) [public final class Foo {...] UMethod (name = Baz) [public fun Baz() = UastEmptyExpression] UMethod (name = doNothing) [public final fun doNothing() : void {...}] UBlockExpression [{...}] = Nothing - UReturnExpression [return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Nothing - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + UReturnExpression [return Unit] = Nothing + USimpleNameReferenceExpression (identifier = Unit) [Unit] = external Unit() 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 7bb980b1c2f..f3885e7cdb4 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/InnerNonFixedTypeVariable.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/InnerNonFixedTypeVariable.values.fir.txt @@ -3,9 +3,9 @@ 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 - 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 + UQualifiedReferenceExpression [list.[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [list.[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + USimpleNameReferenceExpression (identifier = list) [list] = Undetermined [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined UClass (name = Some) [public final class Some {...}] 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 b39a542cc30..8d246199cf9 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/Lambdas.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/Lambdas.values.fir.txt @@ -3,9 +3,9 @@ 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 - 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 + UQualifiedReferenceExpression [Stream.[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [Stream.[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + USimpleNameReferenceExpression (identifier = Stream) [Stream] = external Stream() [!] 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 {...}] 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 ca10c0cf040..cbf311cf686 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/ParametersDisorder.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/ParametersDisorder.values.fir.txt @@ -22,37 +22,37 @@ UFile (package = ) [public final class ParametersDisorderKt {...] 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 + UQualifiedReferenceExpression [Math.[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + USimpleNameReferenceExpression (identifier = Math) [Math] = external Math() [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_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 + UQualifiedReferenceExpression [java.lang.String.[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [java.lang.String] = external String() + UQualifiedReferenceExpression [java.lang] = external lang() + USimpleNameReferenceExpression (identifier = java) [java] = external java() + USimpleNameReferenceExpression (identifier = lang) [lang] = external lang() + USimpleNameReferenceExpression (identifier = String) [String] = external String() [!] 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 + UQualifiedReferenceExpression [java.lang.String.[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [java.lang.String] = external String() + UQualifiedReferenceExpression [java.lang] = external lang() + USimpleNameReferenceExpression (identifier = java) [java] = external java() + USimpleNameReferenceExpression (identifier = lang) [lang] = external lang() + USimpleNameReferenceExpression (identifier = String) [String] = external String() [!] 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 + UQualifiedReferenceExpression [java.lang.String.[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [java.lang.String] = external String() + UQualifiedReferenceExpression [java.lang] = external lang() + USimpleNameReferenceExpression (identifier = java) [java] = external java() + USimpleNameReferenceExpression (identifier = lang) [lang] = external lang() + USimpleNameReferenceExpression (identifier = String) [String] = external String() [!] 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 + UQualifiedReferenceExpression [java.lang.String.[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [java.lang.String] = external String() + UQualifiedReferenceExpression [java.lang] = external lang() + USimpleNameReferenceExpression (identifier = java) [java] = external java() + USimpleNameReferenceExpression (identifier = lang) [lang] = external lang() + USimpleNameReferenceExpression (identifier = String) [String] = external String() [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined UMethod (name = objectLiteral) [public static final fun objectLiteral() : void {...}] diff --git a/plugins/uast-kotlin-fir/testData/legacyValues/PropertyInitializer.values.fir.txt b/plugins/uast-kotlin-fir/testData/legacyValues/PropertyInitializer.values.fir.txt index 713c417dad2..a58fc72e172 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/PropertyInitializer.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/PropertyInitializer.values.fir.txt @@ -3,8 +3,8 @@ UFile (package = ) [public final class TestPropertyInitializer {...] UMethod (name = TestPropertyInitializer) [public fun TestPropertyInitializer() = UastEmptyExpression] UMethod (name = getWithSetter) [public final fun getWithSetter() : java.lang.String {...}] UBlockExpression [{...}] = Nothing - UReturnExpression [return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Nothing - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + UReturnExpression [return field] = Nothing + USimpleNameReferenceExpression (identifier = field) [field] = external field() UMethod (name = setWithSetter) [public final fun setWithSetter(p: java.lang.String) : void {...}] UParameter (name = p) [var p: java.lang.String] UBlockExpression [{...}] = Undetermined diff --git a/plugins/uast-kotlin-fir/testData/legacyValues/PropertyInitializerWithoutSetter.values.fir.txt b/plugins/uast-kotlin-fir/testData/legacyValues/PropertyInitializerWithoutSetter.values.fir.txt index 87314a75306..13e9b128005 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/PropertyInitializerWithoutSetter.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/PropertyInitializerWithoutSetter.values.fir.txt @@ -4,7 +4,7 @@ UFile (package = ) [public final class PropertyInitializerWithoutSetterKt {...] ULiteralExpression (value = "/sdcard") ["/sdcard"] = "/sdcard" UMethod (name = getWithoutSetter) [public static final fun getWithoutSetter() : java.lang.String {...}] UBlockExpression [{...}] = Nothing - UReturnExpression [return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Nothing - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + UReturnExpression [return field] = Nothing + USimpleNameReferenceExpression (identifier = field) [field] = external field() UMethod (name = setWithoutSetter) [public static final fun setWithoutSetter(value: java.lang.String) : void = UastEmptyExpression] UParameter (name = value) [var value: java.lang.String] diff --git a/plugins/uast-kotlin-fir/testData/legacyValues/PropertyReferences.values.fir.txt b/plugins/uast-kotlin-fir/testData/legacyValues/PropertyReferences.values.fir.txt index 69a9d465219..52a096bbe77 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/PropertyReferences.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/PropertyReferences.values.fir.txt @@ -33,5 +33,5 @@ UFile (package = ) [public final class PropertyReferencesKt {...] UBlockExpression [{...}] = Nothing [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] = Undetermined [!] UnknownKotlinExpression (BINARY_EXPRESSION) [[!] UnknownKotlinExpression (BINARY_EXPRESSION)] = Undetermined - UReturnExpression [return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Nothing - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + UReturnExpression [return privateProp] = Nothing + USimpleNameReferenceExpression (identifier = privateProp) [privateProp] = external privateProp() 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 e378c93d924..8182080cb8f 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/QualifiedConstructorCall.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/QualifiedConstructorCall.values.fir.txt @@ -5,11 +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 (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 + UReturnExpression [return A.B.C.[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Nothing + UQualifiedReferenceExpression [A.B.C.[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [A.B.C] = external C() + UQualifiedReferenceExpression [A.B] = external B() + USimpleNameReferenceExpression (identifier = A) [A] = external A() + USimpleNameReferenceExpression (identifier = B) [B] = external B() + USimpleNameReferenceExpression (identifier = C) [C] = external C() [!] 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 b831056a603..0e7c6a7fc19 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/ReceiverFun.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/ReceiverFun.values.fir.txt @@ -3,10 +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 (THIS_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Nothing - UQualifiedReferenceExpression [[!] UnknownKotlinExpression (THIS_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + UReturnExpression [return [!] UnknownKotlinExpression (THIS_EXPRESSION).length] = Nothing + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (THIS_EXPRESSION).length] = external length() [!] UnknownKotlinExpression (THIS_EXPRESSION) [[!] UnknownKotlinExpression (THIS_EXPRESSION)] = Undetermined - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + USimpleNameReferenceExpression (identifier = length) [length] = external length() 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/ReifiedReturnType.values.fir.txt b/plugins/uast-kotlin-fir/testData/legacyValues/ReifiedReturnType.values.fir.txt index af468390926..428bcf5cc73 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/ReifiedReturnType.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/ReifiedReturnType.values.fir.txt @@ -5,7 +5,7 @@ UFile (package = ) [public final class ReifiedReturnTypeKt {...] UParameter (name = threshold) [var threshold: T] UParameter (name = threshold2) [var threshold2: B] UBlockExpression [{...}] = Nothing - UReturnExpression [return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Nothing - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + UReturnExpression [return threshold2] = Nothing + USimpleNameReferenceExpression (identifier = threshold2) [threshold2] = Undetermined UClass (name = Foo) [public final class Foo {...}] UMethod (name = Foo) [public fun Foo() = UastEmptyExpression] 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 6877603d551..fc98700ad91 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/Resolve.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/Resolve.values.fir.txt @@ -14,40 +14,40 @@ UFile (package = ) [public final class ResolveKt {...] 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 + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).size] = external size() [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined - UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + USimpleNameReferenceExpression (identifier = size) [size] = external size() + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).indices] = external indices() [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + USimpleNameReferenceExpression (identifier = indices) [indices] = external indices() [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] = Undetermined [!] UnknownKotlinExpression (BINARY_EXPRESSION) [[!] UnknownKotlinExpression (BINARY_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 + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).entries.[!] UnknownKotlinExpression (CALL_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).entries.[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [[!] UnknownKotlinExpression (CALL_EXPRESSION).entries] = external entries() [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + USimpleNameReferenceExpression (identifier = entries) [entries] = external entries() [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] = Undetermined - UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [intRange.[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + USimpleNameReferenceExpression (identifier = intRange) [intRange] = external intRange() [!] 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 - UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [t.[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + USimpleNameReferenceExpression (identifier = t) [t] = 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 - UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [listT.[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + USimpleNameReferenceExpression (identifier = listT) [listT] = Undetermined [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined [!] UnknownKotlinExpression (FOR) [[!] UnknownKotlinExpression (FOR)] = Undetermined UClass (name = A) [public class A {...}] 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 cf11803be02..00e9e5a73ef 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/SAM.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/SAM.values.fir.txt @@ -8,11 +8,11 @@ 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 (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 + UField (name = baz) [private static final var baz: java.lang.Runnable = java.lang.[!] UnknownKotlinExpression (CALL_EXPRESSION)] + UQualifiedReferenceExpression [java.lang.[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression [java.lang] = external lang() + USimpleNameReferenceExpression (identifier = java) [java] = external java() + USimpleNameReferenceExpression (identifier = lang) [lang] = external lang() [!] 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] diff --git a/plugins/uast-kotlin-fir/testData/legacyValues/StringTemplate.values.fir.txt b/plugins/uast-kotlin-fir/testData/legacyValues/StringTemplate.values.fir.txt index b431da7382e..b84ba460270 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/StringTemplate.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/StringTemplate.values.fir.txt @@ -6,13 +6,13 @@ UFile (package = ) [public final class StringTemplateKt {...] ULiteralExpression (value = "ipsum") ["ipsum"] = "ipsum" UField (name = baz) [private static final var baz: java.lang.String = "dolor"] ULiteralExpression (value = "dolor") ["dolor"] = "dolor" - UField (name = foobarbaz) [private static final var foobarbaz: java.lang.String = [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + " " + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + " " + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] - UPolyadicExpression (operator = +) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + " " + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + " " + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + UField (name = foobarbaz) [private static final var foobarbaz: java.lang.String = foo + " " + bar + " " + baz] + UPolyadicExpression (operator = +) [foo + " " + bar + " " + baz] = Undetermined + USimpleNameReferenceExpression (identifier = foo) [foo] = Undetermined ULiteralExpression (value = " ") [" "] = " " - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + USimpleNameReferenceExpression (identifier = bar) [bar] = Undetermined ULiteralExpression (value = " ") [" "] = " " - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + USimpleNameReferenceExpression (identifier = baz) [baz] = Undetermined UMethod (name = getFoo) [public static final fun getFoo() : java.lang.String = UastEmptyExpression] UMethod (name = getBar) [public static final fun getBar() : java.lang.String = UastEmptyExpression] UMethod (name = getBaz) [public static final fun getBaz() : java.lang.String = 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 ebf9049e650..3ac076e0d86 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/StringTemplateComplex.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/StringTemplateComplex.values.fir.txt @@ -14,20 +14,20 @@ UFile (package = ) [public final class StringTemplateComplexKt {...] ULiteralExpression (value = " ") [" "] = " " ULiteralExpression (value = "literal") ["literal"] = "literal" ULiteralExpression (value = " z") [" z"] = " z" - UField (name = literalInLiteral) [private static final var literalInLiteral: java.lang.String = "a " + "literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + " z"] - UPolyadicExpression (operator = +) ["a " + "literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + " z"] = Undetermined + UField (name = literalInLiteral) [private static final var literalInLiteral: java.lang.String = "a " + "literal" + case4 + " z"] + UPolyadicExpression (operator = +) ["a " + "literal" + case4 + " z"] = Undetermined ULiteralExpression (value = "a ") ["a "] = "a " - UPolyadicExpression (operator = +) ["literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + UPolyadicExpression (operator = +) ["literal" + case4] = Undetermined ULiteralExpression (value = "literal") ["literal"] = "literal" - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + USimpleNameReferenceExpression (identifier = case4) [case4] = Undetermined ULiteralExpression (value = " z") [" z"] = " z" - 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 + UField (name = literalInLiteral2) [private static final var literalInLiteral2: java.lang.String = "a " + "literal" + case4.[!] UnknownKotlinExpression (CALL_EXPRESSION) + " z"] + UPolyadicExpression (operator = +) ["a " + "literal" + case4.[!] UnknownKotlinExpression (CALL_EXPRESSION) + " z"] = Undetermined ULiteralExpression (value = "a ") ["a "] = "a " - UQualifiedReferenceExpression ["literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined - UPolyadicExpression (operator = +) ["literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression ["literal" + case4.[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + UPolyadicExpression (operator = +) ["literal" + case4] = Undetermined ULiteralExpression (value = "literal") ["literal"] = "literal" - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + USimpleNameReferenceExpression (identifier = case4) [case4] = Undetermined [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined ULiteralExpression (value = " z") [" z"] = " z" UField (name = empty) [private static final var empty: java.lang.String = ""] @@ -42,8 +42,8 @@ UFile (package = ) [public final class StringTemplateComplexKt {...] UParameter (name = i) [var i: int = 0] ULiteralExpression (value = 0) [0] = (long)0 UBlockExpression [{...}] = Nothing - UReturnExpression [return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Nothing - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + UReturnExpression [return i] = Nothing + USimpleNameReferenceExpression (identifier = i) [i] = Undetermined UMethod (name = foo) [public static final fun foo() : void {...}] UBlockExpression [{...}] = Undetermined [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined 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 22a7464cd78..4d5b262d8a3 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/StringTemplateComplexForUInjectionHost.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/StringTemplateComplexForUInjectionHost.values.fir.txt @@ -14,20 +14,20 @@ UFile (package = ) [public final class StringTemplateComplexForUInjectionHostKt ULiteralExpression (value = " ") [" "] = " " ULiteralExpression (value = "literal") ["literal"] = "literal" ULiteralExpression (value = " z") [" z"] = " z" - UField (name = literalInLiteral) [private static final var literalInLiteral: java.lang.String = "a " + "literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + " z"] - UPolyadicExpression (operator = +) ["a " + "literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + " z"] = Undetermined + UField (name = literalInLiteral) [private static final var literalInLiteral: java.lang.String = "a " + "literal" + case4 + " z"] + UPolyadicExpression (operator = +) ["a " + "literal" + case4 + " z"] = Undetermined ULiteralExpression (value = "a ") ["a "] = "a " - UPolyadicExpression (operator = +) ["literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + UPolyadicExpression (operator = +) ["literal" + case4] = Undetermined ULiteralExpression (value = "literal") ["literal"] = "literal" - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + USimpleNameReferenceExpression (identifier = case4) [case4] = Undetermined ULiteralExpression (value = " z") [" z"] = " z" - 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 + UField (name = literalInLiteral2) [private static final var literalInLiteral2: java.lang.String = "a " + "literal" + case4.[!] UnknownKotlinExpression (CALL_EXPRESSION) + " z"] + UPolyadicExpression (operator = +) ["a " + "literal" + case4.[!] UnknownKotlinExpression (CALL_EXPRESSION) + " z"] = Undetermined ULiteralExpression (value = "a ") ["a "] = "a " - UQualifiedReferenceExpression ["literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined - UPolyadicExpression (operator = +) ["literal" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + UQualifiedReferenceExpression ["literal" + case4.[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + UPolyadicExpression (operator = +) ["literal" + case4] = Undetermined ULiteralExpression (value = "literal") ["literal"] = "literal" - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + USimpleNameReferenceExpression (identifier = case4) [case4] = Undetermined [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined ULiteralExpression (value = " z") [" z"] = " z" UField (name = empty) [private static final var empty: java.lang.String = ""] @@ -42,8 +42,8 @@ UFile (package = ) [public final class StringTemplateComplexForUInjectionHostKt UParameter (name = i) [var i: int = 0] ULiteralExpression (value = 0) [0] = (long)0 UBlockExpression [{...}] = Nothing - UReturnExpression [return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Nothing - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + UReturnExpression [return i] = Nothing + USimpleNameReferenceExpression (identifier = i) [i] = Undetermined UMethod (name = foo) [public static final fun foo() : void {...}] UBlockExpression [{...}] = Undetermined [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined 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 75f7ac93d67..0b6860e823b 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/StringTemplateInClass.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/StringTemplateInClass.values.fir.txt @@ -1,8 +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 (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] - UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + UField (name = foo) [private final var foo: error.NonExistentClass = X.[!] UnknownKotlinExpression (CALL_EXPRESSION)] + UQualifiedReferenceExpression [X.[!] UnknownKotlinExpression (CALL_EXPRESSION)] = Undetermined + USimpleNameReferenceExpression (identifier = X) [X] = external X() [!] 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/StringTemplateWithVar.values.fir.txt b/plugins/uast-kotlin-fir/testData/legacyValues/StringTemplateWithVar.values.fir.txt index 15d26f939e2..653a48361b7 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/StringTemplateWithVar.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/StringTemplateWithVar.values.fir.txt @@ -2,9 +2,9 @@ UFile (package = ) [public final class StringTemplateWithVarKt {...] UClass (name = StringTemplateWithVarKt) [public final class StringTemplateWithVarKt {...}] UField (name = bar) [private static final var bar: java.lang.String = "bar"] ULiteralExpression (value = "bar") ["bar"] = "bar" - UField (name = f) [private static final var f: java.lang.String = "foo" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] - UPolyadicExpression (operator = +) ["foo" + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + UField (name = f) [private static final var f: java.lang.String = "foo" + bar] + UPolyadicExpression (operator = +) ["foo" + bar] = Undetermined ULiteralExpression (value = "foo") ["foo"] = "foo" - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + USimpleNameReferenceExpression (identifier = bar) [bar] = Undetermined UMethod (name = getBar) [public static final fun getBar() : java.lang.String = UastEmptyExpression] UMethod (name = getF) [public static final fun getF() : java.lang.String = UastEmptyExpression] diff --git a/plugins/uast-kotlin-fir/testData/legacyValues/TypeReferences.values.fir.txt b/plugins/uast-kotlin-fir/testData/legacyValues/TypeReferences.values.fir.txt index 2b75b85e5c2..b895ce5e40c 100644 --- a/plugins/uast-kotlin-fir/testData/legacyValues/TypeReferences.values.fir.txt +++ b/plugins/uast-kotlin-fir/testData/legacyValues/TypeReferences.values.fir.txt @@ -6,8 +6,8 @@ UFile (package = ) [public final class TypeReferencesKt {...] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] = Undetermined [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] = Undetermined [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] = Undetermined - UReturnExpression [return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Nothing - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] = Undetermined + UReturnExpression [return result] = Nothing + USimpleNameReferenceExpression (identifier = result) [result] = external result() UMethod (name = parameterizedFoo) [public static final fun parameterizedFoo(arg: T) : void {...}] UParameter (name = arg) [var arg: T] UBlockExpression [{...}] = Undetermined diff --git a/plugins/uast-kotlin-fir/testData/type/arrayGetAssignMultiIndex.types.fir.txt b/plugins/uast-kotlin-fir/testData/type/arrayGetAssignMultiIndex.types.fir.txt index a8f427828f2..d484a43625e 100644 --- a/plugins/uast-kotlin-fir/testData/type/arrayGetAssignMultiIndex.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/type/arrayGetAssignMultiIndex.types.fir.txt @@ -21,8 +21,8 @@ UFile (package = ) [public final class ArrayGetAssignMultiIndexKt {...] [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] [!] UnknownKotlinExpression (BINARY_EXPRESSION) [[!] UnknownKotlinExpression (BINARY_EXPRESSION)] [!] UnknownKotlinExpression (BINARY_EXPRESSION) [[!] UnknownKotlinExpression (BINARY_EXPRESSION)] - UReturnExpression [return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)[[!] UnknownKotlinExpression (PREFIX_EXPRESSION), 3]] : PsiType:Void - UArrayAccessExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)[[!] UnknownKotlinExpression (PREFIX_EXPRESSION), 3]] : PsiType:String - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UReturnExpression [return s[[!] UnknownKotlinExpression (PREFIX_EXPRESSION), 3]] : PsiType:Void + UArrayAccessExpression [s[[!] UnknownKotlinExpression (PREFIX_EXPRESSION), 3]] : PsiType:String + USimpleNameReferenceExpression (identifier = s) [s] : PsiType:String[] [!] UnknownKotlinExpression (PREFIX_EXPRESSION) [[!] UnknownKotlinExpression (PREFIX_EXPRESSION)] ULiteralExpression (value = 3) [3] : PsiType:int diff --git a/plugins/uast-kotlin-fir/testData/type/typeCast.types.fir.txt b/plugins/uast-kotlin-fir/testData/type/typeCast.types.fir.txt index fd39e3a617f..40a4ce1eb10 100644 --- a/plugins/uast-kotlin-fir/testData/type/typeCast.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/type/typeCast.types.fir.txt @@ -8,43 +8,43 @@ UFile (package = ) [import java.lang.Runnable...] UParameter (name = x) [var x: java.lang.Object] UParameter (name = isSafe) [var isSafe: boolean] UBlockExpression [{...}] - UReturnExpression [return if ([!] UnknownKotlinExpression (REFERENCE_EXPRESSION)) [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) as java.lang.Runnable else [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) as? java.lang.Runnable] - UIfExpression [if ([!] UnknownKotlinExpression (REFERENCE_EXPRESSION)) [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) as java.lang.Runnable else [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) as? java.lang.Runnable] : PsiType:Runnable - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] - UBinaryExpressionWithType [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION) as java.lang.Runnable] : PsiType:Runnable - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UReturnExpression [return if (isSafe) x as java.lang.Runnable else x as? java.lang.Runnable] + UIfExpression [if (isSafe) x as java.lang.Runnable else x as? java.lang.Runnable] : PsiType:Runnable + USimpleNameReferenceExpression (identifier = isSafe) [isSafe] : PsiType:boolean + UBinaryExpressionWithType [x as java.lang.Runnable] : PsiType:Runnable + USimpleNameReferenceExpression (identifier = x) [x] : PsiType:Object UTypeReferenceExpression (name = java.lang.Runnable) [java.lang.Runnable] - UBinaryExpressionWithType [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION) as? java.lang.Runnable] : PsiType:Runnable - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UBinaryExpressionWithType [x as? java.lang.Runnable] : PsiType:Runnable + USimpleNameReferenceExpression (identifier = x) [x] : PsiType:Object UTypeReferenceExpression (name = java.lang.Runnable) [java.lang.Runnable] UMethod (name = box) [public static final fun box() : java.lang.String {...}] UBlockExpression [{...}] : PsiType:Void [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] - UIfExpression [if ([!] UnknownKotlinExpression (BINARY_EXPRESSION)) return "Fail: " + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:Unit + UIfExpression [if ([!] UnknownKotlinExpression (BINARY_EXPRESSION)) return "Fail: " + x] : PsiType:Unit [!] UnknownKotlinExpression (BINARY_EXPRESSION) [[!] UnknownKotlinExpression (BINARY_EXPRESSION)] - UReturnExpression [return "Fail: " + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:Void - UPolyadicExpression (operator = +) ["Fail: " + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:String + UReturnExpression [return "Fail: " + x] : PsiType:Void + UPolyadicExpression (operator = +) ["Fail: " + x] : PsiType:String ULiteralExpression (value = "Fail: ") ["Fail: "] : PsiType:String - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + USimpleNameReferenceExpression (identifier = x) [x] : PsiType:Object [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] - UIfExpression [if ([!] UnknownKotlinExpression (BINARY_EXPRESSION)) return "Fail: " + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:Unit + UIfExpression [if ([!] UnknownKotlinExpression (BINARY_EXPRESSION)) return "Fail: " + y] : PsiType:Unit [!] UnknownKotlinExpression (BINARY_EXPRESSION) [[!] UnknownKotlinExpression (BINARY_EXPRESSION)] - UReturnExpression [return "Fail: " + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:Void - UPolyadicExpression (operator = +) ["Fail: " + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:String + UReturnExpression [return "Fail: " + y] : PsiType:Void + UPolyadicExpression (operator = +) ["Fail: " + y] : PsiType:String ULiteralExpression (value = "Fail: ") ["Fail: "] : PsiType:String - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + USimpleNameReferenceExpression (identifier = y) [y] : PsiType:Object [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] - UIfExpression [if ([!] UnknownKotlinExpression (BINARY_EXPRESSION)) return "Fail: " + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:Unit + UIfExpression [if ([!] UnknownKotlinExpression (BINARY_EXPRESSION)) return "Fail: " + r] : PsiType:Unit [!] UnknownKotlinExpression (BINARY_EXPRESSION) [[!] UnknownKotlinExpression (BINARY_EXPRESSION)] - UReturnExpression [return "Fail: " + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:Void - UPolyadicExpression (operator = +) ["Fail: " + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:String + UReturnExpression [return "Fail: " + r] : PsiType:Void + UPolyadicExpression (operator = +) ["Fail: " + r] : PsiType:String ULiteralExpression (value = "Fail: ") ["Fail: "] : PsiType:String - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] - UIfExpression [if ([!] UnknownKotlinExpression (BINARY_EXPRESSION)) return "Fail: " + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:Unit + USimpleNameReferenceExpression (identifier = r) [r] : PsiType:Object + UIfExpression [if ([!] UnknownKotlinExpression (BINARY_EXPRESSION)) return "Fail: " + r] : PsiType:Unit [!] UnknownKotlinExpression (BINARY_EXPRESSION) [[!] UnknownKotlinExpression (BINARY_EXPRESSION)] - UReturnExpression [return "Fail: " + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:Void - UPolyadicExpression (operator = +) ["Fail: " + [!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] : PsiType:String + UReturnExpression [return "Fail: " + r] : PsiType:Void + UPolyadicExpression (operator = +) ["Fail: " + r] : PsiType:String ULiteralExpression (value = "Fail: ") ["Fail: "] : PsiType:String - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + USimpleNameReferenceExpression (identifier = r) [r] : PsiType:Object UReturnExpression [return "OK"] : PsiType:Void ULiteralExpression (value = "OK") ["OK"] : PsiType:String 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 e5eb8941f15..b9589861965 100644 --- a/plugins/uast-kotlin-fir/testData/type/typeCheck.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/type/typeCheck.types.fir.txt @@ -3,12 +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 (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)] + UReturnExpression [return if (x !is java.lang.String) x.[!] UnknownKotlinExpression (CALL_EXPRESSION) else x] : PsiType:Void + UIfExpression [if (x !is java.lang.String) x.[!] UnknownKotlinExpression (CALL_EXPRESSION) else x] : PsiType:String + UBinaryExpressionWithType [x !is java.lang.String] : PsiType:boolean + USimpleNameReferenceExpression (identifier = x) [x] : PsiType:NonExistentClass UTypeReferenceExpression (name = java.lang.String) [java.lang.String] - UQualifiedReferenceExpression [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION).[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:String - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UQualifiedReferenceExpression [x.[!] UnknownKotlinExpression (CALL_EXPRESSION)] : PsiType:String + USimpleNameReferenceExpression (identifier = x) [x] : PsiType:NonExistentClass [!] UnknownKotlinExpression (CALL_EXPRESSION) [[!] UnknownKotlinExpression (CALL_EXPRESSION)] - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + USimpleNameReferenceExpression (identifier = x) [x] : PsiType:NonExistentClass diff --git a/plugins/uast-kotlin-fir/testData/type/withGeneric.types.fir.txt b/plugins/uast-kotlin-fir/testData/type/withGeneric.types.fir.txt index 42cb5245fe4..2d7813b0c82 100644 --- a/plugins/uast-kotlin-fir/testData/type/withGeneric.types.fir.txt +++ b/plugins/uast-kotlin-fir/testData/type/withGeneric.types.fir.txt @@ -9,9 +9,9 @@ UFile (package = ) [public final class WithGenericKt {...] UMethod (name = test2) [public static final fun test2() : T {...}] UBlockExpression [{...}] : PsiType:Void [!] UnknownKotlinExpression (PROPERTY) [[!] UnknownKotlinExpression (PROPERTY)] - UReturnExpression [return [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) as T] : PsiType:Void - UBinaryExpressionWithType [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION) as T] : PsiType:T - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UReturnExpression [return a as T] : PsiType:Void + UBinaryExpressionWithType [a as T] : PsiType:T + USimpleNameReferenceExpression (identifier = a) [a] : PsiType:Object UTypeReferenceExpression (name = T) [T] UMethod (name = test3) [public static final fun test3() : T {...}] UBlockExpression [{...}] @@ -22,8 +22,8 @@ UFile (package = ) [public final class WithGenericKt {...] UMethod (name = castToString) [public static final fun castToString(t: T) : void {...}] UParameter (name = t) [var t: T] UBlockExpression [{...}] : PsiType:String - UBinaryExpressionWithType [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION) as java.lang.String] : PsiType:String - [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) [[!] UnknownKotlinExpression (REFERENCE_EXPRESSION)] + UBinaryExpressionWithType [t as java.lang.String] : PsiType:String + USimpleNameReferenceExpression (identifier = t) [t] : PsiType:T UTypeReferenceExpression (name = java.lang.String) [java.lang.String] UMethod (name = box) [public static final fun box() : java.lang.String {...}] UBlockExpression [{...}] : PsiType:Void diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUSimpleReferenceExpression.kt b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUSimpleReferenceExpression.kt index 3c99efbfdb9..5f4c391ff67 100644 --- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUSimpleReferenceExpression.kt +++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUSimpleReferenceExpression.kt @@ -36,18 +36,10 @@ import org.jetbrains.uast.visitor.UastVisitor var PsiElement.destructuringDeclarationInitializer: Boolean? by UserDataProperty(Key.create("kotlin.uast.destructuringDeclarationInitializer")) -open class KotlinUSimpleReferenceExpression( +class KotlinUSimpleReferenceExpression( override val sourcePsi: KtSimpleNameExpression, givenParent: UElement? -) : KotlinAbstractUExpression(givenParent), USimpleNameReferenceExpression, KotlinUElementWithType, KotlinEvaluatableUElement { - private val resolvedDeclaration: PsiElement? by lz { baseResolveProviderService.resolveToDeclaration(sourcePsi) } - - override val identifier get() = sourcePsi.getReferencedName() - - override fun resolve() = resolvedDeclaration - - override val resolvedName: String? - get() = (resolvedDeclaration as? PsiNamedElement)?.name +) : KotlinAbstractUSimpleReferenceExpression(sourcePsi, givenParent) { override fun accept(visitor: UastVisitor) { visitor.visitSimpleNameReferenceExpression(this) @@ -60,8 +52,6 @@ open class KotlinUSimpleReferenceExpression( visitor.afterVisitSimpleNameReferenceExpression(this) } - override val referenceNameElement: UElement? by lz { sourcePsi.getIdentifier()?.toUElement() } - private fun visitAccessorCalls(visitor: UastVisitor) { // Visit Kotlin get-set synthetic Java property calls as function calls val bindingContext = sourcePsi.analyze()