Rename RefinedInSwift to ShouldRefineInSwift

JetBrains · Aug 16, 2022 · 37a46bd · 37a46bd
1 parent c2520c6
commit 37a46bd
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 42 deletions.
diff --git a/compiler/testData/diagnostics/nativeTests/objCRefinement.kt b/compiler/testData/diagnostics/nativeTests/objCRefinement.kt
@@ -18,7 +18,7 @@ annotation class RefinesInSwift
 @RefinesInSwift
 @Target(AnnotationTarget.PROPERTY, AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.BINARY)
-public annotation class RefinedInSwift
+public annotation class ShouldRefineInSwift
 
 // FILE: plugin.kt
 package plugin
@@ -31,11 +31,11 @@ annotation class PluginHiddenFromObjC
 @RefinesInSwift
 @Target(AnnotationTarget.PROPERTY, AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.BINARY)
-annotation class PluginRefinedInSwift
+annotation class PluginShouldRefineInSwift
 
 // FILE: test.kt
 import plugin.PluginHiddenFromObjC
-import plugin.PluginRefinedInSwift
+import plugin.PluginShouldRefineInSwift
 
 @HidesFromObjC
 <!REDUNDANT_SWIFT_REFINEMENT!>@RefinesInSwift<!>
@@ -58,25 +58,25 @@ annotation class MyRefinedAnnotationC
 annotation class MyRefinedAnnotationD
 
 @HiddenFromObjC
-<!REDUNDANT_SWIFT_REFINEMENT!>@RefinedInSwift<!>
+<!REDUNDANT_SWIFT_REFINEMENT!>@ShouldRefineInSwift<!>
 var refinedProperty: Int = 0
 
 @PluginHiddenFromObjC
-<!REDUNDANT_SWIFT_REFINEMENT!>@PluginRefinedInSwift<!>
+<!REDUNDANT_SWIFT_REFINEMENT!>@PluginShouldRefineInSwift<!>
 fun pluginRefinedFunction() { }
 
 @HiddenFromObjC
 @PluginHiddenFromObjC
 fun multipleObjCRefinementsFunction() { }
 
-@RefinedInSwift
-@PluginRefinedInSwift
+@ShouldRefineInSwift
+@PluginShouldRefineInSwift
 fun multipleSwiftRefinementsFunction() { }
 
 @HiddenFromObjC
 @PluginHiddenFromObjC
