Skip to content

Fixed irregular spacing between list items #79388

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 11 commits into from
Aug 4, 2025
Merged

Fixed irregular spacing between list items #79388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cf13b42
fixed irregular spacing between list item
Fanominals Jul 14, 2025
f3b351d
removed documentation comment
Fanominals Jul 14, 2025
4002e9e
fixed some tests
Fanominals Jul 15, 2025
3244cb2
fixed text with new expected
Fanominals Jul 16, 2025
8c45e53
reverted hovertests back to main, added fix to spaces being added whe…
Fanominals Jul 23, 2025
3dd0eb1
modified tagged text instead to resolve LSP issues
Fanominals Jul 28, 2025
d6febbb
Merge branch 'main' into dev/t-gosingh/fix-list-items
Fanominals Jul 28, 2025
58989aa
reverted tests back to main
Fanominals Jul 29, 2025
38ae6df
reverted tests back to main
Fanominals Jul 29, 2025
c7752a0
Merge branch 'dev/t-gosingh/fix-list-items' of https://github.com/dot…
Fanominals Jul 29, 2025
6c405e8
defer tail slicing for efficiency
Fanominals Jul 31, 2025
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
151 changes: 79 additions & 72 deletions src/EditorFeatures/Test2/IntelliSense/IntellisenseQuickInfoBuilderTests_Lists.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,21 +57,23 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
New ClassifiedTextRun(ClassificationTypeNames.Punctuation, "("),
New ClassifiedTextRun(ClassificationTypeNames.Punctuation, ")"))),
New ContainerElement(
ContainerElementStyle.Wrapped,
New ClassifiedTextElement(
New ClassifiedTextRun(ClassificationTypeNames.Text, "• ")),
ContainerElementStyle.Stacked,
New ContainerElement(
ContainerElementStyle.Stacked,
ContainerElementStyle.Wrapped,
New ClassifiedTextElement(
New ClassifiedTextRun(ClassificationTypeNames.Text, "Item 1"))))),
New ContainerElement(
ContainerElementStyle.Wrapped,
New ClassifiedTextElement(
New ClassifiedTextRun(ClassificationTypeNames.Text, "• ")),
New ContainerElement(
ContainerElementStyle.Stacked,
New ClassifiedTextElement(
New ClassifiedTextRun(ClassificationTypeNames.Text, "Item 2")))))
New ClassifiedTextRun(ClassificationTypeNames.Text, "• ")),
New ContainerElement(
ContainerElementStyle.Stacked,
New ClassifiedTextElement(
New ClassifiedTextRun(ClassificationTypeNames.Text, "Item 1")))),
New ContainerElement(
ContainerElementStyle.Wrapped,
New ClassifiedTextElement(
New ClassifiedTextRun(ClassificationTypeNames.Text, "• ")),
New ContainerElement(
ContainerElementStyle.Stacked,
New ClassifiedTextElement(
New ClassifiedTextRun(ClassificationTypeNames.Text, "Item 2")))))))

ToolTipAssert.EqualContent(expected, intellisenseQuickInfo.Item)
End Function
Expand Down Expand Up @@ -120,21 +122,23 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
New ClassifiedTextRun(ClassificationTypeNames.Punctuation, "("),
New ClassifiedTextRun(ClassificationTypeNames.Punctuation, ")"))),
New ContainerElement(
ContainerElementStyle.Wrapped,
New ClassifiedTextElement(
New ClassifiedTextRun(ClassificationTypeNames.Text, "1. ")),
ContainerElementStyle.Stacked,
New ContainerElement(
ContainerElementStyle.Stacked,
ContainerElementStyle.Wrapped,
New ClassifiedTextElement(
New ClassifiedTextRun(ClassificationTypeNames.Text, "Item 1"))))),
New ContainerElement(
ContainerElementStyle.Wrapped,
New ClassifiedTextElement(
New ClassifiedTextRun(ClassificationTypeNames.Text, "2. ")),
New ContainerElement(
ContainerElementStyle.Stacked,
New ClassifiedTextElement(
New ClassifiedTextRun(ClassificationTypeNames.Text, "Item 2")))))
New ClassifiedTextRun(ClassificationTypeNames.Text, "1. ")),
New ContainerElement(
ContainerElementStyle.Stacked,
New ClassifiedTextElement(
New ClassifiedTextRun(ClassificationTypeNames.Text, "Item 1")))),
New ContainerElement(
ContainerElementStyle.Wrapped,
New ClassifiedTextElement(
New ClassifiedTextRun(ClassificationTypeNames.Text, "2. ")),
New ContainerElement(
ContainerElementStyle.Stacked,
New ClassifiedTextElement(
New ClassifiedTextRun(ClassificationTypeNames.Text, "Item 2")))))))

