From f2644392adf0fbaab8f429858db9aa9e64d48a3c Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 12 Jun 2025 13:32:49 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D0=BD=D0=B0=20=D0=BF=D1=83=D1=81=D1=82=D0=BE=D1=82?=
 =?UTF-8?q?=D1=83=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D0=B9?=
 =?UTF-8?q?=20=D0=BF=D1=80=D0=B8=20=D1=80=D0=B0=D1=81=D0=BF=D0=B0=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=BA=D0=B5=20++?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  3 ++
 properties                                    |  2 +-
 src/_VisualDVM/Constants.java                 |  2 +-
 .../Passes/All/SPF_InsertIncludesPass.java    | 36 +++++++++++++++----
 .../ProjectData/Project/db_project_info.java  | 18 +++++-----
 .../Transformation/IncludeToInsertJson.java   |  7 ++--
 6 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index bebddfcb..d7aa18bc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,7 +8,10 @@
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
       <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/SPF_InsertIncludesPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/db_project_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/db_project_info.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/Transformation/IncludeToInsertJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/Transformation/IncludeToInsertJson.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/properties b/properties
index 9ba582ab..9f6592fd 100644
--- a/properties
+++ b/properties
@@ -4,7 +4,7 @@
   "ServerUserPassword": "mprit_2011",
   "OfferRegistrationOnStart": true,
   "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "E:\\Tests\\Downloads\\composit_1749198959",
+  "ProjectsSearchDirectory": "E:\\Tests\\Downloads\\bugreport_1749652835\\tmp_influxsys\\v3",
   "DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system",
   "VisualiserPath": "C:\\Users\\misha\\Downloads",
   "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index d6db99f4..4cade4b4 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
 
 import java.util.Vector;
 public class Constants {
-    public static final int version = 1252;
+    public static final int version = 1253;
     public static final int planner_version = 24;
     public static final int testingMaxKernels = 64;
     //--
diff --git a/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java b/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java
index 45c82f25..823aca00 100644
--- a/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java
+++ b/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java
@@ -6,14 +6,9 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Sapfor.SapforTransformation;
 import _VisualDVM.ProjectData.SapforData.Includes.Analysis.FileInfo;
 import _VisualDVM.ProjectData.SapforData.Includes.Analysis.Include;
-import _VisualDVM.ProjectData.SapforData.Includes.Transformation.IncludeToInsertJson;
-import _VisualDVM.ProjectData.SapforData.Includes.Transformation.IncludesToInsertJson;
 
 import java.util.Vector;
 import java.util.stream.Collectors;
-
-
-
 public class SPF_InsertIncludesPass extends SapforTransformation {
     @Override
     protected PassCode necessary() {
@@ -21,6 +16,34 @@ public class SPF_InsertIncludesPass extends SapforTransformation {
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
+        if (super.canStart(args)) {
+            if (target.numAddicted <= 0) {
+                Log.Writeln_("Не найдено файлов, имеющих зависимости по включению.");
+                return false;
+            }
+            Vector<String> Result = new Vector<>();
+            for (FileInfo fileInfo : target.addictedFiles.values()) {
+                Vector<Include> selected_children = fileInfo.dependencies.stream().filter(Selectable::isSelected).collect(Collectors.toCollection(Vector::new));
+                if (!selected_children.isEmpty()) {
+                    Result.add(fileInfo.file);
+                    Result.add(String.valueOf(selected_children.size()));
+                    for (Include di : selected_children) {
+                        Result.add(String.valueOf(di.line));
+                        Result.add(di.dependencyFileName);
+                    }
+                }
+            }
+            if (Result.isEmpty()) {
+                Log.Writeln_("Не отмечено ни одного заголовка для подстановки");
+                return false;
+            }
+            Options = Utils_.toU(String.join("|", Result));
+            return true;
+        }
+        return false;
+    }
+
+        /*
         if (super.canStart(args)) {
             if (target.numAddicted <= 0) {
                 Log.Writeln_("Не найдено файлов, имеющих зависимости по включению.");
@@ -41,7 +64,8 @@ public class SPF_InsertIncludesPass extends SapforTransformation {
             return true;
         }
         return false;
-    }
+
+         */
     @Override
     protected void FocusBeforeStart() {
         Global.mainModule.getUI().getMainWindow().getProjectWindow().FocusDependencies();
diff --git a/src/_VisualDVM/ProjectData/Project/db_project_info.java b/src/_VisualDVM/ProjectData/Project/db_project_info.java
index 6bdedaf0..a56d8362 100644
--- a/src/_VisualDVM/ProjectData/Project/db_project_info.java
+++ b/src/_VisualDVM/ProjectData/Project/db_project_info.java
@@ -1141,15 +1141,17 @@ public class db_project_info extends DBObject {
     }
     ///------------------------------------------------------------------------------------------->>>>>
     public void unpackMessagesAndLog(String packed_messages, String log_in) throws Exception {
-        MessagesJson messages = Utils_.gson.fromJson(packed_messages, MessagesJson.class);
-        for (FileMessagesJson fileMessages: messages.allMessages){
-            fileMessages.file=Utils_.toW(fileMessages.file);
-            //--
-            DBProjectFile messageFile = db.files.Data.get(fileMessages.file);
-            for (Message message: fileMessages.messages){
-                messageFile.AddNewMessage(message);
+        if (!packed_messages.isEmpty()) {
+            MessagesJson messages = Utils_.gson.fromJson(packed_messages, MessagesJson.class);
+            for (FileMessagesJson fileMessages : messages.allMessages) {
+                fileMessages.file = Utils_.toW(fileMessages.file);
+                //--
+                DBProjectFile messageFile = db.files.Data.get(fileMessages.file);
+                for (Message message : fileMessages.messages) {
+                    messageFile.AddNewMessage(message);
+                }
+                messageFile.father.db.Update(messageFile);
             }
-            messageFile.father.db.Update(messageFile);
         }
         Log = log_in;
         Update();
diff --git a/src/_VisualDVM/ProjectData/SapforData/Includes/Transformation/IncludeToInsertJson.java b/src/_VisualDVM/ProjectData/SapforData/Includes/Transformation/IncludeToInsertJson.java
index 2428681e..8907637c 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Includes/Transformation/IncludeToInsertJson.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Includes/Transformation/IncludeToInsertJson.java
@@ -9,13 +9,12 @@ public class IncludeToInsertJson {
     @Expose
     public int line;
     //--
-    public IncludeToInsertJson(){
-
+    public IncludeToInsertJson() {
     }
     //--
-    public IncludeToInsertJson(String includeName_in, String fileName_in, int line_in){
+    public IncludeToInsertJson(String includeName_in, String fileName_in, int line_in) {
         includeName = Utils_.toU(includeName_in);
         fileName = Utils_.toU(fileName_in);
-        line= line_in;
+        line = line_in;
     }
 }