[elpa] externals/pyim 302f1bff4b 34/41: Refactor pyim-preview.el

[ELPA Syncer]

branch: externals/pyim
commit 302f1bff4b8d21a08adf3e9dd4332e68b50f4aef
Author: Feng Shu <tumashu@163.com>
Commit: Feng Shu <tumashu@163.com>

    Refactor pyim-preview.el
---
 pyim-preview.el | 48 ++++++++++++++++++++++++++++++++----------------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/pyim-preview.el b/pyim-preview.el
index a2afaa9eea..68b2f82e73 100644
--- a/pyim-preview.el
+++ b/pyim-preview.el
@@ -67,7 +67,8 @@
 
 这个函数会在 `pyim-input-method' 中调用，用于删除
 `pyim-preview-overlay' 中保存的 overlay。"
-  (if (and (overlayp pyim-preview-overlay) (overlay-start 
pyim-preview-overlay))
+  (if (and (overlayp pyim-preview-overlay)
+           (overlay-start pyim-preview-overlay))
       (delete-overlay pyim-preview-overlay)))
 
 (defun pyim-preview-refresh (&rest _)
@@ -77,21 +78,7 @@ pyim 会使用 Emacs overlay 机制在 *待输入buffer* 光标处高亮显示
 个预览字符串，让用户可以查看将要输入的字符串，这个函数用于更新这
 个字符串的内容。"
   (let* ((scheme (pyim-scheme-current))
-         (candidates (pyim-process-get-candidates))
-         (pos (1- (min (pyim-process-get-candidate-position)
-                       (length candidates))))
-         (preview (concat (pyim-process-get-outcome)
-                          (nth pos candidates))))
-    (when (pyim-scheme-quanpin-p scheme)
-      (let ((rest (mapconcat
-                   (lambda (py)
-                     (concat (nth 0 py) (nth 1 py)))
-                   (nthcdr (length preview)
-                           (pyim-process-get-first-imobj))
-                   "'")))
-        (when (string< "" rest)
-          (setq preview (concat preview rest)))))
-    (setq preview (pyim-process-subword-and-magic-convert preview))
+         (preview (pyim-preview-string scheme)))
     ;; Delete old preview string.
     (pyim-preview-delete-string)
     ;; Insert new preview string.
@@ -102,6 +89,35 @@ pyim 会使用 Emacs overlay 机制在 *待输入buffer* 光标处高亮显示
 
 (add-hook 'pyim-process-ui-refresh-hook #'pyim-preview-refresh)
 
+(cl-defgeneric pyim-preview-string (scheme)
+  "获得 preview 字符串。")
+
+(cl-defmethod pyim-preview-string (_scheme)
+  "获得 preview 字符串。"
+  (let* ((candidates (pyim-process-get-candidates))
+         (pos (1- (min (pyim-process-get-candidate-position)
+                       (length candidates))))
+         (preview (concat (pyim-process-get-outcome)
+                          (nth pos candidates))))
+    (pyim-process-subword-and-magic-convert preview)))
+
+(cl-defmethod pyim-preview-string ((_scheme pyim-scheme-quanpin))
+  "获得 preview 字符串，适用于全拼输入法。"
+  (let* ((candidates (pyim-process-get-candidates))
+         (pos (1- (min (pyim-process-get-candidate-position)
+                       (length candidates))))
+         (preview (concat (pyim-process-get-outcome)
+                          (nth pos candidates)))
+         (rest (mapconcat
+                (lambda (py)
+                  (concat (nth 0 py) (nth 1 py)))
+                (nthcdr (length preview)
+                        (pyim-process-get-first-imobj))
+                "'")))
+    (when (string< "" rest)
+      (setq preview (concat preview rest)))
+    (pyim-process-subword-and-magic-convert preview)))
+
 (defun pyim-preview-delete-string ()
   "删除已经插入 buffer 的 preview 预览字符串。"
   (when (overlay-start pyim-preview-overlay)