fix(script_translator): always_show_comments also applies to phrases

Closes rime#272, Closes rime#419
LEOYoon-Tsaw · Jan 18, 2021 · 012768b · 012768b
1 parent 4aff30d
commit 012768b
Showing 1 changed file with 3 additions and 12 deletions.
diff --git a/src/rime/gear/script_translator.cc b/src/rime/gear/script_translator.cc
@@ -448,7 +448,9 @@ an<Candidate> ScriptTranslation::Peek() {
   }
   if (candidate_->comment().empty()) {
     auto spelling = syllabifier_->GetOriginalSpelling(*candidate_);
-    if (!spelling.empty() && spelling != candidate_->preedit()) {
+    if (!spelling.empty() &&
+        (translator_->always_show_comments() ||
+          spelling != candidate_->preedit())) {
       candidate_->set_comment(/*quote_left + */spelling/* + quote_right*/);
     }
   }
@@ -462,17 +464,6 @@ void ScriptTranslation::PrepareCandidate() {
     return;
   }
   if (sentence_) {
-    if (sentence_->preedit().empty()) {
-      sentence_->set_preedit(syllabifier_->GetPreeditString(*sentence_));
-    }
-    if (sentence_->comment().empty()) {
-      auto spelling = syllabifier_->GetOriginalSpelling(*sentence_);
-      if (!spelling.empty() &&
-          (translator_->always_show_comments() ||
-              spelling != sentence_->preedit())) {
-        sentence_->set_comment(/*quote_left + */spelling/* + quote_right*/);
-      }
-    }
     candidate_ = sentence_;
     return;
   }