From b900622e4e3bd396634b014cef448bc12bcf2e5b Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 26 Mar 2025 00:11:41 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=BC=D0=B5=D0=B6=D1=83?=
 =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D1=8B=D0=B9.=20=D0=B8=D1=81=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D0=BB=20=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=B2=D0=B8=D0=B4=D0=B8=D0=BC=D1=8B=D0=B9=20=D1=81=D0=B8=D0=BC?=
 =?UTF-8?q?=D0=B2=D0=BE=D0=BB=20=D0=B4=D0=BB=D1=8F=20=D0=BE=D0=B1=D0=BE?=
 =?UTF-8?q?=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B7=D0=BB=D0=B8=D1=87=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 36 -------------------
 properties                                    |  4 +--
 .../Visual/Menus/MainMenuBar/MainMenuBar.java |  3 +-
 .../Visual/Windows/ComparisonForm.java        | 14 +++++---
 4 files changed, 13 insertions(+), 44 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ac806ae4..8b14fc43 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,45 +7,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/com/github/difflib/DiffUtils.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/github/difflib/UnifiedDiffUtils.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/github/difflib/algorithm/Change.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/github/difflib/algorithm/DiffAlgorithmFactory.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/github/difflib/algorithm/DiffAlgorithmI.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/github/difflib/algorithm/DiffAlgorithmListener.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/github/difflib/algorithm/myers/MyersDiff.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/github/difflib/algorithm/myers/MyersDiffWithLinearSpace.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/github/difflib/algorithm/myers/PathNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/github/difflib/patch/AbstractDelta.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/github/difflib/patch/ChangeDelta.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/github/difflib/patch/Chunk.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/github/difflib/patch/ConflictOutput.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/github/difflib/patch/DeleteDelta.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/github/difflib/patch/DeltaType.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/github/difflib/patch/DiffException.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/github/difflib/patch/EqualDelta.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/github/difflib/patch/InsertDelta.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/github/difflib/patch/Patch.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/github/difflib/patch/PatchFailedException.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/github/difflib/patch/VerifyChunk.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/github/difflib/text/DiffRow.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/github/difflib/text/DiffRowGenerator.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/github/difflib/text/StringUtils.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/github/difflib/text/deltamerge/DeltaMergeUtils.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/github/difflib/text/deltamerge/InlineDeltaMergeInfo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/github/difflib/unifieddiff/UnifiedDiff.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/github/difflib/unifieddiff/UnifiedDiffFile.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/github/difflib/unifieddiff/UnifiedDiffParserException.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/github/difflib/unifieddiff/UnifiedDiffReader.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/github/difflib/unifieddiff/UnifiedDiffWriter.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/github/difflib/unifieddiff/package-info.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/artifacts/VisualSapfor_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/artifacts/VisualSapfor_jar.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/TestPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/TestPass.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VersionsComparisonMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VersionsComparisonMenu.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ComparisonForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/properties b/properties
index 240df601..0e490eeb 100644
--- a/properties
+++ b/properties
@@ -4,7 +4,7 @@
   "ServerUserPassword": "mprit_2011",
   "OfferRegistrationOnStart": true,
   "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "E:\\Tests\\Downloads\\bugreport_1742890241",
+  "ProjectsSearchDirectory": "E:\\BUG",
   "DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system",
   "VisualiserPath": "C:\\Users\\misha\\Downloads",
   "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
@@ -15,7 +15,7 @@
   "AutoTestsLoad": true,
   "ConfirmPassesStart": true,
   "ShowPassesDone": true,
-  "FocusPassesResult": false,
+  "FocusPassesResult": true,
   "collapseCredentials": true,
   "collapseFileGraphs": false,
   "collapseFileMessages": false,
diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
index 32c30481..c27e7eda 100644
--- a/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
+++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
@@ -67,7 +67,7 @@ public class MainMenuBar extends VisualiserMenuBar {
         setPreferredSize(new Dimension(0, 30));
         //--
 
-
+/*
         add(new MenuBarButton() {
             {
                 setIcon("/Common/icons/Apply.png");
@@ -77,6 +77,7 @@ public class MainMenuBar extends VisualiserMenuBar {
                 });
             }
         });
+ */
         //--
         add(new JSeparator());
         add(MachineButton = new MenuBarButton() {
diff --git a/src/_VisualDVM/Visual/Windows/ComparisonForm.java b/src/_VisualDVM/Visual/Windows/ComparisonForm.java
index 6b618046..bc01700e 100644
--- a/src/_VisualDVM/Visual/Windows/ComparisonForm.java
+++ b/src/_VisualDVM/Visual/Windows/ComparisonForm.java
@@ -9,6 +9,9 @@ import Common.Visual.Menus.VisualiserMenuBar;
 import Common.Visual.UI;
 import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
 import _VisualDVM.Utils;
+import com.github.difflib.DiffUtils;
+import com.github.difflib.patch.AbstractDelta;
+import com.github.difflib.patch.Patch;
 import com.github.difflib.text.DiffRow;
 import com.github.difflib.text.DiffRowGenerator;
 import javafx.util.Pair;
@@ -16,7 +19,6 @@ import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaHighlighter;
 import org.fife.ui.rtextarea.RTextScrollPane;
 
 import javax.swing.*;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Vector;
 import java.util.regex.Matcher;
@@ -48,6 +50,8 @@ public abstract class ComparisonForm<T> {
     //-----
     private boolean events_on = false;//относится только к мастеру, отвечает за скроллы.
     private int current_diff_line = -1;
+    final String separator = "\u200B";
+    //невидимый пробел https://translated.turbopages.org/proxy_u/en-ru.ru.898e1daf-67e318c0-3fccff8a-74722d776562/https/stackoverflow.com/questions/17978720/invisible-characters-ascii
     //--->>
     //   protected Object ownScrollModel = null;
     //---<<
@@ -160,8 +164,8 @@ public abstract class ComparisonForm<T> {
                 .showInlineDiffs(true)
                 .inlineDiffByWord(true)
                 .ignoreWhiteSpaces(true)
-                .oldTag(f -> "~")
-                .newTag(f -> "**")
+                .oldTag(f -> separator)
+                .newTag(f -> separator)
                 .build();
         List<DiffRow> rows = generator.generateDiffRows(
                 visible_lines,
@@ -176,7 +180,7 @@ public abstract class ComparisonForm<T> {
         Body.setCaretPosition(0);
         slave.Body.setCaretPosition(0);
         //--
-        Pattern master_pattern = Pattern.compile("~.*~");
+        Pattern master_pattern = Pattern.compile(separator + ".*" + separator);
         Matcher master_matcher = master_pattern.matcher(Body.getText());
         while (master_matcher.find()) {
             Body.getHighlighter().addHighlight(
@@ -185,7 +189,7 @@ public abstract class ComparisonForm<T> {
                     SPFEditor.RedTextPainter
             );
         }
-        Pattern slave_pattern = Pattern.compile("\\*.*\\*");
+        Pattern slave_pattern = Pattern.compile(separator + ".*" + separator);
         Matcher slave_matcher = slave_pattern.matcher(slave.Body.getText());
         while (slave_matcher.find()) {
             slave_highlighter.addHighlight(