Skip to content

Commit eb3c9b7

Browse files
committed
Fix RS1024 (Compare symbols correctly)
1 parent 1cf7fb8 commit eb3c9b7

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/ReadabilityRules/SA1141CodeFixProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ private static SyntaxNode TransformArgumentListToTuple(SemanticModel semanticMod
132132
var argument = arguments[i];
133133

134134
var argumentTypeInfo = semanticModel.GetTypeInfo(argument.Expression);
135-
if (argumentTypeInfo.Type != argumentTypeInfo.ConvertedType)
135+
if (!Equals(argumentTypeInfo.Type, argumentTypeInfo.ConvertedType))
136136
{
137137
var expectedType = SyntaxFactory.ParseTypeName(argumentTypeInfo.ConvertedType.ToDisplayString());
138138
argument = argument.WithExpression(SyntaxFactory.CastExpression(expectedType, argument.Expression));

StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/ReadabilityRules/SA1142CodeFixProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ private static async Task<Document> GetTransformedDocumentAsync(Document documen
5959
private static SyntaxNode GetReplacementNode(SemanticModel semanticModel, SyntaxNode fieldName)
6060
{
6161
var fieldSymbol = (IFieldSymbol)semanticModel.GetSymbolInfo(fieldName.Parent).Symbol;
62-
var fieldNameSymbol = fieldSymbol.ContainingType.GetMembers().OfType<IFieldSymbol>().Single(fs => (fs != fieldSymbol) && (fs.CorrespondingTupleField() == fieldSymbol));
62+
var fieldNameSymbol = fieldSymbol.ContainingType.GetMembers().OfType<IFieldSymbol>().Single(fs => !Equals(fs, fieldSymbol) && Equals(fs.CorrespondingTupleField(), fieldSymbol));
6363

6464
return SyntaxFactory.IdentifierName(fieldNameSymbol.Name).WithTriviaFrom(fieldName);
6565
}

StyleCop.Analyzers/StyleCop.Analyzers/Helpers/SymbolNameHelpers.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ private static bool AppendTupleType(StringBuilder builder, INamedTypeSymbol name
196196
}
197197

198198
AppendQualifiedSymbolName(builder, field.Type, fieldType.Type);
199-
if (field != field.CorrespondingTupleField())
199+
if (!Equals(field, field.CorrespondingTupleField()))
200200
{
201201
builder.Append(" ").Append(field.Name);
202202
}

StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/SA1142ReferToTupleElementsByName.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ private static bool CheckFieldName(IFieldSymbol fieldSymbol)
7070
}
7171

7272
// check if this already is a proper tuple field name
73-
if (fieldSymbol.CorrespondingTupleField() != fieldSymbol)
73+
if (!Equals(fieldSymbol.CorrespondingTupleField(), fieldSymbol))
7474
{
7575
return false;
7676
}
7777

7878
// check if there is a tuple field name declared.
79-
return fieldSymbol.ContainingType.GetMembers().OfType<IFieldSymbol>().Count(fs => fs.CorrespondingTupleField() == fieldSymbol) > 1;
79+
return fieldSymbol.ContainingType.GetMembers().OfType<IFieldSymbol>().Count(fs => Equals(fs.CorrespondingTupleField(), fieldSymbol)) > 1;
8080
}
8181
}
8282
}

0 commit comments

Comments
 (0)