Minor

rampaa · Jan 3, 2025 · 4918706 · 4918706
1 parent 2dc75c2
commit 4918706
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/JL.Core.Tests/LookupTests.cs b/JL.Core.Tests/LookupTests.cs
@@ -58,7 +58,7 @@ public void LookupText_始まる()
                 dict: DictUtils.Dicts.Values.First(static dict => dict.Type is DictType.JMdict),
                 frequencies: [new LookupFrequencyResult("VN (Nazeka)", 759, false)],
                 primarySpelling: "始まる",
-                deconjugatedMatchedText: "始まる",
+                deconjugatedMatchedText: null,
                 readings: ["はじまる"],
                 formattedDefinitions: "(v5r, vi) (1) to begin; to start; to commence；(v5r, vi) (2) to happen (again); to begin (anew)；(v5r, vi) (3) to date (from); to originate (in)",
                 entryId: 1307500

diff --git a/JL.Core/Lookup/LookupResult.cs b/JL.Core/Lookup/LookupResult.cs
@@ -40,7 +40,6 @@ public sealed class LookupResult
     internal LookupResult(
         string primarySpelling,
         string matchedText,
-        string? deconjugatedMatchedText,
         Dict dict,
         string[]? readings,
         List<LookupFrequencyResult>? frequencies = null,
@@ -54,6 +53,7 @@ internal LookupResult(
         string[]? nanoriReadings = null,
         string[]? radicalNames = null,
         string? formattedDefinitions = null,
+        string? deconjugatedMatchedText = null,
         string? deconjugationProcess = null,
         string? kanjiComposition = null,
         string? kanjiStats = null,

diff --git a/JL.Core/Lookup/LookupUtils.cs b/JL.Core/Lookup/LookupUtils.cs
@@ -969,9 +969,9 @@ private static List<LookupResult> BuildJmdictResult(
                         primarySpelling: jmdictResult.PrimarySpelling,
                         readings: jmdictResult.Readings,
                         matchedText: wordResult.MatchedText,
-                        deconjugatedMatchedText: wordResult.DeconjugatedMatchedText,
                         entryId: jmdictResult.Id,
                         alternativeSpellings: jmdictResult.AlternativeSpellings,
+                        deconjugatedMatchedText: wordResult.DeconjugatedMatchedText,
                         deconjugationProcess: deconjugatedWord ? LookupResultUtils.DeconjugationProcessesToText(wordResult.Processes![i]) : null,
                         frequencies: wordFreqsExist ? GetWordFrequencies(jmdictResult, wordFreqs!, frequencyDicts) : null,
                         primarySpellingOrthographyInfoList: jmdictResult.PrimarySpellingOrthographyInfo,
@@ -1020,7 +1020,6 @@ private static List<LookupResult> BuildJmnedictResult(
                         alternativeSpellings: jmnedictRecord.AlternativeSpellings,
                         readings: jmnedictRecord.Readings,
                         matchedText: nameResult.MatchedText,
-                        deconjugatedMatchedText: nameResult.DeconjugatedMatchedText,
                         dict: nameResult.Dict,
                         formattedDefinitions: jmnedictRecord.BuildFormattedDefinition(nameResult.Dict.Options),
                         pitchAccentDict: pitchAccentDict
@@ -1059,7 +1058,6 @@ private static LookupResult BuildKanjidicResult(string kanji, IntermediaryResult
             kanjiComposition: kanjiComposition,
             frequencies: GetKanjidicFrequencies(kanji, kanjiRecord.Frequency, kanjiFreqs),
             matchedText: intermediaryResult.MatchedText,
-            deconjugatedMatchedText: intermediaryResult.DeconjugatedMatchedText,
             dict: intermediaryResult.Dict,
             formattedDefinitions: kanjiRecord.BuildFormattedDefinition(),
             pitchAccentDict: pitchAccentDict
@@ -1100,7 +1098,6 @@ private static List<LookupResult> BuildYomichanKanjiResult(
                     kanjiStats: yomichanKanjiDictResult.BuildFormattedStats(),
                     frequencies: kanjiFreqsExist ? GetKanjiFrequencies(kanji, kanjiFreqs!) : null,
                     matchedText: intermediaryResult.MatchedText,
-                    deconjugatedMatchedText: intermediaryResult.DeconjugatedMatchedText,
                     dict: intermediaryResult.Dict,
                     formattedDefinitions: yomichanKanjiDictResult.BuildFormattedDefinition(intermediaryResult.Dict.Options),
                     pitchAccentDict: pitchAccentDict
@@ -1189,7 +1186,6 @@ private static List<LookupResult> BuildEpwingYomichanResult(string kanji, Interm
                 (
                     primarySpelling: epwingResult.PrimarySpelling,
                     matchedText: intermediaryResult.MatchedText,
-                    deconjugatedMatchedText: intermediaryResult.DeconjugatedMatchedText,
                     frequencies: kanjiFreqsExist ? GetKanjiFrequencies(epwingResult.PrimarySpelling, kanjiFreqs!) : null,
                     dict: intermediaryResult.Dict,
                     readings: epwingResult.Reading is not null ? [epwingResult.Reading] : null,
@@ -1288,7 +1284,6 @@ private static List<LookupResult> BuildEpwingNazekaResult(string kanji, Intermed
                     primarySpelling: epwingResult.PrimarySpelling,
                     alternativeSpellings: epwingResult.AlternativeSpellings,
                     matchedText: intermediaryResult.MatchedText,
-                    deconjugatedMatchedText: intermediaryResult.DeconjugatedMatchedText,
                     frequencies: kanjiFreqsExist ? GetKanjiFrequencies(epwingResult.PrimarySpelling, kanjiFreqs!) : null,
                     dict: intermediaryResult.Dict,
                     readings: epwingResult.Reading is not null
@@ -1393,7 +1388,6 @@ private static ConcurrentBag<LookupResult> BuildCustomNameResult(
                     (
                         primarySpelling: customNameDictResult.PrimarySpelling,
                         matchedText: customNameResult.MatchedText,
-                        deconjugatedMatchedText: customNameResult.DeconjugatedMatchedText,
                         frequencies: [new LookupFrequencyResult(customNameResult.Dict.Name, -freq, false)],
                         dict: customNameResult.Dict,
                         readings: customNameDictResult.Reading is not null