From 6af930f6df0e864ede52c9b13a7abef85c56f963 Mon Sep 17 00:00:00 2001 From: Jinseong Jeon Date: Mon, 17 May 2021 14:59:38 -0700 Subject: [PATCH] FIR UAST: convert LeafPsiElement to UIdentifier --- .../uast/kotlin/internal/converterUtils.kt | 7 + .../uast/kotlin/FirKotlinConverter.kt | 22 +++ .../declarations/FirKotlinUIdentifier.kt | 2 + .../AnnotatedExpressions.identifiers.fir.txt | 30 +++ .../AnnotationComplex.identifiers.fir.txt | 27 +++ .../AnnotationParameters.identifiers.fir.txt | 40 ++++ .../Anonymous.identifiers.fir.txt | 35 ++++ .../Assertion.identifiers.fir.txt | 6 + .../Bitwise.identifiers.fir.txt | 72 ++++++++ .../BrokenMethod.identifiers.fir.txt | 15 ++ .../ClassAnnotation.identifiers.fir.txt | 13 ++ .../ConstructorDelegate.identifiers.fir.txt | 21 +++ .../Constructors.identifiers.fir.txt | 80 ++++++++ .../CycleInTypeParameters.identifiers.fir.txt | 7 + .../DefaultImpls.identifiers.fir.txt | 4 + ...DefaultParameterValues.identifiers.fir.txt | 5 + .../Delegate.identifiers.fir.txt | 16 ++ .../DeprecatedHidden.identifiers.fir.txt | 10 + ...structuringDeclaration.identifiers.fir.txt | 14 ++ .../Elvis.identifiers.fir.txt | 13 ++ .../ElvisType.identifiers.fir.txt | 9 + ...EnumValuesConstructors.identifiers.fir.txt | 7 + .../IfStatement.identifiers.fir.txt | 3 + .../Imports.identifiers.fir.txt | 23 +++ .../legacyIdentifiers/In.identifiers.fir.txt | 11 ++ ...eUnresolvedConstructor.identifiers.fir.txt | 11 ++ .../InnerClasses.identifiers.fir.txt | 13 ++ ...erNonFixedTypeVariable.identifiers.fir.txt | 13 ++ .../LambdaReturn.identifiers.fir.txt | 66 +++++++ .../Lambdas.identifiers.fir.txt | 19 ++ .../LocalDeclarations.identifiers.fir.txt | 14 ++ ...VariableWithAnnotation.identifiers.fir.txt | 4 + .../ManyAlternatives.identifiers.fir.txt | 7 + .../MethodReference.identifiers.fir.txt | 5 + .../NameContainingFile.identifiers.fir.txt | 4 + .../NonTrivialIdentifiers.identifiers.fir.txt | 17 ++ ...PropertyWithAnnotation.identifiers.fir.txt | 19 ++ .../ParametersDisorder.identifiers.fir.txt | 67 +++++++ ...etersWithDefaultValues.identifiers.fir.txt | 9 + .../PropertyAccessors.identifiers.fir.txt | 13 ++ .../PropertyDelegate.identifiers.fir.txt | 9 + .../PropertyInitializer.identifiers.fir.txt | 9 + ...itializerWithoutSetter.identifiers.fir.txt | 3 + .../PropertyReferences.identifiers.fir.txt | 53 ++++++ ...PropertyWithAnnotation.identifiers.fir.txt | 19 ++ ...alifiedConstructorCall.identifiers.fir.txt | 11 ++ .../ReceiverFun.identifiers.fir.txt | 14 ++ .../Reified.identifiers.fir.txt | 23 +++ .../ReifiedParameters.identifiers.fir.txt | 47 +++++ .../ReifiedResolve.identifiers.fir.txt | 31 ++++ .../ReifiedReturnType.identifiers.fir.txt | 171 ++++++++++++++++++ .../Resolve.identifiers.fir.txt | 62 +++++++ .../legacyIdentifiers/SAM.identifiers.fir.txt | 67 +++++++ .../Simple.identifiers.fir.txt | 5 + .../SimpleAnnotated.identifiers.fir.txt | 8 + .../StringTemplate.identifiers.fir.txt | 7 + .../StringTemplateComplex.identifiers.fir.txt | 20 ++ ...mplexForUInjectionHost.identifiers.fir.txt | 20 ++ .../StringTemplateInClass.identifiers.fir.txt | 4 + .../StringTemplateWithVar.identifiers.fir.txt | 3 + .../SuperCalls.identifiers.fir.txt | 50 +++++ .../Suspend.identifiers.fir.txt | 13 ++ .../TryCatch.identifiers.fir.txt | 26 +++ ...thOtherAliasInArgument.identifiers.fir.txt | 23 +++ .../TypeAliases.identifiers.fir.txt | 8 + .../TypeInAnnotation.identifiers.fir.txt | 3 + .../TypeReferences.identifiers.fir.txt | 52 ++++++ ...ctedContainerException.identifiers.fir.txt | 23 +++ .../WhenAndDestructing.identifiers.fir.txt | 11 ++ .../WhenIs.identifiers.fir.txt | 7 + .../WhenStringLiteral.identifiers.fir.txt | 7 + .../ea101715.identifiers.fir.txt | 4 + .../kotlin/FirUastIdentifiersTestBase.kt | 3 + .../AbstractFirLegacyUastIdentifiersTest.kt | 2 +- .../jetbrains/uast/kotlin/KotlinConverter.kt | 6 - 75 files changed, 1590 insertions(+), 7 deletions(-) create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotatedExpressions.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotationComplex.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotationParameters.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/Anonymous.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/Assertion.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/Bitwise.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/BrokenMethod.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/ClassAnnotation.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/ConstructorDelegate.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/Constructors.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/CycleInTypeParameters.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultImpls.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultParameterValues.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/Delegate.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/DeprecatedHidden.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/DestructuringDeclaration.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/Elvis.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/ElvisType.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/EnumValuesConstructors.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/IfStatement.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/Imports.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/In.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/InferenceInsideUnresolvedConstructor.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/InnerClasses.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/InnerNonFixedTypeVariable.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/LambdaReturn.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/Lambdas.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/LocalDeclarations.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/LocalVariableWithAnnotation.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/ManyAlternatives.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/MethodReference.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/NameContainingFile.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/NonTrivialIdentifiers.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParameterPropertyWithAnnotation.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersDisorder.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersWithDefaultValues.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyAccessors.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyDelegate.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyInitializer.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyInitializerWithoutSetter.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyReferences.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyWithAnnotation.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/QualifiedConstructorCall.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReceiverFun.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/Reified.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedParameters.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedResolve.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedReturnType.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/Resolve.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/SAM.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/Simple.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/SimpleAnnotated.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplate.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateComplex.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateComplexForUInjectionHost.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateInClass.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateWithVar.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/SuperCalls.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/Suspend.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/TryCatch.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliasExpansionWithOtherAliasInArgument.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliases.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeInAnnotation.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeReferences.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/UnexpectedContainerException.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenAndDestructing.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenIs.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenStringLiteral.identifiers.fir.txt create mode 100644 plugins/uast-kotlin-fir/testData/legacyIdentifiers/ea101715.identifiers.fir.txt diff --git a/plugins/uast-kotlin-base/src/org/jetbrains/uast/kotlin/internal/converterUtils.kt b/plugins/uast-kotlin-base/src/org/jetbrains/uast/kotlin/internal/converterUtils.kt index 74968fa0c8e..828e7ea2ea4 100644 --- a/plugins/uast-kotlin-base/src/org/jetbrains/uast/kotlin/internal/converterUtils.kt +++ b/plugins/uast-kotlin-base/src/org/jetbrains/uast/kotlin/internal/converterUtils.kt @@ -5,6 +5,7 @@ package org.jetbrains.uast.kotlin +import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.uast.DEFAULT_EXPRESSION_TYPES_LIST import org.jetbrains.uast.DEFAULT_TYPES_LIST import org.jetbrains.uast.UElement @@ -40,3 +41,9 @@ fun Array>.accommodate(vararg makers: UEl inline fun alternative(noinline make: () -> U?) = UElementAlternative(U::class.java, make) class UElementAlternative(val uType: Class, val make: () -> U?) + +val identifiersTokens = setOf( + KtTokens.IDENTIFIER, KtTokens.CONSTRUCTOR_KEYWORD, KtTokens.OBJECT_KEYWORD, + KtTokens.THIS_KEYWORD, KtTokens.SUPER_KEYWORD, + KtTokens.GET_KEYWORD, KtTokens.SET_KEYWORD +) diff --git a/plugins/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/FirKotlinConverter.kt b/plugins/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/FirKotlinConverter.kt index 8b7b1df3ffc..c29bb82b786 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 @@ -6,13 +6,16 @@ package org.jetbrains.uast.kotlin import com.intellij.psi.PsiElement +import com.intellij.psi.impl.source.tree.LeafPsiElement import org.jetbrains.kotlin.asJava.LightClassUtil import org.jetbrains.kotlin.asJava.classes.KtLightClass import org.jetbrains.kotlin.asJava.elements.* import org.jetbrains.kotlin.asJava.findFacadeClass import org.jetbrains.kotlin.asJava.toLightClass import org.jetbrains.kotlin.asJava.toPsiParameters +import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.psi.* +import org.jetbrains.kotlin.psi.psiUtil.getParentOfType import org.jetbrains.kotlin.utils.addToStdlib.safeAs import org.jetbrains.uast.* @@ -192,6 +195,25 @@ internal object FirKotlinConverter { is KtImportDirective -> { el(build(::KotlinUImportStatement)) } + is LeafPsiElement -> { + when { + element.elementType in identifiersTokens -> { + if (element.elementType != KtTokens.OBJECT_KEYWORD || + element.getParentOfType(false)?.nameIdentifier == null + ) + el(build(::FirKotlinUIdentifier)) + else null + } + element.elementType in KtTokens.OPERATIONS && element.parent is KtOperationReferenceExpression -> { + el(build(::FirKotlinUIdentifier)) + } + element.elementType == KtTokens.LBRACKET && element.parent is KtCollectionLiteralExpression -> { + // TODO: need counterpart of UCollectionLiteralExpression + null + } + else -> null + } + } else -> null } } diff --git a/plugins/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/declarations/FirKotlinUIdentifier.kt b/plugins/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/declarations/FirKotlinUIdentifier.kt index 4013e3d1788..74cb9cc70e7 100644 --- a/plugins/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/declarations/FirKotlinUIdentifier.kt +++ b/plugins/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/declarations/FirKotlinUIdentifier.kt @@ -50,4 +50,6 @@ class FirKotlinUIdentifier( } return null } + + constructor(sourcePsi: PsiElement?, uastParent: UElement?) : this(null, sourcePsi, uastParent) } diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotatedExpressions.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotatedExpressions.identifiers.fir.txt new file mode 100644 index 00000000000..85cfc1a851d --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotatedExpressions.identifiers.fir.txt @@ -0,0 +1,30 @@ +foo -> UMethod (name = foo) + Suppress -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + foo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + Suppress -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + a -> [!] UnknownKotlinExpression (PROPERTY) + Suppress -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + 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) + c -> [!] UnknownKotlinExpression (PROPERTY) + Suppress -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + ?: -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + b -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +annotatedSwitch -> UMethod (name = annotatedSwitch) +str -> UParameter (name = str) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Suppress -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +str -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +isBlank -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +str -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +isNotEmpty -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +!= -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotationComplex.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotationComplex.identifiers.fir.txt new file mode 100644 index 00000000000..1500832fcd5 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotationComplex.identifiers.fir.txt @@ -0,0 +1,27 @@ +Annotation -> UClass (name = Annotation) +strings -> UMethod (name = strings) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Annotation -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +A -> UClass (name = A) +AnnotationInner -> UClass (name = AnnotationInner) +value -> UMethod (name = value) +Annotation -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +AnnotationArray -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Annotation -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +B1 -> UClass (name = B1) +AnnotationArray -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +value -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Annotation -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +B2 -> UClass (name = B2) +AnnotationArray -> UClass (name = AnnotationArray) +value -> UMethod (name = value) +Annotation -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +AnnotationArray -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Annotation -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +strings -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +arrayOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +C -> UClass (name = C) +AnnotationArray -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Annotation -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +strings -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +C2 -> UClass (name = C2) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotationParameters.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotationParameters.identifiers.fir.txt new file mode 100644 index 00000000000..e1305031926 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/AnnotationParameters.identifiers.fir.txt @@ -0,0 +1,40 @@ +IntRange -> UClass (name = IntRange) +from -> UMethod (name = from) +Long -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +to -> UMethod (name = to) +Long -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +RequiresPermission -> UClass (name = RequiresPermission) +anyOf -> UMethod (name = anyOf) +IntArray -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +RequiresStrPermission -> UClass (name = RequiresStrPermission) +strs -> UMethod (name = strs) +Array -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +WithDefaultValue -> UClass (name = WithDefaultValue) +value -> UMethod (name = value) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +SuppressLint -> UClass (name = SuppressLint) +value -> UMethod (name = value) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +RequiresPermission -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +anyOf -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +intArrayOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +IntRange -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +from -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +to -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +WithDefaultValue -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +SuppressLint -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +foo -> UMethod (name = foo) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +IntRange -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +SuppressLint -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +bar -> UMethod (name = bar) +Unit -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +RequiresPermission -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +anyOf -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +fooWithArrLiteral -> UMethod (name = fooWithArrLiteral) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +RequiresStrPermission -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +strs -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +fooWithStrArrLiteral -> UMethod (name = fooWithStrArrLiteral) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Anonymous.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Anonymous.identifiers.fir.txt new file mode 100644 index 00000000000..81792c1522d --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Anonymous.identifiers.fir.txt @@ -0,0 +1,35 @@ +java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +io -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Closeable -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +io -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +InputStream -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +foo -> UMethod (name = foo) + runnable -> [!] UnknownKotlinExpression (PROPERTY) + object -> UClass (name = null) + Runnable -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + run -> UMethod (name = run) + runnable -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + run -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + runnable2 -> [!] UnknownKotlinExpression (PROPERTY) + Runnable -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + runnable2 -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + run -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + closeableRunnable -> [!] UnknownKotlinExpression (PROPERTY) + object -> UClass (name = null) + Runnable -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Closeable -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + close -> UMethod (name = close) + run -> UMethod (name = run) + runnableIs -> [!] UnknownKotlinExpression (PROPERTY) + object -> UClass (name = null) + InputStream -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Runnable -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + read -> UMethod (name = read) + Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + run -> UMethod (name = run) +withErr -> UMethod (name = withErr) + runnable -> [!] UnknownKotlinExpression (PROPERTY) + object -> [!] UnknownKotlinExpression (OBJECT_DECLARATION) + Runnable -> null diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Assertion.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Assertion.identifiers.fir.txt new file mode 100644 index 00000000000..a25006bcf0a --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Assertion.identifiers.fir.txt @@ -0,0 +1,6 @@ +foo -> UMethod (name = foo) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + s -> [!] UnknownKotlinExpression (PROPERTY) + String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + s -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + !! -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Bitwise.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Bitwise.identifiers.fir.txt new file mode 100644 index 00000000000..6259c6557b1 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Bitwise.identifiers.fir.txt @@ -0,0 +1,72 @@ +foo -> UMethod (name = foo) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + mask -> [!] UnknownKotlinExpression (PROPERTY) + Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + x -> [!] UnknownKotlinExpression (PROPERTY) + Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + pos -> [!] UnknownKotlinExpression (PROPERTY) + x -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + and -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + mask -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + max -> [!] UnknownKotlinExpression (PROPERTY) + x -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + or -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + mask -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + zebra -> [!] UnknownKotlinExpression (PROPERTY) + x -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + xor -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + mask -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + signed -> [!] UnknownKotlinExpression (PROPERTY) + x -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + shr -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + one -> [!] UnknownKotlinExpression (PROPERTY) + x -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + ushr -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + 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) +bar -> UMethod (name = bar) +Long -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + mask -> [!] UnknownKotlinExpression (PROPERTY) + Long -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + x -> [!] UnknownKotlinExpression (PROPERTY) + Long -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + pos -> [!] UnknownKotlinExpression (PROPERTY) + x -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + and -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + mask -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + max -> [!] UnknownKotlinExpression (PROPERTY) + x -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + or -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + mask -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + zebra -> [!] UnknownKotlinExpression (PROPERTY) + x -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + xor -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + mask -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + signed -> [!] UnknownKotlinExpression (PROPERTY) + x -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + shr -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + one -> [!] UnknownKotlinExpression (PROPERTY) + x -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + ushr -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + 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) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/BrokenMethod.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/BrokenMethod.identifiers.fir.txt new file mode 100644 index 00000000000..23a2d4c73cb --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/BrokenMethod.identifiers.fir.txt @@ -0,0 +1,15 @@ +main -> UMethod (name = main) +args -> UParameter (name = args) +Array -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + TestUsed -> UClass (name = TestUsed) + parameter -> UParameter (name = parameter) + CharSequence -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Used -> UClass (name = Used) + parameter -> UParameter (name = parameter) + Any -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + object -> UClass (name = Companion) + Any -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + doStuff1 -> UMethod (name = doStuff1) + Used -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + this -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ClassAnnotation.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ClassAnnotation.identifiers.fir.txt new file mode 100644 index 00000000000..c1830ef2420 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ClassAnnotation.identifiers.fir.txt @@ -0,0 +1,13 @@ +Test -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +A -> UClass (name = A) +MyAnnotation -> UClass (name = MyAnnotation) +text -> UMethod (name = text) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +MyAnnotation -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +B -> UClass (name = B) +MyAnnotation -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +InB -> UClass (name = InB) +MyAnnotation -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +object -> UClass (name = Companion) +MyAnnotation -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Obj -> UClass (name = Obj) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ConstructorDelegate.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ConstructorDelegate.identifiers.fir.txt new file mode 100644 index 00000000000..4ee4aa3d184 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ConstructorDelegate.identifiers.fir.txt @@ -0,0 +1,21 @@ +Base -> UClass (name = Base) +print -> UMethod (name = print) +BaseImpl -> UClass (name = BaseImpl) +x -> UParameter (name = x) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Base -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +print -> UMethod (name = print) + print -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + x -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Derived -> UClass (name = Derived) +b -> UParameter (name = b) +Base -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Base -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +createBase -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +CharSequence -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +createBase -> UMethod (name = createBase) +i -> UParameter (name = i) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Base -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + BaseImpl -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + i -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Constructors.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Constructors.identifiers.fir.txt new file mode 100644 index 00000000000..c35288f631e --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Constructors.identifiers.fir.txt @@ -0,0 +1,80 @@ +A -> UClass (name = A) +str -> UParameter (name = str) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +constructor -> UMethod (name = A) +i -> UParameter (name = i) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +this -> [!] UnknownKotlinExpression (CONSTRUCTOR_DELEGATION_REFERENCE) +i -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +toString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +AWithInit -> UClass (name = AWithInit) +str -> UParameter (name = str) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +constructor -> UMethod (name = AWithInit) +i -> UParameter (name = i) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +this -> [!] UnknownKotlinExpression (CONSTRUCTOR_DELEGATION_REFERENCE) +i -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +toString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +AWith2Init -> UClass (name = AWith2Init) +str -> UParameter (name = str) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +constructor -> UMethod (name = AWith2Init) +i -> UParameter (name = i) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +this -> [!] UnknownKotlinExpression (CONSTRUCTOR_DELEGATION_REFERENCE) +i -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +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) +constructor -> UMethod (name = AWithSecondary) +i -> UParameter (name = i) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + = -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + i -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + 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) +AWithSecondaryInit -> UClass (name = AWithSecondaryInit) +a -> UField (name = a) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + 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) + 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) + local -> [!] UnknownKotlinExpression (PROPERTY) + String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + s -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + local -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + toString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +AWithFieldInit -> UClass (name = AWithFieldInit) +i -> UParameter (name = i) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +a -> UField (name = a) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + = -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + i -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + toString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/CycleInTypeParameters.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/CycleInTypeParameters.identifiers.fir.txt new file mode 100644 index 00000000000..65a3e7bee41 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/CycleInTypeParameters.identifiers.fir.txt @@ -0,0 +1,7 @@ +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/DefaultImpls.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultImpls.identifiers.fir.txt new file mode 100644 index 00000000000..261d7b0c074 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultImpls.identifiers.fir.txt @@ -0,0 +1,4 @@ +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/DefaultParameterValues.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultParameterValues.identifiers.fir.txt new file mode 100644 index 00000000000..10a2bd44bb4 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DefaultParameterValues.identifiers.fir.txt @@ -0,0 +1,5 @@ +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/Delegate.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Delegate.identifiers.fir.txt new file mode 100644 index 00000000000..a9a6c971478 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Delegate.identifiers.fir.txt @@ -0,0 +1,16 @@ +MyColor -> UClass (name = MyColor) +x -> UParameter (name = x) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +y -> UParameter (name = y) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +z -> UParameter (name = z) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Some -> UClass (name = Some) +delegate -> UMethod (name = getDelegate) +lazy -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + MyColor -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +lambda -> UField (name = lambda) +lazy -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + MyColor -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +nonLazy -> UField (name = nonLazy) +MyColor -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DeprecatedHidden.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DeprecatedHidden.identifiers.fir.txt new file mode 100644 index 00000000000..26335ed7933 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DeprecatedHidden.identifiers.fir.txt @@ -0,0 +1,10 @@ +test -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +pkg -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +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) +test2 -> [!] UnknownKotlinExpression (FUN) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DestructuringDeclaration.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DestructuringDeclaration.identifiers.fir.txt new file mode 100644 index 00000000000..24e03f8a5c9 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/DestructuringDeclaration.identifiers.fir.txt @@ -0,0 +1,14 @@ +foo -> UMethod (name = foo) +data -> UParameter (name = data) +Any -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + a -> [!] UnknownKotlinExpression (DESTRUCTURING_DECLARATION_ENTRY) + b -> [!] UnknownKotlinExpression (DESTRUCTURING_DECLARATION_ENTRY) + to -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + Suppress -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + 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) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Elvis.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Elvis.identifiers.fir.txt new file mode 100644 index 00000000000..a2a60c3256b --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Elvis.identifiers.fir.txt @@ -0,0 +1,13 @@ +foo -> UMethod (name = foo) +bar -> UParameter (name = bar) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +bar -> UMethod (name = bar) +baz -> UMethod (name = baz) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + foo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + ?: -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + foo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + ?: -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + bar -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + toString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ElvisType.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ElvisType.identifiers.fir.txt new file mode 100644 index 00000000000..cc73f438a1d --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ElvisType.identifiers.fir.txt @@ -0,0 +1,9 @@ +foo -> UMethod (name = foo) +text -> UParameter (name = text) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +bar -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +text -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +?: -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) +bar -> UMethod (name = bar) +o -> UParameter (name = o) +Any -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/EnumValuesConstructors.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/EnumValuesConstructors.identifiers.fir.txt new file mode 100644 index 00000000000..9773dd23127 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/EnumValuesConstructors.identifiers.fir.txt @@ -0,0 +1,7 @@ +Style -> UClass (name = Style) +value -> UParameter (name = value) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +SYSTEM -> [!] UnknownKotlinExpression (ENUM_ENTRY) +USER -> [!] UnknownKotlinExpression (ENUM_ENTRY) +INTERNAL -> [!] UnknownKotlinExpression (ENUM_ENTRY) +UNKNOWN -> [!] UnknownKotlinExpression (ENUM_ENTRY) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/IfStatement.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/IfStatement.identifiers.fir.txt new file mode 100644 index 00000000000..28cc36e199a --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/IfStatement.identifiers.fir.txt @@ -0,0 +1,3 @@ +foo -> UMethod (name = foo) + x -> [!] UnknownKotlinExpression (PROPERTY) + != -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Imports.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Imports.identifiers.fir.txt new file mode 100644 index 00000000000..1bd382b79c9 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Imports.identifiers.fir.txt @@ -0,0 +1,23 @@ +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/In.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/In.identifiers.fir.txt new file mode 100644 index 00000000000..bc1965b00f9 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/In.identifiers.fir.txt @@ -0,0 +1,11 @@ +foo -> UMethod (name = foo) +Boolean -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + 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) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InferenceInsideUnresolvedConstructor.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InferenceInsideUnresolvedConstructor.identifiers.fir.txt new file mode 100644 index 00000000000..e7bba36c2f1 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InferenceInsideUnresolvedConstructor.identifiers.fir.txt @@ -0,0 +1,11 @@ +bar -> [!] UnknownKotlinExpression (PROPERTY) +Any -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +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) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InnerClasses.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InnerClasses.identifiers.fir.txt new file mode 100644 index 00000000000..7cd411e0b7e --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InnerClasses.identifiers.fir.txt @@ -0,0 +1,13 @@ +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/InnerNonFixedTypeVariable.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InnerNonFixedTypeVariable.identifiers.fir.txt new file mode 100644 index 00000000000..dabc981a943 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/InnerNonFixedTypeVariable.identifiers.fir.txt @@ -0,0 +1,13 @@ +Some -> UClass (name = Some) +T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +Some -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +test -> UMethod (name = test) +list -> UParameter (name = list) +List -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Any -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + list -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + filterIsInstance -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + Some -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + mapTo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + mutableSetOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LambdaReturn.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LambdaReturn.identifiers.fir.txt new file mode 100644 index 00000000000..1fed04fc603 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LambdaReturn.identifiers.fir.txt @@ -0,0 +1,66 @@ +org -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +jetbrains -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +uast -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +kotlin -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +foo -> UMethod (name = foo) + lam1 -> [!] UnknownKotlinExpression (PROPERTY) + a -> [!] UnknownKotlinExpression (VALUE_PARAMETER) + Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + b -> [!] UnknownKotlinExpression (PROPERTY) + a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + + -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + b -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + lam2 -> [!] UnknownKotlinExpression (PROPERTY) + a -> [!] UnknownKotlinExpression (VALUE_PARAMETER) + Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + 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) + lam3 -> [!] UnknownKotlinExpression (PROPERTY) + lbd -> [!] UnknownKotlinExpression (LABEL) + a -> [!] UnknownKotlinExpression (VALUE_PARAMETER) + Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + d -> [!] UnknownKotlinExpression (PROPERTY) + lbd -> [!] UnknownKotlinExpression (LABEL) + a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + + -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + d -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + 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) + lam5 -> [!] UnknownKotlinExpression (PROPERTY) + a -> [!] UnknownKotlinExpression (VALUE_PARAMETER) + Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + + -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + bar -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + it -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + > -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + b -> [!] UnknownKotlinExpression (PROPERTY) + it -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + + -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + b -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + x -> [!] UnknownKotlinExpression (PROPERTY) + Unit -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + a -> [!] UnknownKotlinExpression (DESTRUCTURING_DECLARATION_ENTRY) + b -> [!] UnknownKotlinExpression (DESTRUCTURING_DECLARATION_ENTRY) + listOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + y -> [!] UnknownKotlinExpression (PROPERTY) + Unit -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + listOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +bar -> [!] UnknownKotlinExpression (FUN) +lmbd -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + lmbd -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Lambdas.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Lambdas.identifiers.fir.txt new file mode 100644 index 00000000000..93827b8f775 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Lambdas.identifiers.fir.txt @@ -0,0 +1,19 @@ +java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +util -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +stream -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Stream -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +foo -> UMethod (name = foo) + Stream -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + empty -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + filter -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + it -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + isEmpty -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +doSelectItem -> UMethod (name = doSelectItem) +selectItemFunction -> UParameter (name = selectItemFunction) +Unit -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + selectItemFunction -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + baz -> [!] UnknownKotlinExpression (PROPERTY) + Local -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + baz -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +lambdaInPlaceCall -> UMethod (name = lambdaInPlaceCall) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LocalDeclarations.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LocalDeclarations.identifiers.fir.txt new file mode 100644 index 00000000000..1c102589f3f --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LocalDeclarations.identifiers.fir.txt @@ -0,0 +1,14 @@ +foo -> UMethod (name = foo) +Boolean -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Local -> UClass (name = Local) + bar -> [!] UnknownKotlinExpression (FUN) + Local -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + baz -> [!] UnknownKotlinExpression (PROPERTY) + Local -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + someLocalFun -> [!] UnknownKotlinExpression (FUN) + text -> [!] UnknownKotlinExpression (VALUE_PARAMETER) + String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + bar -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + == -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + Local -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LocalVariableWithAnnotation.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LocalVariableWithAnnotation.identifiers.fir.txt new file mode 100644 index 00000000000..b7978e2872d --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/LocalVariableWithAnnotation.identifiers.fir.txt @@ -0,0 +1,4 @@ +TestAnnotation -> UClass (name = TestAnnotation) +foo -> UMethod (name = foo) + TestAnnotation -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + bar -> [!] UnknownKotlinExpression (PROPERTY) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ManyAlternatives.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ManyAlternatives.identifiers.fir.txt new file mode 100644 index 00000000000..85205210d22 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ManyAlternatives.identifiers.fir.txt @@ -0,0 +1,7 @@ +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/MethodReference.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/MethodReference.identifiers.fir.txt new file mode 100644 index 00000000000..e129a586467 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/MethodReference.identifiers.fir.txt @@ -0,0 +1,5 @@ +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/NameContainingFile.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/NameContainingFile.identifiers.fir.txt new file mode 100644 index 00000000000..43db1cf25c6 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/NameContainingFile.identifiers.fir.txt @@ -0,0 +1,4 @@ +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/NonTrivialIdentifiers.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/NonTrivialIdentifiers.identifiers.fir.txt new file mode 100644 index 00000000000..157dee615a7 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/NonTrivialIdentifiers.identifiers.fir.txt @@ -0,0 +1,17 @@ +A -> UClass (name = A) +invoke -> UMethod (name = invoke) + this -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +invoke -> UMethod (name = invoke) +f -> UParameter (name = f) +Unit -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +main -> UMethod (name = main) +a -> UParameter (name = a) +A -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + !! -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + p -> [!] UnknownKotlinExpression (PROPERTY) + A -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + !! -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + p -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + A -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParameterPropertyWithAnnotation.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParameterPropertyWithAnnotation.identifiers.fir.txt new file mode 100644 index 00000000000..19a68174c09 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParameterPropertyWithAnnotation.identifiers.fir.txt @@ -0,0 +1,19 @@ +MyAnnotation -> UClass (name = MyAnnotation) +MyAnnotation2 -> UClass (name = MyAnnotation2) +MyAnnotation3 -> UClass (name = MyAnnotation3) +MyAnnotation4 -> UClass (name = MyAnnotation4) +MyAnnotation5 -> UClass (name = MyAnnotation5) +Test1 -> UClass (name = Test1) +MyAnnotation -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +bar -> UParameter (name = bar) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Test2 -> UClass (name = Test2) +get -> null +MyAnnotation -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +set -> null +MyAnnotation2 -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +MyAnnotation3 -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +MyAnnotation4 -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +MyAnnotation5 -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +bar -> UParameter (name = bar) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersDisorder.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersDisorder.identifiers.fir.txt new file mode 100644 index 00000000000..eda750044d9 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersDisorder.identifiers.fir.txt @@ -0,0 +1,67 @@ +global -> UMethod (name = global) +a -> UParameter (name = a) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +b -> UParameter (name = b) +Float -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +withDefault -> UMethod (name = withDefault) +c -> UParameter (name = c) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +d -> UParameter (name = d) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +withReceiver -> UMethod (name = withReceiver) +a -> UParameter (name = a) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +b -> UParameter (name = b) +Float -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +call -> UMethod (name = call) + global -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + b -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + withDefault -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + d -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + withReceiver -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + Math -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + atan2 -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + unresolvedMethod -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + lang -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + format -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + lang -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + format -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + arrayOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + lang -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + format -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + arrayOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + arrayOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + lang -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + format -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + chunked -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + toTypedArray -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + with -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + A -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + with2Receivers -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +A -> UClass (name = A) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +with2Receivers -> UMethod (name = with2Receivers) +a -> UParameter (name = a) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +b -> UParameter (name = b) +Float -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Parent -> UClass (name = Parent) +a -> UParameter (name = a) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +b -> UParameter (name = b) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +objectLiteral -> UMethod (name = objectLiteral) + object -> UClass (name = null) + Parent -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + b -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersWithDefaultValues.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersWithDefaultValues.identifiers.fir.txt new file mode 100644 index 00000000000..4dc9b39c541 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ParametersWithDefaultValues.identifiers.fir.txt @@ -0,0 +1,9 @@ +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/PropertyAccessors.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyAccessors.identifiers.fir.txt new file mode 100644 index 00000000000..3cc06029b58 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyAccessors.identifiers.fir.txt @@ -0,0 +1,13 @@ +PropertyTest -> UClass (name = PropertyTest) +stringRepresentation -> [!] UnknownKotlinExpression (PROPERTY) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +get -> [!] UnknownKotlinExpression (PROPERTY_ACCESSOR) +this -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +toString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +set -> [!] UnknownKotlinExpression (PROPERTY_ACCESSOR) +value -> [!] UnknownKotlinExpression (VALUE_PARAMETER) + setDataFromString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + value -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +setDataFromString -> UMethod (name = setDataFromString) +data -> UParameter (name = data) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyDelegate.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyDelegate.identifiers.fir.txt new file mode 100644 index 00000000000..301b1281513 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyDelegate.identifiers.fir.txt @@ -0,0 +1,9 @@ +sdCardPath -> UMethod (name = getSdCardPath) +lazy -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +localPropertyTest -> UMethod (name = localPropertyTest) + sdCardPathLocal -> [!] UnknownKotlinExpression (PROPERTY) + lazy -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +Suppress -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +annotatedDelegate -> UMethod (name = getAnnotatedDelegate) +lazy -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + + -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyInitializer.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyInitializer.identifiers.fir.txt new file mode 100644 index 00000000000..08feaf267e1 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyInitializer.identifiers.fir.txt @@ -0,0 +1,9 @@ +TestPropertyInitializer -> UClass (name = TestPropertyInitializer) +withSetter -> [!] UnknownKotlinExpression (PROPERTY) +get -> [!] UnknownKotlinExpression (PROPERTY_ACCESSOR) +field -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +set -> [!] UnknownKotlinExpression (PROPERTY_ACCESSOR) +p -> [!] UnknownKotlinExpression (VALUE_PARAMETER) + field -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + = -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + p -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyInitializerWithoutSetter.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyInitializerWithoutSetter.identifiers.fir.txt new file mode 100644 index 00000000000..17a6b85d052 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyInitializerWithoutSetter.identifiers.fir.txt @@ -0,0 +1,3 @@ +withoutSetter -> UField (name = withoutSetter) +get -> [!] UnknownKotlinExpression (PROPERTY_ACCESSOR) +field -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyReferences.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyReferences.identifiers.fir.txt new file mode 100644 index 00000000000..eeea8977c02 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyReferences.identifiers.fir.txt @@ -0,0 +1,53 @@ +A -> UClass (name = A) +init -> UParameter (name = init) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +privateProp -> UField (name = privateProp) +mutableProp -> UField (name = mutableProp) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + mutableProp -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + = -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + init -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +add -> UMethod (name = add) +x -> UParameter (name = x) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + result -> [!] UnknownKotlinExpression (PROPERTY) + privateProp -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + privateProp -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + = -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + x -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + privateProp -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +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) +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) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyWithAnnotation.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyWithAnnotation.identifiers.fir.txt new file mode 100644 index 00000000000..5229081030e --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/PropertyWithAnnotation.identifiers.fir.txt @@ -0,0 +1,19 @@ +TestAnnotation -> UClass (name = TestAnnotation) +TestAnnotation -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +prop1 -> UField (name = prop1) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +get -> null +TestAnnotation -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +prop2 -> [!] UnknownKotlinExpression (PROPERTY) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +get -> [!] UnknownKotlinExpression (PROPERTY_ACCESSOR) +set -> null +TestAnnotation -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +prop3 -> [!] UnknownKotlinExpression (PROPERTY) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +get -> [!] UnknownKotlinExpression (PROPERTY_ACCESSOR) +set -> [!] UnknownKotlinExpression (PROPERTY_ACCESSOR) +value -> [!] UnknownKotlinExpression (VALUE_PARAMETER) + field -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + = -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + value -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/QualifiedConstructorCall.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/QualifiedConstructorCall.identifiers.fir.txt new file mode 100644 index 00000000000..480ba6e6716 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/QualifiedConstructorCall.identifiers.fir.txt @@ -0,0 +1,11 @@ +A -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +B -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +C -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +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 -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReceiverFun.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReceiverFun.identifiers.fir.txt new file mode 100644 index 00000000000..24653b199cc --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReceiverFun.identifiers.fir.txt @@ -0,0 +1,14 @@ +MyReceiverAnnotation -> UClass (name = MyReceiverAnnotation) +name -> UMethod (name = name) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +MyReceiverAnnotation -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +foo -> UMethod (name = foo) +this -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +length -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +MyReceiverAnnotation -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +rx -> [!] UnknownKotlinExpression (PROPERTY) +Regex -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +get -> [!] UnknownKotlinExpression (PROPERTY_ACCESSOR) + toRegex -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Reified.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Reified.identifiers.fir.txt new file mode 100644 index 00000000000..c39649beba8 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Reified.identifiers.fir.txt @@ -0,0 +1,23 @@ +test -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +pkg -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Context -> UClass (name = Context) +T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +ownSystemService1 -> [!] UnknownKotlinExpression (FUN) +getSystemService -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +ownSystemService2 -> [!] UnknownKotlinExpression (FUN) +getSystemService -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +Context -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +systemService1 -> [!] UnknownKotlinExpression (FUN) +getSystemService -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Context -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +systemService2 -> [!] UnknownKotlinExpression (FUN) +getSystemService -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedParameters.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedParameters.identifiers.fir.txt new file mode 100644 index 00000000000..7b994d71f8a --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedParameters.identifiers.fir.txt @@ -0,0 +1,47 @@ +T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +functionWithLambda -> [!] UnknownKotlinExpression (FUN) +t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +process -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +process -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +t -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +functionWithVararg -> [!] UnknownKotlinExpression (FUN) +i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +t -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +functionWithReceiver -> [!] UnknownKotlinExpression (FUN) +i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +this -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +`name with spaces` -> [!] UnknownKotlinExpression (FUN) +i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +this -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +functionWithParamAnnotation -> [!] UnknownKotlinExpression (FUN) +Suppress -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +t -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +functionUnresolved -> [!] UnknownKotlinExpression (FUN) +Suppress -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +Unresolved -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +t -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedResolve.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedResolve.identifiers.fir.txt new file mode 100644 index 00000000000..f4a6ae7ba58 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedResolve.identifiers.fir.txt @@ -0,0 +1,31 @@ +T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +Any -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +foo -> [!] UnknownKotlinExpression (FUN) +init -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Unit -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + TODO -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +Any -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +bar -> [!] UnknownKotlinExpression (FUN) +init -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Unit -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + TODO -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +resolve -> UMethod (name = resolve) + foo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + x -> [!] UnknownKotlinExpression (PROPERTY) + String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + foo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + bar -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + y -> [!] UnknownKotlinExpression (PROPERTY) + String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + bar -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + z -> [!] UnknownKotlinExpression (PROPERTY) + listOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + filterIsInstance -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedReturnType.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedReturnType.identifiers.fir.txt new file mode 100644 index 00000000000..7173437328d --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ReifiedReturnType.identifiers.fir.txt @@ -0,0 +1,171 @@ +T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +function1 -> [!] UnknownKotlinExpression (FUN) +t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +s -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +function2 -> [!] UnknownKotlinExpression (FUN) +t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +s -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +t -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +CharSequence -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +function2CharSequence -> [!] UnknownKotlinExpression (FUN) +t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +s -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +t -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +function3 -> [!] UnknownKotlinExpression (FUN) +t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +s -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +function4 -> [!] UnknownKotlinExpression (FUN) +t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +s -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +t -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +function5 -> [!] UnknownKotlinExpression (FUN) +t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +s -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +Activity -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +function6 -> [!] UnknownKotlinExpression (FUN) +t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +s -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +t -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +function7 -> [!] UnknownKotlinExpression (FUN) +t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +s -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +t -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +function8 -> [!] UnknownKotlinExpression (FUN) +t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +s -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +t -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +function9 -> [!] UnknownKotlinExpression (FUN) +t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +s -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +t -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +function10 -> [!] UnknownKotlinExpression (FUN) +t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +s -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +t -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +function11 -> [!] UnknownKotlinExpression (FUN) +t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +s -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +t -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +CharSequence -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +function11CharSequence -> [!] UnknownKotlinExpression (FUN) +t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +s -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +t -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +CharSequence -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +B -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +function12CharSequence -> [!] UnknownKotlinExpression (FUN) +t -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +B -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +i -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +s -> [!] UnknownKotlinExpression (VALUE_PARAMETER) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +B -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +t -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +B -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +copyWhenGreater -> UMethod (name = copyWhenGreater) +list -> UParameter (name = list) +List -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +threshold -> UParameter (name = threshold) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +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) +Foo -> UClass (name = Foo) +T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +Z -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +foo -> [!] UnknownKotlinExpression (FUN) +Z -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + TODO -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Resolve.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Resolve.identifiers.fir.txt new file mode 100644 index 00000000000..f2324f3dbff --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Resolve.identifiers.fir.txt @@ -0,0 +1,62 @@ +A -> UClass (name = A) +foo -> UMethod (name = foo) +inlineFoo -> [!] UnknownKotlinExpression (FUN) +bar -> UMethod (name = bar) + A -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + foo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + A -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + inlineFoo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + listOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + A -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + forEach -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + it -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + listOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + joinToString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + listOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + size -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + listOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + indices -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + date -> [!] UnknownKotlinExpression (PROPERTY) + java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + util -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Date -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + util -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Date -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + date -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + time -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + = -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + listOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + last -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + mutableMapOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + to -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + entries -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + first -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + setValue -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + intRange -> [!] UnknownKotlinExpression (PROPERTY) + .. -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + intRange -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + contains -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + as -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + IntRange -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +A -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +barT -> UMethod (name = barT) +t -> UParameter (name = t) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + t -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + foo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +List -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +A -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +barTL -> UMethod (name = barTL) +listT -> UParameter (name = listT) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + listT -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + isEmpty -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + a -> [!] UnknownKotlinExpression (VALUE_PARAMETER) + listT -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + foo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SAM.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SAM.identifiers.fir.txt new file mode 100644 index 00000000000..3c2d07c2a99 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SAM.identifiers.fir.txt @@ -0,0 +1,67 @@ +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) +notSam -> UField (name = notSam) +foo -> UField (name = foo) +java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +lang -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Runnable -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +bar -> UMethod (name = bar) +java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +lang -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Runnable -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + foo -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + = -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + a -> [!] UnknownKotlinExpression (PROPERTY) + as -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + lang -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + Runnable -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + runRunnable -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +baz -> UField (name = baz) +java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +lang -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Runnable -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +runRunnable -> UMethod (name = runRunnable) +r -> UParameter (name = r) +java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +lang -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Runnable -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +r -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +test1 -> UMethod (name = test1) + thread1 -> [!] UnknownKotlinExpression (PROPERTY) + Thread -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +test2 -> UMethod (name = test2) + thread2 -> [!] UnknownKotlinExpression (PROPERTY) + Thread -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + Runnable -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +test3 -> UMethod (name = test3) + ambiguousSamAcceptor -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + Supplier -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + ambiguousSamAcceptor -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + Callable -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +ambiguousSamAcceptor -> UMethod (name = ambiguousSamAcceptor) +s -> UParameter (name = s) +Supplier -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +TODO -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +ambiguousSamAcceptor -> UMethod (name = ambiguousSamAcceptor) +s -> UParameter (name = s) +Callable -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +TODO -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Simple.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Simple.identifiers.fir.txt new file mode 100644 index 00000000000..f3a8634d973 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Simple.identifiers.fir.txt @@ -0,0 +1,5 @@ +Simple -> UClass (name = Simple) +method -> UMethod (name = method) + println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +property -> UField (name = property) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SimpleAnnotated.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SimpleAnnotated.identifiers.fir.txt new file mode 100644 index 00000000000..e96e331efd9 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SimpleAnnotated.identifiers.fir.txt @@ -0,0 +1,8 @@ +SimpleAnnotated -> UClass (name = SimpleAnnotated) +Suppress -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +method -> UMethod (name = method) + println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +kotlin -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +SinceKotlin -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +property -> UField (name = property) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplate.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplate.identifiers.fir.txt new file mode 100644 index 00000000000..55ff759d9c3 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplate.identifiers.fir.txt @@ -0,0 +1,7 @@ +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/StringTemplateComplex.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateComplex.identifiers.fir.txt new file mode 100644 index 00000000000..ca004dda2c8 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateComplex.identifiers.fir.txt @@ -0,0 +1,20 @@ +muchRecur -> UField (name = muchRecur) +case4 -> UField (name = case4) +case5 -> UField (name = case5) +literalInLiteral -> UField (name = literalInLiteral) +case4 -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +literalInLiteral2 -> UField (name = literalInLiteral2) +case4 -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +repeat -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +empty -> UField (name = empty) +simpleForTemplate -> UMethod (name = simpleForTemplate) +i -> UParameter (name = i) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +i -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +foo -> UMethod (name = foo) + println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + baz -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + template1 -> [!] UnknownKotlinExpression (PROPERTY) + simpleForTemplate -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + template2 -> [!] UnknownKotlinExpression (PROPERTY) + simpleForTemplate -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateComplexForUInjectionHost.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateComplexForUInjectionHost.identifiers.fir.txt new file mode 100644 index 00000000000..ca004dda2c8 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateComplexForUInjectionHost.identifiers.fir.txt @@ -0,0 +1,20 @@ +muchRecur -> UField (name = muchRecur) +case4 -> UField (name = case4) +case5 -> UField (name = case5) +literalInLiteral -> UField (name = literalInLiteral) +case4 -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +literalInLiteral2 -> UField (name = literalInLiteral2) +case4 -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +repeat -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +empty -> UField (name = empty) +simpleForTemplate -> UMethod (name = simpleForTemplate) +i -> UParameter (name = i) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +i -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +foo -> UMethod (name = foo) + println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + baz -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + template1 -> [!] UnknownKotlinExpression (PROPERTY) + simpleForTemplate -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + template2 -> [!] UnknownKotlinExpression (PROPERTY) + simpleForTemplate -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateInClass.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateInClass.identifiers.fir.txt new file mode 100644 index 00000000000..88f16901f7c --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateInClass.identifiers.fir.txt @@ -0,0 +1,4 @@ +Demo -> UClass (name = Demo) +foo -> UField (name = foo) +X -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +bar -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateWithVar.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateWithVar.identifiers.fir.txt new file mode 100644 index 00000000000..ca3cd008fd9 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/StringTemplateWithVar.identifiers.fir.txt @@ -0,0 +1,3 @@ +bar -> UField (name = bar) +f -> UField (name = f) +bar -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SuperCalls.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SuperCalls.identifiers.fir.txt new file mode 100644 index 00000000000..bf1abc8d169 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/SuperCalls.identifiers.fir.txt @@ -0,0 +1,50 @@ +A -> UClass (name = A) +str -> UParameter (name = str) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +constructor -> UMethod (name = A) +i -> UParameter (name = i) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +this -> [!] UnknownKotlinExpression (CONSTRUCTOR_DELEGATION_REFERENCE) +i -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +toString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +foo -> UMethod (name = foo) +a -> UParameter (name = a) +Long -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +B -> UClass (name = B) +param -> UParameter (name = param) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +A -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +param -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +C -> UClass (name = C) +A -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +constructor -> UMethod (name = C) +p -> UParameter (name = p) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +super -> [!] UnknownKotlinExpression (CONSTRUCTOR_DELEGATION_REFERENCE) +p -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +constructor -> UMethod (name = C) +i -> UParameter (name = i) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +super -> [!] UnknownKotlinExpression (CONSTRUCTOR_DELEGATION_REFERENCE) +i -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + println -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +foo -> UMethod (name = foo) +a -> UParameter (name = a) +Long -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + super -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + foo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +O -> UClass (name = O) +A -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +anon -> UField (name = anon) +object -> UClass (name = null) +A -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +bar -> UMethod (name = bar) + cons -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + object -> UClass (name = null) + A -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +InnerClass -> UClass (name = InnerClass) +A -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +cons -> UMethod (name = cons) +a -> UParameter (name = a) +A -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Suspend.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Suspend.identifiers.fir.txt new file mode 100644 index 00000000000..92279e184e6 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/Suspend.identifiers.fir.txt @@ -0,0 +1,13 @@ +test -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +pkg -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Context -> UClass (name = Context) +inner -> UMethod (name = inner) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +suspendPrivate -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +suspendPrivate -> UMethod (name = suspendPrivate) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +inner -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +top -> UMethod (name = top) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Context -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +inner -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TryCatch.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TryCatch.identifiers.fir.txt new file mode 100644 index 00000000000..efc08f6557d --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TryCatch.identifiers.fir.txt @@ -0,0 +1,26 @@ +TryCatch -> UClass (name = TryCatch) +catches -> UMethod (name = catches) + body -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + e -> [!] UnknownKotlinExpression (VALUE_PARAMETER) + Throwable -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + 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) +catches -> UMethod (name = catches) + body -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + lang -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + SuppressWarnings -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + e -> [!] UnknownKotlinExpression (VALUE_PARAMETER) + Throwable -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + catcher -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + finalizer -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +body -> UMethod (name = body) +catcher -> UMethod (name = catcher) +finalizer -> UMethod (name = finalizer) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliasExpansionWithOtherAliasInArgument.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliasExpansionWithOtherAliasInArgument.identifiers.fir.txt new file mode 100644 index 00000000000..b1eddcce8ab --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliasExpansionWithOtherAliasInArgument.identifiers.fir.txt @@ -0,0 +1,23 @@ +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/TypeAliases.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliases.identifiers.fir.txt new file mode 100644 index 00000000000..ad5cdf83896 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeAliases.identifiers.fir.txt @@ -0,0 +1,8 @@ +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/TypeInAnnotation.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeInAnnotation.identifiers.fir.txt new file mode 100644 index 00000000000..1e97b4fb0a8 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeInAnnotation.identifiers.fir.txt @@ -0,0 +1,3 @@ +C -> UClass (name = C) +Test -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +foo -> UMethod (name = foo) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeReferences.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeReferences.identifiers.fir.txt new file mode 100644 index 00000000000..2fade3022fb --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/TypeReferences.identifiers.fir.txt @@ -0,0 +1,52 @@ +foo -> UMethod (name = foo) +parameter -> UParameter (name = parameter) +Int -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + varWithType -> [!] UnknownKotlinExpression (PROPERTY) + String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + varWithoutType -> [!] UnknownKotlinExpression (PROPERTY) + result -> [!] UnknownKotlinExpression (PROPERTY) + varWithType -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + + -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + varWithoutType -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + result -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +ListOfLists -> [!] UnknownKotlinExpression (TYPEALIAS) +List -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +List -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +parameterizedFoo -> UMethod (name = parameterizedFoo) +arg -> UParameter (name = arg) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + a -> [!] UnknownKotlinExpression (PROPERTY) + arg -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + at -> [!] UnknownKotlinExpression (PROPERTY) + T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + arg -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + ?: -> [!] UnknownKotlinExpression (OPERATION_REFERENCE) + tl -> [!] UnknownKotlinExpression (PROPERTY) + List -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + listOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + at -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + tsl -> [!] UnknownKotlinExpression (PROPERTY) + List -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + tl -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + map -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + it -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + toString -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + lls -> [!] UnknownKotlinExpression (PROPERTY) + List -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + List -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + llsAliased -> [!] UnknownKotlinExpression (PROPERTY) + ListOfLists -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + llt -> [!] UnknownKotlinExpression (PROPERTY) + List -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + List -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + parameterizedFoo -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + List -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + emptyList -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/UnexpectedContainerException.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/UnexpectedContainerException.identifiers.fir.txt new file mode 100644 index 00000000000..f2a7d0a6f84 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/UnexpectedContainerException.identifiers.fir.txt @@ -0,0 +1,23 @@ +Callback -> UClass (name = Callback) +onError -> UMethod (name = onError) +throwable -> UParameter (name = throwable) +Throwable -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +Model -> UClass (name = Model) + crashMe -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + Callback -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + java -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + object -> UClass (name = null) + Callback -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + onError -> UMethod (name = onError) + throwable -> UParameter (name = throwable) + Throwable -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + UnsupportedOperationException -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +T -> [!] UnknownKotlinExpression (TYPE_PARAMETER) +Any -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +crashMe -> UMethod (name = crashMe) +clazz -> UParameter (name = clazz) +Class -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +factory -> UParameter (name = factory) +T -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + UnsupportedOperationException -> [!] UnknownKotlinExpression (CALL_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenAndDestructing.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenAndDestructing.identifiers.fir.txt new file mode 100644 index 00000000000..41a8e2436a4 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenAndDestructing.identifiers.fir.txt @@ -0,0 +1,11 @@ +getElementsAdditionalResolve -> UMethod (name = getElementsAdditionalResolve) +string -> UParameter (name = string) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +String -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + arr -> [!] UnknownKotlinExpression (PROPERTY) + listOf -> [!] UnknownKotlinExpression (CALL_EXPRESSION) + string -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + bindingContext -> [!] UnknownKotlinExpression (DESTRUCTURING_DECLARATION_ENTRY) + statementFilter -> [!] UnknownKotlinExpression (DESTRUCTURING_DECLARATION_ENTRY) + arr -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) + bindingContext -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenIs.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenIs.identifiers.fir.txt new file mode 100644 index 00000000000..8dcdc61d263 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenIs.identifiers.fir.txt @@ -0,0 +1,7 @@ +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/WhenStringLiteral.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenStringLiteral.identifiers.fir.txt new file mode 100644 index 00000000000..99d43ced920 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/WhenStringLiteral.identifiers.fir.txt @@ -0,0 +1,7 @@ +a -> UField (name = a) +readLine -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +b -> UField (name = b) +a -> [!] UnknownKotlinExpression (REFERENCE_EXPRESSION) +a -> null + println -> null + println -> null diff --git a/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ea101715.identifiers.fir.txt b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ea101715.identifiers.fir.txt new file mode 100644 index 00000000000..0dfa425f347 --- /dev/null +++ b/plugins/uast-kotlin-fir/testData/legacyIdentifiers/ea101715.identifiers.fir.txt @@ -0,0 +1,4 @@ +a -> UMethod (name = a) + a -> [!] UnknownKotlinExpression (PROPERTY) + Obj -> [!] UnknownKotlinExpression (CALL_EXPRESSION) +Obj -> UClass (name = Obj) diff --git a/plugins/uast-kotlin-fir/tests/org/jetbrains/uast/test/common/kotlin/FirUastIdentifiersTestBase.kt b/plugins/uast-kotlin-fir/tests/org/jetbrains/uast/test/common/kotlin/FirUastIdentifiersTestBase.kt index 9e0a81b32c1..f1e43e90f05 100644 --- a/plugins/uast-kotlin-fir/tests/org/jetbrains/uast/test/common/kotlin/FirUastIdentifiersTestBase.kt +++ b/plugins/uast-kotlin-fir/tests/org/jetbrains/uast/test/common/kotlin/FirUastIdentifiersTestBase.kt @@ -55,6 +55,9 @@ interface FirUastIdentifiersTestBase : FirUastPluginSelection, FirUastFileCompar } } catch (e: AssertionError) { if (!isExpectedToFail(filePath)) throw e + } catch (e: NotImplementedError) { + // TODO: Remove this catch once parent conversion in FIR UAST is implemented + if (!isExpectedToFail(filePath)) throw e } cleanUpIdenticalFile( diff --git a/plugins/uast-kotlin-fir/tests/org/jetbrains/uast/test/kotlin/AbstractFirLegacyUastIdentifiersTest.kt b/plugins/uast-kotlin-fir/tests/org/jetbrains/uast/test/kotlin/AbstractFirLegacyUastIdentifiersTest.kt index 6c23eaa86fc..3ba1ddd1107 100644 --- a/plugins/uast-kotlin-fir/tests/org/jetbrains/uast/test/kotlin/AbstractFirLegacyUastIdentifiersTest.kt +++ b/plugins/uast-kotlin-fir/tests/org/jetbrains/uast/test/kotlin/AbstractFirLegacyUastIdentifiersTest.kt @@ -10,7 +10,7 @@ import org.jetbrains.uast.test.common.kotlin.FirLegacyUastIdentifiersTestBase abstract class AbstractFirLegacyUastIdentifiersTest : AbstractFirUastIdentifiersTest(), FirLegacyUastIdentifiersTestBase { override fun isExpectedToFail(filePath: String): Boolean { - // TODO: investigate why everything is failing! + // TODO: Implement parent conversion in FIR UAST return true } diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinConverter.kt b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinConverter.kt index 23f21ea3343..5bed63cda2d 100644 --- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinConverter.kt +++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinConverter.kt @@ -44,12 +44,6 @@ internal object KotlinConverter { else -> element } - private val identifiersTokens = setOf( - KtTokens.IDENTIFIER, KtTokens.CONSTRUCTOR_KEYWORD, KtTokens.OBJECT_KEYWORD, - KtTokens.THIS_KEYWORD, KtTokens.SUPER_KEYWORD, - KtTokens.GET_KEYWORD, KtTokens.SET_KEYWORD - ) - internal fun convertPsiElement( element: PsiElement?, givenParent: UElement?,