ToolTipAssert.EqualContent(expected, intellisenseQuickInfo.Item)
End Function
Expand Down Expand Up @@ -179,28 +183,29 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
New ClassifiedTextRun(ClassificationTypeNames.Punctuation, "("),
New ClassifiedTextRun(ClassificationTypeNames.Punctuation, ")"))),
New ContainerElement(
ContainerElementStyle.Wrapped,
New ClassifiedTextElement(
New ClassifiedTextRun(ClassificationTypeNames.Text, "• ")),
ContainerElementStyle.Stacked,
New ContainerElement(
ContainerElementStyle.Stacked,
ContainerElementStyle.Wrapped,
New ClassifiedTextElement(
New ClassifiedTextRun(ClassificationTypeNames.Text, "word1", ClassifiedTextRunStyle.Bold),
New ClassifiedTextRun(ClassificationTypeNames.WhiteSpace, " "),
New ClassifiedTextRun(ClassificationTypeNames.Text, "–"),
New ClassifiedTextRun(ClassificationTypeNames.Text, "Item 1"))))),
New ContainerElement(
ContainerElementStyle.Wrapped,
New ClassifiedTextElement(
New ClassifiedTextRun(ClassificationTypeNames.Text, "• ")),
New ContainerElement(
ContainerElementStyle.Stacked,
New ClassifiedTextElement(
New ClassifiedTextRun(ClassificationTypeNames.Text, "word2", ClassifiedTextRunStyle.Bold),
New ClassifiedTextRun(ClassificationTypeNames.WhiteSpace, " "),
New ClassifiedTextRun(ClassificationTypeNames.Text, "–"),
New ClassifiedTextRun(ClassificationTypeNames.Text, "Item 2")))))

New ClassifiedTextRun(ClassificationTypeNames.Text, "• ")),
New ContainerElement(
ContainerElementStyle.Stacked,
New ClassifiedTextElement(
New ClassifiedTextRun(ClassificationTypeNames.Text, "word1", ClassifiedTextRunStyle.Bold),
New ClassifiedTextRun(ClassificationTypeNames.WhiteSpace, " "),
New ClassifiedTextRun(ClassificationTypeNames.Text, "–"),
New ClassifiedTextRun(ClassificationTypeNames.Text, "Item 1")))),
New ContainerElement(
ContainerElementStyle.Wrapped,
New ClassifiedTextElement(
New ClassifiedTextRun(ClassificationTypeNames.Text, "• ")),
New ContainerElement(
ContainerElementStyle.Stacked,
New ClassifiedTextElement(
New ClassifiedTextRun(ClassificationTypeNames.Text, "word2", ClassifiedTextRunStyle.Bold),
New ClassifiedTextRun(ClassificationTypeNames.WhiteSpace, " "),
New ClassifiedTextRun(ClassificationTypeNames.Text, "–"),
New ClassifiedTextRun(ClassificationTypeNames.Text, "Item 2")))))))
ToolTipAssert.EqualContent(expected, intellisenseQuickInfo.Item)
End Function

