From cde8c2123c939417f45a4945e5439ea5cf9cee16 Mon Sep 17 00:00:00 2001
From: Qijia Liu <liumeo@pku.edu.cn>
Date: Thu, 26 Oct 2023 16:38:42 -0700
Subject: [PATCH] support predict plugin (#748)

---
 .github/workflows/release-ci.yml | 4 ++--
 Dockerfile                       | 1 +
 README.md                        | 5 +++--
 tools/rime_api_console.cc        | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml
index 53b8728b1..25486d7bf 100644
--- a/.github/workflows/release-ci.yml
+++ b/.github/workflows/release-ci.yml
@@ -13,12 +13,12 @@ jobs:
     uses: ./.github/workflows/macos-build.yml
     with:
       build_variant: '-universal'
-      rime_plugins: hchunhui/librime-lua lotem/librime-octagram
+      rime_plugins: hchunhui/librime-lua lotem/librime-octagram rime/librime-predict
 
   windows:
     uses: ./.github/workflows/windows-build.yml
     with:
-      rime_plugins: hchunhui/librime-lua lotem/librime-octagram
+      rime_plugins: hchunhui/librime-lua lotem/librime-octagram rime/librime-predict
 
   release:
     needs: [macos, windows]
diff --git a/Dockerfile b/Dockerfile
index be7de39ff..e2cac2632 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,6 +20,7 @@ COPY / /librime
 WORKDIR /librime/plugins
 RUN git clone https://github.com/rime/librime-charcode charcode && \
   git clone https://github.com/hchunhui/librime-lua lua && \
+  git clone https://github.com/rime/librime-predict predict && \
   git clone https://github.com/lotem/librime-octagram octagram
 
 WORKDIR /librime
diff --git a/README.md b/README.md
index 508cc1b09..4731b9fb8 100644
--- a/README.md
+++ b/README.md
@@ -85,12 +85,13 @@ Community:
 
 Plugins
 ===
-  - [librime-charcode](https://github.com/rime/librime-charcode) Module that
+  - [librime-charcode](https://github.com/rime/librime-charcode) (Deprecated) Module that
     deals with character encoding; depends on boost::locale and ICU libraries
-  - [librime-legacy](https://github.com/rime/librime-legacy) Legacy module with
+  - [librime-legacy](https://github.com/rime/librime-legacy) (Deprecated) Legacy module with
     GPL-licensed code
   - [librime-lua](https://github.com/hchunhui/librime-lua) Lua scripting
   - [librime-octagram](https://github.com/lotem/librime-octagram) Language model
+  - [librime-predict](https://github.com/rime/librime-predict) Predict next word
   - [librime-proto](https://github.com/lotem/librime-proto) IPC using CapnProto
 
 Related works
diff --git a/tools/rime_api_console.cc b/tools/rime_api_console.cc
index 0e62f69fe..e3cb274ac 100644
--- a/tools/rime_api_console.cc
+++ b/tools/rime_api_console.cc
@@ -66,10 +66,10 @@ void print_menu(RimeMenu* menu) {
 void print_context(RimeContext* context) {
   if (context->composition.length > 0) {
     print_composition(&context->composition);
-    print_menu(&context->menu);
   } else {
     printf("(not composing)\n");
   }
+  print_menu(&context->menu);
 }
 
 void print(RimeSessionId session_id) {