Allow use [词组] in extra dict text format

fcitx · Nov 19, 2024 · 86d1651 · 86d1651
1 parent 003f74d
commit 86d1651
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/libime/table/tablebaseddictionary.cpp b/src/libime/table/tablebaseddictionary.cpp
@@ -1082,7 +1082,8 @@ size_t TableBasedDictionary::loadExtra(std::istream &in, TableFormat format) {
                 continue;
             }
             boost::trim_if(buf, isSpaceCheck);
-            if (buf == ExtraDictPhraseMark) {
+            if (buf == strConst[0][STR_PHRASE] ||
+                buf == strConst[1][STR_PHRASE]) {
                 state = ExtraDictState::Phrase;
                 continue;
             }

diff --git a/test/testtable.cpp b/test/testtable.cpp
@@ -321,7 +321,7 @@ void testEscape() {
     FCITX_ASSERT(out.str() == expect) << out.str();
 }
 
-void testOneMatchingWord() {
+void testExtraDict() {
     libime::TableBasedDictionary table;
     {
         std::string test = "KeyCode=abcdefghijklmnopqrstuvwxy\n"
@@ -361,9 +361,20 @@ void testOneMatchingWord() {
     FCITX_ASSERT(extraIndex == 1);
     table.saveExtra(extraIndex, std::cout, libime::TableFormat::Text);
     testMatchIndex(table, "xynn", 4);
+
+    // Test load [词组]
+    table.removeAllExtra();
+    {
+        std::string test = "[词组]\n统计局\n";
+        std::stringstream ss(test);
+        extraIndex = table.loadExtra(ss, TableFormat::Text);
+    }
+    FCITX_ASSERT(extraIndex == 0);
+    table.saveExtra(extraIndex, std::cout, libime::TableFormat::Text);
+    testMatchIndex(table, "xynn", 3);
 }
 
-void testExtraDict() {
+void testOneMatchingWord() {
 
     std::string test = "KeyCode=abcdefghijklmnopqrstuvwxy\n"
                        "Length=4\n"