[1294] 修复宏环路检测漏检并使用 pynput 覆盖粘贴弹窗及继续编辑测试

Author: da-liii

TeXmacs/tests/python/1294.py

@@ -165,6 +165,25 @@ def activate_window():
     except Exception:
         pass
 
+    try:
+        d = display.Display()
+        root = d.screen().root
+        NET_ACTIVE_WINDOW = d.intern_atom('_NET_ACTIVE_WINDOW')
+        NET_CLIENT_LIST = d.intern_atom('_NET_CLIENT_LIST')
+        prop = root.get_full_property(NET_CLIENT_LIST, Xatom.WINDOW)
+        if prop:
+            for wid in prop.value:
+                win = d.create_resource_object('window', wid)
+                c = str(win.get_wm_class() or "").lower()
+                if "stem" in c or "mogan" in c:
+                    data = [2, X.CurrentTime, 0, 0, 0]
+                    ev = event.ClientMessage(window=wid, client_type=NET_ACTIVE_WINDOW, data=(32, data))
+                    root.send_event(ev, event_mask=X.SubstructureRedirectMask | X.SubstructureNotifyMask)
+                    d.flush()
+                    break
+    except Exception:
+        pass
+
 
 def is_window_ready():
     try:
@@ -276,16 +295,58 @@ def run_case(self, case_name, tex_content):
                 print("  [!] Crashed during paste!")
                 break
 
+        # 处理可能的错误弹窗并关闭
         if not crashed:
-            print("  -> Pressing Enter...")
+            time.sleep(0.5)
+            print("  -> Closing possible error popup (Enter)...")
             self.kbd.tap(Key.enter)
+            time.sleep(0.5)
+            if not self.is_alive():
+                crashed = True
+                print("  [!] Crashed after dismissing popup!")
+
+        # 关闭弹窗后，继续编辑测试（防止损坏状态下继续操作引起崩溃）
+        if not crashed:
+            print("  -> Testing continue editing after paste...")
+            activate_window()
+            time.sleep(0.3)
+            self.mouse.position = POS_DOC
+            time.sleep(0.2)
+            self.mouse.click(Button.left)
+            time.sleep(0.3)
+
+            # 键入文本
+            self.kbd.type("testing edit after paste ")
+            time.sleep(0.3)
+            # 回车触发分段排版
+            self.kbd.tap(Key.enter)
+            time.sleep(0.3)
+            # 键入更多内容
+            self.kbd.type("continue typing 12345")
+            time.sleep(0.3)
+            # 回车
+            self.kbd.tap(Key.enter)
+            time.sleep(0.3)
+            # 退格删除
+            for _ in range(8):
+                self.kbd.tap(Key.backspace)
+                time.sleep(0.05)
+            # 光标移动
+            self.kbd.tap(Key.up)
+            time.sleep(0.1)
+            self.kbd.tap(Key.down)
+            time.sleep(0.1)
+            self.kbd.type(" finished")
+            time.sleep(0.5)
+
+            # 等待排版和可能的后台处理
             t_wait = 0.0
-            while t_wait < 3.5:
+            while t_wait < 2.5:
                 time.sleep(0.2)
                 t_wait += 0.2
                 if not self.is_alive():
                     crashed = True
-                    print("  [!] Crashed after Enter!")
+                    print("  [!] Crashed during continue editing!")
                     break
 
         status = "CRASH" if crashed else "PASS"

devel/1294.md

@@ -70,9 +70,10 @@ xmake b parsetex_test && xmake r parsetex_test
 xmake r 0620
 xmake r 0631
 
-# 2. GUI 自动化测试
+# 2. GUI 自动化测试（使用 pynput 驱动真实 GUI）
 python3 TeXmacs/tests/python/1294.py
