From f189fd1ff08dfc58879a3035a2b252f4f27c85d2 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Fri, 27 May 2022 16:15:58 +0200 Subject: [PATCH] [Analysis API] make KtDeclarationSymbol <: KtSymbolWithTypeParameters To simplify work with type parameters --- .../KtFe10DescSamConstructorSymbol.kt | 5 +++++ .../fir/symbols/KtFirSamConstructorSymbol.kt | 4 ++++ .../analysis/api/symbols/KtCallableSymbol.kt | 3 ++- .../analysis/api/symbols/KtClassLikeSymbol.kt | 9 +++++++-- .../api/symbols/KtDeclarationSymbol.kt | 4 +++- .../api/symbols/KtFunctionLikeSymbol.kt | 8 +++++--- .../api/symbols/KtPropertyAccessorSymbol.kt | 4 ++++ .../api/symbols/KtVariableLikeSymbol.kt | 18 +++++++++++++++++- .../memberScopeByFqName/java.lang.String.txt | 3 +++ .../symbolByFqName/enumEntry.descriptors.txt | 1 + .../symbols/symbolByFqName/enumEntry.txt | 1 + .../symbols/symbolByPsi/annotations.txt | 2 ++ .../anonymousObject.descriptors.txt | 1 + .../symbols/symbolByPsi/anonymousObject.txt | 1 + .../symbols/symbolByPsi/backingField.txt | 5 ++++- .../symbolByPsi/classSecondaryConstructors.txt | 5 ++++- .../symbolByPsi/classWithTypeParams.txt | 2 ++ .../symbols/symbolByPsi/delegateField.txt | 5 +++++ .../testData/symbols/symbolByPsi/enum.txt | 2 ++ .../enumValueMember.descriptors.txt | 5 ++++- .../symbols/symbolByPsi/enumValueMember.txt | 5 ++++- .../symbols/symbolByPsi/forLoopVariable.txt | 1 + .../testData/symbols/symbolByPsi/function.txt | 3 ++- .../symbolByPsi/functionWithTypeParams.txt | 2 ++ .../implicitConstructorDelegationCall.txt | 1 + .../symbolByPsi/implicitReturnInLambda.txt | 13 ++++++++++++- .../symbolByPsi/jvmName.descriptors.txt | 5 ++++- .../testData/symbols/symbolByPsi/jvmName.txt | 5 ++++- .../symbols/symbolByPsi/localDeclarations.txt | 1 + .../memberProperties.descriptors.txt | 1 + .../symbols/symbolByPsi/memberProperties.txt | 1 + .../outerAndInnerClasses.descriptors.txt | 7 +++++++ .../symbolByPsi/outerAndInnerClasses.txt | 7 +++++++ .../topLevelProperties.descriptors.txt | 1 + .../symbols/symbolByPsi/topLevelProperties.txt | 1 + .../testData/symbols/symbolByPsi/typeAlias.txt | 2 ++ .../typeAnnotations.descriptors.txt | 3 ++- .../symbols/symbolByPsi/typeAnnotations.txt | 1 + .../symbols/symbolByPsi/varargFunctions.txt | 6 +++++- .../symbolByReference/accessorField.txt | 1 + .../explicitLambdaParameter.txt | 3 ++- .../implicitLambdaParameter.txt | 3 ++- .../symbolByReference/samConstructor.txt | 1 + 43 files changed, 142 insertions(+), 20 deletions(-) diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSamConstructorSymbol.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSamConstructorSymbol.kt index 2958f2594dd..59bd0ae202f 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSamConstructorSymbol.kt +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSamConstructorSymbol.kt @@ -16,6 +16,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointe import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion +import org.jetbrains.kotlin.analysis.api.symbols.KtTypeParameterSymbol import org.jetbrains.kotlin.name.CallableId import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.calls.inference.returnTypeOrNothing @@ -53,6 +54,10 @@ internal class KtFe10DescSamConstructorSymbol( override val origin: KtSymbolOrigin get() = withValidityAssertion { expandedDescriptor.getSymbolOrigin(analysisContext) } + override val typeParameters: List + get() = withValidityAssertion { descriptor.typeParameters.map { KtFe10DescTypeParameterSymbol(it, analysisContext) } } + + override fun createPointer(): KtSymbolPointer = withValidityAssertion { val pointerByPsi = KtPsiBasedSymbolPointer.createForSymbolFromSource(this) if (pointerByPsi != null) { diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSamConstructorSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSamConstructorSymbol.kt index b65ad1f1002..7b185b4c361 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSamConstructorSymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSamConstructorSymbol.kt @@ -18,6 +18,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeToken import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion +import org.jetbrains.kotlin.analysis.api.symbols.KtTypeParameterSymbol import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirResolveSession import org.jetbrains.kotlin.fir.resolve.getHasStableParameterNames import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol @@ -59,6 +60,9 @@ internal class KtFirSamConstructorSymbol( override val callableIdIfNonLocal: CallableId? get() = withValidityAssertion { firSymbol.getCallableIdIfNonLocal() } + override val typeParameters: List + get() = withValidityAssertion { firSymbol.createKtTypeParameters(builder) } + override fun createPointer(): KtSymbolPointer { val callableId = firSymbol.callableId return KtFirSamConstructorSymbolPointer(ClassId(callableId.packageName, callableId.callableName)) diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtCallableSymbol.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtCallableSymbol.kt index fe156645603..12807504b9c 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtCallableSymbol.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtCallableSymbol.kt @@ -8,11 +8,12 @@ package org.jetbrains.kotlin.analysis.api.symbols import org.jetbrains.kotlin.analysis.api.symbols.markers.KtAnnotatedSymbol import org.jetbrains.kotlin.analysis.api.symbols.markers.KtPossibleMemberSymbol import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolWithKind +import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolWithTypeParameters import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.types.KtType import org.jetbrains.kotlin.name.CallableId -public abstract class KtCallableSymbol : KtSymbol, KtSymbolWithKind, KtAnnotatedSymbol, KtPossibleMemberSymbol, KtDeclarationSymbol { +public abstract class KtCallableSymbol : KtSymbolWithKind, KtAnnotatedSymbol, KtPossibleMemberSymbol, KtDeclarationSymbol { public abstract val callableIdIfNonLocal: CallableId? public abstract val returnType: KtType diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtClassLikeSymbol.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtClassLikeSymbol.kt index b8804fa94ee..730a17c966e 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtClassLikeSymbol.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtClassLikeSymbol.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.analysis.api.symbols +import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.analysis.api.symbols.markers.* import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.types.KtType @@ -21,6 +22,9 @@ public val KtClassifierSymbol.nameOrAnonymous: Name public abstract class KtTypeParameterSymbol : KtClassifierSymbol(), KtNamedSymbol { abstract override fun createPointer(): KtSymbolPointer + final override val typeParameters: List + get() = withValidityAssertion { emptyList() } + public abstract val upperBounds: List public abstract val variance: Variance public abstract val isReified: Boolean @@ -33,7 +37,6 @@ public sealed class KtClassLikeSymbol : KtClassifierSymbol(), KtSymbolWithKind, } public abstract class KtTypeAliasSymbol : KtClassLikeSymbol(), - KtSymbolWithTypeParameters, KtSymbolWithVisibility, KtNamedSymbol, KtAnnotatedSymbol { @@ -64,11 +67,13 @@ public abstract class KtAnonymousObjectSymbol : KtClassOrObjectSymbol() { final override val symbolKind: KtSymbolKind get() = KtSymbolKind.LOCAL final override val name: Name? get() = null + final override val typeParameters: List + get() = withValidityAssertion { emptyList() } + abstract override fun createPointer(): KtSymbolPointer } public abstract class KtNamedClassOrObjectSymbol : KtClassOrObjectSymbol(), - KtSymbolWithTypeParameters, KtSymbolWithModality, KtSymbolWithVisibility, KtNamedSymbol { diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtDeclarationSymbol.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtDeclarationSymbol.kt index 71fcab48640..e7cb7cd1ba2 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtDeclarationSymbol.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtDeclarationSymbol.kt @@ -5,8 +5,10 @@ package org.jetbrains.kotlin.analysis.api.symbols +import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolWithTypeParameters + /** * Represents a symbol of declaration which can be directly expressed in source code. * Eg, classes, type parameters or functions ar [KtDeclarationSymbol], but files and packages are not */ -public sealed interface KtDeclarationSymbol : KtSymbol \ No newline at end of file +public sealed interface KtDeclarationSymbol : KtSymbol, KtSymbolWithTypeParameters \ No newline at end of file diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtFunctionLikeSymbol.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtFunctionLikeSymbol.kt index e4f591442f0..f75f8e66fa9 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtFunctionLikeSymbol.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtFunctionLikeSymbol.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.analysis.api.symbols +import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.analysis.api.symbols.markers.* import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.analysis.api.types.KtType @@ -28,6 +29,9 @@ public abstract class KtAnonymousFunctionSymbol : KtFunctionLikeSymbol() { final override val symbolKind: KtSymbolKind get() = KtSymbolKind.LOCAL final override val callableIdIfNonLocal: CallableId? get() = null + final override val typeParameters: List + get() = withValidityAssertion { emptyList() } + abstract override fun createPointer(): KtSymbolPointer } @@ -40,7 +44,6 @@ public abstract class KtSamConstructorSymbol : KtFunctionLikeSymbol(), KtNamedSy public abstract class KtFunctionSymbol : KtFunctionLikeSymbol(), KtNamedSymbol, KtPossibleMemberSymbol, - KtSymbolWithTypeParameters, KtSymbolWithModality, KtSymbolWithVisibility, KtAnnotatedSymbol { @@ -64,8 +67,7 @@ public abstract class KtFunctionSymbol : KtFunctionLikeSymbol(), public abstract class KtConstructorSymbol : KtFunctionLikeSymbol(), KtPossibleMemberSymbol, KtAnnotatedSymbol, - KtSymbolWithVisibility, - KtSymbolWithTypeParameters { + KtSymbolWithVisibility { public abstract val isPrimary: Boolean public abstract val containingClassIdIfNonLocal: ClassId? diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtPropertyAccessorSymbol.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtPropertyAccessorSymbol.kt index 454fe550959..3c88d9935b9 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtPropertyAccessorSymbol.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtPropertyAccessorSymbol.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.analysis.api.symbols +import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.analysis.api.symbols.markers.* import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer @@ -17,6 +18,9 @@ public sealed class KtPropertyAccessorSymbol : KtFunctionLikeSymbol(), final override val isExtension: Boolean get() = false + final override val typeParameters: List + get() = withValidityAssertion { emptyList() } + public abstract val isDefault: Boolean public abstract val isInline: Boolean public abstract val isOverride: Boolean diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtVariableLikeSymbol.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtVariableLikeSymbol.kt index d7c158135af..31f0acb1e41 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtVariableLikeSymbol.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/KtVariableLikeSymbol.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.analysis.api.symbols import com.intellij.psi.PsiElement import org.jetbrains.kotlin.analysis.api.* +import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.analysis.api.symbols.markers.* import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer @@ -42,6 +43,9 @@ public abstract class KtBackingFieldSymbol : KtVariableLikeSymbol() { final override val isExtension: Boolean get() = false final override val receiverType: KtType? get() = null + final override val typeParameters: List + get() = withValidityAssertion { emptyList() } + abstract override fun createPointer(): KtSymbolPointer public companion object { @@ -55,6 +59,9 @@ public abstract class KtEnumEntrySymbol : KtVariableLikeSymbol(), KtSymbolWithMe final override val isExtension: Boolean get() = false final override val receiverType: KtType? get() = null + final override val typeParameters: List + get() = withValidityAssertion { emptyList() } + //todo reduntant, remove public abstract val containingEnumClassIdIfNonLocal: ClassId? @@ -75,6 +82,10 @@ public abstract class KtJavaFieldSymbol : final override val symbolKind: KtSymbolKind get() = KtSymbolKind.CLASS_MEMBER final override val isExtension: Boolean get() = false final override val receiverType: KtType? get() = null + + final override val typeParameters: List + get() = withValidityAssertion { emptyList() } + public abstract val isStatic: Boolean abstract override fun createPointer(): KtSymbolPointer @@ -82,7 +93,6 @@ public abstract class KtJavaFieldSymbol : public sealed class KtPropertySymbol : KtVariableSymbol(), KtPossibleMemberSymbol, - KtSymbolWithTypeParameters, KtSymbolWithModality, KtSymbolWithVisibility, KtAnnotatedSymbol, @@ -142,6 +152,9 @@ public abstract class KtLocalVariableSymbol : KtVariableSymbol(), KtSymbolWithKi final override val isExtension: Boolean get() = false final override val receiverType: KtType? get() = null + final override val typeParameters: List + get() = withValidityAssertion { emptyList() } + abstract override fun createPointer(): KtSymbolPointer } @@ -151,6 +164,9 @@ public abstract class KtValueParameterSymbol : KtVariableLikeSymbol(), KtSymbolW final override val isExtension: Boolean get() = false final override val receiverType: KtType? get() = null + final override val typeParameters: List + get() = withValidityAssertion { emptyList() } + /** * Whether this value parameter has a default value or not. */ diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.txt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.txt index 1ecfaec6eae..adfbb2d1aed 100644 --- a/analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.txt +++ b/analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.txt @@ -10,6 +10,7 @@ KtJavaFieldSymbol: receiverType: null returnType: ft symbolKind: CLASS_MEMBER + typeParameters: [] visibility: Private getDispatchReceiver(): java/lang/String getContainingModule: KtSdkModule "SDK jdk" @@ -27,6 +28,7 @@ KtJavaFieldSymbol: receiverType: null returnType: kotlin/Int symbolKind: CLASS_MEMBER + typeParameters: [] visibility: Private getDispatchReceiver(): java/lang/String getContainingModule: KtSdkModule "SDK jdk" @@ -70,6 +72,7 @@ KtJavaFieldSymbol: receiverType: null returnType: kotlin/Int symbolKind: CLASS_MEMBER + typeParameters: [] visibility: Private getDispatchReceiver(): java/lang/String getContainingModule: KtSdkModule "SDK jdk" diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/enumEntry.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/enumEntry.descriptors.txt index 33ea6e73a6a..4b7536bff66 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/enumEntry.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/enumEntry.descriptors.txt @@ -8,6 +8,7 @@ KtEnumEntrySymbol: receiverType: null returnType: kotlin/LazyThreadSafetyMode symbolKind: CLASS_MEMBER + typeParameters: [] getContainingModule: Could not render due to kotlin.NotImplementedError: An operation is not implemented: enum entry SYNCHRONIZED deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/enumEntry.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/enumEntry.txt index dbe4c9934ea..2c330695316 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/enumEntry.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/enumEntry.txt @@ -8,5 +8,6 @@ KtEnumEntrySymbol: receiverType: null returnType: kotlin/LazyThreadSafetyMode symbolKind: CLASS_MEMBER + typeParameters: [] getContainingModule: KtLibraryModule "Library kotlin-stdlib" deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt index 80bca3939a1..cf3f1d3a5a6 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt @@ -10,6 +10,7 @@ KtValueParameterSymbol: receiverType: null returnType: kotlin/String symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -25,6 +26,7 @@ KtValueParameterSymbol: receiverType: null returnType: kotlin/Int symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.descriptors.txt index 6135299a62a..a5ba0402e66 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.descriptors.txt @@ -67,6 +67,7 @@ KtAnonymousObjectSymbol: java/lang/Runnable ] symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.txt index aa8ea1210f5..26b8c5aeed3 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.txt @@ -67,6 +67,7 @@ KtAnonymousObjectSymbol: java/lang/Runnable ] symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.txt index ce730a0fbcb..51ea87b3cab 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/backingField.txt @@ -12,6 +12,7 @@ KtPropertyGetterSymbol: receiverType: null returnType: kotlin/Int symbolKind: ACCESSOR + typeParameters: [] valueParameters: [] visibility: Public getContainingModule: KtSourceModule "Sources of main" @@ -29,6 +30,7 @@ KtValueParameterSymbol: receiverType: null returnType: kotlin/Int symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -47,6 +49,7 @@ KtPropertySetterSymbol: receiverType: null returnType: kotlin/Unit symbolKind: ACCESSOR + typeParameters: [] valueParameters: [ KtValueParameterSymbol(value) ] @@ -84,4 +87,4 @@ KtKotlinPropertySymbol: getterDeprecationStatus: null javaGetterName: getP javaSetterName: setP - setterDeprecationStatus: null + setterDeprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.txt index 21e68086f96..6229c537b94 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.txt @@ -27,6 +27,7 @@ KtValueParameterSymbol: receiverType: null returnType: kotlin/Int symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -61,6 +62,7 @@ KtValueParameterSymbol: receiverType: null returnType: kotlin/Int symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -76,6 +78,7 @@ KtValueParameterSymbol: receiverType: null returnType: kotlin/String symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -119,4 +122,4 @@ KtNamedClassOrObjectSymbol: typeParameters: [] visibility: Public getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classWithTypeParams.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classWithTypeParams.txt index c6c0d0a776a..9c627385777 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classWithTypeParams.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classWithTypeParams.txt @@ -6,6 +6,7 @@ KtTypeParameterSymbol: isReified: false name: T origin: SOURCE + typeParameters: [] upperBounds: [ kotlin/Any? ] @@ -18,6 +19,7 @@ KtTypeParameterSymbol: isReified: false name: R origin: SOURCE + typeParameters: [] upperBounds: [ kotlin/Any? ] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.txt index 408a4f8a8af..a38c18f9dfe 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/delegateField.txt @@ -10,6 +10,7 @@ KtValueParameterSymbol: receiverType: null returnType: kotlin/Int symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -25,6 +26,7 @@ KtValueParameterSymbol: receiverType: null returnType: kotlin/Int symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -40,6 +42,7 @@ KtValueParameterSymbol: receiverType: null returnType: kotlin/Int symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -95,6 +98,7 @@ KtAnonymousFunctionSymbol: receiverType: null returnType: MyColor symbolKind: LOCAL + typeParameters: [] valueParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -141,6 +145,7 @@ KtAnonymousFunctionSymbol: receiverType: null returnType: MyColor symbolKind: LOCAL + typeParameters: [] valueParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enum.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enum.txt index 69daaa78ad7..423c735fe66 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/enum.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enum.txt @@ -8,6 +8,7 @@ KtEnumEntrySymbol: receiverType: null returnType: X symbolKind: CLASS_MEMBER + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -21,6 +22,7 @@ KtEnumEntrySymbol: receiverType: null returnType: X symbolKind: CLASS_MEMBER + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt index 9e90f159b11..0932cedd740 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.descriptors.txt @@ -10,6 +10,7 @@ KtValueParameterSymbol: receiverType: null returnType: kotlin/String symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -46,6 +47,7 @@ KtPropertyGetterSymbol: receiverType: null returnType: kotlin/String symbolKind: ACCESSOR + typeParameters: [] valueParameters: [] visibility: Public getDispatchReceiver(): Style.SHEET @@ -95,6 +97,7 @@ KtEnumEntrySymbol: receiverType: null returnType: Style symbolKind: CLASS_MEMBER + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -151,4 +154,4 @@ KtNamedClassOrObjectSymbol: typeParameters: [] visibility: Public getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt index b055aa4742c..5ece4bcd4c3 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt @@ -10,6 +10,7 @@ KtValueParameterSymbol: receiverType: null returnType: kotlin/String symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -46,6 +47,7 @@ KtPropertyGetterSymbol: receiverType: null returnType: kotlin/String symbolKind: ACCESSOR + typeParameters: [] valueParameters: [] visibility: Public getContainingModule: KtSourceModule "Sources of main" @@ -94,6 +96,7 @@ KtEnumEntrySymbol: receiverType: null returnType: Style symbolKind: CLASS_MEMBER + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -150,4 +153,4 @@ KtNamedClassOrObjectSymbol: typeParameters: [] visibility: Public getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/forLoopVariable.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/forLoopVariable.txt index 0004f61a90a..3e89f3b65c7 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/forLoopVariable.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/forLoopVariable.txt @@ -8,6 +8,7 @@ KtLocalVariableSymbol: receiverType: null returnType: kotlin/Int symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/function.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/function.txt index ed8b484c2ba..7f7f6f66830 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/function.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/function.txt @@ -10,6 +10,7 @@ KtValueParameterSymbol: receiverType: null returnType: kotlin/Int symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -38,4 +39,4 @@ KtFunctionSymbol: ] visibility: Public getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/functionWithTypeParams.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/functionWithTypeParams.txt index 7b9a41c71da..28184a01d99 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/functionWithTypeParams.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/functionWithTypeParams.txt @@ -3,6 +3,7 @@ KtTypeParameterSymbol: isReified: false name: X origin: SOURCE + typeParameters: [] upperBounds: [ kotlin/Any? ] @@ -22,6 +23,7 @@ KtValueParameterSymbol: receiverType: null returnType: X symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.txt index 0e2f3e7bd7b..9d5b465dbcb 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.txt @@ -10,6 +10,7 @@ KtValueParameterSymbol: receiverType: null returnType: kotlin/Int symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturnInLambda.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturnInLambda.txt index 5cfdd55fd3e..05e969f12fd 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturnInLambda.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitReturnInLambda.txt @@ -10,6 +10,7 @@ KtValueParameterSymbol: receiverType: null returnType: kotlin/Int symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -23,6 +24,7 @@ KtLocalVariableSymbol: receiverType: null returnType: kotlin/Int symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -35,6 +37,7 @@ KtAnonymousFunctionSymbol: receiverType: null returnType: kotlin/Int symbolKind: LOCAL + typeParameters: [] valueParameters: [ KtValueParameterSymbol(a) ] @@ -51,6 +54,7 @@ KtLocalVariableSymbol: receiverType: null returnType: kotlin/Function1 symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -66,6 +70,7 @@ KtValueParameterSymbol: receiverType: null returnType: kotlin/Int symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -79,6 +84,7 @@ KtLocalVariableSymbol: receiverType: null returnType: kotlin/Int symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -91,6 +97,7 @@ KtAnonymousFunctionSymbol: receiverType: null returnType: kotlin/Int symbolKind: LOCAL + typeParameters: [] valueParameters: [ KtValueParameterSymbol(a) ] @@ -107,6 +114,7 @@ KtLocalVariableSymbol: receiverType: null returnType: kotlin/Function1 symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -120,6 +128,7 @@ KtLocalVariableSymbol: receiverType: null returnType: kotlin/Int symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -132,6 +141,7 @@ KtAnonymousFunctionSymbol: receiverType: null returnType: kotlin/Int symbolKind: LOCAL + typeParameters: [] valueParameters: [ KtValueParameterSymbol(it) ] @@ -175,6 +185,7 @@ KtValueParameterSymbol: receiverType: null returnType: kotlin/Function1 symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -203,4 +214,4 @@ KtFunctionSymbol: ] visibility: Private getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.descriptors.txt index c7d6332ccdd..85230c17732 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.descriptors.txt @@ -48,6 +48,7 @@ KtPropertyGetterSymbol: receiverType: null returnType: kotlin/Int symbolKind: ACCESSOR + typeParameters: [] valueParameters: [] visibility: Public getDispatchReceiver(): Foo @@ -66,6 +67,7 @@ KtValueParameterSymbol: receiverType: null returnType: kotlin/Int symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -87,6 +89,7 @@ KtPropertySetterSymbol: receiverType: null returnType: kotlin/Unit symbolKind: ACCESSOR + typeParameters: [] valueParameters: [ KtValueParameterSymbol(value) ] @@ -148,4 +151,4 @@ KtNamedClassOrObjectSymbol: typeParameters: [] visibility: Public getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt index aab4c5dc06a..79269f77d4e 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt @@ -48,6 +48,7 @@ KtPropertyGetterSymbol: receiverType: null returnType: kotlin/Int symbolKind: ACCESSOR + typeParameters: [] valueParameters: [] visibility: Public getContainingModule: KtSourceModule "Sources of main" @@ -65,6 +66,7 @@ KtValueParameterSymbol: receiverType: null returnType: kotlin/Int symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -86,6 +88,7 @@ KtPropertySetterSymbol: receiverType: null returnType: kotlin/Unit symbolKind: ACCESSOR + typeParameters: [] valueParameters: [ KtValueParameterSymbol(value) ] @@ -146,4 +149,4 @@ KtNamedClassOrObjectSymbol: typeParameters: [] visibility: Public getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/localDeclarations.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/localDeclarations.txt index f18910fd2b9..a47c36d0265 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/localDeclarations.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/localDeclarations.txt @@ -8,6 +8,7 @@ KtLocalVariableSymbol: receiverType: null returnType: kotlin/Int symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.descriptors.txt index 5d7a092c4c0..486784c35c2 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.descriptors.txt @@ -45,6 +45,7 @@ KtPropertyGetterSymbol: receiverType: kotlin/Int returnType: kotlin/Int symbolKind: ACCESSOR + typeParameters: [] valueParameters: [] visibility: Public getDispatchReceiver(): A diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.txt index e92fdd435de..30ee715200c 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.txt @@ -45,6 +45,7 @@ KtPropertyGetterSymbol: receiverType: null returnType: kotlin/Int symbolKind: ACCESSOR + typeParameters: [] valueParameters: [] visibility: Public getContainingModule: KtSourceModule "Sources of main" diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.descriptors.txt index c0c7a5e1a6b..56c039d396a 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.descriptors.txt @@ -3,6 +3,7 @@ KtTypeParameterSymbol: isReified: false name: T origin: SOURCE + typeParameters: [] upperBounds: [ kotlin/Any? ] @@ -15,6 +16,7 @@ KtTypeParameterSymbol: isReified: false name: T1 origin: SOURCE + typeParameters: [] upperBounds: [ kotlin/Any? ] @@ -51,6 +53,7 @@ KtTypeParameterSymbol: isReified: false name: T2 origin: SOURCE + typeParameters: [] upperBounds: [ kotlin/Any? ] @@ -87,6 +90,7 @@ KtTypeParameterSymbol: isReified: false name: T3 origin: SOURCE + typeParameters: [] upperBounds: [ kotlin/Any? ] @@ -99,6 +103,7 @@ KtTypeParameterSymbol: isReified: false name: T4 origin: SOURCE + typeParameters: [] upperBounds: [ kotlin/Any? ] @@ -111,6 +116,7 @@ KtTypeParameterSymbol: isReified: false name: T5 origin: SOURCE + typeParameters: [] upperBounds: [ kotlin/Any? ] @@ -147,6 +153,7 @@ KtTypeParameterSymbol: isReified: false name: T6 origin: SOURCE + typeParameters: [] upperBounds: [ kotlin/Any? ] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt index 26878205e9b..cb4a9ced399 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt @@ -3,6 +3,7 @@ KtTypeParameterSymbol: isReified: false name: T origin: SOURCE + typeParameters: [] upperBounds: [ kotlin/Any? ] @@ -15,6 +16,7 @@ KtTypeParameterSymbol: isReified: false name: T1 origin: SOURCE + typeParameters: [] upperBounds: [ kotlin/Any? ] @@ -51,6 +53,7 @@ KtTypeParameterSymbol: isReified: false name: T2 origin: SOURCE + typeParameters: [] upperBounds: [ kotlin/Any? ] @@ -87,6 +90,7 @@ KtTypeParameterSymbol: isReified: false name: T3 origin: SOURCE + typeParameters: [] upperBounds: [ kotlin/Any? ] @@ -99,6 +103,7 @@ KtTypeParameterSymbol: isReified: false name: T4 origin: SOURCE + typeParameters: [] upperBounds: [ kotlin/Any? ] @@ -111,6 +116,7 @@ KtTypeParameterSymbol: isReified: false name: T5 origin: SOURCE + typeParameters: [] upperBounds: [ kotlin/Any? ] @@ -147,6 +153,7 @@ KtTypeParameterSymbol: isReified: false name: T6 origin: SOURCE + typeParameters: [] upperBounds: [ kotlin/Any? ] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.descriptors.txt index 8be3f6a93ca..eaf5b7c7936 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.descriptors.txt @@ -44,6 +44,7 @@ KtPropertyGetterSymbol: receiverType: kotlin/Int returnType: kotlin/Int symbolKind: ACCESSOR + typeParameters: [] valueParameters: [] visibility: Public getContainingModule: KtSourceModule "Sources of main" diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.txt index 9b4d8c1973f..390be3be554 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/topLevelProperties.txt @@ -44,6 +44,7 @@ KtPropertyGetterSymbol: receiverType: null returnType: kotlin/Int symbolKind: ACCESSOR + typeParameters: [] valueParameters: [] visibility: Public getContainingModule: KtSourceModule "Sources of main" diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAlias.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAlias.txt index c16dd316d00..4c63e346100 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAlias.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAlias.txt @@ -3,6 +3,7 @@ KtTypeParameterSymbol: isReified: false name: T origin: SOURCE + typeParameters: [] upperBounds: [ kotlin/Any? ] @@ -39,6 +40,7 @@ KtTypeParameterSymbol: isReified: false name: Z origin: SOURCE + typeParameters: [] upperBounds: [ kotlin/Any? ] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.descriptors.txt index 57338f732bc..3a32d850f58 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.descriptors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.descriptors.txt @@ -135,6 +135,7 @@ KtValueParameterSymbol: psi: KtAnnotationEntry ] @R|Anno2|() I symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -229,4 +230,4 @@ KtNamedClassOrObjectSymbol: typeParameters: [] visibility: Public getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt index 5368ca3bd0a..fee395f6ed0 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt @@ -135,6 +135,7 @@ KtValueParameterSymbol: psi: KtAnnotationEntry ] @R|Anno2|() I symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.txt index a52978873ee..2a7ae17770e 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/varargFunctions.txt @@ -10,6 +10,7 @@ KtValueParameterSymbol: receiverType: null returnType: kotlin/Int symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -52,6 +53,7 @@ KtValueParameterSymbol: receiverType: null returnType: kotlin/Float? symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -94,6 +96,7 @@ KtValueParameterSymbol: receiverType: null returnType: kotlin/Any symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -136,6 +139,7 @@ KtValueParameterSymbol: receiverType: null returnType: ERROR_TYPE symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null @@ -164,4 +168,4 @@ KtFunctionSymbol: ] visibility: Public getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/accessorField.txt b/analysis/analysis-api/testData/symbols/symbolByReference/accessorField.txt index 8bd81a0ff97..110c5542682 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/accessorField.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/accessorField.txt @@ -8,5 +8,6 @@ KtBackingFieldSymbol: receiverType: null returnType: kotlin/Int symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/explicitLambdaParameter.txt b/analysis/analysis-api/testData/symbols/symbolByReference/explicitLambdaParameter.txt index 3708715c7f6..2669c23b178 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/explicitLambdaParameter.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/explicitLambdaParameter.txt @@ -10,5 +10,6 @@ KtValueParameterSymbol: receiverType: null returnType: kotlin/Int symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/implicitLambdaParameter.txt b/analysis/analysis-api/testData/symbols/symbolByReference/implicitLambdaParameter.txt index e8518d50a30..2c677134337 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/implicitLambdaParameter.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/implicitLambdaParameter.txt @@ -10,5 +10,6 @@ KtValueParameterSymbol: receiverType: null returnType: kotlin/Int symbolKind: LOCAL + typeParameters: [] getContainingModule: KtSourceModule "Sources of main" - deprecationStatus: null + deprecationStatus: null \ No newline at end of file diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/samConstructor.txt b/analysis/analysis-api/testData/symbols/symbolByReference/samConstructor.txt index 50755e63397..d4d7d3515dc 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/samConstructor.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/samConstructor.txt @@ -8,6 +8,7 @@ KtSamConstructorSymbol: receiverType: null returnType: java/lang/Runnable symbolKind: SAM_CONSTRUCTOR + typeParameters: [] valueParameters: [ KtValueParameterSymbol(function) ]