Skip to content

Fix incorrect cursor position in menu completion #3373

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
merged 1 commit into from
Jul 8, 2022
Merged

Fix incorrect cursor position in menu completion #3373

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 14 additions & 2 deletions PSReadLine/Completion.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,7 @@ public void UpdateMenuSelection(int selectedItem, bool select, bool showTooltips
// Determine if showing the tooltip would scroll the top of our buffer off the screen.

int lineLength = 0;
bool fullLine = false;
for (var i = 0; i < toolTip.Length; i++)
{
char c = toolTip[i];
Expand All @@ -572,8 +573,13 @@ public void UpdateMenuSelection(int selectedItem, bool select, bool showTooltips

if (c == '\r' || c == '\n')
{
toolTipLines += 1;
lineLength = 0;
// If we happened to have a full line right before the newline character, then we
// skip this newline character because we already increased the line count.
if (!fullLine)
{
toolTipLines += 1;
lineLength = 0;
}
}
else
{
Expand All @@ -582,8 +588,14 @@ public void UpdateMenuSelection(int selectedItem, bool select, bool showTooltips
{
toolTipLines += 1;
lineLength = 0;

// Indicate that we just had a full line.
fullLine = true;
continue;
}
}

fullLine = false;
}

// The +1 is for the blank line between the menu and tooltips.
Expand Down