Implement PublicButReplaced visibility.

touchlab · May 16, 2024 · d3b59e0 · d3b59e0
1 parent 6fa8929
commit d3b59e0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/SKIE/acceptance-tests b/SKIE/acceptance-tests
diff --git a/...er/core/src/commonMain/kotlin/co/touchlab/skie/phases/sir/member/CreateSirMembersPhase.kt b/...er/core/src/commonMain/kotlin/co/touchlab/skie/phases/sir/member/CreateSirMembersPhase.kt
@@ -169,10 +169,11 @@ class CreateSirMembersPhase(
         get() = this.configuration[SkieVisibility].toSirVisibility()
 
     private val KirCallableDeclaration<*>.isReplaced: Boolean
-        get() = this.isRefinedInSwift
+        get() = this.isRefinedInSwift || this.configuration[SkieVisibility] == SkieVisibility.Level.PublicButReplaced
 
     private val KirCallableDeclaration<*>.isHidden: Boolean
-        get() = this.visibility == SirVisibility.Public && (this.isRefinedInSwift || this.configuration[SkieVisibility] == SkieVisibility.Level.PublicButHidden)
+        get() = (this.visibility == SirVisibility.Public && this.isRefinedInSwift) ||
+            this.configuration[SkieVisibility] in listOf(SkieVisibility.Level.PublicButHidden, SkieVisibility.Level.PublicButReplaced)
 
     private val KirFunction<*>.swiftFunctionName: SwiftFunctionName
         get() {

diff --git a/.../core/src/commonMain/kotlin/co/touchlab/skie/phases/sir/type/CreateKotlinSirTypesPhase.kt b/.../core/src/commonMain/kotlin/co/touchlab/skie/phases/sir/type/CreateKotlinSirTypesPhase.kt
@@ -39,7 +39,8 @@ class CreateKotlinSirTypesPhase : SirPhase {
             kind = kirClass.oirClass.kind.toSirKind(),
             origin = SirClass.Origin.Kir(kirClass),
             visibility = kirClass.configuration[SkieVisibility].toSirVisibility(),
-            isHidden = kirClass.configuration[SkieVisibility] == SkieVisibility.Level.PublicButHidden,
+            isReplaced = kirClass.configuration[SkieVisibility] == SkieVisibility.Level.PublicButReplaced,
+            isHidden = kirClass.configuration[SkieVisibility] in listOf(SkieVisibility.Level.PublicButHidden, SkieVisibility.Level.PublicButReplaced),
         )
 
         createTypeParameters(kirClass.oirClass, sirClass)