From be8a076bb12b497dff46f508279d9ac20baade63 Mon Sep 17 00:00:00 2001
From: amzxyz <rcm@qq.com>
Date: Sun, 18 Jan 2026 16:51:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B6=85=E7=BA=A7=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0CJK=E5=8C=BA=E5=9F=9F=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/super_comment_preedit.lua | 109 +++++++++++++++++++++++-----------
 1 file changed, 75 insertions(+), 34 deletions(-)

diff --git a/lua/super_comment_preedit.lua b/lua/super_comment_preedit.lua
index a2b2c04..49396a6 100644
--- a/lua/super_comment_preedit.lua
+++ b/lua/super_comment_preedit.lua
@@ -116,45 +116,82 @@ end
 -- ----------------------
 -- 部件组字返回的注释
 -- ----------------------
----@return string
-local function get_az_comment(_, env, initial_comment)
-    if not initial_comment or initial_comment == "" then return "〔无〕" end
-    local final_comment = nil
-    local auto_delimiter = env.settings.auto_delimiter or " "
-    -- 拆分初始评论为多个段落
-    local segments = {}
-    for segment in initial_comment:gmatch("[^%s]+") do
-        table.insert(segments, segment)
-    end
-    local semicolon_count = select(2, segments[1]:gsub(";", "")) -- 使用第一个段来判断分号的数量
-    local pinyins = {}
-    local fuzhu = nil
-    for _, segment in ipairs(segments) do
-        local pinyin = segment:match("^[^;~]+")
-        local fz = nil
+local function get_charset_label(text)
+    if not text or text == "" then return nil end
+    local cp = utf8.codepoint(text)
+    if not cp then return nil end
 
-        if semicolon_count == 1 then
-            -- 一个分号：取后段
-            fz = segment:match(";(.+)$")
-        else
-            -- 无分号不取辅助码
-            fz = nil
+    -- 按照 Unicode 区块频率排序
+    if cp >= 0x4E00   and cp <= 0x9FFF  then return "基本" end
+    if cp >= 0x3400   and cp <= 0x4DBF  then return "扩A" end
+    if cp >= 0x20000  and cp <= 0x2A6DF then return "扩B" end
+    if cp >= 0x2A700  and cp <= 0x2B73F then return "扩C" end
+    if cp >= 0x2B740  and cp <= 0x2B81F then return "扩D" end
+    if cp >= 0x2B820  and cp <= 0x2CEAF then return "扩E" end
+    if cp >= 0x2CEB0  and cp <= 0x2EBEF then return "扩F" end
+    if cp >= 0x2EBF0  and cp <= 0x2EE5F then return "扩I" end
+    if cp >= 0x30000  and cp <= 0x3134F then return "扩G" end
+    if cp >= 0x31350  and cp <= 0x323AF then return "扩H" end
+    
+    -- 兼容区
+    if cp >= 0xF900   and cp <= 0xFAFF  then return "兼容" end
+    if cp >= 0x2F800  and cp <= 0x2FA1F then return "兼容" end
+
+    return nil
+end
+
+local function get_az_comment(cand, env, initial_comment)
+    local inner_parts = {}
+    
+    -- 音形注释拆解逻辑
+    if initial_comment and initial_comment ~= "" then
+        local segments = {}
+        for segment in string.gmatch(initial_comment, "[^%s]+") do
+            table.insert(segments, segment)
         end
+        
+        if #segments > 0 then
+            local semicolon_count = select(2, string.gsub(segments[1], ";", ""))
+            local pinyins = {}
+            local fuzhu = nil
+            
+            for _, segment in ipairs(segments) do
+                local pinyin = string.match(segment, "^[^;~]+")
+                local fz = nil
 
-        if pinyin then table.insert(pinyins, pinyin) end
-        if not fuzhu and fz and fz ~= "" then fuzhu = fz end
-    end
+                if semicolon_count == 1 then
+                    fz = string.match(segment, ";(.+)$")
+                end
 
-    -- 拼接结果
-    if #pinyins > 0 then
-        local pinyin_str = table.concat(pinyins, ",")
-        if fuzhu then
-            final_comment = string.format("〔音%s 辅%s〕", pinyin_str, fuzhu)
-        else
-            final_comment = string.format("〔音%s〕", pinyin_str)
+                if pinyin then 
+                    table.insert(pinyins, pinyin) 
+                end
+                if not fuzhu and fz and fz ~= "" then fuzhu = fz end
+            end
+
+            if #pinyins > 0 then
+                local pinyin_str = table.concat(pinyins, ",")
+                table.insert(inner_parts, string.format("音%s", pinyin_str))
+                
+                if fuzhu then
+                    table.insert(inner_parts, string.format("辅%s", fuzhu))
+                end
+            end
         end
     end
-    return final_comment or "〔无〕"
+
+    if cand and cand.text then
+        local label = get_charset_label(cand.text)
+        if label then
+            table.insert(inner_parts, label)
+        end
+    end
+
+    if #inner_parts == 0 then
+        return "〔无〕"
+    end
+    -- 使用间隔号连接
+    return "〔" .. table.concat(inner_parts, "・") .. "〕"
 end
 -- ----------------------
 -- # 辅助码提示或带调全拼注释模块 (Fuzhu)
@@ -526,7 +563,11 @@ function ZH.func(input, env)
                 final_comment = az_comment
             end
         end
-
+        if cand.type == "user_phrase" then  -- 用户字典
+            final_comment = final_comment .. "⋆"
+        elseif cand.type == "sentence" then  -- 造句
+            final_comment = final_comment .. "∞"
+        end
         -- 应用注释
         if final_comment ~= initial_comment then
             genuine_cand.comment = final_comment