From 7bf3e3abcd0703fd851ab85e35dcf8f5791c3139 Mon Sep 17 00:00:00 2001
From: rampaa <rampaa@waifuland.com>
Date: Fri, 31 Jan 2025 19:27:43 +0300
Subject: [PATCH] Minor

---
 JL.Core/Dicts/EPWING/EpwingUtils.cs        | 2 +-
 JL.Core/Lookup/LookupUtils.cs              | 4 +---
 JL.Core/Utilities/JapaneseUtils.cs         | 2 +-
 JL.Core/WordClass/JmdictWordClass.cs       | 3 ++-
 JL.Core/WordClass/JmdictWordClassUtils.cs  | 1 -
 JL.Windows/GUI/AddDictionaryWindow.xaml.cs | 3 ---
 6 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/JL.Core/Dicts/EPWING/EpwingUtils.cs b/JL.Core/Dicts/EPWING/EpwingUtils.cs
index 4f37c0f2..07cae5d7 100644
--- a/JL.Core/Dicts/EPWING/EpwingUtils.cs
+++ b/JL.Core/Dicts/EPWING/EpwingUtils.cs
@@ -6,7 +6,7 @@ namespace JL.Core.Dicts.EPWING;
 
 internal static class EpwingUtils
 {
-    private static readonly SearchValues<char> s_invalidCharacters = SearchValues.Create(['�', '〓', '\n']);
+    private static readonly SearchValues<char> s_invalidCharacters = SearchValues.Create('�', '〓', '\n');
 
     public static bool IsValidEpwingResultForDictType(string primarySpelling, string? reading, string[] definitions, Dict dict)
     {
diff --git a/JL.Core/Lookup/LookupUtils.cs b/JL.Core/Lookup/LookupUtils.cs
index 382766c4..ffd3b459 100644
--- a/JL.Core/Lookup/LookupUtils.cs
+++ b/JL.Core/Lookup/LookupUtils.cs
@@ -950,9 +950,7 @@ private static List<LookupResult> BuildEpwingYomichanResult(
                     EpwingYomichanRecord epwingResult = (EpwingYomichanRecord)dictRecords[j];
 
                     string[]? wordClasses = conjugatable
-                        ? epwingResult.WordClasses is not null
-                            ? epwingResult.WordClasses
-                            : GetWordClassesFromWordClassDictionary(epwingResult)
+                        ? epwingResult.WordClasses ?? GetWordClassesFromWordClassDictionary(epwingResult)
                         : null;
 
                     string[]? readings = epwingResult.Reading is not null ? [epwingResult.Reading] : null;
diff --git a/JL.Core/Utilities/JapaneseUtils.cs b/JL.Core/Utilities/JapaneseUtils.cs
index 87f9a667..2faa3eb2 100644
--- a/JL.Core/Utilities/JapaneseUtils.cs
+++ b/JL.Core/Utilities/JapaneseUtils.cs
@@ -325,7 +325,7 @@ internal static bool IsKatakana(char character)
 
     public static int FindExpressionBoundary(ReadOnlySpan<char> text, int position)
     {
-        int endPosition = MemoryExtensions.IndexOfAny(text[position..], s_expressionTerminatingCharacters);
+        int endPosition = text[position..].IndexOfAny(s_expressionTerminatingCharacters);
         return endPosition < 0 ? text.Length : endPosition + position + 1;
     }
 
diff --git a/JL.Core/WordClass/JmdictWordClass.cs b/JL.Core/WordClass/JmdictWordClass.cs
index 4126c3c5..d814639d 100644
--- a/JL.Core/WordClass/JmdictWordClass.cs
+++ b/JL.Core/WordClass/JmdictWordClass.cs
@@ -1,10 +1,11 @@
 using System.Text.Json.Serialization;
+using JL.Core.Utilities;
 
 namespace JL.Core.WordClass;
 
 internal sealed class JmdictWordClass(string spelling, string[] wordClasses, string[]? readings = null) : IEquatable<JmdictWordClass>
 {
-    [JsonPropertyName("S")] public string Spelling { get; set; } = spelling;
+    [JsonPropertyName("S")] public string Spelling { get; } = spelling.GetPooledString();
     [JsonPropertyName("C")] public string[] WordClasses { get; } = wordClasses;
     [JsonPropertyName("R")] public string[]? Readings { get; } = readings;
 
diff --git a/JL.Core/WordClass/JmdictWordClassUtils.cs b/JL.Core/WordClass/JmdictWordClassUtils.cs
index f1c38cab..41fe920e 100644
--- a/JL.Core/WordClass/JmdictWordClassUtils.cs
+++ b/JL.Core/WordClass/JmdictWordClassUtils.cs
@@ -30,7 +30,6 @@ internal static async Task Load()
             {
                 JmdictWordClass jmdictWordClass = jmdictWordClassList[i];
 
-                jmdictWordClass.Spelling = jmdictWordClass.Spelling.GetPooledString();
                 jmdictWordClass.Readings?.DeduplicateStringsInArray();
                 jmdictWordClass.WordClasses.DeduplicateStringsInArray();
 
diff --git a/JL.Windows/GUI/AddDictionaryWindow.xaml.cs b/JL.Windows/GUI/AddDictionaryWindow.xaml.cs
index 02e18f63..1681527a 100644
--- a/JL.Windows/GUI/AddDictionaryWindow.xaml.cs
+++ b/JL.Windows/GUI/AddDictionaryWindow.xaml.cs
@@ -181,9 +181,6 @@ private void BrowsePathButton_OnClick(object sender, RoutedEventArgs e)
             case DictType.NonspecificKanjiWithWordSchemaYomichan:
             case DictType.NonspecificNameYomichan:
             case DictType.NonspecificYomichan:
-                BrowseForDictionaryFolder();
-                break;
-
             case DictType.PitchAccentYomichan:
                 BrowseForDictionaryFolder();
                 break;