Ensure we use a RGB color before we get it's components

SwiftGen · May 30, 2017 · 0c0e9b1 · 0c0e9b1
1 parent 3956e97
commit 0c0e9b1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/Sources/Parsers/ColorsFileParser.swift b/Sources/Parsers/ColorsFileParser.swift
@@ -108,10 +108,13 @@ extension NSColor {
   }
 
   var hexValue: UInt32 {
-    let hexRed   = UInt32(round(redComponent   * 0xFF)) << 24
-    let hexGreen = UInt32(round(greenComponent * 0xFF)) << 16
-    let hexBlue  = UInt32(round(blueComponent  * 0xFF)) << 8
-    let hexAlpha = UInt32(round(alphaComponent * 0xFF))
+    guard let rgb = rgbColor else { return 0 }
+
+    let hexRed   = UInt32(round(rgb.redComponent   * 0xFF)) << 24
+    let hexGreen = UInt32(round(rgb.greenComponent * 0xFF)) << 16
+    let hexBlue  = UInt32(round(rgb.blueComponent  * 0xFF)) << 8
+    let hexAlpha = UInt32(round(rgb.alphaComponent * 0xFF))
+
     return hexRed | hexGreen | hexBlue | hexAlpha
   }
 }
diff --git a/Sources/Parsers/ColorsFileParsers/ColorsCLRFileParser.swift b/Sources/Parsers/ColorsFileParsers/ColorsCLRFileParser.swift
@@ -19,7 +19,7 @@ final class ColorsCLRFileParser: ColorsFileTypeParser {
       var colors = [String: UInt32]()
 
       for colorName in colorsList.allKeys {
-        colors[colorName] = colorsList.color(withKey: colorName)?.rgbColor?.hexValue
+        colors[colorName] = colorsList.color(withKey: colorName)?.hexValue
       }
 
       return colors

diff --git a/Tests/Resources b/Tests/Resources