Generate fully qualified names for Color/Data/Image resources

Fixes #781
mac-cain13 · Dec 7, 2022 · e7f427f · e7f427f
1 parent 857862a
commit e7f427f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Sources/RswiftGenerators/AssetCatalog+Generator.swift b/Sources/RswiftGenerators/AssetCatalog+Generator.swift
@@ -104,7 +104,7 @@ extension ColorResource: AssetCatalogContent {
         return VarGetter(
             comments: ["Color `\(fullname)`."],
             name: SwiftIdentifier(name: name),
-            typeReference: TypeReference(module: .host, rawName: "ColorResource"),
+            typeReference: TypeReference(module: .rswiftResources, rawName: "ColorResource"),
             valueCodeString: code
         )
     }
@@ -118,7 +118,7 @@ extension DataResource: AssetCatalogContent {
         return VarGetter(
             comments: ["Data asset `\(fullname)`."],
             name: SwiftIdentifier(name: name),
-            typeReference: TypeReference(module: .host, rawName: "DataResource"),
+            typeReference: TypeReference(module: .rswiftResources, rawName: "DataResource"),
             valueCodeString: code
         )
     }
@@ -133,7 +133,7 @@ extension ImageResource: AssetCatalogContent {
         return VarGetter(
             comments: ["Image `\(fullname)`."],
             name: SwiftIdentifier(name: name),
-            typeReference: TypeReference(module: .host, rawName: "ImageResource"),
+            typeReference: TypeReference(module: .rswiftResources, rawName: "ImageResource"),
             valueCodeString: code
         )
     }

diff --git a/Sources/RswiftGenerators/Storyboard+Generator.swift b/Sources/RswiftGenerators/Storyboard+Generator.swift
@@ -202,7 +202,7 @@ private extension StoryboardResource.ViewController {
         VarGetter(
             name: SwiftIdentifier(name: identifier),
             typeReference: genericTypeReference,
-            valueCodeString: #"StoryboardViewControllerIdentifier(identifier: "\#(identifier.escapedStringLiteral)", storyboard: name, bundle: bundle)"#
+            valueCodeString: #".init(identifier: "\#(identifier.escapedStringLiteral)", storyboard: name, bundle: bundle)"#
         )
     }
 }