-<!REDUNDANT_SWIFT_REFINEMENT!>@RefinedInSwift<!>
-<!REDUNDANT_SWIFT_REFINEMENT!>@PluginRefinedInSwift<!>
+<!REDUNDANT_SWIFT_REFINEMENT!>@ShouldRefineInSwift<!>
+<!REDUNDANT_SWIFT_REFINEMENT!>@PluginShouldRefineInSwift<!>
 fun multipleMixedRefinementsFunction() { }
 
 interface InterfaceA {
@@ -89,7 +89,7 @@ interface InterfaceA {
 
 interface InterfaceB {
     val barA: Int
-    @RefinedInSwift
+    @ShouldRefineInSwift
     val barB: Int
     @HiddenFromObjC
     fun fooA()
@@ -100,7 +100,7 @@ interface InterfaceB {
 open class ClassA: InterfaceA, InterfaceB {
     <!INCOMPATIBLE_OBJC_REFINEMENT_OVERRIDE!>@HiddenFromObjC<!>
     override val barA: Int = 0
-    <!INCOMPATIBLE_OBJC_REFINEMENT_OVERRIDE!>@RefinedInSwift<!>
+    <!INCOMPATIBLE_OBJC_REFINEMENT_OVERRIDE!>@ShouldRefineInSwift<!>
     override val barB: Int = 0
     <!INCOMPATIBLE_OBJC_REFINEMENT_OVERRIDE!>override fun fooA() { }<!>
     override fun fooB() { }
@@ -111,7 +111,7 @@ open class ClassA: InterfaceA, InterfaceB {
 class ClassB: ClassA() {
     @HiddenFromObjC
     override fun fooB() { }
-    <!INCOMPATIBLE_OBJC_REFINEMENT_OVERRIDE!>@RefinedInSwift<!>
+    <!INCOMPATIBLE_OBJC_REFINEMENT_OVERRIDE!>@ShouldRefineInSwift<!>
     override fun fooC() { }
 }
 

diff --git a/compiler/testData/diagnostics/nativeTests/objCRefinement.txt b/compiler/testData/diagnostics/nativeTests/objCRefinement.txt
@@ -1,10 +1,10 @@
 package
 
-@kotlin.native.HiddenFromObjC @kotlin.native.RefinedInSwift public var refinedProperty: kotlin.Int
-@kotlin.native.HiddenFromObjC @plugin.PluginHiddenFromObjC @kotlin.native.RefinedInSwift @plugin.PluginRefinedInSwift public fun multipleMixedRefinementsFunction(): kotlin.Unit
+@kotlin.native.HiddenFromObjC @kotlin.native.ShouldRefineInSwift public var refinedProperty: kotlin.Int
+@kotlin.native.HiddenFromObjC @plugin.PluginHiddenFromObjC @kotlin.native.ShouldRefineInSwift @plugin.PluginShouldRefineInSwift public fun multipleMixedRefinementsFunction(): kotlin.Unit
 @kotlin.native.HiddenFromObjC @plugin.PluginHiddenFromObjC public fun multipleObjCRefinementsFunction(): kotlin.Unit
-@kotlin.native.RefinedInSwift @plugin.PluginRefinedInSwift public fun multipleSwiftRefinementsFunction(): kotlin.Unit
-@plugin.PluginHiddenFromObjC @plugin.PluginRefinedInSwift public fun pluginRefinedFunction(): kotlin.Unit
+@kotlin.native.ShouldRefineInSwift @plugin.PluginShouldRefineInSwift public fun multipleSwiftRefinementsFunction(): kotlin.Unit
+@plugin.PluginHiddenFromObjC @plugin.PluginShouldRefineInSwift public fun pluginRefinedFunction(): kotlin.Unit
 
 public open class Base {
     public constructor Base()
@@ -17,7 +17,7 @@ public open class Base {
 public open class ClassA : InterfaceA, InterfaceB {
     public constructor ClassA()
     @kotlin.native.HiddenFromObjC public open override /*2*/ val barA: kotlin.Int = 0
-    @kotlin.native.RefinedInSwift public open override /*2*/ val barB: kotlin.Int = 0
+    @kotlin.native.ShouldRefineInSwift public open override /*2*/ val barB: kotlin.Int = 0
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*2*/ fun fooA(): kotlin.Unit
     public open override /*2*/ fun fooB(): kotlin.Unit
@@ -29,11 +29,11 @@ public open class ClassA : InterfaceA, InterfaceB {
 public final class ClassB : ClassA {
     public constructor ClassB()
     @kotlin.native.HiddenFromObjC public open override /*1*/ /*fake_override*/ val barA: kotlin.Int
-    @kotlin.native.RefinedInSwift public open override /*1*/ /*fake_override*/ val barB: kotlin.Int
+    @kotlin.native.ShouldRefineInSwift public open override /*1*/ /*fake_override*/ val barB: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun fooA(): kotlin.Unit
     @kotlin.native.HiddenFromObjC public open override /*1*/ fun fooB(): kotlin.Unit
-    @kotlin.native.RefinedInSwift public open override /*1*/ fun fooC(): kotlin.Unit
+    @kotlin.native.ShouldRefineInSwift public open override /*1*/ fun fooC(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -73,7 +73,7 @@ public interface InterfaceA {
 
 public interface InterfaceB {
     public abstract val barA: kotlin.Int
-    @kotlin.native.RefinedInSwift public abstract val barB: kotlin.Int
+    @kotlin.native.ShouldRefineInSwift public abstract val barB: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     @kotlin.native.HiddenFromObjC public abstract fun fooA(): kotlin.Unit
     @kotlin.native.HiddenFromObjC public abstract fun fooB(): kotlin.Unit
@@ -127,15 +127,15 @@ package kotlin {
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
 
-        @kotlin.native.RefinesInSwift @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.PROPERTY, AnnotationTarget.FUNCTION}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) public final annotation class RefinedInSwift : kotlin.Annotation {
-            public constructor RefinedInSwift()
+        @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.ANNOTATION_CLASS}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) public final annotation class RefinesInSwift : kotlin.Annotation {
+            public constructor RefinesInSwift()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         }
 
-        @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.ANNOTATION_CLASS}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) public final annotation class RefinesInSwift : kotlin.Annotation {
-            public constructor RefinesInSwift()
+        @kotlin.native.RefinesInSwift @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.PROPERTY, AnnotationTarget.FUNCTION}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) public final annotation class ShouldRefineInSwift : kotlin.Annotation {
+            public constructor ShouldRefineInSwift()
             public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
             public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
             public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -152,8 +152,8 @@ package plugin {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
-    @kotlin.native.RefinesInSwift @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.PROPERTY, AnnotationTarget.FUNCTION}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) public final annotation class PluginRefinedInSwift : kotlin.Annotation {
-        public constructor PluginRefinedInSwift()
+    @kotlin.native.RefinesInSwift @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.PROPERTY, AnnotationTarget.FUNCTION}) @kotlin.annotation.Retention(value = AnnotationRetention.BINARY) public final annotation class PluginShouldRefineInSwift : kotlin.Annotation {
+        public constructor PluginShouldRefineInSwift()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String

diff --git a/....native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanFqNames.kt b/....native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanFqNames.kt
@@ -40,7 +40,7 @@ object KonanFqNames {
     val objCName = FqName("kotlin.native.ObjCName")
     val hidesFromObjC = FqName("kotlin.native.HidesFromObjC")
     val refinesInSwift = FqName("kotlin.native.RefinesInSwift")
-    val refinedInSwift = FqName("kotlin.native.RefinedInSwift")
+    val shouldRefineInSwift = FqName("kotlin.native.ShouldRefineInSwift")
     val reflectionPackageName = FqName("kotlin.native.internal.ReflectionPackageName")
     val cachesInternalAbi = FqName("kotlin.native.caches.abi")
 }
diff --git a/...end.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportHeaderGenerator.kt b/...end.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportHeaderGenerator.kt
@@ -806,7 +806,7 @@ internal class ObjCExportTranslatorImpl(
         }
     }
 
-    private val mustBeDocumentedAnnotationsStopList = setOf(StandardNames.FqNames.deprecated, KonanFqNames.objCName, KonanFqNames.refinedInSwift)
+    private val mustBeDocumentedAnnotationsStopList = setOf(StandardNames.FqNames.deprecated, KonanFqNames.objCName, KonanFqNames.shouldRefineInSwift)
     private fun mustBeDocumentedAnnotations(annotations: Annotations): List<String> {
         return annotations.mapNotNull { it ->
             it.annotationClass?.let { annotationClass ->

diff --git a/kotlin-native/backend.native/tests/objcexport/expectedLazy.h b/kotlin-native/backend.native/tests/objcexport/expectedLazy.h
@@ -1440,14 +1440,14 @@ __attribute__((swift_name("RefinedKt")))
 
 /**
  * @note annotations
- *   refined.MyRefinedInSwift
+ *   refined.MyShouldRefineInSwift
 */
 + (NSString *)myFooRefined __attribute__((swift_private));
 @property (class, readonly) NSString *barRefined __attribute__((swift_private));
 
 /**
  * @note annotations
- *   refined.MyRefinedInSwift
+ *   refined.MyShouldRefineInSwift
 */
 @property (class, readonly) NSString *myBarRefined __attribute__((swift_private));
 @end

diff --git a/kotlin-native/backend.native/tests/objcexport/expectedLazyLegacySuspendUnit.h b/kotlin-native/backend.native/tests/objcexport/expectedLazyLegacySuspendUnit.h
@@ -1375,14 +1375,14 @@ __attribute__((swift_name("RefinedKt")))
 
 /**
  * @note annotations
- *   refined.MyRefinedInSwift
+ *   refined.MyShouldRefineInSwift
 */
 + (NSString *)myFooRefined __attribute__((swift_private));
 @property (class, readonly) NSString *barRefined __attribute__((swift_private));
 
 /**
  * @note annotations
- *   refined.MyRefinedInSwift
+ *   refined.MyShouldRefineInSwift
 */
 @property (class, readonly) NSString *myBarRefined __attribute__((swift_private));
 @end

diff --git a/kotlin-native/backend.native/tests/objcexport/expectedLazyNoGenerics.h b/kotlin-native/backend.native/tests/objcexport/expectedLazyNoGenerics.h
@@ -1375,14 +1375,14 @@ __attribute__((swift_name("RefinedKt")))
 
 /**
  * @note annotations
- *   refined.MyRefinedInSwift
+ *   refined.MyShouldRefineInSwift
 */
 + (NSString *)myFooRefined __attribute__((swift_private));
 @property (class, readonly) NSString *barRefined __attribute__((swift_private));
 
 /**
  * @note annotations
- *   refined.MyRefinedInSwift
+ *   refined.MyShouldRefineInSwift
 */
 @property (class, readonly) NSString *myBarRefined __attribute__((swift_private));
 @end

diff --git a/kotlin-native/backend.native/tests/objcexport/refined.kt b/kotlin-native/backend.native/tests/objcexport/refined.kt
@@ -19,46 +19,46 @@ annotation class MyHiddenFromObjC
 @Retention(AnnotationRetention.BINARY)
 @MustBeDocumented
 @RefinesInSwift
-annotation class MyRefinedInSwift
+annotation class MyShouldRefineInSwift
 
 @OptIn(ExperimentalObjCRefinement::class)
 @HiddenFromObjC
 fun foo(): Int = 1
 
 @OptIn(ExperimentalObjCRefinement::class)
-@RefinedInSwift
+@ShouldRefineInSwift
 fun fooRefined(): String = foo().toString()
 
 @OptIn(ExperimentalObjCRefinement::class)
 @MyHiddenFromObjC
 fun myFoo(): Int = 2
 
 @OptIn(ExperimentalObjCRefinement::class)
-@MyRefinedInSwift
+@MyShouldRefineInSwift
 fun myFooRefined(): String = myFoo().toString()
 
 @OptIn(ExperimentalObjCRefinement::class)
 @HiddenFromObjC
 val bar: Int = 3
 
 @OptIn(ExperimentalObjCRefinement::class)
-@RefinedInSwift
+@ShouldRefineInSwift
 val barRefined: String get() = bar.toString()
 
 @OptIn(ExperimentalObjCRefinement::class)
 @MyHiddenFromObjC
 val myBar: Int = 4
 
 @OptIn(ExperimentalObjCRefinement::class)
-@MyRefinedInSwift
+@MyShouldRefineInSwift
 val myBarRefined: String get() = myBar.toString()
 
 open class RefinedClassA {
     @OptIn(ExperimentalObjCRefinement::class)
     @HiddenFromObjC
     open fun foo(): Int = 1
     @OptIn(ExperimentalObjCRefinement::class)
-    @RefinedInSwift
+    @ShouldRefineInSwift
     open fun fooRefined(): String = foo().toString()
 }
 

diff --git a/kotlin-native/runtime/src/main/kotlin/kotlin/native/Annotations.kt b/kotlin-native/runtime/src/main/kotlin/kotlin/native/Annotations.kt
@@ -155,4 +155,4 @@ public actual annotation class RefinesInSwift
 @Retention(AnnotationRetention.BINARY)
 @MustBeDocumented
 @ExperimentalObjCRefinement
-public actual annotation class RefinedInSwift
+public actual annotation class ShouldRefineInSwift
diff --git a/libraries/stdlib/src/kotlin/annotations/NativeAnnotations.kt b/libraries/stdlib/src/kotlin/annotations/NativeAnnotations.kt
@@ -124,4 +124,4 @@ public expect annotation class RefinesInSwift()
 @MustBeDocumented
 @OptionalExpectation
 @ExperimentalObjCRefinement
-public expect annotation class RefinedInSwift()
+public expect annotation class ShouldRefineInSwift()