Skip to content

Don't create a new FormattingContext if there weren't any cleanup changes #12400

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 2 commits into from
Oct 27, 2025
Merged

Don't create a new FormattingContext if there weren't any cleanup changes #12400

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44e5eb1
Don't create a new FormattingContext if there weren't any cleanup cha…
ToddGrun Oct 25, 2025
6adb783
No need to call SourceText.WithChanges if there aren't any changes
ToddGrun Oct 27, 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
11 changes: 8 additions & 3 deletions ...c/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/CSharpOnTypeFormattingPass.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,15 @@ public async Task<ImmutableArray<TextChange>> ExecuteAsync(FormattingContext con

// We make an optimistic attempt at fixing corner cases.
var cleanupChanges = CleanupDocument(changedContext, linePositionSpanAfterFormatting);
var cleanedText = formattedText.WithChanges(cleanupChanges);
context.Logger?.LogSourceText("AfterCleanupDocument", cleanedText);
var cleanedText = formattedText;

changedContext = await changedContext.WithTextAsync(cleanedText, cancellationToken).ConfigureAwait(false);
if (!cleanupChanges.IsEmpty)
Copy link
Member

@davidwengier davidwengier Oct 27, 2025

Choose a reason for hiding this comment

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

Nit: Should probably move this a couple of lines higher, and just set cleanedText to formattedText if the changes are empty. There is no point calling WithChanges or logging the same content again.

Copy link
Contributor Author

@ToddGrun ToddGrun Oct 27, 2025

Choose a reason for hiding this comment

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

Done in commit 2. I did consider originally doing that, but the WithChanges call short circuits if the IA is empty and I wasn't certain whether we wanted the logging call to always happen.

{
cleanedText = formattedText.WithChanges(cleanupChanges);
context.Logger?.LogSourceText("AfterCleanupDocument", cleanedText);

changedContext = await changedContext.WithTextAsync(cleanedText, cancellationToken).ConfigureAwait(false);
}

// At this point we should have applied all edits that adds/removes newlines.
// Let's now ensure the indentation of each of those lines is correct.
Expand Down