Minor

rampaa · Feb 2, 2025 · 6900ba3 · 6900ba3
1 parent 4b5c33f
commit 6900ba3
Show file tree

Hide file tree

Showing 16 changed files with 29 additions and 149 deletions.
diff --git a/JL.Core.Tests/Deconjugation/DeconjugatorTests.cs b/JL.Core.Tests/Deconjugation/DeconjugatorTests.cs
@@ -27,7 +27,7 @@ public void Deconjugate_わからない()
         bool success = false;
         foreach (Form form in result)
         {
-            if (form.Text is expectedText && form.Process.Count > 0 && form.Process[0] is expectedProcess)
+            if (form is { Text: expectedText, Process.Count: > 0 } && form.Process[0] is expectedProcess)
             {
                 success = true;
                 break;

diff --git a/JL.Core.Tests/LookupTests.cs b/JL.Core.Tests/LookupTests.cs
@@ -69,13 +69,13 @@ public void LookupText_始まる()
 
         // Assert
         Assert.That(actual, Is.EqualTo(expected)
-            .Using<LookupResult, LookupResult>((a, e) =>
+            .Using<LookupResult, LookupResult>(static (a, e) =>
                 a.MatchedText == e.MatchedText
                 && a.Dict == e.Dict
-                && (e.Frequencies is not null ? (a.Frequencies?.SequenceEqual(e.Frequencies) ?? false) : a.Frequencies is null)
+                && (e.Frequencies is not null ? a.Frequencies?.SequenceEqual(e.Frequencies) ?? false : a.Frequencies is null)
                 && a.PrimarySpelling == e.PrimarySpelling
                 && a.DeconjugatedMatchedText == e.DeconjugatedMatchedText
-                && (e.Readings is not null ? (a.Readings?.SequenceEqual(e.Readings) ?? false) : a.Readings is null)
+                && (e.Readings is not null ? a.Readings?.SequenceEqual(e.Readings) ?? false : a.Readings is null)
                 && a.FormattedDefinitions == e.FormattedDefinitions
                 && a.EntryId == e.EntryId));
     }

diff --git a/JL.Core/Deconjugation/Form.cs b/JL.Core/Deconjugation/Form.cs
@@ -50,6 +50,6 @@ public override int GetHashCode()
         }
     }
 
-    public static bool operator ==(Form? left, Form? right) => left is not null ? left.Equals(right) : right is null;
-    public static bool operator !=(Form? left, Form? right) => left is not null ? !left.Equals(right) : right is not null;
+    public static bool operator ==(Form? left, Form? right) => left?.Equals(right) ?? right is null;
+    public static bool operator !=(Form? left, Form? right) => !left?.Equals(right) ?? right is not null;
 }
diff --git a/JL.Core/Dicts/CustomWordDict/CustomWordRecord.cs b/JL.Core/Dicts/CustomWordDict/CustomWordRecord.cs
@@ -236,6 +236,6 @@ public override int GetHashCode()
         }
     }
 
-    public static bool operator ==(CustomWordRecord? left, CustomWordRecord? right) => left is not null ? left.Equals(right) : right is null;
-    public static bool operator !=(CustomWordRecord? left, CustomWordRecord? right) => left is not null ? !left.Equals(right) : right is not null;
+    public static bool operator ==(CustomWordRecord? left, CustomWordRecord? right) => left?.Equals(right) ?? right is null;
+    public static bool operator !=(CustomWordRecord? left, CustomWordRecord? right) => !left?.Equals(right) ?? right is not null;
 }
diff --git a/JL.Core/Dicts/Dict.cs b/JL.Core/Dicts/Dict.cs
@@ -5,7 +5,7 @@
 
 namespace JL.Core.Dicts;
 
