azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIR IDE: rename SymbolKind: MEMBER -> CLASS_MEMBER

Browse Source
This commit is contained in:
Tianyu Geng
2021-09-20 09:45:44 -07:00
committed by Ilya Kirillov
parent d968b2ba49
commit 43257f7688
32 changed files with 220 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolContainingDeclarationProvider.kt
+1 -1
View File
@@ -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 -> {
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirClassInitializerSymbol.kt
+1 -1
View File
@@ -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
}
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirFunctionSymbol.kt
+2 -2
View File
@@ -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,
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirKotlinPropertySymbol.kt
+2 -2
View File
@@ -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,
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirNamedClassOrObjectSymbol.kt
+1 -1
View File
@@ -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
}
}