From 4662df88b5ccd4307e89071cd9ba31f304005f38 Mon Sep 17 00:00:00 2001 From: Beth Rennie Date: Thu, 15 Oct 2026 15:24:58 -0400 Subject: [PATCH] Bug 2053517 - Remove more shared preferences gunk from swift codegen --- .../backends/swift/templates/FeatureManifestTemplate.swift | 4 ++-- .../templates/ImportedModuleInitializationTemplate.swift | 4 +--- .../src/backends/swift/templates/ObjectTemplate.swift | 2 +- .../nimbus-fml/src/backends/swift/templates/macros.swift | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/components/support/nimbus-fml/src/backends/swift/templates/FeatureManifestTemplate.swift b/components/support/nimbus-fml/src/backends/swift/templates/FeatureManifestTemplate.swift index 3ccf6e9d7ab..93ce4012899 100644 --- a/components/support/nimbus-fml/src/backends/swift/templates/FeatureManifestTemplate.swift +++ b/components/support/nimbus-fml/src/backends/swift/templates/FeatureManifestTemplate.swift @@ -118,8 +118,8 @@ public class {{ features_object }} { {%- let class_name = raw_name|class_name %} {{ f.doc()|comment(" ") }} public lazy var {{raw_name|var_name}}: FeatureHolder<{{class_name}}> = { - FeatureHolder({{ nimbus_object }}.shared.getSdk, featureId: {{ raw_name|quoted }}) { variables, prefs in - {{ class_name }}(variables, prefs) + FeatureHolder({{ nimbus_object }}.shared.getSdk, featureId: {{ raw_name|quoted }}) { variables in + {{ class_name }}(variables) } }() {%- endfor %} diff --git a/components/support/nimbus-fml/src/backends/swift/templates/ImportedModuleInitializationTemplate.swift b/components/support/nimbus-fml/src/backends/swift/templates/ImportedModuleInitializationTemplate.swift index 44c083d8fc6..8bd47fd6e89 100644 --- a/components/support/nimbus-fml/src/backends/swift/templates/ImportedModuleInitializationTemplate.swift +++ b/components/support/nimbus-fml/src/backends/swift/templates/ImportedModuleInitializationTemplate.swift @@ -1,13 +1,11 @@ {%- import "macros.swift" as swift %} {%- let variables = "variables" %} -{%- let prefs = "prefs" %} {%- let context = "" %} {%- let class_name = self.inner.about().nimbus_object_name_swift() %} {%- for f in self.inner.features() %} - {{ class_name }}.shared.features.{{ f.name()|var_name }}.with(initializer: { {{ variables }}, {{ prefs }} in + {{ class_name }}.shared.features.{{ f.name()|var_name }}.with(initializer: { {{ variables }} in {{ f.name()|class_name }}( {{ variables }}, - {{ prefs }}, {%- for p in f.props() %} {{p.name()|var_name}}: {{ p.typ()|literal(self, p.default(), context) }}{% if !loop.last %},{% endif %} {%- endfor %} diff --git a/components/support/nimbus-fml/src/backends/swift/templates/ObjectTemplate.swift b/components/support/nimbus-fml/src/backends/swift/templates/ObjectTemplate.swift index adfa2d3b4d2..9d2a2ed6326 100644 --- a/components/support/nimbus-fml/src/backends/swift/templates/ObjectTemplate.swift +++ b/components/support/nimbus-fml/src/backends/swift/templates/ObjectTemplate.swift @@ -8,7 +8,7 @@ public extension {{class_name}} { guard let defaults = defaults else { return self } - return {{class_name}}(variables: self._variables, prefs: self._prefs, defaults: defaults._defaults) + return {{class_name}}(variables: self._variables, defaults: defaults._defaults) } static func create(_ variables: Variables?) -> {{class_name}} { diff --git a/components/support/nimbus-fml/src/backends/swift/templates/macros.swift b/components/support/nimbus-fml/src/backends/swift/templates/macros.swift index a4ffdcfeb99..56db9286b20 100644 --- a/components/support/nimbus-fml/src/backends/swift/templates/macros.swift +++ b/components/support/nimbus-fml/src/backends/swift/templates/macros.swift @@ -39,7 +39,7 @@ public class {{class_name}}: FMLFeatureInterface { {{p.name()|var_name}}: {{ t|defaults_type_label }} = {{ t|literal(self, p.default(), "") }}{% if !loop.last %},{% endif %} {%- endfor %} ) { - self.init(variables: _variables, prefs: _prefs, defaults: Defaults({% for p in inner.props() %} + self.init(variables: _variables, defaults: Defaults({% for p in inner.props() %} {{p.name()|var_name}}: {{p.name()|var_name}}{% if !loop.last %},{% endif %} {%- endfor %})) }