Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: add support for upcasing, downcasing, and capitalizing word #3365

Merged
merged 2 commits into from
Jul 18, 2022
Merged

Feat: add support for upcasing, downcasing, and capitalizing word #3365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85e67a9
Feat: upcasing, downcasing, and capitalizing word
3N4N Jul 2, 2022
6a2ef7e
Fix up some minor issues and add descriptions for the new functions
daxian-dbw Jul 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 66 additions & 0 deletions PSReadLine/BasicEditing.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,72 @@ public static void DeleteCharOrExit(ConsoleKeyInfo? key = null, object arg = nul
_singleton.DeleteCharImpl(1, orExit: true);
}

/// <summary>
/// A helper function to change the case of the current word.
/// </summary>
private static void UpdateWordCase(bool toUpper)
{
if (_singleton._current >= _singleton._buffer.Length)
{
Ding();
return;
}

int endOfWord = _singleton.FindForwardWordPoint(_singleton.Options.WordDelimiters);
int wordlen = endOfWord - _singleton._current;

string word = _singleton._buffer.ToString(_singleton._current, wordlen);
word = toUpper ? word.ToUpper() : word.ToLower();

Replace(_singleton._current, wordlen, word);

_singleton.MoveCursor(endOfWord);
_singleton.Render();
}

/// <summary>
/// Upcase the current word and move to the next one.
/// </summary>
public static void UpcaseWord(ConsoleKeyInfo? key = null, object arg = null)
{
UpdateWordCase(toUpper: true);
}

/// <summary>
/// Downcase the current word and move to the next one.
/// </summary>
public static void DowncaseWord(ConsoleKeyInfo? key = null, object arg = null)
{
UpdateWordCase(toUpper: false);
}

/// <summary>
/// Capitalize the current word and move to the next one.
/// </summary>
public static void CapitalizeWord(ConsoleKeyInfo? key = null, object arg = null)
{
if (_singleton._current >= _singleton._buffer.Length)
{
Ding();
return;
}

int endOfWord = _singleton.FindForwardWordPoint(_singleton.Options.WordDelimiters);
int wordlen = endOfWord - _singleton._current;

char[] word = _singleton._buffer.ToString(_singleton._current, wordlen).ToLower().ToCharArray();
int firstLetterIdx = Array.FindIndex(word, static x => char.IsLetter(x));

if (firstLetterIdx >= 0)
{
word[firstLetterIdx] = char.ToUpper(word[firstLetterIdx]);
Replace(_singleton._current, wordlen, new string(word));
}

_singleton.MoveCursor(endOfWord);
_singleton.Render();
}

private bool AcceptLineImpl(bool validate)
{
using var _ = _prediction.DisableScoped();
Expand Down
13 changes: 11 additions & 2 deletions PSReadLine/KeyBindings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,9 @@ void SetDefaultEmacsBindings()
{ Keys.AltH, MakeKeyHandler(ShowParameterHelp, "ShowParameterHelp") },
{ Keys.F1, MakeKeyHandler(ShowCommandHelp, "ShowCommandHelp") },
{ Keys.F2, MakeKeyHandler(SwitchPredictionView, "SwitchPredictionView") },
{ Keys.AltU, MakeKeyHandler(UpcaseWord, "UpcaseWord") },
{ Keys.AltL, MakeKeyHandler(DowncaseWord, "DowncaseWord") },
{ Keys.AltC, MakeKeyHandler(CapitalizeWord, "CapitalizeWord") },
};

