am 959070d3: am 57574b98: Merge "Remove doesAutoCorrectValidWord()." into lmp-dev

* commit '959070d3bbfc77a78096f534ddd9aa890c7f8579':
  Remove doesAutoCorrectValidWord().

3 files changed, 2 insertions, 13 deletions

diff --git a/native/jni/src/suggest/core/policy/scoring.h b/native/jni/src/suggest/core/policy/scoring.h
index 292194bf2..9e75cace4 100644
--- a/native/jni/src/suggest/core/policy/scoring.h
+++ b/native/jni/src/suggest/core/policy/scoring.h
@@ -37,7 +37,6 @@ class Scoring {
             DicNode *const terminals, const int size) const = 0;
     virtual float getDoubleLetterDemotionDistanceCost(
             const DicNode *const terminalDicNode) const = 0;
-    virtual bool doesAutoCorrectValidWord() const = 0;
     virtual bool autoCorrectsToMultiWordSuggestionIfTop() const = 0;
     virtual bool sameAsTyped(const DicTraverseSession *const traverseSession,
             const DicNode *const dicNode) const = 0;
diff --git a/native/jni/src/suggest/core/result/suggestions_output_utils.cpp b/native/jni/src/suggest/core/result/suggestions_output_utils.cpp
index 7b0e7e1b4..0b99b75ec 100644
--- a/native/jni/src/suggest/core/result/suggestions_output_utils.cpp
+++ b/native/jni/src/suggest/core/result/suggestions_output_utils.cpp
@@ -117,8 +117,7 @@ const int SuggestionsOutputUtils::MIN_LEN_FOR_MULTI_WORD_AUTOCORRECT = 16;
     const int finalScore = scoringPolicy->calculateFinalScore(
             compoundDistance, traverseSession->getInputSize(),
             terminalDicNode->getContainedErrorTypes(),
-            (forceCommitMultiWords && terminalDicNode->hasMultipleWords())
-                     || (isValidWord && scoringPolicy->doesAutoCorrectValidWord()),
+            (forceCommitMultiWords && terminalDicNode->hasMultipleWords()),
             boostExactMatches);
 
     // Don't output invalid or blocked offensive words. However, we still need to submit their
@@ -145,12 +144,7 @@ const int SuggestionsOutputUtils::MIN_LEN_FOR_MULTI_WORD_AUTOCORRECT = 16;
                 traverseSession->getDictionaryStructurePolicy()
                         ->getShortcutPositionOfPtNode(terminalDicNode->getPtNodePos()));
         const bool sameAsTyped = scoringPolicy->sameAsTyped(traverseSession, terminalDicNode);
-        const int shortcutBaseScore = scoringPolicy->doesAutoCorrectValidWord() ?
-                 scoringPolicy->calculateFinalScore(compoundDistance,
-                         traverseSession->getInputSize(),
-                         terminalDicNode->getContainedErrorTypes(),
-                         true /* forceCommit */, boostExactMatches) : finalScore;
-        outputShortcuts(&shortcutIt, shortcutBaseScore, sameAsTyped, outSuggestionResults);
+        outputShortcuts(&shortcutIt, finalScore, sameAsTyped, outSuggestionResults);
     }
 }
 
diff --git a/native/jni/src/suggest/policyimpl/typing/typing_scoring.h b/native/jni/src/suggest/policyimpl/typing/typing_scoring.h
index 66ea62406..04cb6603a 100644
--- a/native/jni/src/suggest/policyimpl/typing/typing_scoring.h
+++ b/native/jni/src/suggest/policyimpl/typing/typing_scoring.h
@@ -69,10 +69,6 @@ class TypingScoring : public Scoring {
         return 0.0f;
     }
 
-    AK_FORCE_INLINE bool doesAutoCorrectValidWord() const {
-        return false;
-    }
-
     AK_FORCE_INLINE bool autoCorrectsToMultiWordSuggestionIfTop() const {
         return true;
     }