Skip to content

Make Ctrl+r in Vi edit mode same as Emacs edit mode #3148

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

Merged
daxian-dbw merged 2 commits into from
Jan 12, 2022
Merged

Make Ctrl+r in Vi edit mode same as Emacs edit mode #3148

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
5bbc26f
Make Ctrl+R in Vi EditMode same as Windows (#2453)
davetapley May 13, 2021
5c00524
Update the tests
daxian-dbw Jan 12, 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
12 changes: 7 additions & 5 deletions PSReadLine/KeyBindings.vi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,9 @@ private void SetDefaultViBindings()
{ Keys.F3, MakeKeyHandler(CharacterSearch, "CharacterSearch") },
{ Keys.ShiftF3, MakeKeyHandler(CharacterSearchBackward,"CharacterSearchBackward") },
{ Keys.CtrlAltQuestion, MakeKeyHandler(ShowKeyBindings, "ShowKeyBindings") },
{ Keys.CtrlR, MakeKeyHandler(ViSearchHistoryBackward,"ViSearchHistoryBackward") },
{ Keys.CtrlS, MakeKeyHandler(SearchForward, "SearchForward") },
{ Keys.CtrlR, MakeKeyHandler(ReverseSearchHistory, "ReverseSearchHistory") },
{ Keys.CtrlS, MakeKeyHandler(ForwardSearchHistory, "ForwardSearchHistory") },
{ Keys.CtrlG, MakeKeyHandler(Abort, "Abort") },
{ Keys.AltH, MakeKeyHandler(ShowParameterHelp, "ShowParameterHelp") },
{ Keys.F1, MakeKeyHandler(ShowCommandHelp, "ShowCommandHelp") },
};
Expand Down Expand Up @@ -201,10 +202,11 @@ private void SetDefaultViBindings()
{ Keys.Uphat, MakeKeyHandler(GotoFirstNonBlankOfLine, "GotoFirstNonBlankOfLine") },
{ Keys.Underbar, MakeKeyHandler(GotoFirstNonBlankOfLine, "GotoFirstNonBlankOfLine") },
{ Keys.Tilde, MakeKeyHandler(InvertCase, "InvertCase") },
{ Keys.Slash, MakeKeyHandler(ViSearchHistoryBackward, "ViSearchHistoryBackward") },
{ Keys.CtrlR, MakeKeyHandler(ViSearchHistoryBackward, "ViSearchHistoryBackward") },
{ Keys.Slash, MakeKeyHandler(ViSearchHistoryBackward, "ViSearchHistoryBackward") },
{ Keys.Question, MakeKeyHandler(SearchForward, "SearchForward") },
{ Keys.CtrlS, MakeKeyHandler(SearchForward, "SearchForward") },
{ Keys.CtrlR, MakeKeyHandler(ReverseSearchHistory, "ReverseSearchHistory") },
{ Keys.CtrlS, MakeKeyHandler(ForwardSearchHistory, "ForwardSearchHistory") },
{ Keys.CtrlG, MakeKeyHandler(Abort, "Abort") },
{ Keys.Plus, MakeKeyHandler(NextHistory, "NextHistory") },
{ Keys.Minus, MakeKeyHandler(PreviousHistory, "PreviousHistory") },
{ Keys.Period, MakeKeyHandler(RepeatLastCommand, "RepeatLastCommand") },
Expand Down
122 changes: 103 additions & 19 deletions test/HistoryTest.VI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Microsoft.PowerShell;
using System;
using Microsoft.PowerShell;
using Xunit;

namespace Test
Expand Down Expand Up @@ -56,31 +57,114 @@ public void ViSearchHistory()

// Clear history in case the above added some history (but it shouldn't)
SetHistory();
Test( " ", Keys( ' ', _.UpArrow, _.DownArrow ) );

SetHistory( "dosomething", "this way", "that way", "anyway", "no way", "yah way" );
Test(" ", Keys(' ', _.UpArrow, _.DownArrow));

Test( "dosomething", Keys(
_.Escape, _.Slash, "some", _.Enter, CheckThat( () => AssertLineIs( "dosomething" ) ),
_.Question, "yah", _.Enter, CheckThat( () => AssertLineIs( "yah way" ) ),
_.Slash, "some", _.Enter, 'h' // need 'h' here to avoid bogus failure
) );
var emphasisColors = Tuple.Create(PSConsoleReadLineOptions.DefaultEmphasisColor, _console.BackgroundColor);
var statusColors = Tuple.Create(_console.ForegroundColor, _console.BackgroundColor);

