Updates `Key` unit tests with easier to edit/read `MemberData` (#3147)

* Prototype

* Makes MemberData test easier to write/read

* Makes MemberData test easier to write/read

UnitTests/Input/KeyTests.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Text;
 using Xunit;
 using Xunit.Abstractions;
@@ -11,6 +10,7 @@ public class KeyTests {
 
 	public KeyTests (ITestOutputHelper output) => _output = output;
 
+
 	[Fact]
 	public void Constructor_Default_ShouldSetKeyToNull ()
 	{
@@ -29,118 +29,117 @@ public class KeyTests {
 	}
 
 	[Theory]
-	[InlineData ('a', KeyCode.A)]
-	[InlineData ('A', KeyCode.A | KeyCode.ShiftMask)]
-	[InlineData ('z', KeyCode.Z)]
-	[InlineData ('Z', KeyCode.Z | KeyCode.ShiftMask)]
-	[InlineData (' ', KeyCode.Space)]
-	[InlineData ('1', KeyCode.D1)]
-	[InlineData ('!', (KeyCode)'!')]
+	[InlineData ('a',  KeyCode.A)]
+	[InlineData ('A',  KeyCode.A | KeyCode.ShiftMask)]
+	[InlineData ('z',  KeyCode.Z)]
+	[InlineData ('Z',  KeyCode.Z | KeyCode.ShiftMask)]
+	[InlineData (' ',  KeyCode.Space)]
+	[InlineData ('1',  KeyCode.D1)]
+	[InlineData ('!',  (KeyCode)'!')]
 	[InlineData ('\r', KeyCode.Enter)]
 	[InlineData ('\t', KeyCode.Tab)]
 #pragma warning disable xUnit1025 // InlineData should be unique within the Theory it belongs to
 	[InlineData ('\r', (KeyCode)13)]
 #pragma warning restore xUnit1025 // InlineData should be unique within the Theory it belongs to
-	[InlineData ('\n', (KeyCode)10)]
-	[InlineData ('ó', (KeyCode)'ó')]
-	[InlineData ('Ó', (KeyCode)'Ó')]
-	[InlineData ('❿', (KeyCode)'❿')]
-	[InlineData ('☑', (KeyCode)'☑')]
-	[InlineData ('英', (KeyCode)'英')]
-	[InlineData ('{', (KeyCode)'{')]
-	[InlineData ('\'', (KeyCode)'\'')]
+	[InlineData ('\n',     (KeyCode)10)]
+	[InlineData ('ó',      (KeyCode)'ó')]
+	[InlineData ('Ó',      (KeyCode)'Ó')]
+	[InlineData ('❿',      (KeyCode)'❿')]
+	[InlineData ('☑',      (KeyCode)'☑')]
+	[InlineData ('英',      (KeyCode)'英')]
+	[InlineData ('{',      (KeyCode)'{')]
+	[InlineData ('\'',     (KeyCode)'\'')]
 	[InlineData ('\xFFFF', (KeyCode)0xFFFF)]
-	[InlineData ('\x0', (KeyCode)0x0)]
+	[InlineData ('\x0',    (KeyCode)0x0)]
 	public void Constructor_Char (char ch, KeyCode expectedKeyCode)
 	{
 		var key = new Key (ch);
 		Assert.Equal (expectedKeyCode, key.KeyCode);
 	}
 
-	public static IEnumerable<object []> ConstructorStrings ()
-	{
-		yield return new object [] { "a", new Key (KeyCode.A) };
-		yield return new object [] { "Ctrl+A", new Key (KeyCode.A | KeyCode.CtrlMask) };
-		yield return new object [] { "Alt+A", new Key (KeyCode.A | KeyCode.AltMask) };
-		yield return new object [] { "Shift+A", new Key (KeyCode.A | KeyCode.ShiftMask) };
-		yield return new object [] { "A", new Key (KeyCode.A | KeyCode.ShiftMask) };
-		yield return new object [] { "â", new Key ((KeyCode)'â')};
-		yield return new object [] { "Shift+â", new Key ((KeyCode)'â' | KeyCode.ShiftMask) };
-		yield return new object [] { "Shift+Â", new Key ((KeyCode)'Â' | KeyCode.ShiftMask) };
-		yield return new object [] { "Ctrl+Shift+CursorUp", new Key (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.CursorUp) };
-		yield return new object [] { "Ctrl+Alt+Shift+CursorUp", new Key (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.CursorUp) };
-		yield return new object [] { "ctrl+alt+shift+cursorup", new Key (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.CursorUp) };
-		yield return new object [] { "CTRL+ALT+SHIFT+CURSORUP", new Key (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.CursorUp) };
-		yield return new object [] { "Ctrl+Alt+Shift+Delete", new Key (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.Delete) };
-		yield return new object [] { "Ctrl+Alt+Shift+Enter", new Key (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.Enter) };
-		yield return new object [] { "Tab", new Key (KeyCode.Tab) };
-		yield return new object [] { "Shift+Tab", new Key (KeyCode.Tab | KeyCode.ShiftMask) };
-		yield return new object [] { "Ctrl+Tab", new Key (KeyCode.Tab | KeyCode.CtrlMask) };
-		yield return new object [] { "Alt+Tab", new Key (KeyCode.Tab | KeyCode.AltMask) };
-		yield return new object [] { "Ctrl+Shift+Tab", new Key (KeyCode.Tab | KeyCode.ShiftMask | KeyCode.CtrlMask) };
-		yield return new object [] { "Ctrl+Alt+Tab", new Key (KeyCode.Tab | KeyCode.AltMask | KeyCode.CtrlMask) };
-		yield return new object [] { "", new Key (KeyCode.Null) };
-		yield return new object [] { " ", new Key (KeyCode.Space) };
-		yield return new object [] { "Space", new Key (KeyCode.Space) };
-		yield return new object [] { "Shift+Space", new Key (KeyCode.Space | KeyCode.ShiftMask) };
-		yield return new object [] { "Ctrl+Space", new Key (KeyCode.Space | KeyCode.CtrlMask) };
-		yield return new object [] { "Alt+Space", new Key (KeyCode.Space | KeyCode.AltMask) };
-		yield return new object [] { "Shift+ ", new Key (KeyCode.Space | KeyCode.ShiftMask) };
-		yield return new object [] { "Ctrl+ ", new Key (KeyCode.Space | KeyCode.CtrlMask) };
-		yield return new object [] { "Alt+ ", new Key (KeyCode.Space | KeyCode.AltMask) };
-		yield return new object [] { "F1", new Key (KeyCode.F1) };
-		yield return new object [] { "0", new Key (KeyCode.D0) };
-		yield return new object [] { "9", new Key (KeyCode.D9) };
-		yield return new object [] { "D0", new Key (KeyCode.D0) };
-		yield return new object [] { "65", new Key (KeyCode.A | KeyCode.ShiftMask) };
-		yield return new object [] { "97", new Key (KeyCode.A)};
-		yield return new object [] { "Shift", new Key (KeyCode.ShiftMask) };
-		yield return new object [] { "Ctrl", new Key (KeyCode.CtrlMask) };
-		yield return new object [] { "Ctrl-A", new Key (KeyCode.A | KeyCode.CtrlMask) };
-		yield return new object [] { "Alt-A", new Key (KeyCode.A | KeyCode.AltMask) };
-		yield return new object [] { "A-Ctrl", new Key (KeyCode.A | KeyCode.CtrlMask) };
-		yield return new object [] { "Alt-A-Ctrl", new Key (KeyCode.A | KeyCode.CtrlMask | KeyCode.AltMask) };
-	}
 
-	// TryParse
+	// Via https://andrewlock.net/creating-parameterised-tests-in-xunit-with-inlinedata-classdata-and-memberdata/
+	public static TheoryData<string, Key> ValidStrings =>
+	new () {
+	{ "a", new Key (KeyCode.A) },
+	{ "Ctrl+A", new Key (KeyCode.A | KeyCode.CtrlMask) },
+	{ "Alt+A", new Key (KeyCode.A | KeyCode.AltMask) },
+	{ "Shift+A", new Key (KeyCode.A | KeyCode.ShiftMask) },
+	{ "A", new Key (KeyCode.A | KeyCode.ShiftMask) },
+	{ "â", new Key ((KeyCode)'â') },
+	{ "Shift+â", new Key ((KeyCode)'â' | KeyCode.ShiftMask) },
+	{ "Shift+Â", new Key ((KeyCode)'Â' | KeyCode.ShiftMask) },
+	{ "Ctrl+Shift+CursorUp", new Key (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.CursorUp) },
+	{ "Ctrl+Alt+Shift+CursorUp", new Key (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.CursorUp) },
+	{ "ctrl+alt+shift+cursorup", new Key (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.CursorUp) },
+	{ "CTRL+ALT+SHIFT+CURSORUP", new Key (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.CursorUp) },
+	{ "Ctrl+Alt+Shift+Delete", new Key (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.Delete) },
+	{ "Ctrl+Alt+Shift+Enter", new Key (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.Enter) },
+	{ "Tab", new Key (KeyCode.Tab) },
+	{ "Shift+Tab", new Key (KeyCode.Tab | KeyCode.ShiftMask) },
+	{ "Ctrl+Tab", new Key (KeyCode.Tab | KeyCode.CtrlMask) },
+	{ "Alt+Tab", new Key (KeyCode.Tab | KeyCode.AltMask) },
+	{ "Ctrl+Shift+Tab", new Key (KeyCode.Tab | KeyCode.ShiftMask | KeyCode.CtrlMask) },
+	{ "Ctrl+Alt+Tab", new Key (KeyCode.Tab | KeyCode.AltMask | KeyCode.CtrlMask) },
+	{ "", new Key (KeyCode.Null) },
+	{ " ", new Key (KeyCode.Space) },
+	{ "Space", new Key (KeyCode.Space) },
+	{ "Shift+Space", new Key (KeyCode.Space | KeyCode.ShiftMask) },
+	{ "Ctrl+Space", new Key (KeyCode.Space | KeyCode.CtrlMask) },
+	{ "Alt+Space", new Key (KeyCode.Space | KeyCode.AltMask) },
+	{ "Shift+ ", new Key (KeyCode.Space | KeyCode.ShiftMask) },
+	{ "Ctrl+ ", new Key (KeyCode.Space | KeyCode.CtrlMask) },
+	{ "Alt+ ", new Key (KeyCode.Space | KeyCode.AltMask) },
+	{ "F1", new Key (KeyCode.F1) },
+	{ "0", new Key (KeyCode.D0) },
+	{ "9", new Key (KeyCode.D9) },
+	{ "D0", new Key (KeyCode.D0) },
+	{ "65", new Key (KeyCode.A | KeyCode.ShiftMask) },
+	{ "97", new Key (KeyCode.A) },
+	{ "Shift", new Key (KeyCode.ShiftMask) },
+	{ "Ctrl", new Key (KeyCode.CtrlMask) },
+	{ "Ctrl-A", new Key (KeyCode.A | KeyCode.CtrlMask) },
+	{ "Alt-A", new Key (KeyCode.A | KeyCode.AltMask) },
+	{ "A-Ctrl", new Key (KeyCode.A | KeyCode.CtrlMask) },
+	{ "Alt-A-Ctrl", new Key (KeyCode.A | KeyCode.CtrlMask | KeyCode.AltMask) }
+	};
+
 	[Theory]
-	[MemberData (nameof (ConstructorStrings))]
+	[MemberData (nameof (ValidStrings))]
 	public void Constructor_String_Valid (string keyString, Key expected)
 	{
-		Key key = new Key (keyString);
-		Assert.Equal (((Key)expected).ToString (), key.ToString ());
+		var key = new Key (keyString);
+		Assert.Equal (expected.ToString (), key.ToString ());
 	}
 
+
 	[Theory]
-	[InlineData("Barf")]
-	public void Constructor_String_Invalid_Throws (string keyString)
-	{
-		Assert.Throws<ArgumentException> (() => new Key (keyString));
-	}
+	[InlineData ("Barf")]
+	public void Constructor_String_Invalid_Throws (string keyString) => Assert.Throws<ArgumentException> (() => new Key (keyString));
 
 	[Theory]
-	[InlineData ('a', KeyCode.A)]
-	[InlineData ('A', KeyCode.A | KeyCode.ShiftMask)]
-	[InlineData ('z', KeyCode.Z)]
-	[InlineData ('Z', KeyCode.Z | KeyCode.ShiftMask)]
-	[InlineData (' ', KeyCode.Space)]
-	[InlineData ('1', KeyCode.D1)]
-	[InlineData ('!', (KeyCode)'!')]
+	[InlineData ('a',  KeyCode.A)]
+	[InlineData ('A',  KeyCode.A | KeyCode.ShiftMask)]
+	[InlineData ('z',  KeyCode.Z)]
+	[InlineData ('Z',  KeyCode.Z | KeyCode.ShiftMask)]
+	[InlineData (' ',  KeyCode.Space)]
+	[InlineData ('1',  KeyCode.D1)]
+	[InlineData ('!',  (KeyCode)'!')]
 	[InlineData ('\r', KeyCode.Enter)]
 	[InlineData ('\t', KeyCode.Tab)]
 #pragma warning disable xUnit1025 // InlineData should be unique within the Theory it belongs to
 	[InlineData ('\r', (KeyCode)13)]
 #pragma warning restore xUnit1025 // InlineData should be unique within the Theory it belongs to
-	[InlineData ('\n', (KeyCode)10)]
-	[InlineData ('ó', (KeyCode)'ó')]
-	[InlineData ('Ó', (KeyCode)'Ó')]
-	[InlineData ('❿', (KeyCode)'❿')]
-	[InlineData ('☑', (KeyCode)'☑')]
-	[InlineData ('英', (KeyCode)'英')]
-	[InlineData ('{', (KeyCode)'{')]
-	[InlineData ('\'', (KeyCode)'\'')]
+	[InlineData ('\n',     (KeyCode)10)]
+	[InlineData ('ó',      (KeyCode)'ó')]
+	[InlineData ('Ó',      (KeyCode)'Ó')]
+	[InlineData ('❿',      (KeyCode)'❿')]
+	[InlineData ('☑',      (KeyCode)'☑')]
+	[InlineData ('英',      (KeyCode)'英')]
+	[InlineData ('{',      (KeyCode)'{')]
+	[InlineData ('\'',     (KeyCode)'\'')]
 	[InlineData ('\xFFFF', (KeyCode)0xFFFF)]
-	[InlineData ('\x0', (KeyCode)0x0)]
+	[InlineData ('\x0',    (KeyCode)0x0)]
 	public void Cast_Char_To_Key (char ch, KeyCode expectedKeyCode)
 	{
 		var key = (Key)ch;
@@ -164,13 +163,13 @@ public class KeyTests {
 
 	// IsValid
 	[Theory]
-	[InlineData (KeyCode.A, true)]
-	[InlineData (KeyCode.B, true)]
-	[InlineData (KeyCode.F1 | KeyCode.ShiftMask, true)]
-	[InlineData (KeyCode.Null, false)]
-	[InlineData (KeyCode.ShiftMask, false)]
-	[InlineData (KeyCode.CtrlMask, false)]
-	[InlineData (KeyCode.AltMask, false)]
+	[InlineData (KeyCode.A,                           true)]
+	[InlineData (KeyCode.B,                           true)]
+	[InlineData (KeyCode.F1 | KeyCode.ShiftMask,      true)]
+	[InlineData (KeyCode.Null,                        false)]
+	[InlineData (KeyCode.ShiftMask,                   false)]
+	[InlineData (KeyCode.CtrlMask,                    false)]
+	[InlineData (KeyCode.AltMask,                     false)]
 	[InlineData (KeyCode.ShiftMask | KeyCode.AltMask, false)]
 	public void IsValid (KeyCode key, bool expected) => Assert.Equal (expected, ((Key)key).IsValid);
 
@@ -182,12 +181,12 @@ public class KeyTests {
 	}
 
 	[Theory]
-	[InlineData (KeyCode.Enter, KeyCode.Enter)]
-	[InlineData (KeyCode.Esc, KeyCode.Esc)]
-	[InlineData (KeyCode.A, (KeyCode)'a')]
+	[InlineData (KeyCode.Enter,                 KeyCode.Enter)]
+	[InlineData (KeyCode.Esc,                   KeyCode.Esc)]
+	[InlineData (KeyCode.A,                     (KeyCode)'a')]
 	[InlineData (KeyCode.A | KeyCode.ShiftMask, KeyCode.A | KeyCode.ShiftMask)]
-	[InlineData (KeyCode.Z, (KeyCode)'z')]
-	[InlineData (KeyCode.Space, KeyCode.Space)]
+	[InlineData (KeyCode.Z,                     (KeyCode)'z')]
+	[InlineData (KeyCode.Space,                 KeyCode.Space)]
 	public void Cast_KeyCode_To_Key (KeyCode cdk, KeyCode expected)
 	{
 		// explicit
@@ -203,8 +202,8 @@ public class KeyTests {
 	public void Standard_Keys_Always_New ()
 	{
 		// Make two local keys, and grab Key.A, which is a reference to a singleton.
-		Key aKey1 = Key.A;
-		Key aKey2 = Key.A;
+		var aKey1 = Key.A;
+		var aKey2 = Key.A;
 
 		// Assert the starting state that is expected
 		Assert.False (aKey1.Handled);
@@ -222,18 +221,18 @@ public class KeyTests {
 	}
 
 	[Theory]
-	[InlineData ((KeyCode)'a', true)]
+	[InlineData ((KeyCode)'a',                     true)]
 	[InlineData ((KeyCode)'a' | KeyCode.ShiftMask, true)]
-	[InlineData (KeyCode.A, true)]
-	[InlineData (KeyCode.A | KeyCode.ShiftMask, true)]
-	[InlineData (KeyCode.F, true)]
-	[InlineData (KeyCode.F | KeyCode.ShiftMask, true)]
+	[InlineData (KeyCode.A,                        true)]
+	[InlineData (KeyCode.A | KeyCode.ShiftMask,    true)]
+	[InlineData (KeyCode.F,                        true)]
+	[InlineData (KeyCode.F | KeyCode.ShiftMask,    true)]
 	// these have alt or ctrl modifiers or are not a..z
 	[InlineData (KeyCode.A | KeyCode.CtrlMask, false)]
-	[InlineData (KeyCode.A | KeyCode.AltMask, false)]
-	[InlineData (KeyCode.D0, false)]
-	[InlineData (KeyCode.Esc, false)]
-	[InlineData (KeyCode.Tab, false)]
+	[InlineData (KeyCode.A | KeyCode.AltMask,  false)]
+	[InlineData (KeyCode.D0,                   false)]
+	[InlineData (KeyCode.Esc,                  false)]
+	[InlineData (KeyCode.Tab,                  false)]
 	public void IsKeyCodeAtoZ (KeyCode key, bool expected)
 	{
 		var eventArgs = new Key (key);
@@ -241,47 +240,47 @@ public class KeyTests {
 	}
 
 	[Theory]
-	[InlineData ((KeyCode)'❿', '❿')]
-	[InlineData ((KeyCode)'☑', '☑')]
-	[InlineData ((KeyCode)'英', '英')]
-	[InlineData ((KeyCode)'{', '{')]
-	[InlineData ((KeyCode)'\'', '\'')]
-	[InlineData ((KeyCode)'\r', '\r')]
-	[InlineData ((KeyCode)'ó', 'ó')]
-	[InlineData ((KeyCode)'ó' | KeyCode.ShiftMask, 'ó')]
-	[InlineData ((KeyCode)'Ó', 'Ó')]
+	[InlineData ((KeyCode)'❿',                                                          '❿')]
+	[InlineData ((KeyCode)'☑',                                                          '☑')]
+	[InlineData ((KeyCode)'英',                                                          '英')]
+	[InlineData ((KeyCode)'{',                                                          '{')]
+	[InlineData ((KeyCode)'\'',                                                         '\'')]
+	[InlineData ((KeyCode)'\r',                                                         '\r')]
+	[InlineData ((KeyCode)'ó',                                                          'ó')]
+	[InlineData ((KeyCode)'ó' | KeyCode.ShiftMask,                                      'ó')]
+	[InlineData ((KeyCode)'Ó',                                                          'Ó')]
 	[InlineData ((KeyCode)'ç' | KeyCode.ShiftMask | KeyCode.AltMask | KeyCode.CtrlMask, '\0')]
-	[InlineData ((KeyCode)'a', 97)] // 97 or Key.Space | Key.A
-	[InlineData ((KeyCode)'A', 97)] // 65 or equivalent to Key.A, but A-Z are mapped to lower case by drivers
-					//[InlineData (Key.A, 97)] // 65 equivalent to (Key)'A', but A-Z are mapped to lower case by drivers
-	[InlineData (KeyCode.ShiftMask | KeyCode.A, 65)]
-	[InlineData (KeyCode.CtrlMask | KeyCode.A, '\0')]
-	[InlineData (KeyCode.AltMask | KeyCode.A, '\0')]
-	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.A, '\0')]
-	[InlineData (KeyCode.ShiftMask | KeyCode.AltMask | KeyCode.A, '\0')]
-	[InlineData (KeyCode.AltMask | KeyCode.CtrlMask | KeyCode.A, '\0')]
+	[InlineData ((KeyCode)'a',                                                          97)] // 97 or Key.Space | Key.A
+	[InlineData ((KeyCode)'A',                                                          97)] // 65 or equivalent to Key.A, but A-Z are mapped to lower case by drivers
+	//[InlineData (Key.A, 97)] // 65 equivalent to (Key)'A', but A-Z are mapped to lower case by drivers
+	[InlineData (KeyCode.ShiftMask | KeyCode.A,                                      65)]
+	[InlineData (KeyCode.CtrlMask | KeyCode.A,                                       '\0')]
+	[InlineData (KeyCode.AltMask | KeyCode.A,                                        '\0')]
+	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.A,                   '\0')]
+	[InlineData (KeyCode.ShiftMask | KeyCode.AltMask | KeyCode.A,                    '\0')]
+	[InlineData (KeyCode.AltMask | KeyCode.CtrlMask | KeyCode.A,                     '\0')]
 	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.A, '\0')]
-	[InlineData ((KeyCode)'z', 'z')]
-	[InlineData ((KeyCode)'Z', 'z')]
-	[InlineData (KeyCode.ShiftMask | KeyCode.Z, 'Z')]
-	[InlineData ((KeyCode)'1', '1')]
-	[InlineData (KeyCode.ShiftMask | KeyCode.D1, '1')]
-	[InlineData (KeyCode.CtrlMask | KeyCode.D1, '\0')]
-	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.D1, '\0')]
-	[InlineData (KeyCode.F1, '\0')]
-	[InlineData (KeyCode.ShiftMask | KeyCode.F1, '\0')]
-	[InlineData (KeyCode.CtrlMask | KeyCode.F1, '\0')]
+	[InlineData ((KeyCode)'z',                                                       'z')]
+	[InlineData ((KeyCode)'Z',                                                       'z')]
+	[InlineData (KeyCode.ShiftMask | KeyCode.Z,                                      'Z')]
+	[InlineData ((KeyCode)'1',                                                       '1')]
+	[InlineData (KeyCode.ShiftMask | KeyCode.D1,                                     '1')]
+	[InlineData (KeyCode.CtrlMask | KeyCode.D1,                                      '\0')]
+	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.D1,                  '\0')]
+	[InlineData (KeyCode.F1,                                                         '\0')]
+	[InlineData (KeyCode.ShiftMask | KeyCode.F1,                                     '\0')]
+	[InlineData (KeyCode.CtrlMask | KeyCode.F1,                                      '\0')]
 #pragma warning disable xUnit1025 // InlineData should be unique within the Theory it belongs to
 	[InlineData (KeyCode.Enter, '\r')]
 #pragma warning restore xUnit1025 // InlineData should be unique within the Theory it belongs to
