Skip to content

Commit 9624a79

Browse files
author
Immo Landwerth
authored
Add ConsoleKey.None and ConsoleModifiers.None (#83114)
This fixes #79868.
1 parent 3a36040 commit 9624a79

File tree

5 files changed

+17
-3
lines changed

5 files changed

+17
-3
lines changed

src/libraries/System.Console/ref/System.Console.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ public enum ConsoleColor
228228
}
229229
public enum ConsoleKey
230230
{
231+
None = 0,
231232
Backspace = 8,
232233
Tab = 9,
233234
Clear = 12,
@@ -389,6 +390,7 @@ public enum ConsoleKey
389390
[System.FlagsAttribute]
390391
public enum ConsoleModifiers
391392
{
393+
None = 0,
392394
Alt = 1,
393395
Shift = 2,
394396
Control = 4,

src/libraries/System.Console/src/System/ConsoleKey.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ namespace System
55
{
66
public enum ConsoleKey
77
{
8+
None = 0x0,
89
Backspace = 0x8,
910
Tab = 0x9,
1011
Clear = 0xC,

src/libraries/System.Console/src/System/ConsoleModifiers.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ namespace System
66
[Flags]
77
public enum ConsoleModifiers
88
{
9+
None = 0,
910
Alt = 1,
1011
Shift = 2,
1112
Control = 4

src/libraries/System.Console/src/System/IO/KeyParser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ private static bool TryParseTerminalInputSequence(char[] buffer, TerminalFormatS
6363
}
6464

6565
Dictionary<ReadOnlyMemory<char>, ConsoleKeyInfo> terminfoDb = terminalFormatStrings.KeyFormatToConsoleKey; // the most important source of truth
66-
ConsoleModifiers modifiers = 0;
66+
ConsoleModifiers modifiers = ConsoleModifiers.None;
6767
ConsoleKey key;
6868

6969
// Is it a three character sequence? (examples: '^[[H' (Home), '^[OP' (F1))

src/libraries/System.Console/tests/ConsoleKeyInfoTests.cs

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,19 @@ public class ConsoleKeyInfoTests
1212
public void Ctor_DefaultCtor_PropertiesReturnDefaults()
1313
{
1414
ConsoleKeyInfo cki = new ConsoleKeyInfo();
15-
Assert.Equal(default(ConsoleKey), cki.Key);
15+
Assert.Equal(ConsoleKey.None, cki.Key);
1616
Assert.Equal(default(char), cki.KeyChar);
17-
Assert.Equal(default(ConsoleModifiers), cki.Modifiers);
17+
Assert.Equal(ConsoleModifiers.None, cki.Modifiers);
18+
}
19+
20+
[Fact]
21+
public void Ctor_ValueCtor_ReturnsNoneForDefault()
22+
{
23+
ConsoleKeyInfo cki = new ConsoleKeyInfo(';', default(ConsoleKey), false, false, false);
24+
25+
Assert.Equal(ConsoleKey.None, cki.Key);
26+
Assert.Equal(';', cki.KeyChar);
27+
Assert.Equal(ConsoleModifiers.None, cki.Modifiers);
1828
}
1929

2030
[Theory]

0 commit comments

Comments
 (0)