SetHistory("dosomething", "this way", "that way", "anyway", "no way", "yah way");

Test("dosomething", Keys(
_.Escape, _.Ctrl_r, "some", _.Enter, CheckThat(() => AssertLineIs("dosomething")),
_.Ctrl_s, "yah", _.Enter, CheckThat(() => AssertLineIs("yah way")),
_.Ctrl_r, "some", _.Enter, 'h' // need 'h' here to avoid bogus failure
_.Escape, _.Slash, "some", _.Enter, CheckThat(() => AssertLineIs("dosomething")),
_.Question, "yah", _.Enter, CheckThat(() => AssertLineIs("yah way")),
_.Slash, "some", _.Enter, 'h' // need 'h' here to avoid bogus failure
));

SetHistory("dosomething", "this way", "that way", "anyway", "no way", "yah way");

Test("dosomething", Keys(
_.Ctrl_r, "some", _.Enter, CheckThat(() => AssertLineIs("dosomething")),
_.Ctrl_s, "yah", _.Enter, CheckThat(() => AssertLineIs("yah way")),
_.Ctrl_r, "some", _.Enter, _.Escape // new esc here to avoid bogus failure
));
SetHistory("someway", "noway", "yahway");

Test("yahway", Keys(
// Change to Command mode.
_.Escape,
_.Ctrl_r, "way",
CheckThat(() => AssertScreenIs(2,
TokenClassification.Command, "yah",
emphasisColors, "way",
NextLine,
statusColors, "bck-i-search: way_")),
_.Ctrl_r,
CheckThat(() => AssertScreenIs(2,
TokenClassification.Command, "no",
emphasisColors, "way",
NextLine,
statusColors, "bck-i-search: way_")),
_.Ctrl_r,
CheckThat(() => AssertScreenIs(2,
TokenClassification.Command, "some",
emphasisColors, "way",
NextLine,
statusColors, "bck-i-search: way_")),
_.Ctrl_s,
CheckThat(() => AssertScreenIs(2,
TokenClassification.Command, "no",
emphasisColors, "way",
NextLine,
statusColors, "fwd-i-search: way_")),
_.Ctrl_s,
CheckThat(() => AssertScreenIs(2,
TokenClassification.Command, "yah",
emphasisColors, "way",
NextLine,
statusColors, "fwd-i-search: way_")),
_.Ctrl_s,
CheckThat(() => AssertScreenIs(2,
TokenClassification.Command, "yahway",
NextLine,
statusColors, "failed-fwd-i-search: way_")),

// Abort the history search.
_.Ctrl_g, CheckThat(() => AssertLineIs(string.Empty)),
// Search again and escape from the search.
_.Ctrl_r, "yah",
_.Escape, CheckThat(() => AssertScreenIs(1, TokenClassification.Command, "yahway")),
// We should not be able to edit the line, because we are in Command mode.
"nnn"));

SetHistory("someway", "noway", "yahway");

Test("nnnyahway", Keys(
_.Ctrl_r, "way",
CheckThat(() => AssertScreenIs(2,
TokenClassification.Command, "yah",
emphasisColors, "way",
NextLine,
statusColors, "bck-i-search: way_")),
_.Ctrl_r,
CheckThat(() => AssertScreenIs(2,
TokenClassification.Command, "no",
emphasisColors, "way",
NextLine,
statusColors, "bck-i-search: way_")),
_.Ctrl_r,
CheckThat(() => AssertScreenIs(2,
TokenClassification.Command, "some",
emphasisColors, "way",
NextLine,
statusColors, "bck-i-search: way_")),
_.Ctrl_s,
CheckThat(() => AssertScreenIs(2,
TokenClassification.Command, "no",
emphasisColors, "way",
NextLine,
statusColors, "fwd-i-search: way_")),
_.Ctrl_s,
CheckThat(() => AssertScreenIs(2,
TokenClassification.Command, "yah",
emphasisColors, "way",
NextLine,
statusColors, "fwd-i-search: way_")),
_.Ctrl_s,
CheckThat(() => AssertScreenIs(2,
TokenClassification.Command, "yahway",
NextLine,
statusColors, "failed-fwd-i-search: way_")),

// Abort the history search.
_.Ctrl_g, CheckThat(() => AssertLineIs(string.Empty)),
// Search again and escape from the search.
_.Ctrl_r, "yah",
_.Escape, CheckThat(() => AssertScreenIs(1, TokenClassification.Command, "yahway")),
// We should be able to edit the line, because we are in Edit mode.
"nnn"));
}

[SkippableFact]
Expand Down