fix alias collisions by parameterizing the alias names

SwiftGen · Aug 21, 2017 · 01698b6 · 01698b6
1 parent e3dcd3d
commit 01698b6
Show file tree

Hide file tree

Showing 23 changed files with 97 additions and 113 deletions.
diff --git a/Tests/Expected/Colors/literals-swift3-context-defaults-customname.swift b/Tests/Expected/Colors/literals-swift3-context-defaults-customname.swift
@@ -1,12 +1,10 @@
 // Generated using SwiftGen, by O.Halligon — https://github.com/SwiftGen/SwiftGen
 
 #if os(OSX)
-  import AppKit.NSColor
-  typealias Color = NSColor
+  import AppKit
   enum UIColor { }
 #elseif os(iOS) || os(tvOS) || os(watchOS)
-  import UIKit.UIColor
-  typealias Color = UIColor
+  import UIKit
 #endif
 
 // swiftlint:disable file_length

diff --git a/Tests/Expected/Colors/literals-swift3-context-defaults.swift b/Tests/Expected/Colors/literals-swift3-context-defaults.swift
@@ -1,12 +1,10 @@
 // Generated using SwiftGen, by O.Halligon — https://github.com/SwiftGen/SwiftGen
 
 #if os(OSX)
-  import AppKit.NSColor
-  typealias Color = NSColor
+  import AppKit
   enum ColorName { }
 #elseif os(iOS) || os(tvOS) || os(watchOS)
-  import UIKit.UIColor
-  typealias Color = UIColor
+  import UIKit
   enum ColorName { }
 #endif
 

diff --git a/Tests/Expected/Colors/literals-swift3-context-multiple.swift b/Tests/Expected/Colors/literals-swift3-context-multiple.swift
@@ -1,12 +1,10 @@
 // Generated using SwiftGen, by O.Halligon — https://github.com/SwiftGen/SwiftGen
 
 #if os(OSX)
-  import AppKit.NSColor
-  typealias Color = NSColor
+  import AppKit
   enum ColorName { }
 #elseif os(iOS) || os(tvOS) || os(watchOS)
-  import UIKit.UIColor
-  typealias Color = UIColor
+  import UIKit
   enum ColorName { }
 #endif
 

diff --git a/Tests/Expected/Colors/literals-swift4-context-defaults-customname.swift b/Tests/Expected/Colors/literals-swift4-context-defaults-customname.swift
@@ -1,12 +1,10 @@
 // Generated using SwiftGen, by O.Halligon — https://github.com/SwiftGen/SwiftGen
 
 #if os(OSX)
-  import AppKit.NSColor
-  typealias Color = NSColor
+  import AppKit
   enum UIColor { }
 #elseif os(iOS) || os(tvOS) || os(watchOS)
-  import UIKit.UIColor
-  typealias Color = UIColor
+  import UIKit
 #endif
 
 // swiftlint:disable file_length

diff --git a/Tests/Expected/Colors/literals-swift4-context-defaults.swift b/Tests/Expected/Colors/literals-swift4-context-defaults.swift
@@ -1,12 +1,10 @@
 // Generated using SwiftGen, by O.Halligon — https://github.com/SwiftGen/SwiftGen
 
 #if os(OSX)
-  import AppKit.NSColor
-  typealias Color = NSColor
+  import AppKit
   enum ColorName { }
 #elseif os(iOS) || os(tvOS) || os(watchOS)
-  import UIKit.UIColor
-  typealias Color = UIColor
+  import UIKit
   enum ColorName { }
 #endif
 

diff --git a/Tests/Expected/Colors/literals-swift4-context-multiple.swift b/Tests/Expected/Colors/literals-swift4-context-multiple.swift
@@ -1,12 +1,10 @@
 // Generated using SwiftGen, by O.Halligon — https://github.com/SwiftGen/SwiftGen
 
 #if os(OSX)
-  import AppKit.NSColor
-  typealias Color = NSColor
+  import AppKit
   enum ColorName { }
 #elseif os(iOS) || os(tvOS) || os(watchOS)
-  import UIKit.UIColor
-  typealias Color = UIColor
+  import UIKit
   enum ColorName { }
 #endif
 

diff --git a/Tests/Expected/XCAssets/swift2-context-all-customname.swift b/Tests/Expected/XCAssets/swift2-context-all-customname.swift
@@ -2,11 +2,9 @@
 
 #if os(OSX)
   import AppKit.NSImage
-  typealias Color = NSColor
   typealias Image = NSImage
 #elseif os(iOS) || os(tvOS) || os(watchOS)
   import UIKit.UIImage
-  typealias Color = UIColor
   typealias Image = UIImage
 #endif
 

diff --git a/Tests/Expected/XCAssets/swift2-context-all-no-all-values.swift b/Tests/Expected/XCAssets/swift2-context-all-no-all-values.swift
@@ -2,11 +2,9 @@
 
 #if os(OSX)
   import AppKit.NSImage
