Skip to content

Update SA1009 to require a space after the closing parenthesis if it is followed by ++ or -- from a prefix unary expression #3750

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 1 commit into from
Dec 18, 2023
Merged

Update SA1009 to require a space after the closing parenthesis if it is followed by ++ or -- from a prefix unary expression #3750

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
43 changes: 43 additions & 0 deletions StyleCop.Analyzers/StyleCop.Analyzers.Test/SpacingRules/SA1009UnitTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -985,6 +985,49 @@ await Task.Delay(1000)
await VerifyCSharpFixAsync(testCode, expected, fixedCode, CancellationToken.None).ConfigureAwait(false);
}

[Theory]
[InlineData("if (true)")]
[InlineData("while (true)")]
[InlineData("for (var i = 0; i < 10; i++)")]
[InlineData("foreach (var i in a)")]
[WorkItem(3731, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3731")]
public async Task TestControlStatementWithBodyOnSameLineAsync(string stmt)
{
var testCode = $@"
public class TestClass
{{
public async void TestMethod(int x, int[] a)
{{
{stmt}++x;
{stmt}--x;
{stmt}x++;
{stmt}{{ x++; }}
}}
}}";

var fixedCode = $@"
public class TestClass
{{
public async void TestMethod(int x, int[] a)
{{
{stmt} ++x;
{stmt} --x;
{stmt} x++;
{stmt} {{ x++; }}
}}
}}";

var expected = new[]
{
Diagnostic(DescriptorFollowed).WithLocation(6, 8 + stmt.Length),
Diagnostic(DescriptorFollowed).WithLocation(7, 8 + stmt.Length),
Diagnostic(DescriptorFollowed).WithLocation(8, 8 + stmt.Length),
Diagnostic(DescriptorFollowed).WithLocation(9, 8 + stmt.Length),
};

await VerifyCSharpFixAsync(testCode, expected, fixedCode, CancellationToken.None).ConfigureAwait(false);
}

private async Task TestWhitespaceInStatementOrDeclAsync(string originalStatement, string fixedStatement, params DiagnosticResult[] expected)
{
string template = @"namespace Foo
Expand Down
4 changes: 3 additions & 1 deletion ...nalyzers/StyleCop.Analyzers/SpacingRules/SA1009ClosingParenthesisMustBeSpacedCorrectly.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,9 @@ private static void HandleCloseParenToken(SyntaxTreeAnalysisContext context, Syn

case SyntaxKind.PlusPlusToken:
case SyntaxKind.MinusMinusToken:
precedesStickyCharacter = true;
precedesStickyCharacter =
!nextToken.Parent.IsKind(SyntaxKind.PreIncrementExpression)
&& !nextToken.Parent.IsKind(SyntaxKind.PreDecrementExpression);
suppressFollowingSpaceError = false;
break;

Expand Down