-	[InlineData (KeyCode.Tab, '\t')]
-	[InlineData (KeyCode.Esc, 0x1b)]
-	[InlineData (KeyCode.Space, ' ')]
+	[InlineData (KeyCode.Tab,                                                            '\t')]
+	[InlineData (KeyCode.Esc,                                                            0x1b)]
+	[InlineData (KeyCode.Space,                                                          ' ')]
 	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.Enter, '\0')]
-	[InlineData (KeyCode.Null, '\0')]
-	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.Null, '\0')]
-	[InlineData (KeyCode.CharMask, '\0')]
-	[InlineData (KeyCode.SpecialMask, '\0')]
+	[InlineData (KeyCode.Null,                                                           '\0')]
+	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.Null,  '\0')]
+	[InlineData (KeyCode.CharMask,                                                       '\0')]
+	[InlineData (KeyCode.SpecialMask,                                                    '\0')]
 	public void AsRune_ShouldReturnCorrectIntValue (KeyCode key, uint expected)
 	{
 		var eventArgs = new Key (key);
@@ -290,7 +289,7 @@ public class KeyTests {
 
 	[Theory]
 	[InlineData (KeyCode.AltMask, true)]
-	[InlineData (KeyCode.A, false)]
+	[InlineData (KeyCode.A,       false)]
 	public void IsAlt_ShouldReturnCorrectValue (KeyCode key, bool expected)
 	{
 		var eventArgs = new Key (key);
@@ -328,7 +327,7 @@ public class KeyTests {
 	[Fact]
 	public void Standard_Keys_Should_Equal_KeyCode ()
 	{
-		Assert.Equal (KeyCode.A, Key.A);
+		Assert.Equal (KeyCode.A,      Key.A);
 		Assert.Equal (KeyCode.Delete, Key.Delete);
 	}
 
@@ -345,148 +344,148 @@ public class KeyTests {
 
 	[Theory]
 	[InlineData (KeyCode.CtrlMask | KeyCode.A, '+', "Ctrl+A")]
-	[InlineData (KeyCode.AltMask | KeyCode.B, '-', "Alt-B")]
+	[InlineData (KeyCode.AltMask | KeyCode.B,  '-', "Alt-B")]
 	public void ToStringWithSeparator_ShouldReturnFormattedString (KeyCode key, char separator, string expected) => Assert.Equal (expected, Key.ToString (key, (Rune)separator));
 
 	[Theory]
-	[InlineData ((KeyCode)'☑', "☑")]
-	[InlineData ((KeyCode)'英', "英")]
-	[InlineData ((KeyCode)'{', "{")]
-	[InlineData ((KeyCode)'\'', "\'")]
-	[InlineData ((KeyCode)'ó', "ó")]
-	[InlineData ((KeyCode)'Ó' | KeyCode.ShiftMask, "Shift+Ó")] // TODO: This is not correct, it should be Shift+ó or just Ó
-	[InlineData ((KeyCode)'Ó', "Ó")]
-	[InlineData ((KeyCode)'ç' | KeyCode.ShiftMask | KeyCode.AltMask | KeyCode.CtrlMask, "Ctrl+Alt+Shift+ç")]
-	[InlineData ((KeyCode)'a', "a")] // 97 or Key.Space | Key.A
-	[InlineData ((KeyCode)'A', "a")] // 65 or equivalent to Key.A, but A-Z are mapped to lower case by drivers
-	[InlineData (KeyCode.ShiftMask | KeyCode.A, "A")]
-	[InlineData ((KeyCode)'a' | KeyCode.ShiftMask, "A")]
-	[InlineData (KeyCode.CtrlMask | KeyCode.A, "Ctrl+A")]
-	[InlineData (KeyCode.AltMask | KeyCode.A, "Alt+A")]
-	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.A, "Ctrl+Shift+A")]
-	[InlineData (KeyCode.ShiftMask | KeyCode.AltMask | KeyCode.A, "Alt+Shift+A")]
-	[InlineData (KeyCode.AltMask | KeyCode.CtrlMask | KeyCode.A, "Ctrl+Alt+A")]
-	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.A, "Ctrl+Alt+Shift+A")]
-	[InlineData (KeyCode.ShiftMask | KeyCode.Z, "Z")]
-	[InlineData (KeyCode.CtrlMask | KeyCode.Z, "Ctrl+Z")]
-	[InlineData (KeyCode.AltMask | KeyCode.Z, "Alt+Z")]
-	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.Z, "Ctrl+Shift+Z")]
-	[InlineData (KeyCode.ShiftMask | KeyCode.AltMask | KeyCode.Z, "Alt+Shift+Z")]
-	[InlineData (KeyCode.AltMask | KeyCode.CtrlMask | KeyCode.Z, "Ctrl+Alt+Z")]
-	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.Z, "Ctrl+Alt+Shift+Z")]
-	[InlineData ((KeyCode)'1', "1")]
-	[InlineData (KeyCode.ShiftMask | KeyCode.D1, "Shift+1")]
-	[InlineData (KeyCode.CtrlMask | KeyCode.D1, "Ctrl+1")]
-	[InlineData (KeyCode.AltMask | KeyCode.D1, "Alt+1")]
-	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.D1, "Ctrl+Shift+1")]
-	[InlineData (KeyCode.ShiftMask | KeyCode.AltMask | KeyCode.D1, "Alt+Shift+1")]
-	[InlineData (KeyCode.AltMask | KeyCode.CtrlMask | KeyCode.D1, "Ctrl+Alt+1")]
-	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.D1, "Ctrl+Alt+Shift+1")]
-	[InlineData (KeyCode.F1, "F1")]
-	[InlineData (KeyCode.ShiftMask | KeyCode.F1, "Shift+F1")]
-	[InlineData (KeyCode.CtrlMask | KeyCode.F1, "Ctrl+F1")]
-	[InlineData (KeyCode.AltMask | KeyCode.F1, "Alt+F1")]
-	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.F1, "Ctrl+Shift+F1")]
-	[InlineData (KeyCode.ShiftMask | KeyCode.AltMask | KeyCode.F1, "Alt+Shift+F1")]
-	[InlineData (KeyCode.AltMask | KeyCode.CtrlMask | KeyCode.F1, "Ctrl+Alt+F1")]
-	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.F1, "Ctrl+Alt+Shift+F1")]
-	[InlineData (KeyCode.Enter, "Enter")]
-	[InlineData (KeyCode.ShiftMask | KeyCode.Enter, "Shift+Enter")]
-	[InlineData (KeyCode.CtrlMask | KeyCode.Enter, "Ctrl+Enter")]
-	[InlineData (KeyCode.AltMask | KeyCode.Enter, "Alt+Enter")]
-	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.Enter, "Ctrl+Shift+Enter")]
-	[InlineData (KeyCode.ShiftMask | KeyCode.AltMask | KeyCode.Enter, "Alt+Shift+Enter")]
-	[InlineData (KeyCode.AltMask | KeyCode.CtrlMask | KeyCode.Enter, "Ctrl+Alt+Enter")]
-	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.Enter, "Ctrl+Alt+Shift+Enter")]
-	[InlineData (KeyCode.Delete, "Delete")]
-	[InlineData (KeyCode.ShiftMask | KeyCode.Delete, "Shift+Delete")]
-	[InlineData (KeyCode.CtrlMask | KeyCode.Delete, "Ctrl+Delete")]
-	[InlineData (KeyCode.AltMask | KeyCode.Delete, "Alt+Delete")]
-	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.Delete, "Ctrl+Shift+Delete")]
-	[InlineData (KeyCode.ShiftMask | KeyCode.AltMask | KeyCode.Delete, "Alt+Shift+Delete")]
-	[InlineData (KeyCode.AltMask | KeyCode.CtrlMask | KeyCode.Delete, "Ctrl+Alt+Delete")]
-	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.Delete, "Ctrl+Alt+Shift+Delete")]
-	[InlineData (KeyCode.CursorUp, "CursorUp")]
-	[InlineData (KeyCode.ShiftMask | KeyCode.CursorUp, "Shift+CursorUp")]
-	[InlineData (KeyCode.CtrlMask | KeyCode.CursorUp, "Ctrl+CursorUp")]
-	[InlineData (KeyCode.AltMask | KeyCode.CursorUp, "Alt+CursorUp")]
-	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.CursorUp, "Ctrl+Shift+CursorUp")]
-	[InlineData (KeyCode.ShiftMask | KeyCode.AltMask | KeyCode.CursorUp, "Alt+Shift+CursorUp")]
-	[InlineData (KeyCode.AltMask | KeyCode.CtrlMask | KeyCode.CursorUp, "Ctrl+Alt+CursorUp")]
+	[InlineData ((KeyCode)'☑',                                                              "☑")]
+	[InlineData ((KeyCode)'英',                                                              "英")]
+	[InlineData ((KeyCode)'{',                                                              "{")]
+	[InlineData ((KeyCode)'\'',                                                             "\'")]
+	[InlineData ((KeyCode)'ó',                                                              "ó")]
+	[InlineData ((KeyCode)'Ó' | KeyCode.ShiftMask,                                          "Shift+Ó")] // TODO: This is not correct, it should be Shift+ó or just Ó
+	[InlineData ((KeyCode)'Ó',                                                              "Ó")]
+	[InlineData ((KeyCode)'ç' | KeyCode.ShiftMask | KeyCode.AltMask | KeyCode.CtrlMask,     "Ctrl+Alt+Shift+ç")]
+	[InlineData ((KeyCode)'a',                                                              "a")] // 97 or Key.Space | Key.A
+	[InlineData ((KeyCode)'A',                                                              "a")] // 65 or equivalent to Key.A, but A-Z are mapped to lower case by drivers
+	[InlineData (KeyCode.ShiftMask | KeyCode.A,                                             "A")]
+	[InlineData ((KeyCode)'a' | KeyCode.ShiftMask,                                          "A")]
+	[InlineData (KeyCode.CtrlMask | KeyCode.A,                                              "Ctrl+A")]
+	[InlineData (KeyCode.AltMask | KeyCode.A,                                               "Alt+A")]
+	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.A,                          "Ctrl+Shift+A")]
+	[InlineData (KeyCode.ShiftMask | KeyCode.AltMask | KeyCode.A,                           "Alt+Shift+A")]
+	[InlineData (KeyCode.AltMask | KeyCode.CtrlMask | KeyCode.A,                            "Ctrl+Alt+A")]
+	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.A,        "Ctrl+Alt+Shift+A")]
+	[InlineData (KeyCode.ShiftMask | KeyCode.Z,                                             "Z")]
+	[InlineData (KeyCode.CtrlMask | KeyCode.Z,                                              "Ctrl+Z")]
+	[InlineData (KeyCode.AltMask | KeyCode.Z,                                               "Alt+Z")]
+	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.Z,                          "Ctrl+Shift+Z")]
+	[InlineData (KeyCode.ShiftMask | KeyCode.AltMask | KeyCode.Z,                           "Alt+Shift+Z")]
+	[InlineData (KeyCode.AltMask | KeyCode.CtrlMask | KeyCode.Z,                            "Ctrl+Alt+Z")]
+	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.Z,        "Ctrl+Alt+Shift+Z")]
+	[InlineData ((KeyCode)'1',                                                              "1")]
+	[InlineData (KeyCode.ShiftMask | KeyCode.D1,                                            "Shift+1")]
+	[InlineData (KeyCode.CtrlMask | KeyCode.D1,                                             "Ctrl+1")]
+	[InlineData (KeyCode.AltMask | KeyCode.D1,                                              "Alt+1")]
+	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.D1,                         "Ctrl+Shift+1")]
+	[InlineData (KeyCode.ShiftMask | KeyCode.AltMask | KeyCode.D1,                          "Alt+Shift+1")]
+	[InlineData (KeyCode.AltMask | KeyCode.CtrlMask | KeyCode.D1,                           "Ctrl+Alt+1")]
+	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.D1,       "Ctrl+Alt+Shift+1")]
+	[InlineData (KeyCode.F1,                                                                "F1")]
+	[InlineData (KeyCode.ShiftMask | KeyCode.F1,                                            "Shift+F1")]
+	[InlineData (KeyCode.CtrlMask | KeyCode.F1,                                             "Ctrl+F1")]
+	[InlineData (KeyCode.AltMask | KeyCode.F1,                                              "Alt+F1")]
+	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.F1,                         "Ctrl+Shift+F1")]
+	[InlineData (KeyCode.ShiftMask | KeyCode.AltMask | KeyCode.F1,                          "Alt+Shift+F1")]
+	[InlineData (KeyCode.AltMask | KeyCode.CtrlMask | KeyCode.F1,                           "Ctrl+Alt+F1")]
+	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.F1,       "Ctrl+Alt+Shift+F1")]
+	[InlineData (KeyCode.Enter,                                                             "Enter")]
+	[InlineData (KeyCode.ShiftMask | KeyCode.Enter,                                         "Shift+Enter")]
+	[InlineData (KeyCode.CtrlMask | KeyCode.Enter,                                          "Ctrl+Enter")]
+	[InlineData (KeyCode.AltMask | KeyCode.Enter,                                           "Alt+Enter")]
+	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.Enter,                      "Ctrl+Shift+Enter")]
+	[InlineData (KeyCode.ShiftMask | KeyCode.AltMask | KeyCode.Enter,                       "Alt+Shift+Enter")]
+	[InlineData (KeyCode.AltMask | KeyCode.CtrlMask | KeyCode.Enter,                        "Ctrl+Alt+Enter")]
+	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.Enter,    "Ctrl+Alt+Shift+Enter")]
+	[InlineData (KeyCode.Delete,                                                            "Delete")]
+	[InlineData (KeyCode.ShiftMask | KeyCode.Delete,                                        "Shift+Delete")]
+	[InlineData (KeyCode.CtrlMask | KeyCode.Delete,                                         "Ctrl+Delete")]
+	[InlineData (KeyCode.AltMask | KeyCode.Delete,                                          "Alt+Delete")]
+	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.Delete,                     "Ctrl+Shift+Delete")]
+	[InlineData (KeyCode.ShiftMask | KeyCode.AltMask | KeyCode.Delete,                      "Alt+Shift+Delete")]
+	[InlineData (KeyCode.AltMask | KeyCode.CtrlMask | KeyCode.Delete,                       "Ctrl+Alt+Delete")]
+	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.Delete,   "Ctrl+Alt+Shift+Delete")]
+	[InlineData (KeyCode.CursorUp,                                                          "CursorUp")]
+	[InlineData (KeyCode.ShiftMask | KeyCode.CursorUp,                                      "Shift+CursorUp")]
+	[InlineData (KeyCode.CtrlMask | KeyCode.CursorUp,                                       "Ctrl+CursorUp")]
+	[InlineData (KeyCode.AltMask | KeyCode.CursorUp,                                        "Alt+CursorUp")]
+	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.CursorUp,                   "Ctrl+Shift+CursorUp")]
+	[InlineData (KeyCode.ShiftMask | KeyCode.AltMask | KeyCode.CursorUp,                    "Alt+Shift+CursorUp")]
+	[InlineData (KeyCode.AltMask | KeyCode.CtrlMask | KeyCode.CursorUp,                     "Ctrl+Alt+CursorUp")]
 	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.CursorUp, "Ctrl+Alt+Shift+CursorUp")]