-public sealed class Dict(DictType type, string name, string path, bool active, int priority, int size, DictOptions options) : IEquatable<Dict>
+public sealed class Dict(DictType type, string name, string path, bool active, int priority, int size, DictOptions options)
 {
     public DictType Type { get; } = type;
     public string Name { get; set; } = name;
@@ -21,31 +21,4 @@ public sealed class Dict(DictType type, string name, string path, bool active, i
 #pragma warning disable CA2227
     [JsonIgnore] public IDictionary<string, IList<IDictRecord>> Contents { get; set; } = FrozenDictionary<string, IList<IDictRecord>>.Empty;
 #pragma warning restore CA2227
-
-    public override int GetHashCode()
-    {
-        unchecked
-        {
-            int hash = (17 * 37) + Name.GetHashCode(StringComparison.OrdinalIgnoreCase);
-            hash = (hash * 37) + Path.GetHashCode(StringComparison.OrdinalIgnoreCase);
-            hash = (hash * 37) + Type.GetHashCode();
-            return hash;
-        }
-    }
-
-    public override bool Equals(object? obj)
-    {
-        return obj is Dict other
-            && string.Equals(Name, other.Name, StringComparison.OrdinalIgnoreCase)
-            && string.Equals(Path, other.Path, StringComparison.OrdinalIgnoreCase)
-            && Type == other.Type;
-    }
-
-    public bool Equals(Dict? other)
-    {
-        return other is not null
-            && string.Equals(Name, other.Name, StringComparison.OrdinalIgnoreCase)
-            && string.Equals(Path, other.Path, StringComparison.OrdinalIgnoreCase)
-            && Type == other.Type;
-    }
 }
diff --git a/JL.Core/Dicts/EPWING/Nazeka/EpwingNazekaRecord.cs b/JL.Core/Dicts/EPWING/Nazeka/EpwingNazekaRecord.cs
@@ -148,6 +148,6 @@ public override int GetHashCode()
         }
     }
 
-    public static bool operator ==(EpwingNazekaRecord? left, EpwingNazekaRecord? right) => left is not null ? left.Equals(right) : right is null;
-    public static bool operator !=(EpwingNazekaRecord? left, EpwingNazekaRecord? right) => left is not null ? !left.Equals(right) : right is not null;
+    public static bool operator ==(EpwingNazekaRecord? left, EpwingNazekaRecord? right) => left?.Equals(right) ?? right is null;
+    public static bool operator !=(EpwingNazekaRecord? left, EpwingNazekaRecord? right) => !left?.Equals(right) ?? right is not null;
 }
diff --git a/JL.Core/Dicts/EPWING/Yomichan/EpwingYomichanRecord.cs b/JL.Core/Dicts/EPWING/Yomichan/EpwingYomichanRecord.cs
@@ -167,6 +167,6 @@ public override int GetHashCode()
         }
     }
 
-    public static bool operator ==(EpwingYomichanRecord? left, EpwingYomichanRecord? right) => left is not null ? left.Equals(right) : right is null;
-    public static bool operator !=(EpwingYomichanRecord? left, EpwingYomichanRecord? right) => left is not null ? !left.Equals(right) : right is not null;
+    public static bool operator ==(EpwingYomichanRecord? left, EpwingYomichanRecord? right) => left?.Equals(right) ?? right is null;
+    public static bool operator !=(EpwingYomichanRecord? left, EpwingYomichanRecord? right) => !left?.Equals(right) ?? right is not null;
 }
diff --git a/JL.Core/Dicts/JMdict/JmdictRecord.cs b/JL.Core/Dicts/JMdict/JmdictRecord.cs
@@ -398,6 +398,6 @@ public override int GetHashCode()
         }
     }
 
-    public static bool operator ==(JmdictRecord? left, JmdictRecord? right) => left is not null ? left.Equals(right) : right is null;
-    public static bool operator !=(JmdictRecord? left, JmdictRecord? right) => left is not null ? !left.Equals(right) : right is not null;
+    public static bool operator ==(JmdictRecord? left, JmdictRecord? right) => left?.Equals(right) ?? right is null;
+    public static bool operator !=(JmdictRecord? left, JmdictRecord? right) => !left?.Equals(right) ?? right is not null;
 }
diff --git a/JL.Core/Dicts/JMdict/JmdictRecordBuilder.cs b/JL.Core/Dicts/JMdict/JmdictRecordBuilder.cs
@@ -342,9 +342,9 @@ private static (string[]?[]? exclusiveWordClasses, string[]? wordClassesSharedBy
 
         return wordClassesSharedByAllSensesList.Count is 0
             ? (wordClasses.TrimToArray(), null)
-            : exclusiveWordClassesList.All(ewc => ewc is null)
+            : exclusiveWordClassesList.All(static ewc => ewc is null)
                 ? (null, wordClassesSharedByAllSensesList.TrimToArray())
-                : (exclusiveWordClassesList.Select(ewc => ewc?.TrimToArray()).ToArray(), wordClassesSharedByAllSensesList.TrimToArray());
+                : (exclusiveWordClassesList.Select(static ewc => ewc?.TrimToArray()).ToArray(), wordClassesSharedByAllSensesList.TrimToArray());
     }
 
     private static (string[]?[]? exclusiveSenseFieldValues, string[]? fieldValuesSharedByAllSenses) GetSenseFields(List<string[]?> senseField)
