++

fix бага со слиянием

.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$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CombineFiles.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CombineFiles.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

properties

@@ -4,7 +4,7 @@
   "ServerUserPassword": "mprit_2011",
   "OfferRegistrationOnStart": true,
   "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "E:\\BUG",
+  "ProjectsSearchDirectory": "E:\\Tests\\Downloads\\bugreport_1747072936\\test_routine_7",
   "DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system",
   "VisualiserPath": "C:\\Users\\misha\\Downloads",
   "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",

src/_VisualDVM/Constants.java

@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
 
 import java.util.Vector;
 public class Constants {
-    public static final int version = 1246;
+    public static final int version = 1247;
     public static final int planner_version = 24;
     public static final int testingMaxKernels = 64;
     //--

src/_VisualDVM/Passes/All/CombineFiles.java

@@ -1,5 +1,6 @@
 package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
+import Common.Visual.UI;
 import Common.Visual.Windows.Dialog.Text.ComboTextDialog;
 import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor;
 import _VisualDVM.ComponentsServer.Component.Sapfor.TransformationPermission;
@@ -54,9 +55,11 @@ public class CombineFiles extends Transformation {
         Vector<String> result_lines = new Vector<>();
         Vector<String> all_includes = new Vector<>();
         //-----------------------------
+
         result_lines.add("!-Found " + target.allIncludes.size() + " headers");
+        System.out.println("found "+target.allIncludes.size()+" headers");
         for (String name : target.allIncludes) {
-            all_includes.add("      include " + Utils_.Quotes(Utils_.toU(name)));
+            all_includes.add("      include " + Utils_.Quotes(Utils_.toU(name))); //---
             result_lines.add("!      include " + Utils_.Quotes(Utils_.toU(name)));
         }
         result_lines.add("!-Collapse-" + target.files_order.size() + " files");
@@ -76,8 +79,7 @@ public class CombineFiles extends Transformation {
                     String header = Utils.extractHeaderName(line);
                     if (header != null) {
                         if (file.dependencies.contains(header))
-                            result_lines.add("      include " + Utils_.Quotes(
+                            result_lines.add("      include " + Utils_.Quotes(Utils_.toU(header)));
-                                    Utils_.toU(header)));
                     } else
                         result_lines.add(line);
                 }
@@ -86,6 +88,7 @@ public class CombineFiles extends Transformation {
                 result_lines.addAll(FileUtils.readLines(target.db.files.Data.get(name).file));
             }
         }
+
         FileUtils.writeLines(result, result_lines, false);
         //-------------------------------
         //теперь скопировать остальные файлы

src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java

@@ -1,5 +1,6 @@
 package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
+import Common.Visual.UI;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Sapfor.SapforAnalysis;
@@ -46,13 +47,16 @@ public class SPF_GetIncludeDependencies extends SapforAnalysis {
             DBProjectFile file = target.db.files.get(fileIncludesJson.file);
             System.out.println("addicted file = "+Utils_.Brackets(fileIncludesJson.file));
             System.out.println("found dependencies :"+fileIncludesJson.includes.size());
+          ///  UI.Info("+");
             for (Include include : fileIncludesJson.includes) {
                 //--
+                System.out.println(include.dependencyFileName);
+                System.out.println(include.line);
                 include.dependencyFileName = Utils_.toW(include.dependencyFileName);
                 //--
                 fileInfo.dependencies.add(include);
-                if (!target.allIncludes.contains(include.file))
+                if (!target.allIncludes.contains(include.dependencyFileName))
-                    target.allIncludes.add(include.file);
+                    target.allIncludes.add(include.dependencyFileName);
                 if (target.db.files.containsKey(include.dependencyFileName)){
                     //- определение типов языков инклудов по файлу куда они цепляютс.
                     if (!file.dependencies.contains(include.dependencyFileName)) {
@@ -87,6 +91,7 @@ public class SPF_GetIncludeDependencies extends SapforAnalysis {
         }
         target.numAddicted += target.addictedFiles.size();
         target.UpdateAddictedCount();
+      //  UI.Info("unpack includes done");
     }
     @Override
     protected void showDone() throws Exception {

src/_VisualDVM/Utils.java

@@ -291,9 +291,9 @@ public class Utils {
                 if (res.startsWith("\\")) {
                     res = res.substring(1);
                 }
+                System.out.println(res);
             }
         }
-        System.out.println(res);
         return res;
     }
     public static String getRelativeName(File dir, File file) {