-	[InlineData (KeyCode.Space, "Space")]
-	[InlineData (KeyCode.Null, "Null")]
-	[InlineData (KeyCode.ShiftMask | KeyCode.Null, "Shift")]
-	[InlineData (KeyCode.CtrlMask | KeyCode.Null, "Ctrl")]
-	[InlineData (KeyCode.AltMask | KeyCode.Null, "Alt")]
-	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.Null, "Ctrl+Shift")]
-	[InlineData (KeyCode.ShiftMask | KeyCode.AltMask | KeyCode.Null, "Alt+Shift")]
-	[InlineData (KeyCode.AltMask | KeyCode.CtrlMask | KeyCode.Null, "Ctrl+Alt")]
-	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.Null, "Ctrl+Alt+Shift")]
+	[InlineData (KeyCode.Space,                                                             "Space")]
+	[InlineData (KeyCode.Null,                                                              "Null")]
+	[InlineData (KeyCode.ShiftMask | KeyCode.Null,                                          "Shift")]
+	[InlineData (KeyCode.CtrlMask | KeyCode.Null,                                           "Ctrl")]
+	[InlineData (KeyCode.AltMask | KeyCode.Null,                                            "Alt")]
+	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.Null,                       "Ctrl+Shift")]
+	[InlineData (KeyCode.ShiftMask | KeyCode.AltMask | KeyCode.Null,                        "Alt+Shift")]
+	[InlineData (KeyCode.AltMask | KeyCode.CtrlMask | KeyCode.Null,                         "Ctrl+Alt")]
+	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.Null,     "Ctrl+Alt+Shift")]
 #pragma warning disable xUnit1025 // InlineData should be unique within the Theory it belongs to