@@ -384,8 +384,8 @@ private static (string[]?[]? exclusiveSenseFieldValues, string[]? fieldValuesSha
 
         return fieldValuesSharedByAllSenses.Count is 0
             ? (senseField.TrimListOfNullableElementsToArray(), null)
-            : exclusiveSenseFieldValues.All(ewc => ewc is null)
+            : exclusiveSenseFieldValues.All(static ewc => ewc is null)
                 ? (null, fieldValuesSharedByAllSenses.TrimToArray())
-                : (exclusiveSenseFieldValues.Select(ewc => ewc?.TrimToArray()).ToArray(), fieldValuesSharedByAllSenses.TrimToArray());
+                : (exclusiveSenseFieldValues.Select(static ewc => ewc?.TrimToArray()).ToArray(), fieldValuesSharedByAllSenses.TrimToArray());
     }
 }
diff --git a/JL.Core/Dicts/JMnedict/JmnedictRecord.cs b/JL.Core/Dicts/JMnedict/JmnedictRecord.cs
@@ -108,6 +108,6 @@ public override int GetHashCode()
         }
     }
 
-    public static bool operator ==(JmnedictRecord? left, JmnedictRecord? right) => left is not null ? left.Equals(right) : right is null;
-    public static bool operator !=(JmnedictRecord? left, JmnedictRecord? right) => left is not null ? !left.Equals(right) : right is not null;
+    public static bool operator ==(JmnedictRecord? left, JmnedictRecord? right) => left?.Equals(right) ?? right is null;
+    public static bool operator !=(JmnedictRecord? left, JmnedictRecord? right) => !left?.Equals(right) ?? right is not null;
 }
diff --git a/JL.Core/Dicts/PitchAccent/PitchAccentRecord.cs b/JL.Core/Dicts/PitchAccent/PitchAccentRecord.cs
@@ -73,6 +73,6 @@ public override int GetHashCode()
         return HashCode.Combine(Spelling, Reading);
     }
 
-    public static bool operator ==(PitchAccentRecord? left, PitchAccentRecord? right) => left is not null ? left.Equals(right) : right is null;
-    public static bool operator !=(PitchAccentRecord? left, PitchAccentRecord? right) => left is not null ? !left.Equals(right) : right is not null;
+    public static bool operator ==(PitchAccentRecord? left, PitchAccentRecord? right) => left?.Equals(right) ?? right is null;
+    public static bool operator !=(PitchAccentRecord? left, PitchAccentRecord? right) => !left?.Equals(right) ?? right is not null;
 }
diff --git a/JL.Core/Freqs/Freq.cs b/JL.Core/Freqs/Freq.cs
@@ -3,7 +3,7 @@
 using JL.Core.Freqs.Options;
 namespace JL.Core.Freqs;
 
-public sealed class Freq(FreqType type, string name, string path, bool active, int priority, int size, int maxValue, FreqOptions options) : IEquatable<Freq>
+public sealed class Freq(FreqType type, string name, string path, bool active, int priority, int size, int maxValue, FreqOptions options)
 {
     public FreqType Type { get; } = type;
     public string Name { get; set; } = name;
@@ -22,32 +22,4 @@ public sealed class Freq(FreqType type, string name, string path, bool active, i
 #pragma warning disable CA2227
     [JsonIgnore] public IDictionary<string, IList<FrequencyRecord>> Contents { get; set; } = FrozenDictionary<string, IList<FrequencyRecord>>.Empty;
 #pragma warning restore CA2227
-
-
-    public override int GetHashCode()
-    {
-        unchecked
-        {
-            int hash = (17 * 37) + Name.GetHashCode(StringComparison.OrdinalIgnoreCase);
-            hash = (hash * 37) + Path.GetHashCode(StringComparison.OrdinalIgnoreCase);
-            hash = (hash * 37) + Type.GetHashCode();
-            return hash;
-        }
-    }
-
-    public override bool Equals(object? obj)
-    {
-        return obj is Freq other
-            && string.Equals(Name, other.Name, StringComparison.OrdinalIgnoreCase)
-            && string.Equals(Path, other.Path, StringComparison.OrdinalIgnoreCase)
-            && Type == other.Type;
-    }
-
-    public bool Equals(Freq? other)
-    {
-        return other is not null
-            && string.Equals(Name, other.Name, StringComparison.OrdinalIgnoreCase)
-            && string.Equals(Path, other.Path, StringComparison.OrdinalIgnoreCase)
-            && Type == other.Type;
-    }
 }
diff --git a/JL.Core/Lookup/LookupResult.cs b/JL.Core/Lookup/LookupResult.cs
@@ -94,6 +94,6 @@ public bool Equals(LookupResult? other)
             && FormattedDefinitions == other.FormattedDefinitions;
     }
 
