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

[FIR] Make FirResolvedDeclarationStatus.modality non nullable

Browse Source 
^KT-58764 Fixed
This commit is contained in:
Dmitriy Novozhilov
2023-08-30 17:40:33 +03:00
committed by Space Team
parent 8299fffae2
commit 6169834bb3
12 changed files with 20 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirFunctionSymbol.kt
+1 -1
View File
@@ -98,7 +98,7 @@ internal class KtFirFunctionSymbol(
}
}
override val modality: Modality get() = withValidityAssertion { firSymbol.modalityOrFinal }
override val modality: Modality get() = withValidityAssertion { firSymbol.modality }
override val visibility: Visibility get() = withValidityAssertion { firSymbol.visibility }
context(KtAnalysisSession)
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirJavaFieldSymbol.kt
+2 -2
View File
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.analysis.api.types.KtType
import org.jetbrains.kotlin.descriptors.Modality
import org.jetbrains.kotlin.descriptors.Visibility
import org.jetbrains.kotlin.fir.declarations.utils.isStatic
import org.jetbrains.kotlin.fir.declarations.utils.modalityOrFinal
import org.jetbrains.kotlin.fir.declarations.utils.modality
import org.jetbrains.kotlin.fir.declarations.utils.visibility
import org.jetbrains.kotlin.fir.symbols.impl.FirFieldSymbol
import org.jetbrains.kotlin.name.CallableId
@@ -46,7 +46,7 @@ internal class KtFirJavaFieldSymbol(
override val callableIdIfNonLocal: CallableId? get() = withValidityAssertion { firSymbol.getCallableIdIfNonLocal() }
override val modality: Modality get() = withValidityAssertion { firSymbol.modalityOrFinal }
override val modality: Modality get() = withValidityAssertion { firSymbol.modality }
override val visibility: Visibility get() = withValidityAssertion { firSymbol.visibility }
override val isStatic: Boolean get() = withValidityAssertion { firSymbol.isStatic }
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirKotlinPropertySymbol.kt
+1 -1
View File
@@ -73,7 +73,7 @@ internal class KtFirKotlinPropertySymbol(
}
}
override val modality: Modality get() = withValidityAssertion { firSymbol.modalityOrFinal }
override val modality: Modality get() = withValidityAssertion { firSymbol.modality }
override val visibility: Visibility get() = withValidityAssertion { firSymbol.visibility }
override val annotationsList by cached {
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirPropertyGetterSymbol.kt
+1 -1
View File
@@ -51,7 +51,7 @@ internal class KtFirPropertyGetterSymbol(
override val hasBody: Boolean get() = withValidityAssertion { firSymbol.fir.hasBody }
override val modality: Modality get() = withValidityAssertion { firSymbol.modalityOrFinal }
override val modality: Modality get() = withValidityAssertion { firSymbol.modality }
override val visibility: Visibility get() = withValidityAssertion { firSymbol.visibility }
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirPropertySetterSymbol.kt
+1 -1
View File
@@ -65,7 +65,7 @@ internal class KtFirPropertySetterSymbol(
override val hasBody: Boolean get() = withValidityAssertion { firSymbol.fir.hasBody }
override val modality: Modality get() = withValidityAssertion { firSymbol.modalityOrFinal }
override val modality: Modality get() = withValidityAssertion { firSymbol.modality }
override val visibility: Visibility get() = withValidityAssertion { firSymbol.visibility }
override val annotationsList by cached {
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSyntheticJavaPropertySymbol.kt
+1 -1
View File
@@ -51,7 +51,7 @@ internal class KtFirSyntheticJavaPropertySymbol(
override val initializer: KtInitializerValue? by cached { firSymbol.getKtConstantInitializer(analysisSession.firResolveSession) }
override val modality: Modality get() = withValidityAssertion { firSymbol.modality ?: firSymbol.invalidModalityError() }
override val modality: Modality get() = withValidityAssertion { firSymbol.modality }
override val visibility: Visibility get() = withValidityAssertion { firSymbol.visibility }
override val annotationsList by cached {