Modify SwiftUI Color extension to extend ShapeStyle (#185)

farkasseb · Péter Krassay · web-flow · commit da393220bdf8 · 2022-08-13T22:11:42.000+03:00
Co-authored-by: Péter Krassay &lt;peter.krassay@protonmail.com&gt;
diff --git a/Sources/XcodeExport/Resources/Color+extension.swift.stencil b/Sources/XcodeExport/Resources/Color+extension.swift.stencil
@@ -13,7 +13,7 @@ private class BundleProvider {
     static let bundle = Bundle(for: BundleProvider.self)
 }
 {% endif %}
-public extension Color {{ "{" }}{% for color in colors %}
+public extension ShapeStyle where Self == Color {{ "{" }}{% for color in colors %}
     static var {{ color.name }}: Color { Color({% if useNamespace %}"{{ color.originalName }}"{% else %}#function{% endif %}{% if not assetsInMainBundle %}, bundle: BundleProvider.bundle{% endif %}) }{% endfor %}
 }
 {% include "Bundle+extension.swift.stencil.include" %}
diff --git a/Tests/XcodeExportTests/XcodeColorExporterTests.swift b/Tests/XcodeExportTests/XcodeColorExporterTests.swift
@@ -237,7 +237,7 @@ final class XcodeColorExporterTests: XCTestCase {
             static let bundle = Bundle(for: BundleProvider.self)
         }
 
-        public extension Color {
+        public extension ShapeStyle where Self == Color {
             static var colorPair1: Color { Color(#function) }
             static var colorPair2: Color { Color(#function) }
         }
@@ -274,7 +274,7 @@ final class XcodeColorExporterTests: XCTestCase {
             static let bundle = Bundle.module
         }
 
-        public extension Color {
+        public extension ShapeStyle where Self == Color {
             static var colorPair1: Color { Color(#function, bundle: BundleProvider.bundle) }
             static var colorPair2: Color { Color(#function, bundle: BundleProvider.bundle) }
         }

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ private class BundleProvider {`
`13`	`13`	`static let bundle = Bundle(for: BundleProvider.self)`
`14`	`14`	`}`
`15`	`15`	`{% endif %}`
`16`		`-public extension Color {{ "{" }}{% for color in colors %}`
	`16`	`+public extension ShapeStyle where Self == Color {{ "{" }}{% for color in colors %}`
`17`	`17`	`static var {{ color.name }}: Color { Color({% if useNamespace %}"{{ color.originalName }}"{% else %}#function{% endif %}{% if not assetsInMainBundle %}, bundle: BundleProvider.bundle{% endif %}) }{% endfor %}`
`18`	`18`	`}`
`19`	`19`	`{% include "Bundle+extension.swift.stencil.include" %}`
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ final class XcodeColorExporterTests: XCTestCase {`
`237`	`237`	`static let bundle = Bundle(for: BundleProvider.self)`
`238`	`238`	`}`
`239`	`239`
`240`		`- public extension Color {`
	`240`	`+ public extension ShapeStyle where Self == Color {`
`241`	`241`	`static var colorPair1: Color { Color(#function) }`
`242`	`242`	`static var colorPair2: Color { Color(#function) }`
`243`	`243`	`}`
`@@ -274,7 +274,7 @@ final class XcodeColorExporterTests: XCTestCase {`
`274`	`274`	`static let bundle = Bundle.module`
`275`	`275`	`}`
`276`	`276`
`277`		`- public extension Color {`
	`277`	`+ public extension ShapeStyle where Self == Color {`
`278`	`278`	`static var colorPair1: Color { Color(#function, bundle: BundleProvider.bundle) }`
`279`	`279`	`static var colorPair2: Color { Color(#function, bundle: BundleProvider.bundle) }`
`280`	`280`	`}`