fix some lint warnings

SwiftGen · Mar 5, 2017 · 00865b3 · 00865b3
1 parent 54f72df
commit 00865b3
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 47 deletions.
diff --git a/Sources/Stencil/AssetsCatalogContext.swift b/Sources/Stencil/AssetsCatalogContext.swift
@@ -23,7 +23,7 @@ extension AssetsCatalogParser {
     return [
       "catalogs": structured,
       "param": ["enumName": enumName],
-      
+
       // NOTE: This is a deprecated variable
       "enumName": enumName,
       "images": images

diff --git a/Sources/Stencil/ColorsContext.swift b/Sources/Stencil/ColorsContext.swift
@@ -31,17 +31,17 @@ extension ColorsFileParser {
         "green": comps[1],
         "blue": comps[2],
         "alpha": comps[3],
-        
+
         // NOTE: This is a deprecated variable
 		"rgba": String(hexChars[0..<8]),
 		"rgb": String(hexChars[0..<6])
       ]
     }).sorted { $0["name"] ?? "" < $1["name"] ?? "" }
-    
+
     return [
       "colors": colorMap,
       "param": ["enumName": enumName],
-      
+
       // NOTE: This is a deprecated variable
       "enumName": enumName
     ]

diff --git a/Sources/Stencil/FontsContext.swift b/Sources/Stencil/FontsContext.swift
@@ -36,7 +36,7 @@ extension FontsFileParser {
     return [
       "families": families,
       "param": ["enumName": enumName],
-      
+
       // NOTE: This is a deprecated variable
       "enumName": enumName
     ]

diff --git a/Sources/Stencil/StoryboardsContext.swift b/Sources/Stencil/StoryboardsContext.swift
@@ -43,49 +43,19 @@ extension StoryboardParser {
       var sbMap: [String:Any] = ["name": storyboardName]
       // Initial Scene
       if let initialScene = initialScenes[storyboardName] {
-        let initial: [String:Any]
-        if let customClass = initialScene.customClass {
-          initial = ["customClass": customClass, "customModule": initialScene.customModule ?? ""]
-        } else {
-          initial = [
-            "baseType": uppercaseFirst(initialScene.tag),
-
-            // NOTE: This is a deprecated variable
-            "isBaseViewController": initialScene.tag == "viewController"
-          ]
-        }
-        sbMap["initialScene"] = initial
+        sbMap["initialScene"] = map(initialScene: initialScene)
       }
       // All Scenes
       if let scenes = storyboardsScenes[storyboardName] {
         sbMap["scenes"] = scenes
           .sorted(by: {$0.storyboardID < $1.storyboardID})
-          .map { (scene: Scene) -> [String:Any] in
-            if let customClass = scene.customClass {
-              return [
-                "identifier": scene.storyboardID,
-                "customClass": customClass,
-                "customModule": scene.customModule ?? ""
-              ]
-            } else if scene.tag == "viewController" {
-              return [
-                "identifier": scene.storyboardID,
-                "baseType": uppercaseFirst(scene.tag),
-
-                // NOTE: This is a deprecated variable
-                "isBaseViewController": scene.tag == "viewController"
-              ]
-            }
-            return ["identifier": scene.storyboardID, "baseType": uppercaseFirst(scene.tag)]
-        }
+          .map(map(scene:))
       }
       // All Segues
       if let segues = storyboardsSegues[storyboardName] {
-		sbMap["segues"] = segues
-			.sorted(by: {$0.identifier < $1.identifier})
-			.map { (segue: Segue) -> [String:String] in
-				["identifier": segue.identifier, "customClass": segue.customClass ?? ""]
-		}
+        sbMap["segues"] = segues
+          .sorted(by: {$0.identifier < $1.identifier})
+          .map(map(segue:))
       }
       return sbMap
     }
@@ -103,4 +73,50 @@ extension StoryboardParser {
       "segueEnumName": segueEnumName
     ]
   }
+
+  private func map(initialScene scene: InitialScene) -> [String: Any] {
+    if let customClass = scene.customClass {
+      return [
+        "customClass": customClass,
+        "customModule": scene.customModule ?? ""
+      ]
+    } else {
+      return [
+        "baseType": uppercaseFirst(scene.tag),
+
+        // NOTE: This is a deprecated variable
+        "isBaseViewController": scene.tag == "viewController"
+      ]
+    }
+  }
+
+  private func map(scene: Scene) -> [String: Any] {
+    if let customClass = scene.customClass {
+      return [
+        "identifier": scene.storyboardID,
+        "customClass": customClass,
+        "customModule": scene.customModule ?? ""
+      ]
+    } else if scene.tag == "viewController" {
+      return [
+        "identifier": scene.storyboardID,
+        "baseType": uppercaseFirst(scene.tag),
+
+        // NOTE: This is a deprecated variable
+        "isBaseViewController": scene.tag == "viewController"
+      ]
+    } else {
+      return [
+        "identifier": scene.storyboardID,
+        "baseType": uppercaseFirst(scene.tag)
+      ]
+    }
+  }
+
+  private func map(segue: Segue) -> [String: Any] {
+    return [
+      "identifier": segue.identifier,
+      "customClass": segue.customClass ?? ""
+    ]
+  }
 }
diff --git a/Sources/Stencil/StringsContext.swift b/Sources/Stencil/StringsContext.swift
@@ -43,10 +43,10 @@ extension StringsFileParser {
         "translation": entry.translation.newlineEscaped,
         "keytail": keytail
       ]
-      
+
       if entry.types.count > 0 {
         result["parameters"] = entry.types.map { $0.rawValue }
-        
+
         // NOTE: params is deprecated
         result["params"] = [
           "types": entry.types.map { $0.rawValue },
@@ -56,7 +56,7 @@ extension StringsFileParser {
           "typednames": entry.types.enumerated().map { "p\($0): \($1.rawValue)" }
         ]
       }
-      
+
       return result
     }
 
@@ -75,7 +75,7 @@ extension StringsFileParser {
     return [
       "tables": tables,
       "param": ["enumName": enumName],
-      
+
       // NOTE: These are deprecated variables
       "enumName": enumName,
       "strings": strings,

diff --git a/Tests/SwiftGenKitTests/StoryboardsMacOSTests.swift b/Tests/SwiftGenKitTests/StoryboardsMacOSTests.swift
@@ -64,18 +64,18 @@ class StoryboardsMacOSTests: XCTestCase {
 
     XCTDiffContexts(result, expected)
   }
-  
+
   func testAllStoryboardsWithCustomName() {
     let parser = StoryboardParser()
     do {
       try parser.parseDirectory(at: Fixtures.directory(sub: .storyboardsMacOS))
     } catch {
       print("Error: \(error.localizedDescription)")
     }
-    
+
     let result = parser.stencilContext(sceneEnumName: "XCTStoryboardsScene", segueEnumName: "XCTStoryboardsSegue")
     let expected = Fixtures.context(for: "customname.plist", sub: .storyboardsMacOS)
-    
+
     XCTDiffContexts(result, expected)
   }
 }