Skip to content
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

Update SA1012 to expect no space between a property pattern's opening brace and an enclosing list pattern's opening bracket #3511

Merged
merged 1 commit into from
Dec 6, 2022
Merged

Update SA1012 to expect no space between a property pattern's opening brace and an enclosing list pattern's opening bracket #3511

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
48 changes: 48 additions & 0 deletions StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp11/SpacingRules/SA1012CSharp11UnitTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,57 @@

namespace StyleCop.Analyzers.Test.CSharp11.SpacingRules
{
using System.Threading;
using System.Threading.Tasks;
using StyleCop.Analyzers.Test.CSharp10.SpacingRules;
using StyleCop.Analyzers.Test.Verifiers;
using Xunit;
using static StyleCop.Analyzers.Test.Verifiers.StyleCopCodeFixVerifier<
StyleCop.Analyzers.SpacingRules.SA1012OpeningBracesMustBeSpacedCorrectly,
StyleCop.Analyzers.SpacingRules.TokenSpacingCodeFixProvider>;

public class SA1012CSharp11UnitTests : SA1012CSharp10UnitTests
{
[Fact]
[WorkItem(3509, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3509")]
public async Task TestPropertyPatternInsideListPatternAsync()
{
var testCode = @"
class C
{
void M(string[] a)
{
_ = a is [ {|#0:{|} Length: 1 }];
sharwell marked this conversation as resolved.
Show resolved Hide resolved
_ = a is [{ Length: 0 },{|#1:{|} Length: 1 }];
}
}
";

var fixedCode = @"
class C
{
void M(string[] a)
{
_ = a is [{ Length: 1 }];
_ = a is [{ Length: 0 }, { Length: 1 }];
}
}
";

await new CSharpTest()
{
ReferenceAssemblies = GenericAnalyzerTest.ReferenceAssembliesNet50,
TestCode = testCode,
ExpectedDiagnostics =
{
// Opening brace should not be preceded by a space
Diagnostic().WithLocation(0).WithArguments(" not", "preceded"),

// Opening brace should be preceded by a space
Diagnostic().WithLocation(1).WithArguments(string.Empty, "preceded"),
},
FixedCode = fixedCode,
}.RunAsync(CancellationToken.None).ConfigureAwait(false);
}
}
}
16 changes: 12 additions & 4 deletions ...Cop.Analyzers/StyleCop.Analyzers/SpacingRules/SA1012OpeningBracesMustBeSpacedCorrectly.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,19 @@ private static void HandleOpenBraceToken(SyntaxTreeAnalysisContext context, Synt
}

bool expectPrecedingSpace = true;
if (token.Parent.IsKind(SyntaxKindEx.PropertyPatternClause)
&& token.GetPreviousToken() is { RawKind: (int)SyntaxKind.OpenParenToken, Parent: { RawKind: (int)SyntaxKindEx.PositionalPatternClause } })
if (token.Parent.IsKind(SyntaxKindEx.PropertyPatternClause))
{
// value is ({ P: 0 }, { P: 0 })
expectPrecedingSpace = false;
var prevToken = token.GetPreviousToken();
if (prevToken is { RawKind: (int)SyntaxKind.OpenParenToken, Parent: { RawKind: (int)SyntaxKindEx.PositionalPatternClause } })
{
// value is ({ P: 0 }, { P: 0 })
expectPrecedingSpace = false;
}
else if (prevToken is { RawKind: (int)SyntaxKind.OpenBracketToken, Parent: { RawKind: (int)SyntaxKindEx.ListPattern } })
{
// value is [{ P: 0 }, { P: 0 }]
expectPrecedingSpace = false;
}
}

bool precededBySpace = token.IsFirstInLine() || token.IsPrecededByWhitespace(context.CancellationToken);
Expand Down