-  typealias Color = NSColor
   typealias Image = NSImage
 #elseif os(iOS) || os(tvOS) || os(watchOS)
   import UIKit.UIImage
-  typealias Color = UIColor
   typealias Image = UIImage
 #endif
 

diff --git a/Tests/Expected/XCAssets/swift2-context-all.swift b/Tests/Expected/XCAssets/swift2-context-all.swift
@@ -2,11 +2,9 @@
 
 #if os(OSX)
   import AppKit.NSImage
-  typealias Color = NSColor
   typealias Image = NSImage
 #elseif os(iOS) || os(tvOS) || os(watchOS)
   import UIKit.UIImage
-  typealias Color = UIColor
   typealias Image = UIImage
 #endif
 

diff --git a/Tests/Expected/XCAssets/swift3-context-all-customname.swift b/Tests/Expected/XCAssets/swift3-context-all-customname.swift
@@ -2,11 +2,11 @@
 
 #if os(OSX)
   import AppKit.NSImage
-  typealias Color = NSColor
+  typealias AssetColorTypeAlias = NSColor
   typealias Image = NSImage
 #elseif os(iOS) || os(tvOS) || os(watchOS)
   import UIKit.UIImage
-  typealias Color = UIColor
+  typealias AssetColorTypeAlias = UIColor
   typealias Image = UIImage
 #endif
 
@@ -37,8 +37,8 @@ struct XCTColorAsset {
 
   #if swift(>=3.2)
   @available(iOS 11.0, tvOS 11.0, watchOS 4.0, OSX 10.13, *)
-  var color: Color {
-    return Color(asset: self)
+  var color: AssetColorTypeAlias {
+    return AssetColorTypeAlias(asset: self)
   }
   #endif
 }
@@ -120,7 +120,7 @@ extension Image {
   }
 }
 