// Some bindings are not available on certain platforms
Expand Down Expand Up @@ -371,6 +374,9 @@ void SetDefaultEmacsBindings()
{ Keys.F, MakeKeyHandler(ForwardWord, "ForwardWord")},
{ Keys.R, MakeKeyHandler(RevertLine, "RevertLine")},
{ Keys.Y, MakeKeyHandler(YankPop, "YankPop")},
{ Keys.U, MakeKeyHandler(UpcaseWord, "UpcaseWord") },
{ Keys.L, MakeKeyHandler(DowncaseWord, "DowncaseWord") },
{ Keys.C, MakeKeyHandler(CapitalizeWord, "CapitalizeWord") },
{ Keys.CtrlY, MakeKeyHandler(YankNthArg, "YankNthArg")},
{ Keys.Backspace, MakeKeyHandler(BackwardKillWord, "BackwardKillWord")},
{ Keys.Period, MakeKeyHandler(YankLastArg, "YankLastArg")},
Expand Down Expand Up @@ -399,28 +405,30 @@ public static KeyHandlerGroup GetDisplayGrouping(string function)
case nameof(AcceptAndGetNext):
case nameof(AcceptLine):
case nameof(AddLine):
case nameof(BackwardDeleteInput):
case nameof(BackwardDeleteChar):
case nameof(BackwardDeleteInput):
case nameof(BackwardDeleteLine):
case nameof(BackwardDeleteWord):
case nameof(BackwardKillInput):
case nameof(BackwardKillLine):
case nameof(BackwardKillWord):
case nameof(CancelLine):
case nameof(CapitalizeWord):
case nameof(Copy):
case nameof(CopyOrCancelLine):
case nameof(Cut):
case nameof(DeleteChar):
case nameof(DeleteCharOrExit):
case nameof(DeleteEndOfBuffer):
case nameof(DeleteEndOfWord):
case nameof(DeleteRelativeLines):
case nameof(DeleteLine):
case nameof(DeleteLineToFirstChar):
case nameof(DeleteNextLines):
case nameof(DeletePreviousLines):
case nameof(DeleteRelativeLines):
case nameof(DeleteToEnd):
case nameof(DeleteWord):
case nameof(DowncaseWord):
case nameof(ForwardDeleteInput):
case nameof(ForwardDeleteLine):
case nameof(InsertLineAbove):
Expand All @@ -442,6 +450,7 @@ public static KeyHandlerGroup GetDisplayGrouping(string function)
case nameof(Undo):
case nameof(UndoAll):
case nameof(UnixWordRubout):
case nameof(UpcaseWord):
case nameof(ValidateAndAcceptLine):
case nameof(ViAcceptLine):
case nameof(ViAcceptLineOrExit):
Expand Down
33 changes: 33 additions & 0 deletions PSReadLine/PSReadLineResources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions PSReadLine/PSReadLineResources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,4 +858,13 @@ Or not saving history with:
<data name="FailedToConvertPointToRenderDataOffset" xml:space="preserve">
<value>Cannot locate the offset in the rendered text that was pointed by the original cursor. Initial Coord: ({0}, {1}) Buffer: ({2}, {3}) Cursor: ({4}, {5})</value>
</data>
<data name="CapitalizeWordDescription" xml:space="preserve">
<value>Find the next word starting from the current position and then make it Pascal case.</value>
</data>
<data name="DowncaseWordDescription" xml:space="preserve">
<value>Find the next word starting from the current position and then make it lower case.</value>
</data>
<data name="UpcaseWordDescription" xml:space="preserve">
<value>Find the next word starting from the current position and then make it upper case.</value>
</data>
</root>
31 changes: 31 additions & 0 deletions test/BasicEditingTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,37 @@ public void DeleteCharOrExit()
Test("exit", Keys("foo", _.Home, Enumerable.Repeat(_.Ctrl_d, 4), InputAcceptedNow));
}

[SkippableFact]
public void UpcaseWord()
{
TestSetup(KeyMode.Emacs);
Test("FOO", Keys("foo", _.Alt_b, _.Alt_u));
Test("FOO bar", Keys("foo bar", _.Home, _.Alt_u));
Test("foo BAR", Keys("foo bar", _.Alt_b, _.Alt_u));
Test("FOO BAR", Keys("foo bar", _.Home, Enumerable.Repeat(_.Alt_u, 2)));
}

[SkippableFact]
public void DowncaseWord()
{
TestSetup(KeyMode.Emacs);
Test("foo", Keys("fOO", _.Alt_b, _.Alt_l));
Test("FOO bar", Keys("FOO BAR", _.Alt_b, _.Alt_l));
Test("foo BAR", Keys("FOO BAR", _.Home, _.Alt_l));
Test("foo bar", Keys("FOO BAR", _.Home, Enumerable.Repeat(_.Alt_l, 2)));
}

[SkippableFact]
public void CapitalizeWord()
{
TestSetup(KeyMode.Emacs);
Test("Foo", Keys("fOO", _.Alt_b, _.Alt_c));
Test("fOO Bar", Keys("fOO bAR", _.Alt_b, _.Alt_c));
Test("Foo BAR", Keys("fOO BAR", _.Home, _.Alt_c));
Test("Foo Bar", Keys("fOO BAR", _.Home, Enumerable.Repeat(_.Alt_c, 2)));
Test("Foo ^&*() Bar", Keys("Foo ^&*() bar", _.Home, Enumerable.Repeat(_.Alt_c, 2)));
}

[SkippableFact]
public void SelectAndDelete()
{
Expand Down