feat(composition): commit script, keeping selected words (#924)

輸入預變換上屏時保留已接受的候選
rime · Aug 26, 2024 · 72564a7 · 72564a7
1 parent 9e08470
commit 72564a7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/rime/composition.cc b/src/rime/composition.cc
@@ -119,15 +119,18 @@ string Composition::GetCommitText() const {
   return result;
 }
 
-string Composition::GetScriptText() const {
+string Composition::GetScriptText(bool keep_selection) const {
   string result;
   size_t start = 0;
   size_t end = 0;
   for (const Segment& seg : *this) {
     auto cand = seg.GetSelectedCandidate();
     start = end;
     end = cand ? cand->end() : seg.end;
-    if (cand && !cand->preedit().empty())
+    if (keep_selection && cand && !cand->text().empty() &&
+        seg.status >= Segment::kSelected)
+      result += cand->text();
+    else if (cand && !cand->preedit().empty())
       result += boost::erase_first_copy(cand->preedit(), "\t");
     else
       result += input_.substr(start, end - start);

diff --git a/src/rime/composition.h b/src/rime/composition.h
@@ -28,7 +28,7 @@ class Composition : public Segmentation {
                      const string& caret) const;
   string GetPrompt() const;
   string GetCommitText() const;
-  string GetScriptText() const;
+  string GetScriptText(bool keep_selection = true) const;
   RIME_API string GetDebugText() const;
   // Returns text of the last segment before the given position.
   string GetTextBefore(size_t pos) const;