Skip to content

Commit 2bb04f2

Browse files
EvangelinkEvangelink
authored
Increase severity of some rules and fix instances (#1305)
Increase severity of some rules and fix instances
1 parent 76ffde3 commit 2bb04f2

25 files changed

+380
-402
lines changed

‎.editorconfig

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,20 +87,34 @@ dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
8787
dotnet_style_prefer_auto_properties = true:warning
8888
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
8989
dotnet_style_prefer_conditional_expression_over_return = true:silent
90+
# CA1805: Do not initialize unnecessarily
91+
dotnet_diagnostic.CA1805.severity = warning
92+
# IDE0063: Use simple 'using' statement
93+
dotnet_diagnostic.IDE0063.severity = warning
94+
# IDE0057: Use range operator
95+
dotnet_diagnostic.IDE0057.severity = warning
96+
# IDE0075: Simplify conditional expression
97+
dotnet_diagnostic.IDE0075.severity = warning
98+
# IDE0071: Simplify interpolation
99+
dotnet_diagnostic.IDE0071.severity = warning
100+
# CA1829: Use Length/Count property instead of Count() when available
101+
dotnet_diagnostic.CA1829.severity = warning
102+
# CA1827: Do not use Count() or LongCount() when Any() can be used
103+
dotnet_diagnostic.CA1827.severity = warning
90104
###############################
91105
# Naming Conventions #
92106
###############################
93107
# Name all constant fields using PascalCase
94108
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
95109
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
96-
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
110+
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
97111
dotnet_naming_symbols.constant_fields.applicable_kinds = field
98112
dotnet_naming_symbols.constant_fields.required_modifiers = const
99113
dotnet_naming_style.pascal_case_style.capitalization = pascal_case
100114
# Static fields should have s_ prefix
101115
dotnet_naming_rule.static_fields_should_have_prefix.severity = suggestion
102116
dotnet_naming_rule.static_fields_should_have_prefix.symbols = static_fields
103-
dotnet_naming_rule.static_fields_should_have_prefix.style = static_prefix_style
117+
dotnet_naming_rule.static_fields_should_have_prefix.style = static_prefix_style
104118
dotnet_naming_symbols.static_fields.applicable_kinds = field
105119
dotnet_naming_symbols.static_fields.required_modifiers = static
106120
dotnet_naming_symbols.static_fields.applicable_accessibilities = private, internal, private_protected
@@ -109,11 +123,15 @@ dotnet_naming_style.static_prefix_style.capitalization = camel_case
109123
# Internal and private fields should be _camelCase
110124
dotnet_naming_rule.camel_case_for_private_internal_fields.severity = suggestion
111125
dotnet_naming_rule.camel_case_for_private_internal_fields.symbols = private_internal_fields
112-
dotnet_naming_rule.camel_case_for_private_internal_fields.style = camel_case_underscore_style
126+
dotnet_naming_rule.camel_case_for_private_internal_fields.style = camel_case_underscore_style
113127
dotnet_naming_symbols.private_internal_fields.applicable_kinds = field
114128
dotnet_naming_symbols.private_internal_fields.applicable_accessibilities = private, internal
115129
dotnet_naming_style.camel_case_underscore_style.required_prefix = _
116130
dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case
131+
# IDE1006: Naming Styles
132+
dotnet_diagnostic.IDE1006.severity = warning
133+
# IDE0090: Use 'new(...)'
134+
dotnet_diagnostic.IDE0090.severity = warning
117135
###############################
118136
# C# Coding Conventions #
119137
###############################

‎src/coverlet.collector/DataCollection/CoverletCoverageCollector.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -163,15 +163,13 @@ private void OnSessionEnd(object sender, SessionEndEventArgs e)
163163
// Get coverage reports
164164
IEnumerable<(string report, string fileName)> coverageReports = _coverageManager?.GetCoverageReports();
165165

166-
if (coverageReports != null && coverageReports.Count() > 0)
166+
if (coverageReports != null && coverageReports.Any())
167167
{
168168
// Send result attachments to test platform.
169-
using (var attachmentManager = new AttachmentManager(_dataSink, _dataCollectionContext, _logger, _eqtTrace, _countDownEventFactory.Create(coverageReports.Count(), TimeSpan.FromSeconds(30))))
169+
using var attachmentManager = new AttachmentManager(_dataSink, _dataCollectionContext, _logger, _eqtTrace, _countDownEventFactory.Create(coverageReports.Count(), TimeSpan.FromSeconds(30)));
170+
foreach ((string report, string fileName) in coverageReports)
170171
{
171-
foreach ((string report, string fileName) in coverageReports)
172-
{
173-
attachmentManager.SendCoverageReport(report, fileName);
174-
}
172+
attachmentManager.SendCoverageReport(report, fileName);
175173
}
176174
}
177175
else

‎src/coverlet.collector/DataCollection/CoverletSettingsParser.cs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public CoverletSettings Parse(XmlElement configurationElement, IEnumerable<strin
6666
/// </summary>
6767
/// <param name="testModules">Test modules</param>
6868
/// <returns>Test module</returns>
69-
private string ParseTestModule(IEnumerable<string> testModules)
69+
private static string ParseTestModule(IEnumerable<string> testModules)
7070
{
7171
// Validate if at least one source present.
7272
if (testModules == null || !testModules.Any())
@@ -86,7 +86,7 @@ private string ParseTestModule(IEnumerable<string> testModules)
8686
/// </summary>
8787
/// <param name="configurationElement">Configuration element</param>
8888
/// <returns>Report formats</returns>
89-
private string[] ParseReportFormats(XmlElement configurationElement)
89+
private static string[] ParseReportFormats(XmlElement configurationElement)
9090
{
9191
string[] formats = Array.Empty<string>();
9292
if (configurationElement != null)
@@ -103,7 +103,7 @@ private string[] ParseReportFormats(XmlElement configurationElement)
103103
/// </summary>
104104
/// <param name="configurationElement">Configuration element</param>
105105
/// <returns>Filters to include</returns>
106-
private string[] ParseIncludeFilters(XmlElement configurationElement)
106+
private static string[] ParseIncludeFilters(XmlElement configurationElement)
107107
{
108108
XmlElement includeFiltersElement = configurationElement[CoverletConstants.IncludeFiltersElementName];
109109
return SplitElement(includeFiltersElement);
@@ -114,7 +114,7 @@ private string[] ParseIncludeFilters(XmlElement configurationElement)
114114
/// </summary>
115115
/// <param name="configurationElement">Configuration element</param>
116116
/// <returns>Directories to include</returns>
117-
private string[] ParseIncludeDirectories(XmlElement configurationElement)
117+
private static string[] ParseIncludeDirectories(XmlElement configurationElement)
118118
{
119119
XmlElement includeDirectoriesElement = configurationElement[CoverletConstants.IncludeDirectoriesElementName];
120120
return SplitElement(includeDirectoriesElement);
@@ -125,7 +125,7 @@ private string[] ParseIncludeDirectories(XmlElement configurationElement)
125125
/// </summary>
126126
/// <param name="configurationElement">Configuration element</param>
127127
/// <returns>Filters to exclude</returns>
128-
private string[] ParseExcludeFilters(XmlElement configurationElement)
128+
private static string[] ParseExcludeFilters(XmlElement configurationElement)
129129
{
130130
var excludeFilters = new List<string> { CoverletConstants.DefaultExcludeFilter };
131131

@@ -147,7 +147,7 @@ private string[] ParseExcludeFilters(XmlElement configurationElement)
147147
/// </summary>
148148
/// <param name="configurationElement">Configuration element</param>
149149
/// <returns>Source files to exclude</returns>
150-
private string[] ParseExcludeSourceFiles(XmlElement configurationElement)
150+
private static string[] ParseExcludeSourceFiles(XmlElement configurationElement)
151151
{
152152
XmlElement excludeSourceFilesElement = configurationElement[CoverletConstants.ExcludeSourceFilesElementName];
153153
return SplitElement(excludeSourceFilesElement);
@@ -158,7 +158,7 @@ private string[] ParseExcludeSourceFiles(XmlElement configurationElement)
158158
/// </summary>
159159
/// <param name="configurationElement">Configuration element</param>
160160
/// <returns>Attributes to exclude</returns>
161-
private string[] ParseExcludeAttributes(XmlElement configurationElement)
161+
private static string[] ParseExcludeAttributes(XmlElement configurationElement)
162162
{
163163
XmlElement excludeAttributesElement = configurationElement[CoverletConstants.ExcludeAttributesElementName];
164164
return SplitElement(excludeAttributesElement);
@@ -169,7 +169,7 @@ private string[] ParseExcludeAttributes(XmlElement configurationElement)
169169
/// </summary>
170170
/// <param name="configurationElement">Configuration element</param>
171171
/// <returns>Merge with attribute</returns>
172-
private string ParseMergeWith(XmlElement configurationElement)
172+
private static string ParseMergeWith(XmlElement configurationElement)
173173
{
174174
XmlElement mergeWithElement = configurationElement[CoverletConstants.MergeWithElementName];
175175
return mergeWithElement?.InnerText;
@@ -180,7 +180,7 @@ private string ParseMergeWith(XmlElement configurationElement)
180180
/// </summary>
181181
/// <param name="configurationElement">Configuration element</param>
182182
/// <returns>Use source link flag</returns>
183-
private bool ParseUseSourceLink(XmlElement configurationElement)
183+
private static bool ParseUseSourceLink(XmlElement configurationElement)
184184
{
185185
XmlElement useSourceLinkElement = configurationElement[CoverletConstants.UseSourceLinkElementName];
186186
bool.TryParse(useSourceLinkElement?.InnerText, out bool useSourceLink);
@@ -192,7 +192,7 @@ private bool ParseUseSourceLink(XmlElement configurationElement)
192192
/// </summary>
193193
/// <param name="configurationElement">Configuration element</param>
194194
/// <returns>Single hit flag</returns>
195-
private bool ParseSingleHit(XmlElement configurationElement)
195+
private static bool ParseSingleHit(XmlElement configurationElement)
196196
{
197197
XmlElement singleHitElement = configurationElement[CoverletConstants.SingleHitElementName];
198198
bool.TryParse(singleHitElement?.InnerText, out bool singleHit);
@@ -204,7 +204,7 @@ private bool ParseSingleHit(XmlElement configurationElement)
204204
/// </summary>
205205
/// <param name="configurationElement">Configuration element</param>
206206
/// <returns>ParseDeterministicReport flag</returns>
207-
private bool ParseDeterministicReport(XmlElement configurationElement)
207+
private static bool ParseDeterministicReport(XmlElement configurationElement)
208208
{
209209
XmlElement deterministicReportElement = configurationElement[CoverletConstants.DeterministicReport];
210210
bool.TryParse(deterministicReportElement?.InnerText, out bool deterministicReport);
@@ -216,7 +216,7 @@ private bool ParseDeterministicReport(XmlElement configurationElement)
216216
/// </summary>
217217
/// <param name="configurationElement">Configuration element</param>
218218
/// <returns>Include Test Assembly Flag</returns>
219-
private bool ParseIncludeTestAssembly(XmlElement configurationElement)
219+
private static bool ParseIncludeTestAssembly(XmlElement configurationElement)
220220
{
221221
XmlElement includeTestAssemblyElement = configurationElement[CoverletConstants.IncludeTestAssemblyElementName];
222222
bool.TryParse(includeTestAssemblyElement?.InnerText, out bool includeTestAssembly);
@@ -228,7 +228,7 @@ private bool ParseIncludeTestAssembly(XmlElement configurationElement)
228228
/// </summary>
229229
/// <param name="configurationElement">Configuration element</param>
230230
/// <returns>Include Test Assembly Flag</returns>
231-
private bool ParseSkipAutoProps(XmlElement configurationElement)
231+
private static bool ParseSkipAutoProps(XmlElement configurationElement)
232232
{
233233
XmlElement skipAutoPropsElement = configurationElement[CoverletConstants.SkipAutoProps];
234234
bool.TryParse(skipAutoPropsElement?.InnerText, out bool skipAutoProps);
@@ -240,7 +240,7 @@ private bool ParseSkipAutoProps(XmlElement configurationElement)
240240
/// </summary>
241241
/// <param name="configurationElement">Configuration element</param>
242242
/// <returns>DoesNotReturn attributes</returns>
243-
private string[] ParseDoesNotReturnAttributes(XmlElement configurationElement)
243+
private static string[] ParseDoesNotReturnAttributes(XmlElement configurationElement)
244244
{
245245
XmlElement doesNotReturnAttributesElement = configurationElement[CoverletConstants.DoesNotReturnAttributesElementName];
246246
return SplitElement(doesNotReturnAttributesElement);
@@ -251,7 +251,7 @@ private string[] ParseDoesNotReturnAttributes(XmlElement configurationElement)
251251
/// </summary>
252252
/// <param name="element">The element to split</param>
253253
/// <returns>An array of the values in the element</returns>
254-
private string[] SplitElement(XmlElement element)
254+
private static string[] SplitElement(XmlElement element)
255255
{
256256
return element?.InnerText?.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Where(value => !string.IsNullOrWhiteSpace(value)).Select(value => value.Trim()).ToArray();
257257
}

‎src/coverlet.collector/InProcDataCollection/CoverletInProcDataCollector.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace Coverlet.Collector.DataCollection
1717
public class CoverletInProcDataCollector : InProcDataCollection
1818
{
1919
private TestPlatformEqtTrace _eqtTrace;
20-
private bool _enableExceptionLog = false;
20+
private bool _enableExceptionLog;
2121

2222
private void AttachDebugger()
2323
{

‎src/coverlet.console/Logging/ConsoleLogger.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ namespace Coverlet.Console.Logging
99
{
1010
class ConsoleLogger : ILogger
1111
{
12-
private static readonly object _sync = new object();
12+
private static readonly object s_sync = new();
13+
1314
public LogLevel Level { get; set; } = LogLevel.Normal;
1415

1516
public void LogError(string message) => Log(LogLevel.Quiet, message, ConsoleColor.Red);
@@ -26,7 +27,7 @@ private void Log(LogLevel level, string message, ConsoleColor color)
2627
{
2728
if (level < Level) return;
2829

29-
lock (_sync)
30+
lock (s_sync)
3031
{
3132
ConsoleColor currentForegroundColor;
3233
if (color != (currentForegroundColor = ForegroundColor))

‎src/coverlet.core/Coverage.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ private bool BranchInCompilerGeneratedClass(string methodName)
330330
return false;
331331
}
332332

333-
private Method GetMethodWithSameLineInSameDocument(Classes documentClasses, string compilerGeneratedClassName, int branchLine)
333+
private static Method GetMethodWithSameLineInSameDocument(Classes documentClasses, string compilerGeneratedClassName, int branchLine)
334334
{
335335
foreach (KeyValuePair<string, Methods> @class in documentClasses)
336336
{

0 commit comments

Comments
 (0)