From a0c45a2df0c0842cf26c743bc01b5ce2fe771652 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 15 Apr 2025 00:02:43 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BD=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D1=81=20?=
 =?UTF-8?q?=D0=B8=D0=BD=D0=BA=D0=BB=D1=83=D0=B4=D0=B0=D0=BC=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  7 +++--
 properties                                    |  2 +-
 src/_VisualDVM/Passes/All/CombineFiles.java   |  5 ++--
 .../All/SPF_GetIncludeDependencies.java       | 30 +++++++++++++------
 .../ProjectData/Files/DBProjectFile.java      |  5 ++--
 src/_VisualDVM/Utils.java                     | 11 +++++--
 .../Visual/Menus/MainEditorMenu.java          |  4 +--
 7 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d25d3925..fec036c6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,9 +8,12 @@
   <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/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/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/SapforData/Includes/Include.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Includes/Include.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/DBProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/DBProjectFile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainEditorMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainEditorMenu.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 639df675..0939001d 100644
--- a/properties
+++ b/properties
@@ -4,7 +4,7 @@
   "ServerUserPassword": "mprit_2011",
   "OfferRegistrationOnStart": true,
   "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "E:\\SAPFOR\\Tests\\BT_inserted",
+  "ProjectsSearchDirectory": "E:\\Tests\\Downloads\\bug_1643809587",
   "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/Passes/All/CombineFiles.java b/src/_VisualDVM/Passes/All/CombineFiles.java
index a7fdb814..d76a34a6 100644
--- a/src/_VisualDVM/Passes/All/CombineFiles.java
+++ b/src/_VisualDVM/Passes/All/CombineFiles.java
@@ -75,10 +75,9 @@ public class CombineFiles extends Transformation {
                 for (String line : file_lines) {
                     String header = Utils.extractHeaderName(line);
                     if (header != null) {
-                        if (file.relativeHeaders.containsKey(header))
+                        if (file.dependencies.contains(header))
                             result_lines.add("      include " + Utils_.Quotes(
-                                    Utils_.toU(
-                                            file.relativeHeaders.get(header).name)));
+                                    Utils_.toU(header)));
                     } else
                         result_lines.add(line);
                 }
diff --git a/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java b/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java
index 5533d56a..8e5c2894 100644
--- a/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java
+++ b/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java
@@ -9,7 +9,8 @@ import _VisualDVM.ProjectData.Files.LanguageStyle;
 import _VisualDVM.ProjectData.LanguageName;
 import _VisualDVM.ProjectData.SapforData.Includes.FileInfo;
 import _VisualDVM.ProjectData.SapforData.Includes.Include;
