Support unwind segues

wudi890520 · Jan 18, 2016 · 61c5a70 · 61c5a70
1 parent c034d11
commit 61c5a70
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 19 deletions.
diff --git a/R.swift/Generators/SegueGenerator.swift b/R.swift/Generators/SegueGenerator.swift
@@ -18,22 +18,13 @@ struct SegueGenerator: Generator {
     let seguesWithInfo = storyboards.flatMap { storyboard in
       storyboard.viewControllers.flatMap { viewController in
         viewController.segues.flatMap { segue -> SegueWithInfo? in
-          let destinationViewControllerType = storyboard.viewControllers
-            .filter { $0.id == segue.destination }
-            .first?
-            .type
-
-          let destinationViewControllerPlaceholderType = storyboard.viewControllerPlaceholders
-            .filter { $0.id == segue.destination }
-            .first
-            .flatMap { storyboard -> Type? in
-              switch storyboard.resolveWithStoryboards(storyboards) {
-                case .CustomBundle: return Type._UIViewController // Not supported, fallback to UIViewController
-                case let .Resolved(vc): return vc?.type
-              }
-            }
-
-          guard let destinationType = destinationViewControllerType ?? destinationViewControllerPlaceholderType else {
+          guard let destinationType = SegueGenerator.resolveDestinationTypeForSegue(
+            segue,
+            inViewController: viewController,
+            inStoryboard: storyboard,
+            allStoryboards: storyboards)
+            else
+          {
             warn("Destination view controller with id \(segue.destination) for segue \(segue.identifier) in \(viewController.type) not found in storyboard \(storyboard.name). Is this storyboard corrupt?")
             return nil
           }
@@ -74,6 +65,31 @@ struct SegueGenerator: Generator {
     )
   }
 
+  private static func resolveDestinationTypeForSegue(segue: Storyboard.Segue, inViewController: Storyboard.ViewController, inStoryboard storyboard: Storyboard, allStoryboards storyboards: [Storyboard]) -> Type? {
+    if segue.kind == "unwind" {
+      return Type._UIViewController
+    }
+
+    let destinationViewControllerType = storyboard.viewControllers
+      .filter { $0.id == segue.destination }
+      .first?
+      .type
+
+    let destinationViewControllerPlaceholderType = storyboard.viewControllerPlaceholders
+      .filter { $0.id == segue.destination }
+      .first
+      .flatMap { storyboard -> Type? in
+        switch storyboard.resolveWithStoryboards(storyboards) {
+        case .CustomBundle:
+          return Type._UIViewController // Not supported, fallback to UIViewController
+        case let .Resolved(vc):
+          return vc?.type
+        }
+      }
+
+    return destinationViewControllerType ?? destinationViewControllerPlaceholderType
+  }
+
   private static func seguesWithInfoForSourceTypeToStruct(seguesWithInfoForSourceType: [SegueWithInfo]) -> Struct? {
     guard let sourceType = seguesWithInfoForSourceType.first?.sourceType else { return nil }
 

diff --git a/R.swift/ResourceTypes/Storyboard.swift b/R.swift/ResourceTypes/Storyboard.swift
@@ -106,7 +106,8 @@ struct Storyboard: WhiteListedExtensionsResourceType, ReusableContainer {
   struct Segue {
     let identifier: String
     let type: Type
-    let destination: String?
+    let destination: String
+    let kind: String
   }
 }
 
@@ -137,11 +138,13 @@ private class StoryboardParserDelegate: NSObject, NSXMLParserDelegate {
         warn("Set the segue of class \(customType) with identifier '\(attributeDict["identifier"] ?? "-no identifier-")' to type custom, using segue subclasses with other types can cause crashes on iOS 8 and lower.")
       }
 
-      if let segueIdentifier = attributeDict["identifier"]
+      if let segueIdentifier = attributeDict["identifier"],
+        destination = attributeDict["destination"],
+        kind = attributeDict["kind"]
       {
         let type = customType ?? Type._UIStoryboardSegue
 
-        let segue = Storyboard.Segue(identifier: segueIdentifier, type: type, destination: attributeDict["destination"])
+        let segue = Storyboard.Segue(identifier: segueIdentifier, type: type, destination: destination, kind: kind)
         currentViewController?.1.addSegue(segue)
       }