Skip to content

Reduce the range walked for formatting content validation #12384

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
ToddGrun merged 1 commit into from
Oct 23, 2025
Merged

Reduce the range walked for formatting content validation #12384

Show file tree
Hide file tree
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
28 changes: 26 additions & 2 deletions src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/SourceTextExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,32 @@ public static string GetSubTextString(this SourceText text, TextSpan span)
return new string(charBuffer, 0, span.Length);
}

public static bool NonWhitespaceContentEquals(this SourceText text, SourceText other)
=> NonWhitespaceContentEquals(text, other, 0, text.Length, 0, other.Length);
public static bool NonWhitespaceContentEquals(this SourceText text, ImmutableArray<TextChange> changes)
{
if (changes.IsEmpty)
{
return true;
}

// Determine the affected spans in the original and changed source texts
var firstChangeSpan = changes[0].Span;
var textStart = firstChangeSpan.Start;
var textEnd = firstChangeSpan.End;

for (var i = 1; i < changes.Length; i++)
{
var changeSpan = changes[i].Span;

textStart = Math.Min(textStart, changeSpan.Start);
textEnd = Math.Max(textEnd, changeSpan.End);
}

var changedText = text.WithChanges(changes);
var changedStart = textStart;
var changedEnd = textEnd + (changedText.Length - text.Length);

return text.NonWhitespaceContentEquals(changedText, textStart, textEnd, changedStart, changedEnd);
}

public static bool NonWhitespaceContentEquals(
this SourceText text,
Expand Down
3 changes: 1 addition & 2 deletions ...rosoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/FormattingContentValidationPass.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@ internal sealed class FormattingContentValidationPass(ILoggerFactory loggerFacto
public Task<bool> IsValidAsync(FormattingContext context, ImmutableArray<TextChange> changes, CancellationToken cancellationToken)
{
var text = context.SourceText;
var changedText = text.WithChanges(changes);

if (!text.NonWhitespaceContentEquals(changedText))
if (!text.NonWhitespaceContentEquals(changes))
{
// Looks like we removed some non-whitespace content as part of formatting. Oops.
// Discard this formatting result.
Expand Down