Expand Down Expand Up @@ -244,27 +249,29 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
New ClassifiedTextRun(ClassificationTypeNames.Punctuation, "("),
New ClassifiedTextRun(ClassificationTypeNames.Punctuation, ")"))),
New ContainerElement(
ContainerElementStyle.Wrapped,
New ClassifiedTextElement(
New ClassifiedTextRun(ClassificationTypeNames.Text, "1. ")),
ContainerElementStyle.Stacked,
New ContainerElement(
ContainerElementStyle.Stacked,
ContainerElementStyle.Wrapped,
New ClassifiedTextElement(
New ClassifiedTextRun(ClassificationTypeNames.Text, "word1", ClassifiedTextRunStyle.Bold),
New ClassifiedTextRun(ClassificationTypeNames.WhiteSpace, " "),
New ClassifiedTextRun(ClassificationTypeNames.Text, "–"),
New ClassifiedTextRun(ClassificationTypeNames.Text, "Item 1"))))),
New ContainerElement(
ContainerElementStyle.Wrapped,
New ClassifiedTextElement(
New ClassifiedTextRun(ClassificationTypeNames.Text, "2. ")),
New ContainerElement(
ContainerElementStyle.Stacked,
New ClassifiedTextElement(
New ClassifiedTextRun(ClassificationTypeNames.Text, "word2", ClassifiedTextRunStyle.Bold),
New ClassifiedTextRun(ClassificationTypeNames.WhiteSpace, " "),
New ClassifiedTextRun(ClassificationTypeNames.Text, "–"),
New ClassifiedTextRun(ClassificationTypeNames.Text, "Item 2")))))
New ClassifiedTextRun(ClassificationTypeNames.Text, "1. ")),
New ContainerElement(
ContainerElementStyle.Stacked,
New ClassifiedTextElement(
New ClassifiedTextRun(ClassificationTypeNames.Text, "word1", ClassifiedTextRunStyle.Bold),
New ClassifiedTextRun(ClassificationTypeNames.WhiteSpace, " "),
New ClassifiedTextRun(ClassificationTypeNames.Text, "–"),
New ClassifiedTextRun(ClassificationTypeNames.Text, "Item 1")))),
New ContainerElement(
ContainerElementStyle.Wrapped,
New ClassifiedTextElement(
New ClassifiedTextRun(ClassificationTypeNames.Text, "2. ")),
New ContainerElement(
ContainerElementStyle.Stacked,
New ClassifiedTextElement(
New ClassifiedTextRun(ClassificationTypeNames.Text, "word2", ClassifiedTextRunStyle.Bold),
New ClassifiedTextRun(ClassificationTypeNames.WhiteSpace, " "),
New ClassifiedTextRun(ClassificationTypeNames.Text, "–"),
New ClassifiedTextRun(ClassificationTypeNames.Text, "Item 2")))))))

ToolTipAssert.EqualContent(expected, intellisenseQuickInfo.Item)
Copy link
Member

@akhera99 akhera99 Jul 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why was this assert removed?

Copy link
Contributor Author

@Fanominals Fanominals Jul 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was not intended, just fixed this in the new commit

End Function
Expand Down Expand Up @@ -357,15 +364,15 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense
New ContainerElement(
ContainerElementStyle.Stacked,
New ContainerElement(
ContainerElementStyle.Wrapped,
New ClassifiedTextElement(
New ClassifiedTextRun(ClassificationTypeNames.Text, "1. ")),
ContainerElementStyle.Stacked,
New ContainerElement(
ContainerElementStyle.Stacked,
ContainerElementStyle.Wrapped,
New ClassifiedTextElement(
New ClassifiedTextRun(ClassificationTypeNames.Text, "Item 2.1")))),
New ContainerElement(
ContainerElementStyle.Stacked Or ContainerElementStyle.VerticalPadding,
New ClassifiedTextRun(ClassificationTypeNames.Text, "1. ")),
New ContainerElement(
ContainerElementStyle.Stacked,
New ClassifiedTextElement(
New ClassifiedTextRun(ClassificationTypeNames.Text, "Item 2.1")))),
New ContainerElement(
ContainerElementStyle.Wrapped,
New ClassifiedTextElement(
Expand Down
8 changes: 8 additions & 0 deletions src/Features/Core/Portable/QuickInfo/Presentation/TaggedTextExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,14 @@ ref TextElementBuilder.AsRef(in nestedBuilder),

case TextTags.ContainerEnd:
// We're finished processing inline elements. Break out and let the caller continue

// Documentation formatting may add an extra LineBreak after ContainerEnd to separate
// elements in LSP scenarios. During rendering, we consume this extra LineBreak to
// prevent double spacing, since each line is already rendered on its own line.
if (taggedTexts is [var head, ..] && head.Tag == TextTags.LineBreak)
{
taggedTexts = taggedTexts[1..];
}
done = true;
break;

Expand Down
Loading