From 43257f7688c01b2cbce246b7cc0867299571378b Mon Sep 17 00:00:00 2001 From: Tianyu Geng Date: Mon, 20 Sep 2021 09:45:44 -0700 Subject: [PATCH] FIR IDE: rename SymbolKind: MEMBER -> CLASS_MEMBER --- ...tFirSymbolContainingDeclarationProvider.kt | 2 +- .../symbols/KtFirClassInitializerSymbol.kt | 2 +- .../api/fir/symbols/KtFirFunctionSymbol.kt | 4 +- .../fir/symbols/KtFirKotlinPropertySymbol.kt | 4 +- .../symbols/KtFirNamedClassOrObjectSymbol.kt | 2 +- .../api/symbols/KtFunctionLikeSymbol.kt | 2 +- .../api/symbols/KtVariableLikeSymbol.kt | 6 +- .../api/symbols/markers/KtSymbolWithKind.kt | 2 +- .../testData/memberScopeByFqName/Int.txt | 128 +++++++-------- .../memberScopeByFqName/MutableList.txt | 48 +++--- .../memberScopeByFqName/java.lang.String.txt | 154 +++++++++--------- .../memberScopeByFqName/kotlin.Function2.txt | 8 +- .../symbols/symbolByFqName/enumEntry.txt | 2 +- .../symbols/symbolByFqName/memberFunction.txt | 2 +- .../memberFunctionWithOverloads.txt | 4 +- .../symbols/symbolByFqName/nestedClass.txt | 2 +- .../symbols/symbolByPsi/annotations.txt | 4 +- .../symbols/symbolByPsi/anonymousObject.txt | 6 +- .../symbols/symbolByPsi/classInitializer.txt | 4 +- .../symbols/symbolByPsi/classMembes.txt | 4 +- .../symbolByPsi/classPrimaryConstructor.txt | 2 +- .../classSecondaryConstructors.txt | 6 +- .../symbols/symbolByPsi/deprecated.txt | 4 +- .../testData/symbols/symbolByPsi/enum.txt | 4 +- .../symbols/symbolByPsi/enumValueMember.txt | 8 +- .../implicitConstructorDelegationCall.txt | 2 +- .../testData/symbols/symbolByPsi/jvmName.txt | 4 +- .../symbols/symbolByPsi/memberFunctions.txt | 4 +- .../symbols/symbolByPsi/memberProperties.txt | 4 +- .../symbolByPsi/outerAndInnerClasses.txt | 6 +- .../symbols/symbolByPsi/typeAnnotations.txt | 4 +- .../constructorViaTypeAlias.txt | 2 +- 32 files changed, 220 insertions(+), 220 deletions(-) diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolContainingDeclarationProvider.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolContainingDeclarationProvider.kt index 831764dcc71..8e3334fec74 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolContainingDeclarationProvider.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolContainingDeclarationProvider.kt @@ -104,7 +104,7 @@ internal class KtFirSymbolContainingDeclarationProvider( private fun getContainingDeclarationForLibrarySymbol(symbol: KtSymbolWithKind): KtSymbolWithKind = with(analysisSession) { require(symbol.origin == KtSymbolOrigin.LIBRARY || symbol.origin == KtSymbolOrigin.JAVA) - check(symbol.symbolKind == KtSymbolKind.MEMBER) + check(symbol.symbolKind == KtSymbolKind.CLASS_MEMBER) val containingClassId = when (symbol) { is KtClassLikeSymbol -> { diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirClassInitializerSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirClassInitializerSymbol.kt index b797a6f0919..cf1d7ceb4d7 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirClassInitializerSymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirClassInitializerSymbol.kt @@ -28,5 +28,5 @@ internal class KtFirClassInitializerSymbol( TODO("Figure out how to create such a pointer. Should we give an index to class initializers?") } - override val symbolKind: KtSymbolKind get() = KtSymbolKind.MEMBER + override val symbolKind: KtSymbolKind get() = KtSymbolKind.CLASS_MEMBER } \ No newline at end of file diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirFunctionSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirFunctionSymbol.kt index cc7edd72c3b..50e4684d73b 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirFunctionSymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirFunctionSymbol.kt @@ -91,7 +91,7 @@ internal class KtFirFunctionSymbol( when { fir.isLocal -> KtSymbolKind.LOCAL fir.containingClass()?.classId == null -> KtSymbolKind.TOP_LEVEL - else -> KtSymbolKind.MEMBER + else -> KtSymbolKind.CLASS_MEMBER } } override val modality: Modality get() = getModality() @@ -104,7 +104,7 @@ internal class KtFirFunctionSymbol( KtSymbolKind.TOP_LEVEL -> firRef.withFir { fir -> KtFirTopLevelFunctionSymbolPointer(fir.symbol.callableId, fir.createSignature()) } - KtSymbolKind.MEMBER -> firRef.withFir { fir -> + KtSymbolKind.CLASS_MEMBER -> firRef.withFir { fir -> KtFirMemberFunctionSymbolPointer( fir.containingClass()?.classId ?: error("ClassId should not be null for member function"), fir.name, diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirKotlinPropertySymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirKotlinPropertySymbol.kt index f34f4536ed6..0c9d304531f 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirKotlinPropertySymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirKotlinPropertySymbol.kt @@ -77,7 +77,7 @@ internal class KtFirKotlinPropertySymbol( get() = firRef.withFir { fir -> when (fir.containingClass()?.classId) { null -> KtSymbolKind.TOP_LEVEL - else -> KtSymbolKind.MEMBER + else -> KtSymbolKind.CLASS_MEMBER } } override val modality: Modality get() = getModality() @@ -119,7 +119,7 @@ internal class KtFirKotlinPropertySymbol( KtPsiBasedSymbolPointer.createForSymbolFromSource(this)?.let { return it } return when (symbolKind) { KtSymbolKind.TOP_LEVEL -> TODO("Creating symbol for top level properties is not supported yet") - KtSymbolKind.MEMBER -> firRef.withFir { fir -> + KtSymbolKind.CLASS_MEMBER -> firRef.withFir { fir -> KtFirMemberPropertySymbolPointer( fir.containingClass()?.classId ?: error("ClassId should not be null for member property"), fir.name, diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirNamedClassOrObjectSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirNamedClassOrObjectSymbol.kt index e4609ed9682..e0a5a742551 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirNamedClassOrObjectSymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirNamedClassOrObjectSymbol.kt @@ -107,7 +107,7 @@ internal class KtFirNamedClassOrObjectSymbol( get() = firRef.withFir { fir -> when { fir.isLocal -> KtSymbolKind.LOCAL - fir.symbol.classId.isNestedClass -> KtSymbolKind.MEMBER + fir.symbol.classId.isNestedClass -> KtSymbolKind.CLASS_MEMBER else -> KtSymbolKind.TOP_LEVEL } } 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 589bd6a5ff6..8bd15e0938d 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 @@ -64,7 +64,7 @@ public abstract class KtConstructorSymbol : KtFunctionLikeSymbol(), public abstract val containingClassIdIfNonLocal: ClassId? final override val callableIdIfNonLocal: CallableId? get() = null - final override val symbolKind: KtSymbolKind get() = KtSymbolKind.MEMBER + final override val symbolKind: KtSymbolKind get() = KtSymbolKind.CLASS_MEMBER final override val isExtension: Boolean get() = false final override val receiverType: KtTypeAndAnnotations? get() = null 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 f6c3c706199..bf329cddc5b 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 @@ -48,7 +48,7 @@ public abstract class KtBackingFieldSymbol : KtVariableLikeSymbol() { public abstract class KtEnumEntrySymbol : KtVariableLikeSymbol(), KtSymbolWithMembers, KtSymbolWithKind { - final override val symbolKind: KtSymbolKind get() = KtSymbolKind.MEMBER + final override val symbolKind: KtSymbolKind get() = KtSymbolKind.CLASS_MEMBER final override val isExtension: Boolean get() = false final override val receiverType: KtTypeAndAnnotations? get() = null public abstract val containingEnumClassIdIfNonLocal: ClassId? @@ -67,7 +67,7 @@ public abstract class KtJavaFieldSymbol : KtSymbolWithModality, KtSymbolWithVisibility, KtSymbolWithKind { - final override val symbolKind: KtSymbolKind get() = KtSymbolKind.MEMBER + final override val symbolKind: KtSymbolKind get() = KtSymbolKind.CLASS_MEMBER final override val isExtension: Boolean get() = false final override val receiverType: KtTypeAndAnnotations? get() = null public abstract val isStatic: Boolean @@ -110,7 +110,7 @@ public abstract class KtKotlinPropertySymbol : KtPropertySymbol() { public abstract class KtSyntheticJavaPropertySymbol : KtPropertySymbol() { final override val hasBackingField: Boolean get() = true final override val hasGetter: Boolean get() = true - final override val symbolKind: KtSymbolKind get() = KtSymbolKind.MEMBER + final override val symbolKind: KtSymbolKind get() = KtSymbolKind.CLASS_MEMBER abstract override val getter: KtPropertyGetterSymbol diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/KtSymbolWithKind.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/KtSymbolWithKind.kt index ef82f16c089..32ef04a1733 100644 --- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/KtSymbolWithKind.kt +++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/markers/KtSymbolWithKind.kt @@ -16,7 +16,7 @@ public interface KtSymbolWithKind : KtSymbol { public enum class KtSymbolKind { TOP_LEVEL, - MEMBER, + CLASS_MEMBER, LOCAL, ACCESSOR, SAM_CONSTRUCTOR, diff --git a/analysis/analysis-api/testData/memberScopeByFqName/Int.txt b/analysis/analysis-api/testData/memberScopeByFqName/Int.txt index cb1e5263438..a564fbd1af4 100644 --- a/analysis/analysis-api/testData/memberScopeByFqName/Int.txt +++ b/analysis/analysis-api/testData/memberScopeByFqName/Int.txt @@ -17,7 +17,7 @@ KtFirFunctionSymbol: name: and origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -44,7 +44,7 @@ KtFirFunctionSymbol: name: compareTo origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -71,7 +71,7 @@ KtFirFunctionSymbol: name: compareTo origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -98,7 +98,7 @@ KtFirFunctionSymbol: name: compareTo origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -125,7 +125,7 @@ KtFirFunctionSymbol: name: compareTo origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -152,7 +152,7 @@ KtFirFunctionSymbol: name: compareTo origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -179,7 +179,7 @@ KtFirFunctionSymbol: name: compareTo origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -206,7 +206,7 @@ KtFirFunctionSymbol: name: dec origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -231,7 +231,7 @@ KtFirFunctionSymbol: name: div origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -258,7 +258,7 @@ KtFirFunctionSymbol: name: div origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -285,7 +285,7 @@ KtFirFunctionSymbol: name: div origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -312,7 +312,7 @@ KtFirFunctionSymbol: name: div origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -339,7 +339,7 @@ KtFirFunctionSymbol: name: div origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -366,7 +366,7 @@ KtFirFunctionSymbol: name: div origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -393,7 +393,7 @@ KtFirFunctionSymbol: name: inc origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -418,7 +418,7 @@ KtFirFunctionSymbol: name: inv origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -443,7 +443,7 @@ KtFirFunctionSymbol: name: minus origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -470,7 +470,7 @@ KtFirFunctionSymbol: name: minus origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -497,7 +497,7 @@ KtFirFunctionSymbol: name: minus origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -524,7 +524,7 @@ KtFirFunctionSymbol: name: minus origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -551,7 +551,7 @@ KtFirFunctionSymbol: name: minus origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -578,7 +578,7 @@ KtFirFunctionSymbol: name: minus origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -605,7 +605,7 @@ KtFirFunctionSymbol: name: or origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -632,7 +632,7 @@ KtFirFunctionSymbol: name: plus origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -659,7 +659,7 @@ KtFirFunctionSymbol: name: plus origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -686,7 +686,7 @@ KtFirFunctionSymbol: name: plus origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -713,7 +713,7 @@ KtFirFunctionSymbol: name: plus origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -740,7 +740,7 @@ KtFirFunctionSymbol: name: plus origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -767,7 +767,7 @@ KtFirFunctionSymbol: name: plus origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -794,7 +794,7 @@ KtFirFunctionSymbol: name: rangeTo origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -821,7 +821,7 @@ KtFirFunctionSymbol: name: rangeTo origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -848,7 +848,7 @@ KtFirFunctionSymbol: name: rangeTo origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -875,7 +875,7 @@ KtFirFunctionSymbol: name: rangeTo origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -907,7 +907,7 @@ KtFirFunctionSymbol: name: rem origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -939,7 +939,7 @@ KtFirFunctionSymbol: name: rem origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -971,7 +971,7 @@ KtFirFunctionSymbol: name: rem origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -1003,7 +1003,7 @@ KtFirFunctionSymbol: name: rem origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -1035,7 +1035,7 @@ KtFirFunctionSymbol: name: rem origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -1067,7 +1067,7 @@ KtFirFunctionSymbol: name: rem origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -1094,7 +1094,7 @@ KtFirFunctionSymbol: name: shl origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(bitCount) @@ -1121,7 +1121,7 @@ KtFirFunctionSymbol: name: shr origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(bitCount) @@ -1148,7 +1148,7 @@ KtFirFunctionSymbol: name: times origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -1175,7 +1175,7 @@ KtFirFunctionSymbol: name: times origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -1202,7 +1202,7 @@ KtFirFunctionSymbol: name: times origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -1229,7 +1229,7 @@ KtFirFunctionSymbol: name: times origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -1256,7 +1256,7 @@ KtFirFunctionSymbol: name: times origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -1283,7 +1283,7 @@ KtFirFunctionSymbol: name: times origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -1310,7 +1310,7 @@ KtFirFunctionSymbol: name: toByte origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -1335,7 +1335,7 @@ KtFirFunctionSymbol: name: toChar origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -1360,7 +1360,7 @@ KtFirFunctionSymbol: name: toDouble origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -1385,7 +1385,7 @@ KtFirFunctionSymbol: name: toFloat origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -1410,7 +1410,7 @@ KtFirFunctionSymbol: name: toInt origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -1435,7 +1435,7 @@ KtFirFunctionSymbol: name: toLong origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -1460,7 +1460,7 @@ KtFirFunctionSymbol: name: toShort origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -1485,7 +1485,7 @@ KtFirFunctionSymbol: name: unaryMinus origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -1510,7 +1510,7 @@ KtFirFunctionSymbol: name: unaryPlus origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -1535,7 +1535,7 @@ KtFirFunctionSymbol: name: ushr origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(bitCount) @@ -1562,7 +1562,7 @@ KtFirFunctionSymbol: name: xor origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -1589,7 +1589,7 @@ KtFirFunctionSymbol: name: equals origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -1616,7 +1616,7 @@ KtFirFunctionSymbol: name: hashCode origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -1641,7 +1641,7 @@ KtFirFunctionSymbol: name: toString origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -1664,7 +1664,7 @@ KtFirNamedClassOrObjectSymbol: superTypes: [ [] kotlin/Any ] - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] visibility: Public deprecationStatus: null @@ -1681,7 +1681,7 @@ KtFirConstructorSymbol: isPrimary: false origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -1701,7 +1701,7 @@ KtFirConstructorSymbol: isPrimary: true origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Private diff --git a/analysis/analysis-api/testData/memberScopeByFqName/MutableList.txt b/analysis/analysis-api/testData/memberScopeByFqName/MutableList.txt index 5740a4e262f..2b3ff05a755 100644 --- a/analysis/analysis-api/testData/memberScopeByFqName/MutableList.txt +++ b/analysis/analysis-api/testData/memberScopeByFqName/MutableList.txt @@ -17,7 +17,7 @@ KtFirFunctionSymbol: name: add origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(element) @@ -44,7 +44,7 @@ KtFirFunctionSymbol: name: add origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(index) @@ -72,7 +72,7 @@ KtFirFunctionSymbol: name: addAll origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(index) @@ -100,7 +100,7 @@ KtFirFunctionSymbol: name: addAll origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(elements) @@ -127,7 +127,7 @@ KtFirFunctionSymbol: name: clear origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -152,7 +152,7 @@ KtFirFunctionSymbol: name: listIterator origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -177,7 +177,7 @@ KtFirFunctionSymbol: name: listIterator origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(index) @@ -204,7 +204,7 @@ KtFirFunctionSymbol: name: remove origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(element) @@ -231,7 +231,7 @@ KtFirFunctionSymbol: name: removeAll origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(elements) @@ -258,7 +258,7 @@ KtFirFunctionSymbol: name: removeAt origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(index) @@ -285,7 +285,7 @@ KtFirFunctionSymbol: name: retainAll origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(elements) @@ -312,7 +312,7 @@ KtFirFunctionSymbol: name: set origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(index) @@ -340,7 +340,7 @@ KtFirFunctionSymbol: name: subList origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(fromIndex) @@ -368,7 +368,7 @@ KtFirFunctionSymbol: name: contains origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(element) @@ -395,7 +395,7 @@ KtFirFunctionSymbol: name: containsAll origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(elements) @@ -422,7 +422,7 @@ KtFirFunctionSymbol: name: get origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(index) @@ -449,7 +449,7 @@ KtFirFunctionSymbol: name: indexOf origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(element) @@ -476,7 +476,7 @@ KtFirFunctionSymbol: name: isEmpty origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -501,7 +501,7 @@ KtFirFunctionSymbol: name: iterator origin: INTERSECTION_OVERRIDE receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -526,7 +526,7 @@ KtFirFunctionSymbol: name: lastIndexOf origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(element) @@ -557,7 +557,7 @@ KtFirKotlinPropertySymbol: origin: LIBRARY receiverType: null setter: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER visibility: Public deprecationStatus: null getterDeprecationStatus: null @@ -584,7 +584,7 @@ KtFirFunctionSymbol: name: equals origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -611,7 +611,7 @@ KtFirFunctionSymbol: name: hashCode origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -636,7 +636,7 @@ KtFirFunctionSymbol: name: toString origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public diff --git a/analysis/analysis-api/testData/memberScopeByFqName/java.lang.String.txt b/analysis/analysis-api/testData/memberScopeByFqName/java.lang.String.txt index 84f9342d337..2b5dda31c93 100644 --- a/analysis/analysis-api/testData/memberScopeByFqName/java.lang.String.txt +++ b/analysis/analysis-api/testData/memberScopeByFqName/java.lang.String.txt @@ -8,7 +8,7 @@ KtFirJavaFieldSymbol: name: value origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER visibility: Private deprecationStatus: null @@ -22,7 +22,7 @@ KtFirJavaFieldSymbol: name: hash origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER visibility: Private deprecationStatus: null @@ -45,7 +45,7 @@ KtFirFunctionSymbol: name: hash32 origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: PackageVisibility @@ -61,7 +61,7 @@ KtFirJavaFieldSymbol: name: hash32 origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER visibility: Private deprecationStatus: null @@ -88,7 +88,7 @@ KtFirSyntheticJavaPropertySymbol: origin: JAVA_SYNTHETIC_PROPERTY receiverType: null setter: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER visibility: Public deprecationStatus: null getterDeprecationStatus: null @@ -115,7 +115,7 @@ KtFirFunctionSymbol: name: isEmpty origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -140,7 +140,7 @@ KtFirFunctionSymbol: name: codePointAt origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -167,7 +167,7 @@ KtFirFunctionSymbol: name: codePointBefore origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -194,7 +194,7 @@ KtFirFunctionSymbol: name: codePointCount origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -222,7 +222,7 @@ KtFirFunctionSymbol: name: offsetByCodePoints origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -250,7 +250,7 @@ KtFirFunctionSymbol: name: getChars origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -278,7 +278,7 @@ KtFirFunctionSymbol: name: getChars origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -313,7 +313,7 @@ KtFirFunctionSymbol: name: getBytes origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -343,7 +343,7 @@ KtFirFunctionSymbol: name: getBytes origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -370,7 +370,7 @@ KtFirFunctionSymbol: name: getBytes origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -397,7 +397,7 @@ KtFirFunctionSymbol: name: getBytes origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -422,7 +422,7 @@ KtFirFunctionSymbol: name: equals origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -449,7 +449,7 @@ KtFirFunctionSymbol: name: contentEquals origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -476,7 +476,7 @@ KtFirFunctionSymbol: name: contentEquals origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -503,7 +503,7 @@ KtFirFunctionSymbol: name: equalsIgnoreCase origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -530,7 +530,7 @@ KtFirFunctionSymbol: name: compareTo origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -557,7 +557,7 @@ KtFirFunctionSymbol: name: compareToIgnoreCase origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -584,7 +584,7 @@ KtFirFunctionSymbol: name: regionMatches origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -614,7 +614,7 @@ KtFirFunctionSymbol: name: regionMatches origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -645,7 +645,7 @@ KtFirFunctionSymbol: name: startsWith origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -673,7 +673,7 @@ KtFirFunctionSymbol: name: startsWith origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -700,7 +700,7 @@ KtFirFunctionSymbol: name: endsWith origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -727,7 +727,7 @@ KtFirFunctionSymbol: name: hashCode origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -752,7 +752,7 @@ KtFirFunctionSymbol: name: indexOf origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -779,7 +779,7 @@ KtFirFunctionSymbol: name: indexOf origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -807,7 +807,7 @@ KtFirFunctionSymbol: name: indexOf origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -834,7 +834,7 @@ KtFirFunctionSymbol: name: indexOf origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -862,7 +862,7 @@ KtFirFunctionSymbol: name: indexOfSupplementary origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -890,7 +890,7 @@ KtFirFunctionSymbol: name: lastIndexOf origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -917,7 +917,7 @@ KtFirFunctionSymbol: name: lastIndexOf origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -945,7 +945,7 @@ KtFirFunctionSymbol: name: lastIndexOf origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -972,7 +972,7 @@ KtFirFunctionSymbol: name: lastIndexOf origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -1000,7 +1000,7 @@ KtFirFunctionSymbol: name: lastIndexOfSupplementary origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -1028,7 +1028,7 @@ KtFirFunctionSymbol: name: substring origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -1055,7 +1055,7 @@ KtFirFunctionSymbol: name: substring origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -1083,7 +1083,7 @@ KtFirFunctionSymbol: name: subSequence origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -1111,7 +1111,7 @@ KtFirFunctionSymbol: name: concat origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -1138,7 +1138,7 @@ KtFirFunctionSymbol: name: replace origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -1166,7 +1166,7 @@ KtFirFunctionSymbol: name: replace origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -1194,7 +1194,7 @@ KtFirFunctionSymbol: name: matches origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -1221,7 +1221,7 @@ KtFirFunctionSymbol: name: contains origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -1248,7 +1248,7 @@ KtFirFunctionSymbol: name: replaceFirst origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -1276,7 +1276,7 @@ KtFirFunctionSymbol: name: replaceAll origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -1304,7 +1304,7 @@ KtFirFunctionSymbol: name: split origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -1332,7 +1332,7 @@ KtFirFunctionSymbol: name: split origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -1359,7 +1359,7 @@ KtFirFunctionSymbol: name: toLowerCase origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -1386,7 +1386,7 @@ KtFirFunctionSymbol: name: toLowerCase origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -1411,7 +1411,7 @@ KtFirFunctionSymbol: name: toUpperCase origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -1438,7 +1438,7 @@ KtFirFunctionSymbol: name: toUpperCase origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -1463,7 +1463,7 @@ KtFirFunctionSymbol: name: trim origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -1488,7 +1488,7 @@ KtFirFunctionSymbol: name: toString origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -1513,7 +1513,7 @@ KtFirFunctionSymbol: name: toCharArray origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -1538,7 +1538,7 @@ KtFirFunctionSymbol: name: intern origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -1563,7 +1563,7 @@ KtFirFunctionSymbol: name: get origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -1590,7 +1590,7 @@ KtFirNamedClassOrObjectSymbol: [] java/util/Comparator> [] java/io/Serializable ] - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] visibility: Private deprecationStatus: null @@ -1607,7 +1607,7 @@ KtFirConstructorSymbol: isPrimary: false origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -1625,7 +1625,7 @@ KtFirConstructorSymbol: isPrimary: false origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -1645,7 +1645,7 @@ KtFirConstructorSymbol: isPrimary: false origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -1665,7 +1665,7 @@ KtFirConstructorSymbol: isPrimary: false origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -1687,7 +1687,7 @@ KtFirConstructorSymbol: isPrimary: false origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -1714,7 +1714,7 @@ KtFirConstructorSymbol: isPrimary: false origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -1742,7 +1742,7 @@ KtFirConstructorSymbol: isPrimary: false origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -1763,7 +1763,7 @@ KtFirConstructorSymbol: isPrimary: false origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -1786,7 +1786,7 @@ KtFirConstructorSymbol: isPrimary: false origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -1809,7 +1809,7 @@ KtFirConstructorSymbol: isPrimary: false origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -1830,7 +1830,7 @@ KtFirConstructorSymbol: isPrimary: false origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -1851,7 +1851,7 @@ KtFirConstructorSymbol: isPrimary: false origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -1873,7 +1873,7 @@ KtFirConstructorSymbol: isPrimary: false origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -1893,7 +1893,7 @@ KtFirConstructorSymbol: isPrimary: false origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -1913,7 +1913,7 @@ KtFirConstructorSymbol: isPrimary: false origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -1933,7 +1933,7 @@ KtFirConstructorSymbol: isPrimary: false origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) @@ -1959,7 +1959,7 @@ KtFirConstructorSymbol: isPrimary: false origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p0) diff --git a/analysis/analysis-api/testData/memberScopeByFqName/kotlin.Function2.txt b/analysis/analysis-api/testData/memberScopeByFqName/kotlin.Function2.txt index 2ff5d2e6c88..0a2bbb21ad9 100644 --- a/analysis/analysis-api/testData/memberScopeByFqName/kotlin.Function2.txt +++ b/analysis/analysis-api/testData/memberScopeByFqName/kotlin.Function2.txt @@ -17,7 +17,7 @@ KtFirFunctionSymbol: name: invoke origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(p1) @@ -45,7 +45,7 @@ KtFirFunctionSymbol: name: equals origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(other) @@ -72,7 +72,7 @@ KtFirFunctionSymbol: name: hashCode origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -97,7 +97,7 @@ KtFirFunctionSymbol: name: toString origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/enumEntry.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/enumEntry.txt index 43dc5a0d954..2fbcef376fa 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/enumEntry.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/enumEntry.txt @@ -6,5 +6,5 @@ KtFirEnumEntrySymbol: name: SYNCHRONIZED origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER deprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunction.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunction.txt index a8b25ddbe85..297be9dc658 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunction.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunction.txt @@ -17,7 +17,7 @@ KtFirFunctionSymbol: name: get origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(index) diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunctionWithOverloads.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunctionWithOverloads.txt index c6a8b9e83d4..502836e2d93 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunctionWithOverloads.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/memberFunctionWithOverloads.txt @@ -17,7 +17,7 @@ KtFirFunctionSymbol: name: listIterator origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -42,7 +42,7 @@ KtFirFunctionSymbol: name: listIterator origin: LIBRARY receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(index) diff --git a/analysis/analysis-api/testData/symbols/symbolByFqName/nestedClass.txt b/analysis/analysis-api/testData/symbols/symbolByFqName/nestedClass.txt index 6232a635b4c..285919a7449 100644 --- a/analysis/analysis-api/testData/symbols/symbolByFqName/nestedClass.txt +++ b/analysis/analysis-api/testData/symbols/symbolByFqName/nestedClass.txt @@ -15,7 +15,7 @@ KtFirNamedClassOrObjectSymbol: superTypes: [ [] kotlin/collections/Map.Entry ] - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [ KtFirTypeParameterSymbol(K) KtFirTypeParameterSymbol(V) diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt index 29221b617a2..7f6c2f30d1b 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt @@ -38,7 +38,7 @@ KtFirConstructorSymbol: isPrimary: true origin: SOURCE receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(param1) @@ -93,7 +93,7 @@ KtFirFunctionSymbol: name: x origin: SOURCE receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.txt index fd3b10b3784..27f27536aec 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/anonymousObject.txt @@ -17,7 +17,7 @@ KtFirFunctionSymbol: name: run origin: SOURCE receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -46,7 +46,7 @@ KtFirKotlinPropertySymbol: origin: SOURCE receiverType: null setter: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER visibility: Public deprecationStatus: null getterDeprecationStatus: null @@ -90,7 +90,7 @@ KtFirKotlinPropertySymbol: origin: SOURCE receiverType: null setter: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER visibility: Public deprecationStatus: null getterDeprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.txt index 18ed4c96302..0174f72220d 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classInitializer.txt @@ -21,7 +21,7 @@ KtFirKotlinPropertySymbol: origin: SOURCE receiverType: null setter: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER visibility: Public deprecationStatus: null getterDeprecationStatus: null @@ -31,7 +31,7 @@ KtFirKotlinPropertySymbol: KtFirClassInitializerSymbol: origin: SOURCE - symbolKind: MEMBER + symbolKind: CLASS_MEMBER deprecationStatus: null KtFirNamedClassOrObjectSymbol: diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classMembes.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classMembes.txt index 92baa01d804..e260f0a7f2d 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classMembes.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classMembes.txt @@ -21,7 +21,7 @@ KtFirKotlinPropertySymbol: origin: SOURCE receiverType: null setter: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER visibility: Public deprecationStatus: null getterDeprecationStatus: null @@ -48,7 +48,7 @@ KtFirFunctionSymbol: name: x origin: SOURCE receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt index 024511b7f31..ac5360c3dca 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classPrimaryConstructor.txt @@ -10,7 +10,7 @@ KtFirConstructorSymbol: isPrimary: true origin: SOURCE receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.txt index d495310e989..73a8b1cf6ab 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/classSecondaryConstructors.txt @@ -10,7 +10,7 @@ KtFirConstructorSymbol: isPrimary: true origin: SOURCE receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -42,7 +42,7 @@ KtFirConstructorSymbol: isPrimary: false origin: SOURCE receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(x) @@ -90,7 +90,7 @@ KtFirConstructorSymbol: isPrimary: false origin: SOURCE receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(y) diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.txt index d58cbb98bc1..d7915d411e1 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.txt @@ -230,7 +230,7 @@ KtFirKotlinPropertySymbol: origin: SOURCE receiverType: null setter: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER visibility: Public deprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use i2) getterDeprecationStatus: SimpleDeprecationInfo(deprecationLevel=WARNING, propagatesToOverrides=true, message=don't use i2) @@ -262,7 +262,7 @@ KtFirFunctionSymbol: name: f2 origin: SOURCE receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enum.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enum.txt index 768bba1b521..def43ea1be1 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/enum.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enum.txt @@ -6,7 +6,7 @@ KtFirEnumEntrySymbol: name: Y origin: SOURCE receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER deprecationStatus: null KtFirEnumEntrySymbol: @@ -17,7 +17,7 @@ KtFirEnumEntrySymbol: name: Z origin: SOURCE receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER deprecationStatus: null KtFirNamedClassOrObjectSymbol: diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt index 41768786e2d..d14031c3cbb 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt @@ -24,7 +24,7 @@ KtFirConstructorSymbol: isPrimary: true origin: SOURCE receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(value) @@ -75,7 +75,7 @@ KtFirKotlinPropertySymbol: origin: SOURCE receiverType: null setter: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER visibility: Public deprecationStatus: null getterDeprecationStatus: null @@ -91,7 +91,7 @@ KtFirEnumEntrySymbol: name: SHEET origin: SOURCE receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER deprecationStatus: null KtFirKotlinPropertySymbol: @@ -117,7 +117,7 @@ KtFirKotlinPropertySymbol: origin: SOURCE receiverType: null setter: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER visibility: Public deprecationStatus: null getterDeprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.txt index cece4c0783f..d9360587791 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/implicitConstructorDelegationCall.txt @@ -24,7 +24,7 @@ KtFirConstructorSymbol: isPrimary: false origin: SOURCE receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(i) diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt index 7892e914086..c7cffeea767 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt @@ -29,7 +29,7 @@ KtFirKotlinPropertySymbol: origin: SOURCE receiverType: null setter: KtFirPropertySetterSymbol() - symbolKind: MEMBER + symbolKind: CLASS_MEMBER visibility: Public deprecationStatus: null getterDeprecationStatus: null @@ -127,7 +127,7 @@ KtFirKotlinPropertySymbol: origin: SOURCE receiverType: null setter: KtFirPropertySetterSymbol() - symbolKind: MEMBER + symbolKind: CLASS_MEMBER visibility: Public deprecationStatus: null getterDeprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/memberFunctions.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/memberFunctions.txt index 9a119f88734..29743cf44bd 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/memberFunctions.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/memberFunctions.txt @@ -17,7 +17,7 @@ KtFirFunctionSymbol: name: x origin: SOURCE receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public @@ -42,7 +42,7 @@ KtFirFunctionSymbol: name: y origin: SOURCE receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [] visibility: Public diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.txt index 785c9605dc8..b3fe029da24 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/memberProperties.txt @@ -21,7 +21,7 @@ KtFirKotlinPropertySymbol: origin: SOURCE receiverType: null setter: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER visibility: Public deprecationStatus: null getterDeprecationStatus: null @@ -72,7 +72,7 @@ KtFirKotlinPropertySymbol: origin: SOURCE receiverType: [] kotlin/Int setter: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER visibility: Public deprecationStatus: null getterDeprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt index e39fcbff4fd..76fa8768b52 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt @@ -35,7 +35,7 @@ KtFirNamedClassOrObjectSymbol: superTypes: [ [] kotlin/Any ] - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [ KtFirTypeParameterSymbol(T1) ] @@ -69,7 +69,7 @@ KtFirNamedClassOrObjectSymbol: superTypes: [ [] kotlin/Any ] - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [ KtFirTypeParameterSymbol(T2) ] @@ -207,7 +207,7 @@ KtFirFunctionSymbol: name: foo origin: SOURCE receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [ KtFirTypeParameterSymbol(T3) ] diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt index 8b6c892ad5f..db58b2c528a 100644 --- a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt +++ b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt @@ -167,7 +167,7 @@ KtFirFunctionSymbol: name: f origin: SOURCE receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [] valueParameters: [ KtFirValueParameterSymbol(arg) @@ -201,7 +201,7 @@ KtFirKotlinPropertySymbol: origin: SOURCE receiverType: null setter: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER visibility: Public deprecationStatus: null getterDeprecationStatus: null diff --git a/analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.txt b/analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.txt index 8b8c3095eff..f38c5b92291 100644 --- a/analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.txt +++ b/analysis/analysis-api/testData/symbols/symbolByReference/constructorViaTypeAlias.txt @@ -10,7 +10,7 @@ KtFirConstructorSymbol: isPrimary: false origin: JAVA receiverType: null - symbolKind: MEMBER + symbolKind: CLASS_MEMBER typeParameters: [ KtFirTypeParameterSymbol(E) ]