-extension Color {
+extension AssetColorTypeAlias {
   #if swift(>=3.2)
   @available(iOS 11.0, tvOS 11.0, watchOS 4.0, OSX 10.13, *)
   convenience init!(asset: XCTColorAsset) {

diff --git a/Tests/Expected/XCAssets/swift3-context-all-no-all-values.swift b/Tests/Expected/XCAssets/swift3-context-all-no-all-values.swift
@@ -2,11 +2,11 @@
 
 #if os(OSX)
   import AppKit.NSImage
-  typealias Color = NSColor
+  typealias AssetColorTypeAlias = NSColor
   typealias Image = NSImage
 #elseif os(iOS) || os(tvOS) || os(watchOS)
   import UIKit.UIImage
-  typealias Color = UIColor
+  typealias AssetColorTypeAlias = UIColor
   typealias Image = UIImage
 #endif
 
@@ -37,8 +37,8 @@ struct ColorAsset {
 
   #if swift(>=3.2)
   @available(iOS 11.0, tvOS 11.0, watchOS 4.0, OSX 10.13, *)
-  var color: Color {
-    return Color(asset: self)
+  var color: AssetColorTypeAlias {
+    return AssetColorTypeAlias(asset: self)
   }
   #endif
 }
@@ -90,7 +90,7 @@ extension Image {
   }
 }
 
-extension Color {
+extension AssetColorTypeAlias {
   #if swift(>=3.2)
   @available(iOS 11.0, tvOS 11.0, watchOS 4.0, OSX 10.13, *)
   convenience init!(asset: ColorAsset) {

diff --git a/Tests/Expected/XCAssets/swift3-context-all.swift b/Tests/Expected/XCAssets/swift3-context-all.swift
@@ -2,11 +2,11 @@
 
 #if os(OSX)
   import AppKit.NSImage
-  typealias Color = NSColor
+  typealias AssetColorTypeAlias = NSColor
   typealias Image = NSImage
 #elseif os(iOS) || os(tvOS) || os(watchOS)
   import UIKit.UIImage
-  typealias Color = UIColor
+  typealias AssetColorTypeAlias = UIColor
   typealias Image = UIImage
 #endif
 
@@ -37,8 +37,8 @@ struct ColorAsset {
 
   #if swift(>=3.2)
   @available(iOS 11.0, tvOS 11.0, watchOS 4.0, OSX 10.13, *)
-  var color: Color {
-    return Color(asset: self)
+  var color: AssetColorTypeAlias {
+    return AssetColorTypeAlias(asset: self)
   }
   #endif
 }
@@ -120,7 +120,7 @@ extension Image {
   }
 }
 
-extension Color {
+extension AssetColorTypeAlias {
   #if swift(>=3.2)
   @available(iOS 11.0, tvOS 11.0, watchOS 4.0, OSX 10.13, *)
   convenience init!(asset: ColorAsset) {

diff --git a/Tests/Expected/XCAssets/swift4-context-all-customname.swift b/Tests/Expected/XCAssets/swift4-context-all-customname.swift
@@ -2,11 +2,11 @@
 
 #if os(OSX)
   import AppKit.NSImage
-  typealias Color = NSColor
+  typealias AssetColorTypeAlias = NSColor
   typealias Image = NSImage
 #elseif os(iOS) || os(tvOS) || os(watchOS)
   import UIKit.UIImage
-  typealias Color = UIColor
+  typealias AssetColorTypeAlias = UIColor
   typealias Image = UIImage
 #endif
 
@@ -36,8 +36,8 @@ struct XCTColorAsset {
   fileprivate var name: String
 
   @available(iOS 11.0, tvOS 11.0, watchOS 4.0, OSX 10.13, *)
-  var color: Color {
-    return Color(asset: self)
+  var color: AssetColorTypeAlias {
+    return AssetColorTypeAlias(asset: self)
   }
 }
 
@@ -120,7 +120,7 @@ extension Image {
   }
 }
 
-extension Color {
+extension AssetColorTypeAlias {
   @available(iOS 11.0, tvOS 11.0, watchOS 4.0, OSX 10.13, *)
   convenience init!(asset: XCTColorAsset) {
     let bundle = Bundle(for: BundleToken.self)

diff --git a/Tests/Expected/XCAssets/swift4-context-all-no-all-values.swift b/Tests/Expected/XCAssets/swift4-context-all-no-all-values.swift
@@ -2,11 +2,11 @@
 
 #if os(OSX)
   import AppKit.NSImage
-  typealias Color = NSColor
+  typealias AssetColorTypeAlias = NSColor
   typealias Image = NSImage
 #elseif os(iOS) || os(tvOS) || os(watchOS)
   import UIKit.UIImage
-  typealias Color = UIColor
+  typealias AssetColorTypeAlias = UIColor
   typealias Image = UIImage
 #endif
 
@@ -36,8 +36,8 @@ struct ColorAsset {
   fileprivate var name: String
 
   @available(iOS 11.0, tvOS 11.0, watchOS 4.0, OSX 10.13, *)
-  var color: Color {
-    return Color(asset: self)
+  var color: AssetColorTypeAlias {
+    return AssetColorTypeAlias(asset: self)
   }
 }
 
@@ -90,7 +90,7 @@ extension Image {
   }
 }
 
-extension Color {
+extension AssetColorTypeAlias {
   @available(iOS 11.0, tvOS 11.0, watchOS 4.0, OSX 10.13, *)
   convenience init!(asset: ColorAsset) {
     let bundle = Bundle(for: BundleToken.self)

diff --git a/Tests/Expected/XCAssets/swift4-context-all.swift b/Tests/Expected/XCAssets/swift4-context-all.swift
@@ -2,11 +2,11 @@
 
 #if os(OSX)
   import AppKit.NSImage
-  typealias Color = NSColor
+  typealias AssetColorTypeAlias = NSColor
   typealias Image = NSImage
 #elseif os(iOS) || os(tvOS) || os(watchOS)
   import UIKit.UIImage
-  typealias Color = UIColor
+  typealias AssetColorTypeAlias = UIColor
   typealias Image = UIImage
 #endif
 
@@ -36,8 +36,8 @@ struct ColorAsset {
   fileprivate var name: String
 
   @available(iOS 11.0, tvOS 11.0, watchOS 4.0, OSX 10.13, *)
-  var color: Color {
-    return Color(asset: self)
+  var color: AssetColorTypeAlias {
+    return AssetColorTypeAlias(asset: self)
   }
 }
 
@@ -120,7 +120,7 @@ extension Image {
   }
 }
 
-extension Color {
+extension AssetColorTypeAlias {
   @available(iOS 11.0, tvOS 11.0, watchOS 4.0, OSX 10.13, *)
   convenience init!(asset: ColorAsset) {
     let bundle = Bundle(for: BundleToken.self)

diff --git a/templates/colors/literals-swift3.stencil b/templates/colors/literals-swift3.stencil
@@ -3,12 +3,10 @@
 {% if palettes %}
 {% set enumName %}{{param.enumName|default:"ColorName"}}{% endset %}
 #if os(OSX)
-  import AppKit.NSColor
-  typealias Color = NSColor
+  import AppKit
   {% if enumName != 'NSColor' %}enum {{enumName}} { }{% endif %}
 #elseif os(iOS) || os(tvOS) || os(watchOS)
-  import UIKit.UIColor
-  typealias Color = UIColor
+  import UIKit
   {% if enumName != 'UIColor' %}enum {{enumName}} { }{% endif %}
 #endif
 

diff --git a/templates/colors/literals-swift4.stencil b/templates/colors/literals-swift4.stencil
@@ -3,12 +3,10 @@
 {% if palettes %}
 {% set enumName %}{{param.enumName|default:"ColorName"}}{% endset %}
 #if os(OSX)
-  import AppKit.NSColor
-  typealias Color = NSColor
+  import AppKit
   {% if enumName != 'NSColor' %}enum {{enumName}} { }{% endif %}
 #elseif os(iOS) || os(tvOS) || os(watchOS)
-  import UIKit.UIColor
-  typealias Color = UIColor
+  import UIKit
   {% if enumName != 'UIColor' %}enum {{enumName}} { }{% endif %}
 #endif