Skip to content

Handle checked and unchecked statements in formatting #48242

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

Handle checked and unchecked statements in formatting #48242

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
840c3d7
Add formatting tests with checked and unchecked
Youssef1313 Oct 2, 2020
5adc5d1
Support checked and unchecked statements in formatting
Youssef1313 Oct 2, 2020
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
60 changes: 60 additions & 0 deletions src/EditorFeatures/CSharpTest/Formatting/Indentation/SmartTokenFormatterFormatRangeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3119,6 +3119,66 @@ public void M()
AutoFormatToken(code, expected, useTabs);
}

[WpfTheory]
[CombinatorialData]
[Trait(Traits.Feature, Traits.Features.SmartTokenFormatting)]
public void UsingStatementWithNestedCheckedStatement(bool useTabs)
{
var code = @"class C
{
public void M()
{
using (null)
checked
{
}$$
}
}";

var expected = @"class C
{
public void M()
{
using (null)
checked
{
}
}
}";

AutoFormatToken(code, expected, useTabs);
}

[WpfTheory]
[CombinatorialData]
[Trait(Traits.Feature, Traits.Features.SmartTokenFormatting)]
public void UsingStatementWithNestedUncheckedStatement(bool useTabs)
{
var code = @"class C
{
public void M()
{
using (null)
unchecked
{
}$$
}
}";

var expected = @"class C
{
public void M()
{
using (null)
unchecked
{
}
}
}";

AutoFormatToken(code, expected, useTabs);
}

[WpfTheory]
[CombinatorialData]
[Trait(Traits.Feature, Traits.Features.SmartTokenFormatting)]
Expand Down
2 changes: 2 additions & 0 deletions ...orkspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Utilities/FormattingRangeHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,8 @@ private static bool IsSpecialContainingNode(SyntaxNode node)
node.Kind() == SyntaxKind.LabeledStatement ||
node.Kind() == SyntaxKind.LockStatement ||
node.Kind() == SyntaxKind.FixedStatement ||
node.Kind() == SyntaxKind.UncheckedStatement ||
node.Kind() == SyntaxKind.CheckedStatement ||
node.Kind() == SyntaxKind.GetAccessorDeclaration ||
node.Kind() == SyntaxKind.SetAccessorDeclaration ||
node.Kind() == SyntaxKind.AddAccessorDeclaration ||
Expand Down