Merge branch 'master' into swiftidentifier-refactor

Author: tomlokhorst

R.swift.Library

@@ -137,12 +137,12 @@ struct StoryboardGenerator: Generator {
     // Validation
     let validateImagesLines = Set(storyboard.usedImageIdentifiers)
       .map {
-        "if UIImage(named: \"\($0)\") == nil { throw ValidationError(description: \"[R.swift] Image named '\($0)' is used in storyboard '\(storyboard.name)', but couldn't be loaded.\") }"
+        "if UIImage(named: \"\($0)\") == nil { throw Rswift.ValidationError(description: \"[R.swift] Image named '\($0)' is used in storyboard '\(storyboard.name)', but couldn't be loaded.\") }"
       }
     let validateViewControllersLines = storyboard.viewControllers
       .flatMap { vc in
         vc.storyboardIdentifier.map {
-          "if _R.storyboard.\(SwiftIdentifier(name: storyboard.name))().\(SwiftIdentifier(name: $0))() == nil { throw ValidationError(description:\"[R.swift] ViewController with identifier '\(SwiftIdentifier(name: $0))' could not be loaded from storyboard '\(storyboard.name)' as '\(vc.type)'.\") }"
+          "if _R.storyboard.\(SwiftIdentifier(name: storyboard.name))().\(SwiftIdentifier(name: $0))() == nil { throw Rswift.ValidationError(description:\"[R.swift] ViewController with identifier '\(SwiftIdentifier(name: $0))' could not be loaded from storyboard '\(storyboard.name)' as '\(vc.type)'.\") }"
         }
       }
     let validateLines = validateImagesLines + validateViewControllersLines

R.swift/Generators/StoryboardGenerator.swift

@@ -168,7 +168,7 @@ struct StringsGenerator: Generator {
       isStatic: true,
       name: SwiftIdentifier(name: values.key),
       typeDefinition: .Inferred(Type.StringResource),
-      value: "StringResource(key: \"\(escapedKey)\", tableName: \"\(values.tableName)\", locales: [\(locales)])"
+      value: "StringResource(key: \"\(escapedKey)\", tableName: \"\(values.tableName)\", bundle: _R.hostingBundle, locales: [\(locales)])"
     )
   }
 
@@ -254,10 +254,10 @@ private struct StringValues {
     let escapedKey = key.escapedStringLiteral
 
     if tableName == "Localizable" {
-      return "NSLocalizedString(\"\(escapedKey)\", comment: \"\")"
+      return "NSLocalizedString(\"\(escapedKey)\", bundle: _R.hostingBundle, comment: \"\")"
     }
     else {
-      return "NSLocalizedString(\"\(escapedKey)\", tableName: \"\(tableName)\", comment: \"\")"
+      return "NSLocalizedString(\"\(escapedKey)\", bundle: _R.hostingBundle, tableName: \"\(tableName)\", comment: \"\")"
     }
   }
 

R.swift/Generators/StringsGenerator.swift

@@ -119,7 +119,7 @@ private class StoryboardParserDelegate: NSObject, NSXMLParserDelegate {
   var reusables: [Reusable] = []
 
   // State
-  var currentViewController: (String, Storyboard.ViewController)?
+  var currentViewController: Storyboard.ViewController?
 
   @objc func parser(parser: NSXMLParser, didStartElement elementName: String, namespaceURI: String?, qualifiedName qName: String?, attributes attributeDict: [String : String]) {
     switch elementName {
@@ -147,7 +147,7 @@ private class StoryboardParserDelegate: NSObject, NSXMLParserDelegate {
         let type = customType ?? Type._UIStoryboardSegue
 
         let segue = Storyboard.Segue(identifier: segueIdentifier, type: type, destination: destination, kind: kind)
-        currentViewController?.1.addSegue(segue)
+        currentViewController?.addSegue(segue)
       }
 
     case "image":
@@ -168,7 +168,7 @@ private class StoryboardParserDelegate: NSObject, NSXMLParserDelegate {
 
     default:
       if let viewController = viewControllerFromAttributes(attributeDict, elementName: elementName) {
-        currentViewController = (elementName, viewController)
+        currentViewController = viewController
       }
 
       if let reusable = reusableFromAttributes(attributeDict, elementName: elementName) {
@@ -178,9 +178,20 @@ private class StoryboardParserDelegate: NSObject, NSXMLParserDelegate {
   }
 
   @objc func parser(parser: NSXMLParser, didEndElement elementName: String, namespaceURI: String?, qualifiedName qName: String?) {
-    if let currentViewController = currentViewController where elementName == currentViewController.0 {
-      viewControllers.append(currentViewController.1)
-      self.currentViewController = nil
+
+    // We keep the current view controller open to collect segues until the closing scene:
+    // <scene>
+    //   <viewController>
+    //     ...
+    //     <segue />
+    //   </viewController>
+    //   <segue />
+    // </scene>
+    if elementName == "scene" {
+      if let currentViewController = currentViewController {
+        viewControllers.append(currentViewController)
+        self.currentViewController = nil
+      }
     }
   }