Skip to content

Commit 767793b

Browse files
authored
Use IsEditorRequired in Equality checks (#33553)
* Use IsEditorRequired in Equality checks
1 parent ef19746 commit 767793b

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

src/Razor/Microsoft.AspNetCore.Razor.Language/src/BoundAttributeDescriptorComparer.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace Microsoft.AspNetCore.Razor.Language
1010
{
11-
internal class BoundAttributeDescriptorComparer : IEqualityComparer<BoundAttributeDescriptor>
11+
internal sealed class BoundAttributeDescriptorComparer : IEqualityComparer<BoundAttributeDescriptor>
1212
{
1313
/// <summary>
1414
/// A default instance of the <see cref="BoundAttributeDescriptorComparer"/>.
@@ -19,7 +19,7 @@ private BoundAttributeDescriptorComparer()
1919
{
2020
}
2121

22-
public virtual bool Equals(BoundAttributeDescriptor descriptorX, BoundAttributeDescriptor descriptorY)
22+
public bool Equals(BoundAttributeDescriptor descriptorX, BoundAttributeDescriptor descriptorY)
2323
{
2424
if (object.ReferenceEquals(descriptorX, descriptorY))
2525
{
@@ -37,6 +37,7 @@ public virtual bool Equals(BoundAttributeDescriptor descriptorX, BoundAttributeD
3737
descriptorX.IsEnum == descriptorY.IsEnum &&
3838
descriptorX.HasIndexer == descriptorY.HasIndexer &&
3939
descriptorX.CaseSensitive == descriptorY.CaseSensitive &&
40+
descriptorX.IsEditorRequired == descriptorY.IsEditorRequired &&
4041
string.Equals(descriptorX.Name, descriptorY.Name, StringComparison.Ordinal) &&
4142
string.Equals(descriptorX.IndexerNamePrefix, descriptorY.IndexerNamePrefix, StringComparison.Ordinal) &&
4243
string.Equals(descriptorX.TypeName, descriptorY.TypeName, StringComparison.Ordinal) &&
@@ -48,7 +49,7 @@ public virtual bool Equals(BoundAttributeDescriptor descriptorX, BoundAttributeD
4849
descriptorY.Metadata.OrderBy(propertyY => propertyY.Key, StringComparer.Ordinal));
4950
}
5051

51-
public virtual int GetHashCode(BoundAttributeDescriptor descriptor)
52+
public int GetHashCode(BoundAttributeDescriptor descriptor)
5253
{
5354
if (descriptor == null)
5455
{
@@ -58,6 +59,7 @@ public virtual int GetHashCode(BoundAttributeDescriptor descriptor)
5859
var hash = HashCodeCombiner.Start();
5960
hash.Add(descriptor.Kind, StringComparer.Ordinal);
6061
hash.Add(descriptor.Name, StringComparer.Ordinal);
62+
hash.Add(descriptor.IsEditorRequired);
6163

6264
if (descriptor.BoundAttributeParameters != null)
6365
{

src/Razor/Microsoft.AspNetCore.Razor.Language/src/TagHelperDescriptorComparer.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace Microsoft.AspNetCore.Razor.Language
1010
{
11-
internal class TagHelperDescriptorComparer : IEqualityComparer<TagHelperDescriptor>
11+
internal sealed class TagHelperDescriptorComparer : IEqualityComparer<TagHelperDescriptor>
1212
{
1313
/// <summary>
1414
/// A default instance of the <see cref="TagHelperDescriptorComparer"/>.
@@ -19,7 +19,7 @@ private TagHelperDescriptorComparer()
1919
{
2020
}
2121

22-
public virtual bool Equals(TagHelperDescriptor descriptorX, TagHelperDescriptor descriptorY)
22+
public bool Equals(TagHelperDescriptor descriptorX, TagHelperDescriptor descriptorY)
2323
{
2424
if (object.ReferenceEquals(descriptorX, descriptorY))
2525
{
@@ -109,7 +109,7 @@ public virtual bool Equals(TagHelperDescriptor descriptorX, TagHelperDescriptor
109109
}
110110

111111
/// <inheritdoc />
112-
public virtual int GetHashCode(TagHelperDescriptor descriptor)
112+
public int GetHashCode(TagHelperDescriptor descriptor)
113113
{
114114
if (descriptor == null)
115115
{

0 commit comments

Comments
 (0)