Commit: 14d693b8a8ad77af24f48f1aa371b7efb35a3356 - ibus-cp-decorator (git)

Commit MetaInfo

• Revision: 14d693b8a8ad77af24f48f1aa371b7efb35a3356 (tree)
• Time: 2020-10-04 06:27:48
• Author: dyknon <dyknon@user...>
• Commiter: dyknon

Log Message

simplify

Change Summary

• modified: extroot/extension.js

Incremental Difference

--- a/extroot/extension.js
+++ b/extroot/extension.js
@@ -133,10 +133,11 @@ function connect_signals(candidate_popup){
   _preedit_handle_id = candidate_popup._panelService.connect(
     "update-preedit-text",
     (ps, text, cursorPosition, visible) => {
-      // cursorPosition:  index start from 0; counting Unicode characters.
-      //                  XXX: How about combining characters?
-      // text.get_text(): Javascript string object.
-      //                  Its indexes are based on UTF-16 code units.
+      // Text length and position representations
+      // iBus:       index start from 0; counting Unicode characters.
+      //             XXX: How about combining characters?
+      // Javascript: Counts UTF-16 code units.
+      // Pango:      Counts UTF-8 bytes.
       const text_string = text.get_text();
       let newstring = text_string;
       const attrs = text.get_attributes();
@@ -145,16 +146,23 @@ function connect_signals(candidate_popup){
         let unicode_count = 0;
         let utf16_count = 0;
         let utf8_count = 0;
-        while(utf16_count < text_string.length){
-          if(_cursor_letter !== void 0 && cursorPosition == unicode_count){
-            if(!_cursor_combining || unicode_count){
+        let cursor = () => {};
+        if(_cursor_letter !== void 0){
+          cursor = () => {
+            if(
+              cursorPosition == unicode_count
+              && (!_cursor_combining || unicode_count)
+            ){
               newstring = "";
               newstring += text_string.substring(0, utf16_count);
               newstring += _cursor_letter;
               newstring += text_string.substring(utf16_count);
               utf8_count += _cursor_utf8_cnt;
             }
-          }
+          };
+        }
+        while(utf16_count < text_string.length){
+          cursor();
 
           const code = text_string.codePointAt(utf16_count);
           if(code > 0xffff){
@@ -168,15 +176,7 @@ function connect_signals(candidate_popup){
 
           utf8i.push(utf8_count);
         }
-        if(_cursor_letter !== void 0 && cursorPosition == unicode_count){
-          if(!_cursor_combining || unicode_count){
-            newstring = "";
-            newstring += text_string.substring(0, utf16_count);
-            newstring += _cursor_letter;
-            newstring += text_string.substring(utf16_count);
-            utf8_count += _cursor_utf8_cnt;
-          }
-        }
+        cursor();
       }
 
       candidate_popup._preeditText.text = newstring;