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

Make placement of raw string guide line independent of the space chars used #73435

Merged
merged 2 commits into from
May 13, 2024
Merged

Make placement of raw string guide line independent of the space chars used #73435

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f764085
Make placement of raw string guide line independent of the space char…
DoctorKrolic May 11, 2024
63b6d15
Merge branch 'dotnet:main' into raw-string-guide-line-placement
DoctorKrolic May 12, 2024
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
14 changes: 9 additions & 5 deletions ...itorFeatures/Core.Wpf/StringIndentation/StringIndentationAdornmentManager.VisibleBlock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,21 @@ private VisibleBlock(double x, ImmutableArray<(double start, double end)> ySegme
if (span.End.GetContainingLine().Start == span.End)
return null;

// We want to draw the line right before the quote character. So -1 to get that character's position.
// Horizontally position the adornment in the center of the character. This position could actually be
// 0 if the entire doc is deleted and we haven't recomputed the updated tags yet. So be resilient for
// the position being out of bounds.
// This position could actually be 0 if the entire doc is deleted
// and we haven't recomputed the updated tags yet. So be resilient
// for the position being out of bounds.
if (span.End == 0)
return null;

// We want to draw the line right before the quote character. So -1 to get that character's position.
// If we position the adornment right at the end of that character it will visually merge with the
// text, so we want to back it off a little bit to the left. Half of a virtual space is gonna do the trick.
// It is important to keep this value independent of what space character is used to avoid visual bugs
// like https://github.com/dotnet/roslyn/issues/64230
var bufferPosition = span.End - 1;
var anchorPointLine = view.GetTextViewLineContainingBufferPosition(bufferPosition);
var bounds = anchorPointLine.GetCharacterBounds(bufferPosition);
var x = Math.Floor((bounds.Left + bounds.Right) * 0.5);
var x = Math.Floor(bounds.Right - (anchorPointLine.VirtualSpaceWidth / 2));

var firstLine = view.TextViewLines.FirstVisibleLine;
var lastLine = view.TextViewLines.LastVisibleLine;
Expand Down
Loading