refactor(diff): get rid of own indentation, it is in-place

fix(diff): fix XPath generation

Author: chemodun

XMLDiff/Program.cs

@@ -211,10 +211,7 @@ private static void ProcessSingleFile(string originalXmlPath, string modifiedXml
                 XDocument modifiedDoc = XDocument.Load(modifiedXmlPath);
                 Logger.Info($"Parsed modified XML: {modifiedXmlPath}");
 
-                string indentStr = DetectIndentation(originalXmlPath);
-                Logger.Info($"Detected indentation: {ConsoleEscape(indentStr)}");
-
-                XElement diffRoot = GenerateDiff(originalDoc, modifiedDoc, indentStr);
+                XElement diffRoot = GenerateDiff(originalDoc, modifiedDoc);
 
                 if (!diffRoot.HasElements)
                 {
@@ -223,7 +220,6 @@ private static void ProcessSingleFile(string originalXmlPath, string modifiedXml
                 }
 
                 XDocument diffDoc = new XDocument(new XDeclaration("1.0", "utf-8", "yes"), diffRoot);
-                IndentXml(diffDoc, indentStr);
 
 
                 diffDoc.Save(diffXmlPath);
@@ -317,33 +313,26 @@ private static string DetectIndentation(string xmlPath)
 
         #region Diff Generation
 
-        private static XElement GenerateDiff(XDocument original, XDocument modified, string indentStr)
+        private static XElement GenerateDiff(XDocument original, XDocument modified)
         {
             XElement diffRoot = new XElement("diff");
             if (original.Root == null || modified.Root == null)
             {
                 Logger.Error("Original or modified XML does not have a root element.");
                 return diffRoot;
             }
-            CompareElements(original, modified, diffRoot, indentStr);
+            CompareElements(original, modified, diffRoot);
             return diffRoot;
         }
 
-        private static bool CompareElements(XDocument original, XDocument modified, XElement diffRoot, string indentStr, XElement ?originalElem = null, XElement ?modifiedElem = null, bool checkOnly = false)
+        private static bool CompareElements(XDocument original, XDocument modified, XElement diffRoot, XElement ?originalElem = null, XElement ?modifiedElem = null, bool checkOnly = false)
         {
             if (originalElem != null && modifiedElem != null)
             {
                 if (originalElem.Name != modifiedElem.Name)
                 {
-                    if (!checkOnly) {
-                        string sel = GenerateXPath(originalElem, original.Root);
-                        XElement replaceOp = new XElement("replace",
-                            new XAttribute("sel", sel),
-                            modifiedElem
-                        );
-                        diffRoot.Add(replaceOp);
-                        Logger.Debug($"Replaced element '{originalElem.Name}' with '{modifiedElem.Name}'.");
-                    }
+                    // Process can be there only in case of changes detection, not for the real diff generation
+                    Logger.Error($"Element names do not match: {originalElem.Name} vs {modifiedElem.Name}");
                     return true;
                 }
 
@@ -470,14 +459,14 @@ private static bool CompareElements(XDocument original, XDocument modified, XEle
                             return true;
                         }
                         matchedEnough = false;
-                        if (! CompareElements(original, modified, diffRoot, indentStr, originalChild, modifiedChild, true)) {
+                        if (! CompareElements(original, modified, diffRoot, originalChild, modifiedChild, true)) {
                             bool nextMatched = true;
                             if ( i + 1 < originalChildren.Count && j + 1 < modifiedChildren.Count) {
                                 XElement originalTemp = new XElement("temp");
                                 originalTemp.Add(originalChildren[i + 1]);
                                 XElement modifiedTemp = new XElement("temp");
                                 modifiedTemp.Add(modifiedChildren[j + 1]);
-                                nextMatched = ! CompareElements(original, modified, diffRoot, indentStr, originalTemp, modifiedTemp, true);
+                                nextMatched = ! CompareElements(original, modified, diffRoot, originalTemp, modifiedTemp, true);
                             }
                             if (nextMatched) {
                                 if (savedOp != null) {
@@ -490,7 +479,7 @@ private static bool CompareElements(XDocument original, XDocument modified, XEle
                     }
                     Logger.Debug($"Matched enough: {matchedEnough}, i: {i}, j: {j}");
                     if (matchedEnough) {
-                        if (CompareElements(original, modified, diffRoot, indentStr, originalChild, modifiedChild, checkOnly))
+                        if (CompareElements(original, modified, diffRoot, originalChild, modifiedChild, checkOnly))
                         {
                             if (checkOnly) {
                                 return true;
@@ -516,8 +505,8 @@ private static bool CompareElements(XDocument original, XDocument modified, XEle
                             {
                                 var addedChild = modifiedChildren[l];
                                 XElement addOp = new XElement("add",
-                                    new XAttribute("sel", GenerateXPath(addedChild, original.Root)),
-                                    new XAttribute("pos", "after"),
+                                    new XAttribute("sel", GenerateXPath(originalChild, originalChild.Document.Root)),
+                                    new XAttribute("pos", "before"),
                                     addedChild
                                 );
                                 diffRoot.Add(addOp);
@@ -580,7 +569,7 @@ private static string GenerateXPath(XElement element, XElement? root)
 
             var path = new System.Text.StringBuilder();
             XElement? current = element;
-            while (current != null && current != root)
+            while (current != null)
             {
                 string step = current.Name.LocalName;
                 var siblings = current.Parent?.Elements(current.Name.LocalName).ToList();
@@ -630,16 +619,6 @@ private static string GenerateXPath(XElement element, XElement? root)
 
         #endregion
 
-        #region XML Indentation
-
-        private static void IndentXml(XDocument doc, string indentStr)
-        {
-            // Currently, XDocument.Save with SaveOptions.None preserves indentation
-            // Custom indentation can be implemented if necessary
-        }
-
-        #endregion
-
         #region Diff Validation
 
         private static bool ValidateXsdPath(string? xsdPath)