Skip to content

Commit d2a70fe

Browse files
committed
Unify HasAttribute and HasAnyAttribute
1 parent f57fa2c commit d2a70fe

File tree

42 files changed

+89
-94
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+89
-94
lines changed

src/Microsoft.CodeAnalysis.Analyzers/Core/MetaAnalyzers/ClassIsNotDiagnosticAnalyzer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public override void Initialize(AnalysisContext context)
4747
var namedType = (INamedTypeSymbol)sac.Symbol;
4848

4949
if (namedType.TypeKind == TypeKind.Class &&
50-
namedType.HasAttribute(diagnosticAnalyzerAttribute) &&
50+
namedType.HasAnyAttribute(diagnosticAnalyzerAttribute) &&
5151
!namedType.DerivesFrom(diagnosticAnalyzer, baseTypesOnly: true))
5252
{
5353
sac.ReportDiagnostic(namedType.Locations[0].CreateDiagnostic(Rule, namedType.Name));

src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/AvoidOutParameters.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public void Analyze(SymbolAnalysisContext analysisContext)
7979
private bool IsOutParameter(IParameterSymbol parameterSymbol) =>
8080
parameterSymbol.RefKind == RefKind.Out ||
8181
// Handle VB.NET special case for out parameters
82-
(parameterSymbol.RefKind == RefKind.Ref && parameterSymbol.HasAttribute(outAttributeSymbol));
82+
(parameterSymbol.RefKind == RefKind.Ref && parameterSymbol.HasAnyAttribute(outAttributeSymbol));
8383

8484
private bool IsTryPatternMethod(IMethodSymbol methodSymbol, int numberOfOutParams) =>
8585
methodSymbol.Name.StartsWith("Try", StringComparison.Ordinal) &&

src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/CollectionPropertiesShouldBeReadOnly.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ private static void AnalyzeSymbol(SymbolAnalysisContext context, KnownTypes know
125125
}
126126

127127
// Special case: the DataContractSerializer requires that a public setter exists.
128-
if (property.HasAttribute(knownTypes.DataMemberAttribute))
128+
if (property.HasAnyAttribute(knownTypes.DataMemberAttribute))
129129
{
130130
return;
131131
}

src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotDeclareVisibleInstanceFields.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public override void Initialize(AnalysisContext context)
5454

5555
// Do not report on types marked with StructLayoutAttribute
5656
// See https://github.com/dotnet/roslyn-analyzers/issues/4149
57-
if (field.ContainingType.HasAttribute(structLayoutAttributeType))
57+
if (field.ContainingType.HasAnyAttribute(structLayoutAttributeType))
5858
{
5959
return;
6060
}

src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotPassTypesByReference.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public override void Initialize(AnalysisContext context)
6060
{
6161
// VB.NET out is a ref parameter with the OutAttribute
6262
if (parameterSymbol.RefKind == RefKind.Ref &&
63-
!parameterSymbol.HasAttribute(outAttributeType))
63+
!parameterSymbol.HasAnyAttribute(outAttributeType))
6464
{
6565
context.ReportDiagnostic(parameterSymbol.CreateDiagnostic(Rule, parameterSymbol.Name));
6666
}

src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/EnumStorageShouldBeInt32.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ private static void AnalyzeSymbol(SymbolAnalysisContext context, INamedTypeSymbo
7272
}
7373

7474
// If enum is Int64 and has Flags attributes then exit
75-
if (underlyingType == SpecialType.System_Int64 && symbol.HasAttribute(flagsAttribute))
75+
if (underlyingType == SpecialType.System_Int64 && symbol.HasAnyAttribute(flagsAttribute))
7676
{
7777
return;
7878
}

src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/EnumWithFlagsAttribute.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ private static void AnalyzeSymbol(SymbolAnalysisContext symbolContext, INamedTyp
9494

9595
if (EnumHelpers.TryGetEnumMemberValues(symbol, out IList<ulong> memberValues))
9696
{
97-
if (symbol.HasAttribute(flagsAttributeType))
97+
if (symbol.HasAnyAttribute(flagsAttributeType))
9898
{
9999
// Check "CA2217: Do not mark enums with FlagsAttribute"
100100
if (reportCA2217 && !ShouldBeFlags(memberValues, out IEnumerable<ulong> missingValues))

src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/EnumsShouldHaveZeroValue.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ private static void AnalyzeSymbol(SymbolAnalysisContext context, INamedTypeSymbo
117117

118118
ImmutableArray<IFieldSymbol> zeroValuedFields = GetZeroValuedFields(symbol).ToImmutableArray();
119119

120-
if (symbol.HasAttribute(flagsAttribute))
120+
if (symbol.HasAnyAttribute(flagsAttribute))
121121
{
122122
CheckFlags(symbol, zeroValuedFields, context);
123123
}

src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/MarkAttributesWithAttributeUsage.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ private static void AnalyzeSymbol<TContext>(INamedTypeSymbol symbol, INamedTypeS
6565
return;
6666
}
6767

68-
if (!symbol.HasAttribute(attributeUsageAttributeType))
68+
if (!symbol.HasAnyAttribute(attributeUsageAttributeType))
6969
{
7070
addDiagnostic(context, symbol.CreateDiagnostic(Rule, symbol.Name));
7171
}

src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/PropertyNamesShouldNotMatchGetMethods.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ private static void AnalyzeSymbol(SymbolAnalysisContext context, INamedTypeSymbo
7272

7373
// If either the property or method is marked as obsolete, bail out
7474
// see https://github.com/dotnet/roslyn-analyzers/issues/2956
75-
if (symbol.HasAttribute(obsoleteAttributeType))
75+
if (symbol.HasAnyAttribute(obsoleteAttributeType))
7676
{
7777
return;
7878
}
@@ -116,7 +116,7 @@ private static void AnalyzeSymbol(SymbolAnalysisContext context, INamedTypeSymbo
116116

117117
// If either the property or method is marked as obsolete, bail out
118118
// see https://github.com/dotnet/roslyn-analyzers/issues/2956
119-
if (member.HasAttribute(obsoleteAttributeType))
119+
if (member.HasAnyAttribute(obsoleteAttributeType))
120120
{
121121
continue;
122122
}

0 commit comments

Comments
 (0)