-    public static bool operator ==(LookupResult? left, LookupResult? right) => left is not null ? left.Equals(right) : right is null;
-    public static bool operator !=(LookupResult? left, LookupResult? right) => left is not null ? !left.Equals(right) : right is not null;
+    public static bool operator ==(LookupResult? left, LookupResult? right) => left?.Equals(right) ?? right is null;
+    public static bool operator !=(LookupResult? left, LookupResult? right) => !left?.Equals(right) ?? right is not null;
 }
diff --git a/JL.Core/Utilities/ExtensionMethods.cs b/JL.Core/Utilities/ExtensionMethods.cs
@@ -183,71 +183,6 @@ internal static void AddRange<T>(this ConcurrentBag<T> source, IEnumerable<T> it
             : list.ToArray();
     }
 
-    internal static T[][] ToSingleElementArrayIfIdentical<T>(this List<T[]> list) where T : class
-    {
-        if (list.Count is 1)
-        {
-            return list.ToArray();
-        }
-
-        T[] firstElemenmt = list[0];
-        for (int i = 1; i < list.Count; i++)
-        {
-            if (!list[i].SequenceEqual(firstElemenmt))
-            {
-                return list.ToArray();
-            }
-        }
-
-        return [firstElemenmt];
-    }
-
-    internal static T[]?[]? TrimListOfNullableElementsToSingleElementArrayIfIdentical<T>(this List<T[]?> list) where T : class
-    {
-        if (list.Count is 0)
-        {
-            return null;
-        }
-
-        T[]? firstElement = list[0];
-        if (list.Count is 1)
-        {
-            return firstElement is not null
-                ? [firstElement]
-                : null;
-        }
-
-        bool allElementsAreNull = true;
-        for (int i = 0; i < list.Count; i++)
-        {
-            if (list[i] is not null)
-            {
-                allElementsAreNull = false;
-                break;
-            }
-        }
-
-        bool allElementsAreIdentical = firstElement is not null;
-        if (!allElementsAreNull && allElementsAreIdentical)
-        {
-            for (int i = 1; i < list.Count; i++)
-            {
-                T[]? currentItem = list[i];
-                if (currentItem is null || !currentItem.SequenceEqual(firstElement!))
-                {
-                    allElementsAreIdentical = false;
-                    break;
-                }
-            }
-        }
-
-        return allElementsAreNull
-            ? null
-            : allElementsAreIdentical
-                ? [firstElement]
-                : list.ToArray();
-    }
-
     internal static string GetPooledString(this string str)
     {
         return Utils.StringPoolInstance.GetOrAdd(str);

diff --git a/JL.Core/WordClass/JmdictWordClass.cs b/JL.Core/WordClass/JmdictWordClass.cs
@@ -54,6 +54,6 @@ public override int GetHashCode()
         }
     }
 
-    public static bool operator ==(JmdictWordClass? left, JmdictWordClass? right) => left is not null ? left.Equals(right) : right is null;
-    public static bool operator !=(JmdictWordClass? left, JmdictWordClass? right) => left is not null ? !left.Equals(right) : right is not null;
+    public static bool operator ==(JmdictWordClass? left, JmdictWordClass? right) => left?.Equals(right) ?? right is null;
+    public static bool operator !=(JmdictWordClass? left, JmdictWordClass? right) => !left?.Equals(right) ?? right is not null;
 }
diff --git a/JL.Core/WordClass/JmdictWordClassUtils.cs b/JL.Core/WordClass/JmdictWordClassUtils.cs
@@ -71,7 +71,7 @@ internal static Task Serialize()
             {
                 JmdictRecord jmdictRecord = (JmdictRecord)jmdictRecordList[i];
                 string[] wordClasses = s_usedWordClasses
-                    .Intersect((jmdictRecord.WordClasses?.Where(wc => wc is not null).SelectMany(static wc => wc!) ?? [])
+                    .Intersect((jmdictRecord.WordClasses?.Where(static wc => wc is not null).SelectMany(static wc => wc!) ?? [])
                         .Union(jmdictRecord.WordClassesSharedByAllSenses ?? [])).ToArray();
 
                 if (wordClasses.Length is 0)