From 50237a34ccd652cd2da36487d6a08a6554b1512c Mon Sep 17 00:00:00 2001
From: RememBerBer <rememberber@163.com>
Date: Sun, 28 Sep 2025 14:13:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4diff=E5=B7=A5=E5=85=B7TextAre?=
 =?UTF-8?q?a=E5=AE=9E=E7=8E=B0=E7=B1=BB=E4=B8=BARegexRSyntaxTextViewer?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E4=BE=BF=E6=9B=B4=E5=A5=BD=E7=9A=84=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E9=BB=91/=E7=99=BD=E4=B8=BB=E9=A2=98=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E5=90=8E=E7=9A=84=E8=A1=A8=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../moo/tool/ui/component/TopMenuBar.java           |  9 +++++----
 .../moo/tool/ui/form/func/TextDiffForm.java         | 13 +++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/luoboduner/moo/tool/ui/component/TopMenuBar.java b/src/main/java/com/luoboduner/moo/tool/ui/component/TopMenuBar.java
index d4425f36..246f3a10 100644
--- a/src/main/java/com/luoboduner/moo/tool/ui/component/TopMenuBar.java
+++ b/src/main/java/com/luoboduner/moo/tool/ui/component/TopMenuBar.java
@@ -12,10 +12,7 @@ import com.luoboduner.moo.tool.ui.component.textviewer.QuickNoteRSyntaxTextViewe
 import com.luoboduner.moo.tool.ui.component.textviewer.QuickNoteRSyntaxTextViewerManager;
 import com.luoboduner.moo.tool.ui.dialog.*;
 import com.luoboduner.moo.tool.ui.form.MainWindow;
-import com.luoboduner.moo.tool.ui.form.func.HostForm;
-import com.luoboduner.moo.tool.ui.form.func.JavaConsoleForm;
-import com.luoboduner.moo.tool.ui.form.func.JsonBeautyForm;
-import com.luoboduner.moo.tool.ui.form.func.RegexForm;
+import com.luoboduner.moo.tool.ui.form.func.*;
 import com.luoboduner.moo.tool.util.SystemUtil;
 import com.luoboduner.moo.tool.util.UpgradeUtil;
 
@@ -447,6 +444,10 @@ public class TopMenuBar extends JMenuBar {
         JavaConsoleForm.getInstance().getScrollPane().updateTheme();
         JavaConsoleForm.getInstance().getScrollPane().updateUI();
 
+        TextDiffForm.getInstance().getLeftTextArea().updateTheme();
+        TextDiffForm.getInstance().getRightTextArea().updateTheme();
+
+
         SwingUtilities.updateComponentTreeUI(App.popupMenu);
         App.popupMenu.updateUI();
     }
diff --git a/src/main/java/com/luoboduner/moo/tool/ui/form/func/TextDiffForm.java b/src/main/java/com/luoboduner/moo/tool/ui/form/func/TextDiffForm.java
index 8f007578..198a02f5 100644
--- a/src/main/java/com/luoboduner/moo/tool/ui/form/func/TextDiffForm.java
+++ b/src/main/java/com/luoboduner/moo/tool/ui/form/func/TextDiffForm.java
@@ -12,6 +12,7 @@ import com.luoboduner.moo.tool.dao.TFuncContentMapper;
 import com.luoboduner.moo.tool.domain.TFuncContent;
 import com.luoboduner.moo.tool.service.DiffService;
 import com.luoboduner.moo.tool.ui.FuncConsts;
+import com.luoboduner.moo.tool.ui.component.textviewer.RegexRSyntaxTextViewer;
 import com.luoboduner.moo.tool.ui.listener.func.TextDiffListener;
 import com.luoboduner.moo.tool.util.MybatisUtil;
 import com.luoboduner.moo.tool.util.ScrollUtil;
@@ -76,9 +77,9 @@ public class TextDiffForm {
     private JScrollPane unifiedScrollPane;
     private JPanel unifiedPanel;
 
-    private RSyntaxTextArea leftTextArea;
-    private RSyntaxTextArea rightTextArea;
-    private RSyntaxTextArea unifiedTextArea;
+    private RegexRSyntaxTextViewer leftTextArea;
+    private RegexRSyntaxTextViewer rightTextArea;
+    private RegexRSyntaxTextViewer unifiedTextArea;
 
     // Diff highlight painters
     private final DefaultHighlighter.DefaultHighlightPainter delPainter =
@@ -139,7 +140,7 @@ public class TextDiffForm {
      */
     private void initTextAreas() {
         // 左侧文本区域
-        leftTextArea = new RSyntaxTextArea();
+        leftTextArea = new RegexRSyntaxTextViewer();
         leftTextArea.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_NONE);
         leftTextArea.setCodeFoldingEnabled(true);
         leftTextArea.setAntiAliasingEnabled(true);
@@ -150,7 +151,7 @@ public class TextDiffForm {
         leftTextArea.setCaretPosition(0);
 
         // 右侧文本区域
-        rightTextArea = new RSyntaxTextArea();
+        rightTextArea = new RegexRSyntaxTextViewer();
         rightTextArea.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_NONE);
         rightTextArea.setCodeFoldingEnabled(true);
         rightTextArea.setAntiAliasingEnabled(true);
@@ -161,7 +162,7 @@ public class TextDiffForm {
         rightTextArea.setCaretPosition(0);
 
         // 统一diff显示区域
-        unifiedTextArea = new RSyntaxTextArea();
+        unifiedTextArea = new RegexRSyntaxTextViewer();
         unifiedTextArea.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_JAVA);
         unifiedTextArea.setCodeFoldingEnabled(true);
         unifiedTextArea.setAntiAliasingEnabled(true);