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

[K/N] Move more names to NativeStandardInteropNames

Browse Source 
^KT-61564
This commit is contained in:
Vladimir Sukharev
2024-01-02 17:48:53 +01:00
committed by Space Team
parent 324e04586a
commit a78cfff8c9
4 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/checkers.native/src/org/jetbrains/kotlin/fir/analysis/diagnostics/native/FirNativeErrorsDefaultMessages.kt
+1 -1
View File
@@ -126,7 +126,7 @@ object FirNativeErrorsDefaultMessages : BaseDiagnosticRendererFactory() {
)
map.put(
MUST_BE_UNIT_TYPE,
"Unexpected {0}: ''{1}''\nOnly \"Unit\" is supported here.",
"Unexpected {0}: ''{1}''\nOnly ''Unit'' is supported here.",
TO_STRING,
FirDiagnosticRenderers.RENDER_TYPE
)
compiler/fir/checkers/checkers.native/src/org/jetbrains/kotlin/fir/analysis/native/checkers/FirNativeObjCOutletChecker.kt
+5 -9
View File
@@ -18,13 +18,9 @@ import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor
import org.jetbrains.kotlin.fir.declarations.hasAnnotation
import org.jetbrains.kotlin.fir.declarations.utils.isExpect
import org.jetbrains.kotlin.fir.types.coneType
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.NativeStandardInteropNames.objCOutletClassId
object FirNativeObjCOutletChecker : FirClassChecker() {
// Copy/pasted from InteropFqNames.objCOutlet, since module `kotlin-native:backend.native` cannot be imported here for now.
val objCOutletFqName = FqName("kotlinx.cinterop.ObjCOutlet")
override fun check(declaration: FirClass, context: CheckerContext, reporter: DiagnosticReporter) {
val session = context.session
@@ -35,12 +31,12 @@ object FirNativeObjCOutletChecker : FirClassChecker() {
fun checkCanGenerateOutletSetterImp(property: FirProperty) {
if (!property.isVar) {
reporter.reportOn(property.source, FirNativeErrors.PROPERTY_MUST_BE_VAR, objCOutletFqName, context)
reporter.reportOn(property.source, FirNativeErrors.PROPERTY_MUST_BE_VAR, objCOutletClassId.asSingleFqName(), context)
return
}
property.receiverParameter?.let {
reporter.reportOn(it.source, FirNativeErrors.MUST_NOT_HAVE_EXTENSION_RECEIVER, "@$objCOutletFqName", context)
reporter.reportOn(it.source, FirNativeErrors.MUST_NOT_HAVE_EXTENSION_RECEIVER, "@${objCOutletClassId.asFqNameString()}", context)
}
val type = property.returnTypeRef
@@ -48,7 +44,7 @@ object FirNativeObjCOutletChecker : FirClassChecker() {
reporter.reportOn(
property.returnTypeRef.source,
FirNativeErrors.MUST_BE_OBJC_OBJECT_TYPE,
"@$objCOutletFqName type",
"@${objCOutletClassId.asSingleFqName()} type",
type.coneType,
context
)
@@ -58,7 +54,7 @@ object FirNativeObjCOutletChecker : FirClassChecker() {
fun checkKotlinObjCClass(firClass: FirClass) {
for (decl in firClass.declarations) {
if (decl is FirProperty && decl.annotations.hasAnnotation(ClassId.topLevel(objCOutletFqName), session))
if (decl is FirProperty && decl.annotations.hasAnnotation(objCOutletClassId, session))
checkCanGenerateOutletSetterImp(decl)
}
}
compiler/fir/checkers/checkers.native/src/org/jetbrains/kotlin/fir/analysis/native/checkers/FirNativeObjCOverrideInitChecker.kt
+1 -5
View File
@@ -28,13 +28,9 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
import org.jetbrains.kotlin.fir.types.*
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.name.NativeStandardInteropNames.objCOverrideInitClassId
object FirNativeObjCOverrideInitChecker : FirClassChecker() {
val objCOverrideInitClassId = ClassId(FqName("kotlinx.cinterop"), Name.identifier("ObjCObjectBase.OverrideInit"))
@OptIn(SymbolInternals::class)
override fun check(declaration: FirClass, context: CheckerContext, reporter: DiagnosticReporter) {
val session = context.session
core/compiler.common.native/src/org/jetbrains/kotlin/name/NativeStandardInteropNames.kt
+2
View File
@@ -22,6 +22,8 @@ object NativeStandardInteropNames {
val objCConstructorClassId = ClassId(cInteropPackage, Name.identifier("ObjCConstructor"))
val externalObjCClassClassId = ClassId(cInteropPackage, Name.identifier("ExternalObjCClass"))
val objCActionClassId = ClassId(cInteropPackage, Name.identifier("ObjCAction"))
val objCOutletClassId = ClassId(cInteropPackage, Name.identifier("ObjCOutlet"))
val objCOverrideInitClassId = ClassId(cInteropPackage, Name.identifier("ObjCObjectBase.OverrideInit"))
object ForwardDeclarations {