-	[InlineData (KeyCode.ShiftMask, "Shift")]
-	[InlineData (KeyCode.CtrlMask, "Ctrl")]
-	[InlineData (KeyCode.AltMask, "Alt")]
-	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask, "Ctrl+Shift")]
-	[InlineData (KeyCode.ShiftMask | KeyCode.AltMask, "Alt+Shift")]
-	[InlineData (KeyCode.AltMask | KeyCode.CtrlMask, "Ctrl+Alt")]
+	[InlineData (KeyCode.ShiftMask,                                      "Shift")]
+	[InlineData (KeyCode.CtrlMask,                                       "Ctrl")]
+	[InlineData (KeyCode.AltMask,                                        "Alt")]
+	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask,                   "Ctrl+Shift")]
+	[InlineData (KeyCode.ShiftMask | KeyCode.AltMask,                    "Alt+Shift")]
+	[InlineData (KeyCode.AltMask | KeyCode.CtrlMask,                     "Ctrl+Alt")]
 	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask, "Ctrl+Alt+Shift")]
 #pragma warning restore xUnit1025 // InlineData should be unique within the Theory it belongs to
-	[InlineData (KeyCode.CharMask, "CharMask")]
-	[InlineData (KeyCode.SpecialMask, "Ctrl+Alt+Shift")]
-	[InlineData ((KeyCode)'+', "+")]
-	[InlineData ((KeyCode)'+' | KeyCode.ShiftMask, "Shift++")]
-	[InlineData ((KeyCode)'+' | KeyCode.CtrlMask, "Ctrl++")] 
+	[InlineData (KeyCode.CharMask,                                    "CharMask")]
+	[InlineData (KeyCode.SpecialMask,                                 "Ctrl+Alt+Shift")]
+	[InlineData ((KeyCode)'+',                                        "+")]
+	[InlineData ((KeyCode)'+' | KeyCode.ShiftMask,                    "Shift++")]
+	[InlineData ((KeyCode)'+' | KeyCode.CtrlMask,                     "Ctrl++")]
 	[InlineData ((KeyCode)'+' | KeyCode.ShiftMask | KeyCode.CtrlMask, "Ctrl+Shift++")]
 	public void ToString_ShouldReturnFormattedString (KeyCode key, string expected) => Assert.Equal (expected, Key.ToString (key));
 
 	// TryParse
 	[Theory]
