Fix #181: XML Processing instructions changed automatically (#215)

* Use XmlNode.Name in PI-Processing relates Issue #181 * Add test case based in Issue #181 Extended bug scenario by using multiple processing instructions at once. * Update handling of process instructions * Remove unnecessary whitespace * Reduce test-files to its minimum Use interpolation instead of String.Builder
Xavalon · Dec 3, 2019 · eb43352 · eb43352
1 parent f0548bd
commit eb43352
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 2 deletions.
diff --git a/XamlStyler.Core/DocumentProcessors/ProcessInstructionDocumentProcessor.cs b/XamlStyler.Core/DocumentProcessors/ProcessInstructionDocumentProcessor.cs
@@ -29,7 +29,7 @@ public void Process(XmlReader xmlReader, StringBuilder output, ElementProcessCon
                 output.Append(Environment.NewLine);
             }
 
-            output.Append(currentIndentString).Append("<?Mapping ").Append(xmlReader.Value).Append(" ?>");
+            output.Append($"{currentIndentString}<?{xmlReader.Name} {xmlReader.Value}?>");
         }
     }
 }
diff --git a/XamlStyler.UnitTests/FileHandlingIntegrationTests.cs b/XamlStyler.UnitTests/FileHandlingIntegrationTests.cs
@@ -294,6 +294,12 @@ public void TestAttributeOrderRuleGroupsOnSeparateLinesHandling()
             this.DoTest(stylerOptions);
         }
 
+        [Test]
+        public void TestProcessingInstructionHandling()
+        {
+            this.DoTest(this.GetLegacyStylerOptions());
+        }
+
         [Test]
         public void TestXmlnsAliasesHandling()
         {
@@ -459,7 +465,7 @@ private void DoTestCase<T>(
             [System.Runtime.CompilerServices.CallerMemberName] string callerMemberName = "")
         {
             FileHandlingIntegrationTests.DoTest(
-                stylerOptions, 
+                stylerOptions,
                 Path.Combine("TestFiles", callerMemberName),
                 testIdentifier.ToString());
         }

diff --git a/XamlStyler.UnitTests/TestFiles/TestProcessingInstructionHandling.expected b/XamlStyler.UnitTests/TestFiles/TestProcessingInstructionHandling.expected
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<?xaml-comp compile="true"?>
+<?Mapping compile="true"?>
+<XmlRoot />
diff --git a/XamlStyler.UnitTests/TestFiles/TestProcessingInstructionHandling.testxaml b/XamlStyler.UnitTests/TestFiles/TestProcessingInstructionHandling.testxaml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<?xaml-comp compile="true"?>
+<?Mapping compile="true"?>
+<XmlRoot />
diff --git a/XamlStyler.UnitTests/XamlStyler.UnitTest.csproj b/XamlStyler.UnitTests/XamlStyler.UnitTest.csproj
@@ -92,6 +92,12 @@
     <None Include="TestFiles\TestAttributeIndentationHandling_0.expected">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="TestFiles\TestProcessingInstructionHandling.expected">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="TestFiles\TestProcessingInstructionHandling.testxaml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="TestFiles\TestSingleLineNestedMarkupExtensions.expected">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>