Fixes #34 - Markup extension formatting does work as expected when ne…

…sted
Xavalon · Dec 13, 2016 · 1e09904 · 1e09904
1 parent b7c776d
commit 1e09904
Show file tree

Hide file tree

Showing 9 changed files with 82 additions and 4 deletions.
diff --git a/XamlStyler.Core/MarkupExtensions/Formatter/MarkupExtensionFormatter.cs b/XamlStyler.Core/MarkupExtensions/Formatter/MarkupExtensionFormatter.cs
@@ -9,12 +9,15 @@ namespace Xavalon.XamlStyler.Core.MarkupExtensions.Formatter
     public class MarkupExtensionFormatter
     {
         private readonly IList<string> singleLineTypes;
-        private readonly MarkupExtensionFormatterBase singleLineFormatter = new SingleLineMarkupExtensionFormatter();
-        private readonly MarkupExtensionFormatterBase multiLineFormatter = new MultiLineMarkupExtensionFormatter();
+        private readonly MarkupExtensionFormatterBase singleLineFormatter;
+        private readonly MarkupExtensionFormatterBase multiLineFormatter;
 
         public MarkupExtensionFormatter(IList<string> singleLineTypes)
         {
             this.singleLineTypes = singleLineTypes;
+
+            this.singleLineFormatter = new SingleLineMarkupExtensionFormatter(this);
+            this.multiLineFormatter = new MultiLineMarkupExtensionFormatter(this);
         }
 
         /// <summary>

diff --git a/XamlStyler.Core/MarkupExtensions/Formatter/MarkupExtensionFormatterBase.cs b/XamlStyler.Core/MarkupExtensions/Formatter/MarkupExtensionFormatterBase.cs
@@ -9,6 +9,13 @@ namespace Xavalon.XamlStyler.Core.MarkupExtensions.Formatter
 {
     internal abstract class MarkupExtensionFormatterBase
     {
+        protected readonly MarkupExtensionFormatter markupExtensionFormatter;
+
+        protected MarkupExtensionFormatterBase(MarkupExtensionFormatter markupExtensionFormatter)
+        {
+            this.markupExtensionFormatter = markupExtensionFormatter;
+        }
+
         public IEnumerable<string> Format(MarkupExtension markupExtension)
         {
             return markupExtension.Arguments.Any()
@@ -29,7 +36,16 @@ protected IEnumerable<string> Format(Argument argument)
 
             if (type == typeof(PositionalArgument))
             {
-                return this.Format((PositionalArgument)argument);
+                var positionalArgument = (PositionalArgument)argument;
+
+                if (positionalArgument.Value.GetType() == typeof(MarkupExtension))
+                {
+                    return this.markupExtensionFormatter.Format((MarkupExtension)positionalArgument.Value);
+                }
+                else
+                {
+                    return this.Format(positionalArgument);
+                }
             }
 
             throw new ArgumentException($"Unhandled type {type.FullName}", nameof(argument));

diff --git a/XamlStyler.Core/MarkupExtensions/Formatter/MultiLineMarkupExtensionFormatter.cs b/XamlStyler.Core/MarkupExtensions/Formatter/MultiLineMarkupExtensionFormatter.cs
@@ -7,6 +7,11 @@ namespace Xavalon.XamlStyler.Core.MarkupExtensions.Formatter
 {
     internal class MultiLineMarkupExtensionFormatter : MarkupExtensionFormatterBase
     {
+        internal MultiLineMarkupExtensionFormatter(MarkupExtensionFormatter markupExtensionFormatter)
+            : base(markupExtensionFormatter)
+        {
+        }
+
         protected override IEnumerable<string> Format(Argument[] arguments)
         {
             var list = new List<string>();

diff --git a/XamlStyler.Core/MarkupExtensions/Formatter/SingleLineMarkupExtensionFormatter.cs b/XamlStyler.Core/MarkupExtensions/Formatter/SingleLineMarkupExtensionFormatter.cs
@@ -8,6 +8,11 @@ namespace Xavalon.XamlStyler.Core.MarkupExtensions.Formatter
 {
     internal class SingleLineMarkupExtensionFormatter : MarkupExtensionFormatterBase
     {
+        internal SingleLineMarkupExtensionFormatter(MarkupExtensionFormatter markupExtensionFormatter)
+            : base(markupExtensionFormatter)
+        {
+        }
+
         protected override IEnumerable<string> Format(Argument[] arguments)
         {
             StringBuilder stringBuilder = new StringBuilder();

diff --git a/XamlStyler.Core/MarkupExtensions/Parser/MarkupExtension.cs b/XamlStyler.Core/MarkupExtensions/Parser/MarkupExtension.cs
@@ -64,7 +64,7 @@ private static IEnumerable<Argument> GetArguments(IEnumerable<ParseTreeNode> nod
                 else
                 {
                     // Unwrap argument.
-                    foreach (var markupExtensionArgument in GetArguments(node.ChildNodes))
+                    foreach (var markupExtensionArgument in MarkupExtension.GetArguments(node.ChildNodes))
                     {
                         yield return markupExtensionArgument;
                     }

diff --git a/XamlStyler.UnitTests/FileHandlingIntegrationTests.cs b/XamlStyler.UnitTests/FileHandlingIntegrationTests.cs
@@ -174,6 +174,20 @@ public void TestMarkupExtensionHandling(bool indentWithTabs, int tabSize)
             this.DoTestCase(stylerOptions, $"{tabSize}_{(indentWithTabs ? "tabs" : "spaces")}");
         }
 
+        [Test]
+        public void TestNestedCustomMarkupExtensionsWithBindings()
+        {
+            var stylerOptions = new StylerOptions(
+                config: this.GetConfiguration(@"TestConfigurations\LegacyTestSettings.json"))
+            {
+                KeepFirstAttributeOnSameLine = false,
+                AttributesTolerance = 1,
+                NoNewLineMarkupExtensions = "x:Bind, Binding"
+            };
+
+            this.DoTest(stylerOptions);
+        }
+
         [Test]
         public void TestMarkupWithAttributeNotOnFirstLine()
         {

diff --git a/XamlStyler.UnitTests/TestFiles/TestNestedCustomMarkupExtensionsWithBindings.expected b/XamlStyler.UnitTests/TestFiles/TestNestedCustomMarkupExtensionsWithBindings.expected
@@ -0,0 +1,16 @@
+<Window
+  x:Class="WpfApplication.MainWindow"
+  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:local="clr-namespace:WpfApplication"
+  Title="MainWindow">
+  <Grid>
+    <Button
+      Content="Click Me"
+      Foreground="Black"
+      IsEnabled="{LogicalAnd {Binding IsWritable},
+                             {Binding ElementName=CheckBox, Path=IsChecked},
+                             {CustomMarkupExtension ElementName=CheckBox,
+                                                    Path=IsChecked}}" />
+  </Grid>
+</Window>
diff --git a/XamlStyler.UnitTests/TestFiles/TestNestedCustomMarkupExtensionsWithBindings.testxaml b/XamlStyler.UnitTests/TestFiles/TestNestedCustomMarkupExtensionsWithBindings.testxaml
@@ -0,0 +1,13 @@
+<Window
+  x:Class="WpfApplication.MainWindow"
+  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:local="clr-namespace:WpfApplication"
+  Title="MainWindow">
+  <Grid>
+    <Button
+      Content="Click Me"
+      Foreground="Black"
+      IsEnabled="{LogicalAnd {Binding IsWritable}, {Binding ElementName=CheckBox, Path=IsChecked}, {CustomMarkupExtension ElementName=CheckBox, Path=IsChecked}}" />
+  </Grid>
+</Window>
diff --git a/XamlStyler.UnitTests/XamlStyler.UnitTest.csproj b/XamlStyler.UnitTests/XamlStyler.UnitTest.csproj
@@ -128,6 +128,12 @@
     <None Include="TestFiles\TestAttributeIndentationHandling_0.expected">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="TestFiles\TestNestedCustomMarkupExtensionsWithBindings.testxaml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="TestFiles\TestNestedCustomMarkupExtensionsWithBindings.expected">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="TestFiles\TestCommentHandling_1.expected">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>