fix(XMLDiff): fix skipping valid xpath step in case if "//" doesn't work with it

fix(XMLDiff): fix losing the previously gathered path if some parent is accessible via "//"
fix(XMLDiff): in total fixes #10

Author: chemodun

XMLDiff/Program.cs

@@ -662,7 +662,16 @@ private static (string step, string patchForParent) GetElementPathStep(
       string step = "";
       if (patchForParent == "")
         patchForParent = $"{element.Name.LocalName}";
-      var attributes = element.Attributes().ToList();
+      List<XAttribute> attributes = [];
+      IEnumerable<XElement> matches = parent.XPathSelectElements(patchForParent);
+      if (matches.Count() == 1 && matches.First() == element)
+      {
+        step = patchForParent;
+      }
+      else
+      {
+        attributes = element.Attributes().ToList();
+      }
       if (attributes.Count > 0)
       {
         if (pathOptions.UseAllAttributes)
@@ -671,9 +680,16 @@ private static (string step, string patchForParent) GetElementPathStep(
           foreach (var attr in attributes)
           {
             string attrValue = attr.Value.Replace("\"", "&quot;");
-            xpath += $"[@{attr.Name.LocalName}=\"{attrValue}\"]";
+            if (attrValue.Contains("'"))
+            {
+              xpath += $"[@{attr.Name.LocalName}=\"{attrValue}\"]";
+            }
+            else
+            {
+              xpath += $"[@{attr.Name.LocalName}='{attrValue}']";
+            }
           }
-          var matches = parent.XPathSelectElements(xpath);
+          matches = parent.XPathSelectElements(xpath);
           if (matches.Count() == 1 && matches.First() == element)
           {
             step = xpath;
@@ -688,8 +704,16 @@ private static (string step, string patchForParent) GetElementPathStep(
         foreach (var attr in attributes)
         {
           string attrValue = attr.Value.Replace("\"", "&quot;");
-          string xpath = $"{patchForParent}[@{attr.Name.LocalName}=\"{attrValue}\"]";
-          var matches = parent.XPathSelectElements(xpath);
+          string xpath = $"{patchForParent}";
+          if (attrValue.Contains("'"))
+          {
+            xpath += $"[@{attr.Name.LocalName}=\"{attrValue}\"]";
+          }
+          else
+          {
+            xpath += $"[@{attr.Name.LocalName}='{attrValue}']";
+          }
+          matches = parent.XPathSelectElements(xpath);
           if (matches.Count() == 1 && matches.First() == element)
           {
             if (step == "")
@@ -698,7 +722,13 @@ private static (string step, string patchForParent) GetElementPathStep(
             {
               var doc_matches = doc.XPathSelectElements($"//{xpath}");
               if (doc_matches.Count() == 1)
+              {
                 return ($"//{xpath}", patchForParent);
+              }
+              else
+              {
+                return (xpath, patchForParent);
+              }
             }
           }
         }
@@ -710,6 +740,10 @@ private static (string step, string patchForParent) GetElementPathStep(
         {
           return ($"//{patchForParent}", patchForParent);
         }
+        else
+        {
+          return (patchForParent, patchForParent);
+        }
       }
       return (step, patchForParent);
     }
@@ -736,7 +770,8 @@ private static string GenerateXPath(XElement element, PathOptions pathOptions)
           (string step, string patchForParent) = GetElementPathStep(current, parent, doc, pathOptions);
           if (step.StartsWith("//"))
           {
-            return step;
+            path.Insert(0, step);
+            return path.ToString();
           }
           if (step == "")
           {