admin/PowerShell-PSReadLine
1
0
Fork 0
mirror of https://github.com/PowerShell/PSReadLine synced 2026-06-08 12:12:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a few custom key binding on Windows (#657)

Browse Source 
Fix #580.
This commit is contained in:
Dongbo Wang
2018-03-25 11:11:13 -07:00
committed by Jason Shirk
parent 8e7900b486
commit 21cd4e3850
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PSReadLine/ConsoleKeyChordConverter.cs
+15 -10
View File
@@ -246,17 +246,22 @@ namespace Microsoft.PowerShell
}
if (isCtrl)
{
if (keyChar >= 'a' && keyChar <= 'z')
switch (keyChar)
{
keyChar = (char)(keyChar - 'a' + 1);
}
else if (keyChar >= 'A' && keyChar <= 'Z')
{
keyChar = (char)(keyChar - 'A' + 1);
}
else
{
keyChar = '\0';
case var _ when (keyChar >= 'a' && keyChar <= 'z'):
keyChar = (char)(keyChar - 'a' + 1);
break;
case var _ when (keyChar >= 'A' && keyChar <= ']'):
keyChar = (char)(keyChar - 'A' + 1);
break;
case '_':
keyChar = Keys.CtrlUnderbar.KeyChar;
mods |= Keys.CtrlUnderbar.Modifiers;
break;
case '^':
keyChar = Keys.CtrlCaret.KeyChar;
mods |= Keys.CtrlCaret.Modifiers;
break;
}
}
PSReadLine/Keys.cs
+4 -3
View File
@@ -326,6 +326,7 @@ namespace Microsoft.PowerShell
public static ConsoleKeyInfo CtrlLBracket = Ctrl('\x1b');
public static ConsoleKeyInfo CtrlBackslash = Ctrl('\x1c');
public static ConsoleKeyInfo CtrlRBracket = Ctrl('\x1d');
public static ConsoleKeyInfo CtrlCaret = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? CtrlShift('\x1e') : Ctrl('\x1e');
public static ConsoleKeyInfo CtrlUnderbar = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? CtrlShift('\x1f') : Ctrl('\x1f');
public static ConsoleKeyInfo CtrlBackspace = Ctrl(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? '\x7f' : '\x08');
public static ConsoleKeyInfo CtrlDelete = Ctrl(ConsoleKey.Delete); // !Linux
@@ -478,13 +479,13 @@ namespace Microsoft.PowerShell
private static ConsoleModifiers NormalizeModifiers(this ConsoleKeyInfo key)
{
var keyChar = key.IgnoreKeyChar() ? key.KeyChar : key.NormalizeKeyChar();
var result = key.Modifiers;
if (!char.IsControl(key.KeyChar))
if (!char.IsControl(keyChar))
{
// Ignore Shift state unless it's a control character.
result = result & ~ConsoleModifiers.Shift;
}
return result;
}
@@ -537,7 +538,7 @@ namespace Microsoft.PowerShell
// Because a comparison of two ConsoleKeyInfo objects is a comparison of the
// combination of the ConsoleKey and Modifiers, we must combine their hashes.
// Note that if the ConsoleKey is default, we must fall back to the KeyChar,
// otherwise every non-special key will compare as the same.
// otherwise every non-special key will compare as the same.
int h1 = obj.IgnoreKeyChar()
? obj.Key.GetHashCode()
: obj.NormalizeKeyChar().GetHashCode();