Add operator overrides for public IComparable types, #683

src/Lucene.Net.QueryParser/Surround/Query/SimpleTerm.cs

@@ -2,7 +2,7 @@
 using Lucene.Net.Index;
 using System;
 using System.Text;
-#pragma warning disable CS0660, CS0661 - CompareTo is deprecated, so skipping implementing equality members (lucenenet#683)
+#pragma warning disable CS0660, CS0661 // CompareTo is deprecated, so skipping implementing equality members (lucenenet#683)
 
 namespace Lucene.Net.QueryParsers.Surround.Query
 {

src/Lucene.Net.Suggest/Suggest/Fst/FSTCompletion.cs

@@ -69,15 +69,13 @@ public int CompareTo(Completion o)
             }
 
             // LUCENENET specific - per CS0660 and CS0661, we need to override Equals and GetHashCode
-            public override bool Equals(object obj) => ReferenceEquals(this, obj);
+            // ReSharper disable once BaseObjectEqualsIsObjectEquals
+            // ReSharper disable once RedundantOverriddenMember
+            public override bool Equals(object obj) => base.Equals(obj);
 
-            public override int GetHashCode()
-            {
-                unchecked
-                {
-                    return (Utf8.GetHashCode() * 397) ^ Bucket;
-                }
-            }
+            // ReSharper disable once BaseObjectGetHashCodeCallInGetHashCode
+            // ReSharper disable once RedundantOverriddenMember
+            public override int GetHashCode() => base.GetHashCode();
 
             #region Operator overrides
             #nullable enable

src/Lucene.Net.Suggest/Suggest/Lookup.cs

@@ -124,20 +124,13 @@ public int CompareTo(LookupResult o)
             }
 
             // LUCENENET specific - per CS0660 and CS0661, we need to override Equals and GetHashCode
-            public override bool Equals(object obj) => ReferenceEquals(this, obj);
+            // ReSharper disable once BaseObjectEqualsIsObjectEquals
+            // ReSharper disable once RedundantOverriddenMember
+            public override bool Equals(object obj) => base.Equals(obj);
 
-            public override int GetHashCode()
-            {
-                unchecked
-                {
-                    var hashCode = (Key != null ? Key.GetHashCode() : 0);
-                    hashCode = (hashCode * 397) ^ (HighlightKey != null ? HighlightKey.GetHashCode() : 0);
-                    hashCode = (hashCode * 397) ^ Value.GetHashCode();
-                    hashCode = (hashCode * 397) ^ (Payload != null ? Payload.GetHashCode() : 0);
-                    hashCode = (hashCode * 397) ^ (Contexts != null ? Contexts.GetHashCode() : 0);
-                    return hashCode;
-                }
-            }
+            // ReSharper disable once BaseObjectGetHashCodeCallInGetHashCode
+            // ReSharper disable once RedundantOverriddenMember
+            public override int GetHashCode() => base.GetHashCode();
 
             #region Operator overrides
             // LUCENENET specific - per csharpsquid:S1210, IComparable<T> should override comparison operators

src/Lucene.Net/Util/Automaton/State.cs

@@ -367,7 +367,8 @@ public virtual int CompareTo(State s)
         // IndexOutOfRangeExceptions when using FuzzyTermsEnum.
         // See GH-296.
         // Overriding here to prevent CS0660 warning due to defining the == operator.
-        public override bool Equals(object obj) => ReferenceEquals(this, obj);
+        // ReSharper disable once BaseObjectEqualsIsObjectEquals
+        public override bool Equals(object obj) => base.Equals(obj);
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public override int GetHashCode()