Skip to content

Commit

Permalink
[Swift Export] Use package visibility for init(__externalRCRef:)
Browse files Browse the repository at this point in the history 
Every class generated by Swift Export from Kotlin Class has such an
initializer. It is part of the internal machinery and not supposed to be
invoked by users.

This commit switches these initializers to `package` visibility, thus
limiting user access but keeping inter-module access for multimodular
Swift Export output.

^KT-71951 Fixed
  • Loading branch information
@SvyatoslavScherbina @qodana-bot
SvyatoslavScherbina authored and qodana-bot committed Oct 7, 2024
1 parent 884da6f commit d8a3154
Show file tree
Hide file tree
Showing 23 changed files with 79 additions and 78 deletions.
1 change: 1 addition & 0 deletions .../swift/sir-light-classes/src/org/jetbrains/sir/lightclasses/nodes/SirClassFromKtSymbol.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ internal class SirClassFromKtSymbol(

private fun kotlinBaseInitDeclaration(): SirDeclaration = buildInit {
origin = SirOrigin.KotlinBaseInitOverride(`for` = KotlinSource(ktSymbol))
visibility = SirVisibility.PACKAGE // Hide from users, but not from other Swift Export modules.
isFailable = false
isOverride = true
parameters.add(
Expand Down
2 changes: 1 addition & 1 deletion native/swift/swift-export-standalone/testData/generation/any/golden_result/main/main.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public final class MyObject : KotlinRuntime.KotlinBase {
private override init() {
fatalError()
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand Down
2 changes: 1 addition & 1 deletion .../generation/classes/golden_result/cross_module_inheritance/cross_module_inheritance.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public final class CLASS_ACROSS_MODULES : inheritance.OPEN_CLASS {
return CLASS_ACROSS_MODULES_value_set__TypesOfArguments__Swift_Int32__(self.__externalRCRef(), newValue)
}
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand Down
6 changes: 3 additions & 3 deletions ...export-standalone/testData/generation/classes/golden_result/inheritance/inheritance.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public final class INHERITANCE_SINGLE_CLASS : inheritance.OPEN_CLASS {
return INHERITANCE_SINGLE_CLASS_value_set__TypesOfArguments__Swift_Int32__(self.__externalRCRef(), newValue)
}
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand All @@ -32,7 +32,7 @@ public final class OBJECT_WITH_CLASS_INHERITANCE : inheritance.OPEN_CLASS {
private override init() {
fatalError()
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand All @@ -44,7 +44,7 @@ open class OPEN_CLASS : KotlinRuntime.KotlinBase {
super.init(__externalRCRef: __kt)
__root___OPEN_CLASS_init_initialize__TypesOfArguments__Swift_UInt__(__kt)
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand Down
50 changes: 25 additions & 25 deletions ...e/swift/swift-export-standalone/testData/generation/classes/golden_result/main/main.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public final class CLASS_WITH_SAME_NAME : KotlinRuntime.KotlinBase {
super.init(__externalRCRef: __kt)
__root___CLASS_WITH_SAME_NAME_init_initialize__TypesOfArguments__Swift_UInt__(__kt)
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand All @@ -23,7 +23,7 @@ public final class ClassWithNonPublicConstructor : KotlinRuntime.KotlinBase {
return ClassWithNonPublicConstructor_a_get(self.__externalRCRef())
}
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand Down Expand Up @@ -52,7 +52,7 @@ public final class Foo : KotlinRuntime.KotlinBase {
private override init() {
fatalError()
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand Down Expand Up @@ -80,7 +80,7 @@ public final class Foo : KotlinRuntime.KotlinBase {
super.init(__externalRCRef: __kt)
Foo_INSIDE_CLASS_init_initialize__TypesOfArguments__Swift_UInt__(__kt)
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand All @@ -102,7 +102,7 @@ public final class Foo : KotlinRuntime.KotlinBase {
return Foo_my_variable_set__TypesOfArguments__Swift_Int64__(self.__externalRCRef(), newValue)
}
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand Down Expand Up @@ -133,7 +133,7 @@ public final class OBJECT_NO_PACKAGE : KotlinRuntime.KotlinBase {
super.init(__externalRCRef: __kt)
OBJECT_NO_PACKAGE_Bar_CLASS_INSIDE_CLASS_INSIDE_OBJECT_init_initialize__TypesOfArguments__Swift_UInt__(__kt)
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand All @@ -148,7 +148,7 @@ public final class OBJECT_NO_PACKAGE : KotlinRuntime.KotlinBase {
private override init() {
fatalError()
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand All @@ -162,7 +162,7 @@ public final class OBJECT_NO_PACKAGE : KotlinRuntime.KotlinBase {
return OBJECT_NO_PACKAGE_Bar_i_get(self.__externalRCRef())
}
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand All @@ -184,7 +184,7 @@ public final class OBJECT_NO_PACKAGE : KotlinRuntime.KotlinBase {
super.init(__externalRCRef: __kt)
OBJECT_NO_PACKAGE_Foo_init_initialize__TypesOfArguments__Swift_UInt__(__kt)
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand All @@ -199,7 +199,7 @@ public final class OBJECT_NO_PACKAGE : KotlinRuntime.KotlinBase {
private override init() {
fatalError()
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand All @@ -226,7 +226,7 @@ public final class OBJECT_NO_PACKAGE : KotlinRuntime.KotlinBase {
private override init() {
fatalError()
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand Down Expand Up @@ -258,7 +258,7 @@ public extension ExportedKotlinPackages.namespace.deeper {
private override init() {
fatalError()
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand Down Expand Up @@ -294,7 +294,7 @@ public extension ExportedKotlinPackages.namespace.deeper {
super.init(__externalRCRef: __kt)
namespace_deeper_Foo_INSIDE_CLASS_DEEPER_INSIDE_CLASS_init_initialize__TypesOfArguments__Swift_UInt__(__kt)
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand All @@ -321,7 +321,7 @@ public extension ExportedKotlinPackages.namespace.deeper {
super.init(__externalRCRef: __kt)
namespace_deeper_Foo_INSIDE_CLASS_init_initialize__TypesOfArguments__Swift_UInt__(__kt)
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand All @@ -348,7 +348,7 @@ public extension ExportedKotlinPackages.namespace.deeper {
super.init(__externalRCRef: __kt)
namespace_deeper_Foo_init_initialize__TypesOfArguments__Swift_UInt__(__kt)
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand All @@ -363,7 +363,7 @@ public extension ExportedKotlinPackages.namespace.deeper {
super.init(__externalRCRef: __kt)
namespace_deeper_NAMESPACED_CLASS_init_initialize__TypesOfArguments__Swift_UInt__(__kt)
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand All @@ -380,7 +380,7 @@ public extension ExportedKotlinPackages.namespace.deeper {
private override init() {
fatalError()
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand All @@ -391,7 +391,7 @@ public extension ExportedKotlinPackages.namespace.deeper {
return namespace_deeper_OBJECT_WITH_PACKAGE_Bar_i_get(self.__externalRCRef())
}
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand All @@ -413,7 +413,7 @@ public extension ExportedKotlinPackages.namespace.deeper {
super.init(__externalRCRef: __kt)
namespace_deeper_OBJECT_WITH_PACKAGE_Foo_init_initialize__TypesOfArguments__Swift_UInt__(__kt)
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand All @@ -428,7 +428,7 @@ public extension ExportedKotlinPackages.namespace.deeper {
private override init() {
fatalError()
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand All @@ -455,7 +455,7 @@ public extension ExportedKotlinPackages.namespace.deeper {
private override init() {
fatalError()
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand All @@ -473,7 +473,7 @@ public extension ExportedKotlinPackages.namespace {
super.init(__externalRCRef: __kt)
namespace_Foo_INSIDE_CLASS_init_initialize__TypesOfArguments__Swift_UInt__(__kt)
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand All @@ -497,7 +497,7 @@ public extension ExportedKotlinPackages.namespace {
super.init(__externalRCRef: __kt)
namespace_Foo_init_initialize__TypesOfArguments__Swift_UInt__(__kt)
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand All @@ -512,7 +512,7 @@ public extension ExportedKotlinPackages.namespace {
super.init(__externalRCRef: __kt)
namespace_NAMESPACED_CLASS_init_initialize__TypesOfArguments__Swift_UInt__(__kt)
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand All @@ -526,7 +526,7 @@ public extension ExportedKotlinPackages.why_we_need_module_names {
super.init(__externalRCRef: __kt)
why_we_need_module_names_CLASS_WITH_SAME_NAME_init_initialize__TypesOfArguments__Swift_UInt__(__kt)
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand Down
2 changes: 1 addition & 1 deletion ...lden_result/dependency_deeper_neighbor_exported/dependency_deeper_neighbor_exported.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public extension ExportedKotlinPackages.dependency.four {
super.init(__externalRCRef: __kt)
dependency_four_AnotherBar_init_initialize__TypesOfArguments__Swift_UInt__(__kt)
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand Down
2 changes: 1 addition & 1 deletion ...t-standalone/testData/generation/functionAndClassWithSameName/golden_result/dep/dep.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public extension ExportedKotlinPackages.test.factory.modules {
super.init(__externalRCRef: __kt)
test_factory_modules_ClassFromDependency_init_initialize__TypesOfArguments__Swift_UInt__(__kt)
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand Down
2 changes: 1 addition & 1 deletion .../testData/generation/functionAndClassWithSameName/golden_result/flattened/flattened.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public extension ExportedKotlinPackages.flattenedPackage {
super.init(__externalRCRef: __kt)
flattenedPackage_FlattenedPackageClass_init_initialize__TypesOfArguments__Swift_UInt__(__kt)
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand Down
12 changes: 6 additions & 6 deletions ...standalone/testData/generation/functionAndClassWithSameName/golden_result/main/main.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public final class ClassWithFactoryWithoutParameters : KotlinRuntime.KotlinBase
return ClassWithFactoryWithoutParameters_value_get(self.__externalRCRef())
}
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand All @@ -32,7 +32,7 @@ public final class ObjectWithFactory : KotlinRuntime.KotlinBase {
private override init() {
fatalError()
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand All @@ -44,7 +44,7 @@ public final class UtcOffset : KotlinRuntime.KotlinBase {
super.init(__externalRCRef: __kt)
__root___UtcOffset_init_initialize__TypesOfArguments__Swift_UInt__(__kt)
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand Down Expand Up @@ -91,7 +91,7 @@ public extension ExportedKotlinPackages.test.factory {
super.init(__externalRCRef: __kt)
test_factory_ClassWithFactoryInAPackage_init_initialize__TypesOfArguments__Swift_UInt__(__kt)
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand All @@ -104,7 +104,7 @@ public extension ExportedKotlinPackages.test.factory {
super.init(__externalRCRef: __kt)
test_factory_Outer_Nested_init_initialize__TypesOfArguments__Swift_UInt__(__kt)
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand All @@ -115,7 +115,7 @@ public extension ExportedKotlinPackages.test.factory {
super.init(__externalRCRef: __kt)
test_factory_Outer_init_initialize__TypesOfArguments__Swift_UInt__(__kt)
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand Down
2 changes: 1 addition & 1 deletion ...swift/swift-export-standalone/testData/generation/functions/golden_result/main/main.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public extension ExportedKotlinPackages.overload {
super.init(__externalRCRef: __kt)
overload_Foo_init_initialize__TypesOfArguments__Swift_UInt__(__kt)
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand Down
2 changes: 1 addition & 1 deletion ...ift/swift-export-standalone/testData/generation/inheritance/golden_result/main/main.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ open class Foo : KotlinRuntime.KotlinBase {
super.init(__externalRCRef: __kt)
__root___Foo_init_initialize__TypesOfArguments__Swift_UInt__(__kt)
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand Down
2 changes: 1 addition & 1 deletion ...t/swift-export-standalone/testData/generation/inner_classes/golden_result/main/main.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ public final class Outer : KotlinRuntime.KotlinBase {
super.init(__externalRCRef: __kt)
__root___Outer_init_initialize__TypesOfArguments__Swift_UInt__(__kt)
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand Down
2 changes: 1 addition & 1 deletion ...ft/swift-export-standalone/testData/generation/nothing_type/golden_result/main/main.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public final class Bar : KotlinRuntime.KotlinBase {
return Bar_p_get(self.__externalRCRef())
}
}
public override init(
package override init(
__externalRCRef: Swift.UInt
) {
super.init(__externalRCRef: __externalRCRef)
Expand Down
Loading

0 comments on commit d8a3154

Please sign in to comment.