@@ -177,18 +177,8 @@ public struct RswiftCore {
177177
178178 let projectStruct = XcodeProjectGenerator . generateProject ( developmentRegion: developmentRegion, knownAssetTags: knownAssetTags)
179179
180- let generateString = generators. contains ( . string) && !stringStruct. isEmpty
181- let generateData = generators. contains ( . data) && !dataStruct. isEmpty
182- let generateColor = generators. contains ( . color) && !colorStruct. isEmpty
183- let generateImage = generators. contains ( . image) && !imageStruct. isEmpty
184- let generateInfo = generators. contains ( . info) && !infoStruct. isEmpty
185- let generateEntitlements = generators. contains ( . entitlements) && !entitlementsStruct. isEmpty
186180 let generateFont = generators. contains ( . font) && !fontStruct. isEmpty
187- let generateFile = generators. contains ( . file) && !fileStruct. isEmpty
188- let generateSegue = generators. contains ( . segue) && !segueStruct. isEmpty
189- let generateId = generators. contains ( . id) && !idStruct. isEmpty
190181 let generateNib = generators. contains ( . nib) && !nibStruct. isEmpty
191- let generateReuseIdentifier = generators. contains ( . reuseIdentifier) && !reuseIdentifierStruct. isEmpty
192182 let generateStoryboard = generators. contains ( . storyboard) && !storyboardStruct. isEmpty
193183
194184 let validateLines = [
@@ -211,43 +201,43 @@ public struct RswiftCore {
211201 var s = Struct ( name: structName, additionalModuleReferences: [ . rswiftResources] ) {
212202 Init . bundle
213203
214- if !projectStruct. isEmpty {
204+ if generators . contains ( . project ) , !projectStruct. isEmpty {
215205 projectStruct
216206 }
217207
218- if generateString {
208+ if generators . contains ( . string ) , !stringStruct . isEmpty {
219209 stringStruct. generateBundleVarGetterForString ( name: " string " )
220210 stringStruct. generateBundleFunctionForString ( name: " string " )
221211 stringStruct. generateLocaleFunctionForString ( name: " string " )
222212 stringStruct. generatePreferredLanguagesFunctionForString ( name: " string " )
223213 stringStruct
224214 }
225215
226- if generateData {
216+ if generators . contains ( . data ) , !dataStruct . isEmpty {
227217 dataStruct. generateBundleVarGetter ( name: " data " )
228218 dataStruct. generateBundleFunction ( name: " data " )
229219 dataStruct
230220 }
231221
232- if generateColor {
222+ if generators . contains ( . color ) , !colorStruct . isEmpty {
233223 colorStruct. generateBundleVarGetter ( name: " color " )
234224 colorStruct. generateBundleFunction ( name: " color " )
235225 colorStruct
236226 }
237227
238- if generateImage {
228+ if generators . contains ( . image ) , !imageStruct . isEmpty {
239229 imageStruct. generateBundleVarGetter ( name: " image " )
240230 imageStruct. generateBundleFunction ( name: " image " )
241231 imageStruct
242232 }
243233
244- if generateInfo {
234+ if generators . contains ( . info ) , !infoStruct . isEmpty {
245235 infoStruct. generateBundleVarGetter ( name: " info " )
246236 infoStruct. generateBundleFunction ( name: " info " )
247237 infoStruct
248238 }
249239
250- if generateEntitlements {
240+ if generators . contains ( . entitlements ) , !entitlementsStruct . isEmpty {
251241 entitlementsStruct. generateLetBinding ( )
252242 entitlementsStruct
253243 }
@@ -258,18 +248,18 @@ public struct RswiftCore {
258248 fontStruct
259249 }
260250
261- if generateFile {
251+ if generators . contains ( . file ) , !fileStruct . isEmpty {
262252 fileStruct. generateBundleVarGetter ( name: " file " )
263253 fileStruct. generateBundleFunction ( name: " file " )
264254 fileStruct
265255 }
266256
267- if generateSegue {
257+ if generators . contains ( . segue ) , !segueStruct . isEmpty {
268258 segueStruct. generateLetBinding ( )
269259 segueStruct
270260 }
271261
272- if generateId {
262+ if generators . contains ( . id ) , !idStruct . isEmpty {
273263 idStruct. generateLetBinding ( )
274264 idStruct
275265 }
@@ -280,7 +270,7 @@ public struct RswiftCore {
280270 nibStruct
281271 }
282272
283- if generateReuseIdentifier {
273+ if generators . contains ( . reuseIdentifier ) , !reuseIdentifierStruct . isEmpty {
284274 reuseIdentifierStruct. generateLetBinding ( )
285275 reuseIdentifierStruct
286276 }
0 commit comments