Update cskk version to latest

Author: naokiri

CMakeLists.txt

@@ -21,7 +21,8 @@ find_package(PkgConfig REQUIRED)
 find_package(Fcitx5Core 5.0.6 REQUIRED)
 find_package(Fcitx5Utils 5.0.6 REQUIRED)
 
-pkg_check_modules(LIBCSKK REQUIRED IMPORTED_TARGET "cskk>=0.12.0")
+# GITHUB_ACTION_BUILD_CSKK_VERSION=1.0.1
+pkg_check_modules(LIBCSKK REQUIRED IMPORTED_TARGET "cskk>=1.0")
 
 option(ENABLE_QT "Enable Qt for GUI configuration" On)
 

bin/cskk_version.sh

@@ -2,4 +2,4 @@
 # Run from repository root and output cskk version from CMakeLists.txt
 # Helper for release automation
 set -e
-cat CMakeLists.txt | sed -n -e "s/pkg_check_modules(LIBCSKK REQUIRED IMPORTED_TARGET \"cskk>=\(.*\)\")/\1/p"
+cat CMakeLists.txt | sed -n -e "s/# GITHUB_ACTION_BUILD_CSKK_VERSION=\(.*\)/\1/p"

src/cskk.cpp

@@ -510,16 +510,17 @@ FcitxCskkContext::formatPreedit(CskkStateInfoFfi *cskkStateInfoArray,
           cskkStateInfo.composition_selection_state_info;
       mainContent.append(selection_marker, TextFormatFlag::DontCommit);
       mainCursorIdx += selection_marker.length();
+      std::string tmpContentString;
       if (compositionSelectionStateInfo.composited) {
         mainCursorIdx += strlen(compositionSelectionStateInfo.composited);
-        mainContent.append(compositionSelectionStateInfo.composited,
-                           TextFormatFlag::Underline);
+        tmpContentString.append(compositionSelectionStateInfo.composited);
       }
       if (compositionSelectionStateInfo.okuri) {
         mainCursorIdx += strlen(compositionSelectionStateInfo.okuri);
-        mainContent.append(compositionSelectionStateInfo.okuri,
-                           TextFormatFlag::Underline);
+        tmpContentString.append(compositionSelectionStateInfo.okuri);
       }
+      mainContent.append(tmpContentString, TextFormatFlag::Underline);
+
       if (compositionSelectionStateInfo.annotation) {
         supplementContent.clear();
         supplementContent.append(compositionSelectionStateInfo.annotation,