-	[InlineData ("a", KeyCode.A)]
-	[InlineData ("Ctrl+A", KeyCode.A | KeyCode.CtrlMask)]
-	[InlineData ("Alt+A", KeyCode.A | KeyCode.AltMask)]
-	[InlineData ("Shift+A", KeyCode.A | KeyCode.ShiftMask)]
-	[InlineData ("A", KeyCode.A | KeyCode.ShiftMask)]
-	[InlineData ("â", (KeyCode)'â')]
-	[InlineData ("Shift+â", (KeyCode)'â' | KeyCode.ShiftMask)]
-	[InlineData ("Shift+Â", (KeyCode)'Â' | KeyCode.ShiftMask)]
-	[InlineData ("Ctrl+Shift+CursorUp", KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.CursorUp)]
+	[InlineData ("a",                       KeyCode.A)]
+	[InlineData ("Ctrl+A",                  KeyCode.A | KeyCode.CtrlMask)]
+	[InlineData ("Alt+A",                   KeyCode.A | KeyCode.AltMask)]
+	[InlineData ("Shift+A",                 KeyCode.A | KeyCode.ShiftMask)]
+	[InlineData ("A",                       KeyCode.A | KeyCode.ShiftMask)]
+	[InlineData ("â",                       (KeyCode)'â')]
+	[InlineData ("Shift+â",                 (KeyCode)'â' | KeyCode.ShiftMask)]
+	[InlineData ("Shift+Â",                 (KeyCode)'Â' | KeyCode.ShiftMask)]
+	[InlineData ("Ctrl+Shift+CursorUp",     KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.CursorUp)]
 	[InlineData ("Ctrl+Alt+Shift+CursorUp", KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.CursorUp)]
 	[InlineData ("ctrl+alt+shift+cursorup", KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.CursorUp)]
 	[InlineData ("CTRL+ALT+SHIFT+CURSORUP", KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.CursorUp)]
