Skip to content

Preserve line breaks after collapsed Razor blocks #84630

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
davidwengier merged 2 commits into from
Jul 27, 2026
+35 −13
Merged

Preserve line breaks after collapsed Razor blocks #84630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
865c87a
Preserve line breaks in Razor folding ranges
davidwengier Jul 27, 2026
70460ca
Update Razor folding range baselines
davidwengier Jul 27, 2026
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
9 changes: 9 additions & 0 deletions ...rc/Microsoft.CodeAnalysis.Remote.Razor/FoldingRanges/AbstractSyntaxNodeFoldingProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,15 @@ public ImmutableArray<FoldingRange> GetFoldingRanges(RazorCodeDocument codeDocum
foreach (var node in nodes)
{
var (start, end) = sourceText.GetLinePositionSpan(node.Span);

// Razor nodes can include the line break after their closing brace. Folding that line break
// pulls the following content onto the collapsed line.
if (end.Character == 0 && end.Line > start.Line)
{
var previousLine = sourceText.Lines[end.Line - 1];
end = new(end.Line - 1, previousLine.Span.Length);
}

var foldingRange = new FoldingRange()
{
StartCharacter = start.Character,
Expand Down
37 changes: 25 additions & 12 deletions ....CodeAnalysis.Razor.CohostingShared.UnitTests/Endpoints/CohostFoldingRangeEndpointTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ public Task BadLooseFileUri()
<div>
Hello World
</div>
}
|]</div>
}|]
</div>

@if (true) {[|
<div>
Hello World
</div>
}
|]
}|]

@if (true) {[|
}|]
""",
Expand All @@ -52,20 +52,35 @@ public Task IfStatements(bool miscellaneousFile)
<div>
Hello World
</div>
}
|]</div>
}|]
</div>

@if (true) {[|
<div>
Hello World
</div>
}
|]
}|]

@if (true) {[|
}|]
""",
miscellaneousFile: miscellaneousFile);

[Fact]
public Task IfStatements_Adjacent()
=> VerifyFoldingRangesAsync("""
@if (true) {[|
<div>
Hello World
</div>
}|]
@if (false) {[|
<div>
Goodbye World
</div>
}|]
""");

[Fact]
public Task LockStatement()
=> VerifyFoldingRangesAsync("""
Expand All @@ -92,8 +107,7 @@ Hello World
<div>
Goodbye World
</div>
}|]
|] }
}|]|]
</div>
""");

Expand Down Expand Up @@ -285,8 +299,7 @@ Hello World
<div>
Goodbye World
</div>
|] }
|] }

@davidwengier davidwengier Jul 27, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

This test had an errant extra close brace, so removed that too

|] }|]
</div>

@code[|
Expand Down
2 changes: 1 addition & 1 deletion src/Razor/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/CodeFoldingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ private void IncrementCount()
""");
}

[IdeFact(Skip = "https://github.com/dotnet/razor/issues/10860")] // FUSE changes whitespace on folding ranges
[IdeFact]
public async Task CodeFolding_IfBlock()
{
await TestServices.SolutionExplorer.AddFileAsync(
Expand Down
Loading