From b79e45ad36962c4dd88ce2e6f9a03fb2e87f602b Mon Sep 17 00:00:00 2001 From: Blair Conrad Date: Thu, 17 Oct 2019 12:51:53 -0400 Subject: [PATCH] Remove option to skip formatting of argument values --- src/FakeItEasy/OutputWriterExtensions.cs | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/src/FakeItEasy/OutputWriterExtensions.cs b/src/FakeItEasy/OutputWriterExtensions.cs index afd4868b6..53780f1e1 100644 --- a/src/FakeItEasy/OutputWriterExtensions.cs +++ b/src/FakeItEasy/OutputWriterExtensions.cs @@ -57,9 +57,8 @@ public static IOutputWriter Write(this IOutputWriter writer, object value) /// /// The writer to write to. /// The values to write to the writer. - /// Specify that argument values should not be formatted. /// The writer. - internal static IOutputWriter WriteArgumentValues(this IOutputWriter writer, IEnumerable values, bool skipFormatting = false) + internal static IOutputWriter WriteArgumentValues(this IOutputWriter writer, IEnumerable values) { Guard.AgainstNull(writer, nameof(writer)); Guard.AgainstNull(values, nameof(values)); @@ -67,14 +66,14 @@ internal static IOutputWriter WriteArgumentValues(this IOutputWriter writer, IEn var list = values.AsList(); if (list.Count <= 5) { - writer.WriteArgumentValuesImpl(list, skipFormatting); + writer.WriteArgumentValuesImpl(list); } else { - writer.WriteArgumentValuesImpl(list.Take(2), skipFormatting); + writer.WriteArgumentValuesImpl(list.Take(2)); int remainingCount = list.Count - 4; writer.Write($", … ({remainingCount} more elements) …, "); - writer.WriteArgumentValuesImpl(list.Skip(list.Count - 2), skipFormatting); + writer.WriteArgumentValuesImpl(list.Skip(list.Count - 2)); } return writer; @@ -85,9 +84,8 @@ internal static IOutputWriter WriteArgumentValues(this IOutputWriter writer, IEn /// /// The writer to write to. /// The values to write to the writer. - /// Specify that argument values should not be formatted. /// The writer. - private static IOutputWriter WriteArgumentValuesImpl(this IOutputWriter writer, IEnumerable values, bool skipFormatting = false) + private static IOutputWriter WriteArgumentValuesImpl(this IOutputWriter writer, IEnumerable values) { bool first = true; foreach (var value in values) @@ -97,14 +95,7 @@ private static IOutputWriter WriteArgumentValuesImpl(this IOutputWriter writer, writer.Write(", "); } - if (skipFormatting) - { - writer.Write(value); - } - else - { - writer.WriteArgumentValue(value); - } + writer.WriteArgumentValue(value); first = false; }