-	[InlineData ("Ctrl+Alt+Shift+Delete", KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.Delete)]
-	[InlineData ("Ctrl+Alt+Shift+Enter", KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.Enter)]
-	[InlineData ("Tab", KeyCode.Tab)]
-	[InlineData ("Shift+Tab", KeyCode.Tab | KeyCode.ShiftMask)]
-	[InlineData ("Ctrl+Tab", KeyCode.Tab | KeyCode.CtrlMask)]
-	[InlineData ("Alt+Tab", KeyCode.Tab | KeyCode.AltMask)]
-	[InlineData ("Ctrl+Shift+Tab", KeyCode.Tab | KeyCode.ShiftMask | KeyCode.CtrlMask)]
-	[InlineData ("Ctrl+Alt+Tab", KeyCode.Tab | KeyCode.AltMask | KeyCode.CtrlMask)]
-	[InlineData ("", KeyCode.Null)]
-	[InlineData (" ", KeyCode.Space)]
-	[InlineData ("Space", KeyCode.Space)]
-	[InlineData ("Shift+Space", KeyCode.Space | KeyCode.ShiftMask)]
-	[InlineData ("Ctrl+Space", KeyCode.Space | KeyCode.CtrlMask)]
-	[InlineData ("Alt+Space", KeyCode.Space | KeyCode.AltMask)]
-	[InlineData ("Shift+ ", KeyCode.Space | KeyCode.ShiftMask)]
-	[InlineData ("Ctrl+ ", KeyCode.Space | KeyCode.CtrlMask)]
-	[InlineData ("Alt+ ", KeyCode.Space | KeyCode.AltMask)]
-	[InlineData ("F1", KeyCode.F1)]
-	[InlineData ("0", KeyCode.D0)]
-	[InlineData ("9", KeyCode.D9)]
-	[InlineData ("D0", KeyCode.D0)]
-	[InlineData ("65", KeyCode.A | KeyCode.ShiftMask)]
-	[InlineData ("97", KeyCode.A)]
-	[InlineData ("Shift", KeyCode.ShiftMask)]
-	[InlineData ("Ctrl", KeyCode.CtrlMask)]
-	[InlineData ("Ctrl-A", KeyCode.A | KeyCode.CtrlMask)]
-	[InlineData ("Alt-A", KeyCode.A | KeyCode.AltMask)]
-	[InlineData ("A-Ctrl", KeyCode.A | KeyCode.CtrlMask)]
-	[InlineData ("Alt-A-Ctrl", KeyCode.A | KeyCode.CtrlMask | KeyCode.AltMask)]
+	[InlineData ("Ctrl+Alt+Shift+Delete",   KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.Delete)]
+	[InlineData ("Ctrl+Alt+Shift+Enter",    KeyCode.ShiftMask | KeyCode.CtrlMask | KeyCode.AltMask | KeyCode.Enter)]
+	[InlineData ("Tab",                     KeyCode.Tab)]
+	[InlineData ("Shift+Tab",               KeyCode.Tab | KeyCode.ShiftMask)]
+	[InlineData ("Ctrl+Tab",                KeyCode.Tab | KeyCode.CtrlMask)]
+	[InlineData ("Alt+Tab",                 KeyCode.Tab | KeyCode.AltMask)]
+	[InlineData ("Ctrl+Shift+Tab",          KeyCode.Tab | KeyCode.ShiftMask | KeyCode.CtrlMask)]
+	[InlineData ("Ctrl+Alt+Tab",            KeyCode.Tab | KeyCode.AltMask | KeyCode.CtrlMask)]
+	[InlineData ("",                        KeyCode.Null)]
+	[InlineData (" ",                       KeyCode.Space)]
+	[InlineData ("Space",                   KeyCode.Space)]
+	[InlineData ("Shift+Space",             KeyCode.Space | KeyCode.ShiftMask)]
+	[InlineData ("Ctrl+Space",              KeyCode.Space | KeyCode.CtrlMask)]
+	[InlineData ("Alt+Space",               KeyCode.Space | KeyCode.AltMask)]
+	[InlineData ("Shift+ ",                 KeyCode.Space | KeyCode.ShiftMask)]
+	[InlineData ("Ctrl+ ",                  KeyCode.Space | KeyCode.CtrlMask)]
+	[InlineData ("Alt+ ",                   KeyCode.Space | KeyCode.AltMask)]
+	[InlineData ("F1",                      KeyCode.F1)]
+	[InlineData ("0",                       KeyCode.D0)]
+	[InlineData ("9",                       KeyCode.D9)]
+	[InlineData ("D0",                      KeyCode.D0)]
+	[InlineData ("65",                      KeyCode.A | KeyCode.ShiftMask)]
+	[InlineData ("97",                      KeyCode.A)]
+	[InlineData ("Shift",                   KeyCode.ShiftMask)]
+	[InlineData ("Ctrl",                    KeyCode.CtrlMask)]
+	[InlineData ("Ctrl-A",                  KeyCode.A | KeyCode.CtrlMask)]
+	[InlineData ("Alt-A",                   KeyCode.A | KeyCode.AltMask)]
+	[InlineData ("A-Ctrl",                  KeyCode.A | KeyCode.CtrlMask)]
+	[InlineData ("Alt-A-Ctrl",              KeyCode.A | KeyCode.CtrlMask | KeyCode.AltMask)]
 	public void TryParse_ShouldReturnTrue_WhenValidKey (string keyString, KeyCode expected)
 	{
-		Assert.True (Key.TryParse (keyString, out Key key));
-		Key expectedKey = (Key)expected;
+		Assert.True (Key.TryParse (keyString, out var key));
+		Key expectedKey = expected;
 		Assert.Equal (expectedKey.ToString (), key.ToString ());
 	}
 
