Merge pull request #19 from atifaziz/option-maybe-val-tostr

Return string value of Some or blank in Option<T>.ToString()
nlkl · Jan 10, 2017 · 8ddb72d · 8ddb72d
2 parents 97d1617 + f4668ce
commit 8ddb72d
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 20 deletions.
diff --git a/Optional.Tests/MaybeTests.cs b/Optional.Tests/MaybeTests.cs
@@ -150,19 +150,19 @@ public void Maybe_Hashing()
         [TestMethod]
         public void Maybe_StringRepresentation()
         {
-            Assert.AreEqual(Option.None<int>().ToString(), "None");
-            Assert.AreEqual(Option.None<int?>().ToString(), "None");
-            Assert.AreEqual(Option.None<string>().ToString(), "None");
+            Assert.AreEqual(Option.None<int>().ToString(), "");
+            Assert.AreEqual(Option.None<int?>().ToString(), "");
+            Assert.AreEqual(Option.None<string>().ToString(), "");
 
-            Assert.AreEqual(Option.Some<int?>(null).ToString(), "Some(null)");
-            Assert.AreEqual(Option.Some<string>(null).ToString(), "Some(null)");
+            Assert.AreEqual(Option.Some<int?>(null).ToString(), "");
+            Assert.AreEqual(Option.Some<string>(null).ToString(), "");
 
-            Assert.AreEqual(Option.Some<int>(1).ToString(), "Some(1)");
-            Assert.AreEqual(Option.Some<int?>(1).ToString(), "Some(1)");
-            Assert.AreEqual(Option.Some<string>("1").ToString(), "Some(1)");
+            Assert.AreEqual(Option.Some<int>(1).ToString(), "1");
+            Assert.AreEqual(Option.Some<int?>(1).ToString(), "1");
+            Assert.AreEqual(Option.Some<string>("1").ToString(), "1");
 
             var now = DateTime.Now;
-            Assert.AreEqual(Option.Some<DateTime>(now).ToString(), "Some(" + now.ToString() + ")");
+            Assert.AreEqual(Option.Some<DateTime>(now).ToString(), now.ToString());
         }
 
         [TestMethod]

diff --git a/Optional/Option_Maybe.cs b/Optional/Option_Maybe.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
 
@@ -12,6 +13,7 @@ namespace Optional
 #if !NETSTANDARD
     [Serializable]
 #endif
+    [DebuggerDisplay("{" + nameof(DebugString) + "}")]
     public struct Option<T> : IEquatable<Option<T>>
     {
         private readonly bool hasValue;
@@ -91,23 +93,31 @@ public override int GetHashCode()
             return 0;
         }
 
-        /// <summary>
-        /// Returns a string that represents the current optional.
-        /// </summary>
-        /// <returns>A string that represents the current optional.</returns>
-        public override string ToString()
+        string DebugString
         {
-            if (hasValue)
+            get
             {
-                if (value == null)
+                if (hasValue)
                 {
-                    return "Some(null)";
+                    if (value == null)
+                    {
+                        return "Some(null)";
+                    }
+
+                    return string.Format("Some({0})", value);
                 }
 
-                return string.Format("Some({0})", value);
+                return "None";
             }
+        }
 
-            return "None";
+        /// <summary>
+        /// Returns a string that represents the current optional.
+        /// </summary>
+        /// <returns>A string that represents the current optional.</returns>
+        public override string ToString()
+        {
+            return hasValue && value != null ? value.ToString() : string.Empty;
         }
 
         /// <summary>

diff --git a/Portable.Optional/project.json b/Portable.Optional/project.json
@@ -3,7 +3,8 @@
   "dependencies": {
     "Microsoft.NETCore.Portable.Compatibility": "1.0.1",
     "Microsoft.NETCore.Platforms": "1.0.1",
-    "System.Collections": "4.0.11"
+    "System.Collections": "4.0.11",
+    "System.Diagnostics.Debug": "4.0.11"
   },
   "frameworks": {
     "netstandard1.0": {}