Skip to content

Fix on-type and code action formatting on Razor explicit statements #84699

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 3 commits into from
Jul 30, 2026
Merged

Fix on-type and code action formatting on Razor explicit statements #84699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee8002e
Add InvertIf explicit statement repro
davidwengier Jul 30, 2026
e7eb823
Preserve explicit Razor block indentation
davidwengier Jul 30, 2026
b734cfd
Add explicit Razor block formatting coverage
davidwengier Jul 30, 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
15 changes: 11 additions & 4 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 @@ -756,12 +756,20 @@ owner.Parent is RazorDirectiveSyntax containingDirective &&
var line = context.SourceText.Lines[i];
var lineStart = line.GetFirstNonWhitespacePosition() ?? line.Start;
var lineStartSpan = new TextSpan(lineStart, 0);
if (!ShouldFormatLine(context, lineStartSpan, allowImplicitStatements: true))
if (!ShouldFormatLine(context, lineStartSpan, allowImplicitStatements: true, out var owner))
{
// We don't care about this line as it lies in an area we don't want to format.
continue;
}

var razorDesiredIndentation = context.GetIndentationOffsetForLevel(indentations[i].IndentationLevel);
if (owner is CSharpTransitionSyntax { Parent: CSharpStatementSyntax })
{
// An explicit statement delimiter has no C# source mapping, so use only its Razor/HTML indentation.
newIndentations[i] = razorDesiredIndentation;
continue;
}

if (!lineStartIndentations.TryGetValue(lineStart, out var csharpDesiredIndentation))
{
// Couldn't remap. This is probably a non-C# location.
Expand Down Expand Up @@ -820,7 +828,6 @@ owner.Parent is RazorDirectiveSyntax containingDirective &&
}

var effectiveCSharpDesiredIndentation = csharpDesiredIndentation - minCSharpIndentation;
var razorDesiredIndentation = context.GetIndentationOffsetForLevel(indentations[i].IndentationLevel);
if (indentations[i].StartsInHtmlContext)
{
// This is a non-C# line.
Expand Down Expand Up @@ -857,8 +864,8 @@ private static bool ShouldFormat(FormattingContext context, TextSpan mappingSpan
private static bool ShouldFormat(FormattingContext context, TextSpan mappingSpan, bool allowImplicitStatements, out RazorSyntaxNode? foundOwner)
=> ShouldFormat(context, mappingSpan, new ShouldFormatOptions(allowImplicitStatements, isLineRequest: false), out foundOwner);

private static bool ShouldFormatLine(FormattingContext context, TextSpan mappingSpan, bool allowImplicitStatements)
=> ShouldFormat(context, mappingSpan, new ShouldFormatOptions(allowImplicitStatements, isLineRequest: true), out _);
private static bool ShouldFormatLine(FormattingContext context, TextSpan mappingSpan, bool allowImplicitStatements, out RazorSyntaxNode? foundOwner)
=> ShouldFormat(context, mappingSpan, new ShouldFormatOptions(allowImplicitStatements, isLineRequest: true), out foundOwner);

private static bool ShouldFormat(FormattingContext context, TextSpan mappingSpan, ShouldFormatOptions options, out RazorSyntaxNode? foundOwner)
{
Expand Down
49 changes: 49 additions & 0 deletions ...crosoft.CodeAnalysis.Razor.CohostingShared.UnitTests/CodeActions/CSharpCodeActionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,55 @@ void M(bool value)
var invertIfAction = Assert.Single(shownActions, action => ((RazorVSInternalCodeAction)action.Value!).Name == PredefinedCodeRefactoringProviderNames.InvertIf);
}

[Fact]
public async Task InvertIf_ExplicitStatement()
{
var input = """
@(booleanValue ?@<br /> : @<br />)

@{
[||]if (true)
{
// true
}
else
{
// false
}
}

@code
{
private bool booleanValue = true;
}
""";

var expected = """
@(booleanValue ?@<br /> : @<br />)

@{
if (false)
{
// false
}
else
{
// true
}
}

@code
{
private bool booleanValue = true;
}
""";

var advancedSettings = ClientSettingsManager.GetClientSettings().AdvancedSettings;
ClientSettingsManager.Update(advancedSettings with { ShowAllCSharpCodeActions = true });

await VerifyCodeActionAsync(input, expected, PredefinedCodeRefactoringProviderNames.InvertIf);
}

[Fact]
public async Task GenerateConstructor()
{
Expand Down
130 changes: 130 additions & 0 deletions ...crosoft.CodeAnalysis.Razor.CohostingShared.UnitTests/Formatting/DocumentFormattingTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7182,6 +7182,136 @@ void Method()
""");
}

[Fact]
public async Task ExplicitStatement_ShiftedOpeningBrace()
{
await RunFormattingTestAsync(
input: """
@(booleanValue ?@<br /> : @<br />)

@{
if (false)
{
// false
}
else
{
// true
}
}

@code
{
private bool booleanValue = true;
}
""",
htmlFormatted: """
@(booleanValue ?@
<br /> : @
<br />)

@{
if (false)
{
// false
}
else
{
// true
}
}

@code
{
private bool booleanValue = true;
}
""",
expected: """
@(booleanValue ?@<br /> : @<br />)

@{
if (false)
{
// false
}
else
{
// true
}
}

@code
{
private bool booleanValue = true;
}
""");
}

[Fact]
public async Task ExplicitStatement_AlreadyFormatted()
{
await RunFormattingTestAsync(
input: """
@(booleanValue ?@<br /> : @<br />)

@{
if (false)
{
// false
}
else
{
// true
}
}

@code
{
private bool booleanValue = true;
}
""",
htmlFormatted: """
@(booleanValue ?@
<br /> : @
<br />)

@{
if (false)
{
// false
}
else
{
// true
}
}

@code
{
private bool booleanValue = true;
}
""",
expected: """
@(booleanValue ?@<br /> : @<br />)

@{
if (false)
{
// false
}
else
{
// true
}
}

@code
{
private bool booleanValue = true;
}
""");
}

[Fact]
public async Task Formats_NonCodeBlockDirectives()
{
Expand Down
45 changes: 45 additions & 0 deletions ...t.VisualStudio.LanguageServices.Razor.UnitTests/Cohost/Formatting/OnTypeFormattingTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,51 @@ await RunOnTypeFormattingTestAsync(
triggerCharacter: '}');
}

[FormattingTestFact]
public async Task CloseCurly_ExplicitStatement_PreservesOpeningBraceAsync()
{
await RunOnTypeFormattingTestAsync(
input: """
@(booleanValue ?@<br /> : @<br />)

@{
if (false)
{
// false
}
else
{
// true
}$$
}

@code
{
private bool booleanValue = true;
}
""",
expected: """
@(booleanValue ?@<br /> : @<br />)

@{
if (false)
{
// false
}
else
{
// true
}
}

@code
{
private bool booleanValue = true;
}
""",
triggerCharacter: '}');
}

[FormattingTestFact]
public async Task FormatsIfStatementInComponent()
{
Expand Down
Loading