@@ -503,24 +502,24 @@ public class KeyTests {
 	[InlineData ("0x99")]
 	[InlineData ("Ctrl-Ctrl")]
 	public void TryParse_ShouldReturnFalse_On_InvalidKey (string keyString) => Assert.False (Key.TryParse (keyString, out var _));
-	
+
 	[Theory]
-	[InlineData (KeyCode.ShiftMask, true, false, false)]
-	[InlineData (KeyCode.ShiftMask | KeyCode.AltMask, true, true, false)]
-	[InlineData (KeyCode.ShiftMask | KeyCode.AltMask | KeyCode.CtrlMask, true, true, true)]
-	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask, true, false, true)]
-	[InlineData (KeyCode.AltMask, false, true, false)]
-	[InlineData (KeyCode.AltMask | KeyCode.CtrlMask, false, true, true)]
-	[InlineData (KeyCode.CtrlMask, false, false, true)]
+	[InlineData (KeyCode.ShiftMask,                                      true,  false, false)]
+	[InlineData (KeyCode.ShiftMask | KeyCode.AltMask,                    true,  true,  false)]
+	[InlineData (KeyCode.ShiftMask | KeyCode.AltMask | KeyCode.CtrlMask, true,  true,  true)]
+	[InlineData (KeyCode.ShiftMask | KeyCode.CtrlMask,                   true,  false, true)]
+	[InlineData (KeyCode.AltMask,                                        false, true,  false)]
+	[InlineData (KeyCode.AltMask | KeyCode.CtrlMask,                     false, true,  true)]
+	[InlineData (KeyCode.CtrlMask,                                       false, false, true)]
 	public void IsShift_IsAlt_IsCtrl (KeyCode keyCode, bool isShift, bool isAlt, bool isCtrl)
 	{
 		Assert.Equal (((Key)keyCode).IsShift, isShift);
-		Assert.Equal (((Key)keyCode).IsAlt, isAlt);
-		Assert.Equal (((Key)keyCode).IsCtrl, isCtrl);
+		Assert.Equal (((Key)keyCode).IsAlt,   isAlt);
+		Assert.Equal (((Key)keyCode).IsCtrl,  isCtrl);
 	}
 
 	[Theory]
-	[InlineData (KeyCode.A, KeyCode.A)]
+	[InlineData (KeyCode.A,  KeyCode.A)]
 	[InlineData (KeyCode.F1, KeyCode.F1)]
 	public void Casting_Between_Key_And_KeyCode (KeyCode keyCode, KeyCode key)
 	{