commit 925e2e5f582cf81a6efc1fb242f7f918247e60ec
author davg <davg@google.com> Mon Sep 16 22:20:06 2019 +0000
committer Ivan Hernandez <ivanhernandez@google.com> Wed Sep 18 22:14:31 2019 +0000
tree 73168c604df571de6489aa3aeb79de9eeb849f80
parent b5355ecb83ce79394d3d5ac004f2b48c17e29220

OptionSet: Treat empty strings as nil

- This fixes issues in inheritance when inheriting a nil
  value with no other customization leads to an empty string,
  which can crash Xcode in the case of run args

PiperOrigin-RevId: 269433225

src/TulsiGenerator/TulsiOption.swift

diff --git a/src/TulsiGenerator/TulsiOption.swift b/src/TulsiGenerator/TulsiOption.swift
index b1257d8..ee04442 100644
--- a/src/TulsiGenerator/TulsiOption.swift
+++ b/src/TulsiGenerator/TulsiOption.swift
@@ -142,8 +142,9 @@
     let inheritValue = defaultValue ?? ""
     func resolveInheritKeyword(_ value: String?) -> String? {
       guard let value = value else { return nil }
-      return value.replacingOccurrences(of: TulsiOption.InheritKeyword,
-                                                        with: inheritValue)
+      let newValue = value.replacingOccurrences(of: TulsiOption.InheritKeyword,
+                                                with: inheritValue)
+      return newValue.isEmpty ? nil : newValue
     }
     if optionType.contains(.SupportsInheritKeyword) {
       projectValue = resolveInheritKeyword(projectValue)