Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed

- Fix analyzer [RCS1260](https://josefpihrt.github.io/docs/roslynator/analyzers/RCS1260) false positive for `omit_when_single_line` on multi-line object/collection initializers ([#1439](https://github.com/dotnet/roslynator/issues/1439)) ([PR](https://github.com/dotnet/roslynator/pull/1808))
- Fix analyzer [RCS0036](https://josefpihrt.github.io/docs/roslynator/analyzers/RCS0036) to report blank lines between single-line declarations in records ([PR](https://github.com/dotnet/roslynator/pull/1813))
- Fix analyzer [RCS1046](https://josefpihrt.github.io/docs/roslynator/analyzers/RCS1046) to report `async void` methods without `Async` suffix ([PR](https://github.com/dotnet/roslynator/pull/1790))
- Fix analyzer [RCS1265](https://josefpihrt.github.io/docs/roslynator/analyzers/RCS1265) to not report catch clauses with a `when` filter ([PR](https://github.com/dotnet/roslynator/pull/1789))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ private static void AnalyzeInitializerExpression(SyntaxNodeAnalysisContext conte

int count = expressions.Count;
int separatorCount = expressions.SeparatorCount;
TextSpan bracesSpan = TextSpan.FromBounds(initializer.OpenBraceToken.SpanStart, initializer.CloseBraceToken.Span.End);
Comment thread
josefpihrt marked this conversation as resolved.

if (count == separatorCount)
{
Expand All @@ -69,7 +70,7 @@ private static void AnalyzeInitializerExpression(SyntaxNodeAnalysisContext conte
ReportRemove(context, expressions.GetSeparator(count - 1));
}
else if (style == TrailingCommaStyle.OmitWhenSingleLine
&& initializer.IsSingleLine(cancellationToken: context.CancellationToken))
&& bracesSpan.IsSingleLine(initializer.SyntaxTree, cancellationToken: context.CancellationToken))
{
ReportRemove(context, expressions.GetSeparator(count - 1));
}
Expand All @@ -81,7 +82,7 @@ private static void AnalyzeInitializerExpression(SyntaxNodeAnalysisContext conte
ReportAdd(context, expressions.Last());
}
else if (style == TrailingCommaStyle.OmitWhenSingleLine
&& !initializer.IsSingleLine(cancellationToken: context.CancellationToken))
&& !bracesSpan.IsSingleLine(initializer.SyntaxTree, cancellationToken: context.CancellationToken))
{
ReportAdd(context, expressions.Last());
}
Expand Down
41 changes: 41 additions & 0 deletions src/Tests/Analyzers.Tests/RCS1260AddOrRemoveTrailingCommaTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -569,4 +569,45 @@ void M(C p)
}
""", options: Options.AddConfigOption(ConfigOptionKeys.TrailingCommaStyle, ConfigOptionValues.TrailingCommaStyle_Omit));
}

[Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.AddOrRemoveTrailingComma)]
public async Task TestNoDiagnostic_ObjectInitializer_OmitWhenSingleLine_SingleProperty()
{
await VerifyNoDiagnosticAsync("""
class Object
{
public string Property1 { get; set; }
}

class C
{
void M()
{
var value = new Object
{
Property1 = "Value",
};
}
}
""", options: Options.AddConfigOption(ConfigOptionKeys.TrailingCommaStyle, ConfigOptionValues.TrailingCommaStyle_OmitWhenSingleLine));
}

[Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.AddOrRemoveTrailingComma)]
public async Task TestNoDiagnostic_CollectionInitializer_OmitWhenSingleLine_SingleElement()
{
await VerifyNoDiagnosticAsync("""
using System.Collections.Generic;

class C
{
void M()
{
var dict = new Dictionary<int, int>
{
{ 1, 2 },
};
}
}
""", options: Options.AddConfigOption(ConfigOptionKeys.TrailingCommaStyle, ConfigOptionValues.TrailingCommaStyle_OmitWhenSingleLine));
}
}
Loading