[Mac] Fixes getting the accelerator keys, if the key is equal to the …

…separator (xamarin#2673) - fixes xamarin#1639
adrianknight89 · May 14, 2018 · bf8d706 · bf8d706
1 parent 67d2be4
commit bf8d706
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/Xamarin.Forms.Core.UnitTests/MenuItemTests.cs b/Xamarin.Forms.Core.UnitTests/MenuItemTests.cs
@@ -56,7 +56,19 @@ public void Accelerator()
 
 			Assert.AreEqual(MenuItem.GetAccelerator(item).ToString(), shourtCutKeyBinding);
 		}
-
+
+		[Test]
+		public void AcceleratorPlus ()
+		{
+			var item = new MenuItem ();
+			string shourtCutKeyLikeSeparator = "+";
+			MenuItem.SetAccelerator (item, Xamarin.Forms.Accelerator.FromString (shourtCutKeyLikeSeparator));
+
+			var accelerator = MenuItem.GetAccelerator(item);
+			Assert.AreEqual (accelerator.ToString (), shourtCutKeyLikeSeparator);
+			Assert.AreEqual (accelerator.Keys.FirstOrDefault(), shourtCutKeyLikeSeparator);
+		}
+
 		protected override T CreateSource()
 		{
 			return new T();

diff --git a/Xamarin.Forms.Core/Accelerator.cs b/Xamarin.Forms.Core/Accelerator.cs
@@ -53,8 +53,12 @@ public static Accelerator FromString(string text)
 
 			}
 
-			var keys = text.Split(new char[] { Separator }, StringSplitOptions.RemoveEmptyEntries);
-			accelarat.Keys = keys;
+			if (text != Separator.ToString()) {
+				var keys = text.Split(new char[] { Separator }, StringSplitOptions.RemoveEmptyEntries);
+				accelarat.Keys = keys;
+			} else {
+				accelarat.Keys = new[] { text };
+			}
 			return accelarat;
 		}