-import _VisualDVM.Utils;
+import _VisualDVM.ProjectData.SapforData.Includes.Json.FileIncludesJson;
+import _VisualDVM.ProjectData.SapforData.Includes.Json.IncludesJson;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 public class SPF_GetIncludeDependencies extends SapforAnalysis {
@@ -30,12 +31,21 @@ public class SPF_GetIncludeDependencies extends SapforAnalysis {
         target.includes_root.removeAllChildren();
         target.allIncludes.clear();
         for (DBProjectFile file : target.db.files.Data.values())
-            file.relativeHeaders.clear();
+            file.dependencies.clear();
     }
     @Override
     public void unpack(String packed) throws Exception {
-       // IncludesJson includesJson = Utils_.gson.fromJson(packed, IncludesJson.class);
-       // System.out.println("packed="+packed);
+        /*
+        IncludesJson includesJson = Utils_.gson.fromJson(packed, IncludesJson.class);
+        System.out.println("packed="+packed);
+        for (FileIncludesJson fileIncludesJson : includesJson.allIncludes) {
+            String file_name = Utils_.toW(fileIncludesJson.file);
+            DBProjectFile dbProjectFile = target.db.files.get(file_name);
+            for (Include include : fileIncludesJson.includes)
+                dbProjectFile.dependencies.add(include.dependencyFileName);
+        }
+         */
+        //--
         update_current = false;
         FileInfo fileInfo = null;
         String[] data_ = packed.split("@");
@@ -56,16 +66,18 @@ public class SPF_GetIncludeDependencies extends SapforAnalysis {
                             if (!target.addictedFiles.containsKey(fileInfo.file))
                                 target.addictedFiles.put(fileInfo.file, fileInfo);
                             //-------------------------------------
-                            String file_name = data__[j];
-                            if (target.db.files.containsKey(file_name)) {
-                                DBProjectFile d_file = target.db.files.Data.get(file_name);
+                            String include_name = data__[j];
+                            if (target.db.files.containsKey(include_name)) {
+                                DBProjectFile d_file = target.db.files.Data.get(include_name);
                                 //----------------->>
                                 if (!target.allIncludes.containsKey(d_file.name))
                                     target.allIncludes.put(d_file.name, d_file);
                                 //----------------->>
+                                //--
                                 DBProjectFile father = target.db.files.Data.get(fileInfo.file);
-                                father.relativeHeaders.put(Utils.getRelativeName(father.file.getParentFile(), d_file.file), d_file);
-                                // if (d_file.fileType == FileType.none)
+                                if (!father.dependencies.contains(include_name))
+                                    father.dependencies.add(include_name);
+                                //--
                                 d_file.UpdateType(FileType.header);
                                 if (d_file.languageName == LanguageName.n)
                                     d_file.UpdateLanguage(father.languageName);
diff --git a/src/_VisualDVM/ProjectData/Files/DBProjectFile.java b/src/_VisualDVM/ProjectData/Files/DBProjectFile.java
index 972938d4..8257e9cb 100644
--- a/src/_VisualDVM/ProjectData/Files/DBProjectFile.java
+++ b/src/_VisualDVM/ProjectData/Files/DBProjectFile.java
@@ -14,6 +14,7 @@ import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
 import _VisualDVM.ProjectData.SapforData.Functions.FuncCall;
 import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
 import _VisualDVM.ProjectData.SapforData.Functions.FunctionType;
+import _VisualDVM.ProjectData.SapforData.Includes.Include;
 import _VisualDVM.ProjectData.SapforData.Loops.Loop;
 import _VisualDVM.Utils;
 import _VisualDVM.Visual.Windows.FileForm;
@@ -63,7 +64,7 @@ public class DBProjectFile extends ProjectFile {
     public LinkedHashMap<Integer, Loop> AllLoops = new LinkedHashMap<>();
     public LinkedHashMap<String, FuncInfo> function_decls = new LinkedHashMap<>(); //объявления
     public Vector<ArrayDecl> array_decls = new Vector<>();
-    public LinkedHashMap<String, DBProjectFile> relativeHeaders = new LinkedHashMap<>();
+    public Vector<String> dependencies = new Vector<>();
     public GCOV_info gcov_info = new GCOV_info();
     private PrintStream Sys;
     public DBProjectFile() {
@@ -228,7 +229,7 @@ public class DBProjectFile extends ProjectFile {
         AllLoops.clear();
         CallGraphTitle = Constants.no_data;
         function_decls.clear();
-        relativeHeaders.clear();
+        dependencies.clear();
         ArrayGraphTitle = Constants.no_data;
         array_decls.clear();
         gcov_info.clear();
diff --git a/src/_VisualDVM/Utils.java b/src/_VisualDVM/Utils.java
index d1c8a0d8..9538df66 100644
--- a/src/_VisualDVM/Utils.java
+++ b/src/_VisualDVM/Utils.java
@@ -286,12 +286,19 @@ public class Utils {
     }
     //</editor-fold>
     public static String extractHeaderName(String line) {
+        String res =null;
         String tline = line.trim().toLowerCase();
         if (tline.startsWith("include")) {
             String[] data = tline.split("'");
-            return data.length > 1 ? data[1] : null;
+            res = data.length > 1 ? Utils_.toW(data[1]) : null;
+            if (res!=null){
+                if (res.startsWith("\\")){
+                    res= res.substring(1);
+                }
+            }
         }
-        return null;
+        System.out.println(res);
+        return res;
     }
     public static String getRelativeName(File dir, File file) {
         return
diff --git a/src/_VisualDVM/Visual/Menus/MainEditorMenu.java b/src/_VisualDVM/Visual/Menus/MainEditorMenu.java
index 9404be55..98cbb81d 100644
--- a/src/_VisualDVM/Visual/Menus/MainEditorMenu.java
+++ b/src/_VisualDVM/Visual/Menus/MainEditorMenu.java
@@ -280,11 +280,11 @@ public class MainEditorMenu extends TextEditorMenu {
                 m_gotoHeader.setText("Невозможно перейти к заголовочному файлу. Выполните проход \"Поиск зависимостей по включению\"");
                 return;
             }
-            if (!Global.mainModule.getFile().relativeHeaders.containsKey(header_)) {
+            if (!Global.mainModule.getFile().dependencies.contains(header_)) {
                 m_gotoHeader.setText("Невозможно перейти к заголовочному файлу " + Utils_.Brackets(header_) + " . Файл не найден среди включений текущего файла.");
                 return;
             }
-            header = Global.mainModule.getFile().relativeHeaders.get(header_);
+            header = Global.mainModule.getProject().db.files.get(header_);
             m_gotoHeader.setText("Переход к заголовочному файлу " + Utils_.Brackets(header_));
             m_gotoHeader.setEnabled(true);
         }