refactor(XMLDiff): extract attribute to XPath element conversion into a separate method

refactor(XMLDiff): always include the first attribute in the XPath element
refactor(XMLDiff): if one of attribute is not enough to identify the element, include step by step next attributes

Author: chemodun

XMLDiff/Program.cs

@@ -747,6 +747,19 @@ private static bool CompareElements(
       return false;
     }
 
+    private static string AttributeToXpathElement(XAttribute attr)
+    {
+      string attrValue = attr.Value.Replace("\"", """);
+      if (attrValue.Contains("'"))
+      {
+        return $"[@{attr.Name.LocalName}=\"{attrValue}\"]";
+      }
+      else
+      {
+        return $"[@{attr.Name.LocalName}='{attrValue}']";
+      }
+    }
+
     private static (string step, string patchForParent) GetElementPathStep(
       XElement element,
       XElement parent,
@@ -763,6 +776,10 @@ private static (string step, string patchForParent) GetElementPathStep(
       if (patchForParent == "")
         patchForParent = $"{element.Name.LocalName}";
       List<XAttribute> attributes = [];
+      if (element.FirstAttribute != null)
+      {
+        patchForParent += AttributeToXpathElement(element.FirstAttribute);
+      }
       IEnumerable<XElement> matches = parent.XPathSelectElements(patchForParent);
       if (matches.Count() == 1 && matches.First() == element)
       {
@@ -774,20 +791,12 @@ private static (string step, string patchForParent) GetElementPathStep(
       }
       if (attributes.Count > 0)
       {
+        string xpath = $"{patchForParent}";
         if (pathOptions.UseAllAttributes)
         {
-          string xpath = $"{patchForParent}";
           foreach (var attr in attributes)
           {
-            string attrValue = attr.Value.Replace("\"", "&quot;");
-            if (attrValue.Contains("'"))
-            {
-              xpath += $"[@{attr.Name.LocalName}=\"{attrValue}\"]";
-            }
-            else
-            {
-              xpath += $"[@{attr.Name.LocalName}='{attrValue}']";
-            }
+            xpath += AttributeToXpathElement(attr);
           }
           matches = parent.XPathSelectElements(xpath);
           if (matches.Count() == 1 && matches.First() == element)
@@ -801,18 +810,11 @@ private static (string step, string patchForParent) GetElementPathStep(
             }
           }
         }
+        xpath = $"{patchForParent}";
         foreach (var attr in attributes)
         {
           string attrValue = attr.Value.Replace("\"", "&quot;");
-          string xpath = $"{patchForParent}";
-          if (attrValue.Contains("'"))
-          {
-            xpath += $"[@{attr.Name.LocalName}=\"{attrValue}\"]";
-          }
-          else
-          {
-            xpath += $"[@{attr.Name.LocalName}='{attrValue}']";
-          }
+          xpath += AttributeToXpathElement(attr);
           matches = parent.XPathSelectElements(xpath);
           if (matches.Count() == 1 && matches.First() == element)
           {