-# 预期：1294_1.tex、1294_2.tex 和 1294_3.tex 均 PASS，进程不退出、无垃圾内容插入
+# 预期：1294_1.tex、1294_2.tex 和 1294_3.tex 均 PASS，
+# 覆盖完整流程：粘贴 -> 关闭错误弹窗 -> 继续键入/分段/删除/光标移动编辑 -> 进程均不崩溃退出
 ```
 
 ### 手动测试方法
@@ -94,3 +95,12 @@ python3 TeXmacs/tests/python/1294.py
   `generic_to_tree (s, "latex-snippet")` → scheme `convert` → `parse-latex`（C++
   `parse_latex`）→ `latex->texmacs`（C++ `latex_to_tree`）。
 - GUI 手动验证（含崩溃用例 249 现象消失）由用户执行。
+
+## 迭代改进记录
+
+- 针对 `dfd860e0f` 中精简 `tree_calls_macro` 时误删 `L(t)` 与 `COMPOUND`/`APPLY` 匹配导致 `has_macro_cycle` 漏判宏环路的问题进行了修复：
+  - `src/Plugins/Tex/fromtex_post.cpp`：恢复 `L(t)` 比较与 `COMPOUND`/`APPLY` 运算符提取，准确识别宏复合节点。
+  - `src/Plugins/Tex/tex.hpp`：导出 `bool has_macro_cycle (tree t)` 接口。
+  - `tests/Plugins/Tex/parsetex_test.cpp`：新增 `test_has_macro_cycle` 独立断言用例，覆盖自递归、带参自递归、相互递归与正常宏，杜绝漏检回归。
+  - `TeXmacs/tests/python/1294.py`：明确采用 `pynput` 完善全流程自动化测试，在粘贴后主动关闭可能的错误弹窗，并模拟用户在文档中继续输入文本、回车分段排版、退格删除以及光标移动等连续编辑操作，验证全过程均不 crash。
+

src/Plugins/Tex/fromtex_post.cpp

@@ -2541,8 +2541,15 @@ latex_to_tree_body (tree t0) {
 
 static bool
 tree_calls_macro (tree t, string name) {
-  // 宏调用在树中即同名原子叶（compound/apply 的头也是原子子节点，由递归覆盖）
   if (is_atomic (t)) return t->label == name;
+  string l= as_string (L (t));
+  if (l == name) return true;
+  if (is_func (t, COMPOUND) && N (t) > 0 && is_atomic (t[0]) &&
+      t[0]->label == name)
+    return true;
+  if (is_func (t, APPLY) && N (t) > 0 && is_atomic (t[0]) &&
+      t[0]->label == name)
+    return true;
   for (int i= 0; i < N (t); i++)
     if (tree_calls_macro (t[i], name)) return true;
   return false;
@@ -2576,7 +2583,7 @@ dfs_macro_cycle (int u, const array<array<int>>& adj, array<int>& state) {
   return false;
 }
 
-static bool
+bool
 has_macro_cycle (tree t) {
   array<string> names;
   array<tree>   bodies;

src/Plugins/Tex/tex.hpp

@@ -21,6 +21,7 @@ tree   parse_latex_document (string s, bool change= false, bool as_pic= false);
 tree   latex_to_tree (tree t);
 tree   latex_document_to_tree (string s, bool as_pic= false);
 tree   latex_class_document_to_tree (string s);
+bool   has_macro_cycle (tree t);
 string latex_verbarg_to_string (tree t);
 string get_latex_style (tree t);
 string string_arg (tree t, bool u= false);

tests/Plugins/Tex/parsetex_test.cpp

@@ -34,6 +34,7 @@ private slots:
   void test_crash_case_249 ();
   void test_crash_case_289 ();
   void test_crash_case_1294_3 ();
+  void test_has_macro_cycle ();
 };
 
 void
@@ -81,5 +82,35 @@ TestParseTex::test_crash_case_1294_3 () {
   check_crash_case ("1294_3.tex");
 }
 
+void
+TestParseTex::test_has_macro_cycle () {
+  // 1. 无参自递归: \def\foo{\foo} -> <assign|foo|<macro|<foo>>>
+  tree self_rec=
+      tuple (compound ("assign", "foo", compound ("macro", compound ("foo"))));
+  QVERIFY (has_macro_cycle (self_rec));
+
+  // 2. 带参自递归: \def\foo#1{\foo{#1}} -> <assign|foo|<macro|x|<foo|<arg|x>>>>
+  tree param_rec= tuple (compound (
+      "assign", "foo",
+      compound ("macro", "x", compound ("foo", compound ("arg", "x")))));
+  QVERIFY (has_macro_cycle (param_rec));
+
+  // 3. 相互递归: foo 调 bar, bar 调 foo
+  tree mutual_rec=
+      tuple (compound ("assign", "foo", compound ("macro", compound ("bar"))),
+             compound ("assign", "bar", compound ("macro", compound ("foo"))));
+  QVERIFY (has_macro_cycle (mutual_rec));
+
+  // 4. 非递归正常宏: foo 调内置命令，无环
+  tree normal_macro= tuple (compound (
+      "assign", "foo",
+      compound ("macro", "x", compound ("bold", compound ("arg", "x")))));
+  QVERIFY (!has_macro_cycle (normal_macro));
+
+  // 5. 普通文档无宏定义
+  tree no_macro= compound ("document", "Hello world");
+  QVERIFY (!has_macro_cycle (no_macro));
+}
+
 QTEST_MAIN (TestParseTex)
 #include "parsetex_test.moc"