Revert "cleanup"

This reverts commit 9a2059e.

docs/ApprovalTests/Reporters.md

@@ -42,6 +42,9 @@ Extend `IApprovalFailureReporter`. For example a file can be launched on failure
 <!-- snippet: FileLauncherReporter.cs -->
 <a id='snippet-FileLauncherReporter.cs'></a>
 ```cs
+using System.Diagnostics;
+using ApprovalTests.Core;
+
 namespace ApprovalTests.Reporters;
 
 public class FileLauncherReporter : IApprovalFailureReporter
@@ -55,7 +58,7 @@ public class FileLauncherReporter : IApprovalFailureReporter
     }
 }
 ```
-<sup><a href='/src/ApprovalTests/Reporters/FileLauncherReporter.cs#L1-L12' title='Snippet source file'>snippet source</a> | <a href='#snippet-FileLauncherReporter.cs' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/ApprovalTests/Reporters/FileLauncherReporter.cs#L1-L15' title='Snippet source file'>snippet source</a> | <a href='#snippet-FileLauncherReporter.cs' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 
@@ -98,7 +101,7 @@ MyGetReporter.INSTANCE,
 GoContinuousDeliveryReporter.INSTANCE,
 AppVeyorReporter.INSTANCE
 ```
-<sup><a href='/src/ApprovalTests/Reporters/DefaultFrontLoaderReporter.cs#L9-L19' title='Snippet source file'>snippet source</a> | <a href='#snippet-continuous_integration' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/ApprovalTests/Reporters/DefaultFrontLoaderReporter.cs#L11-L21' title='Snippet source file'>snippet source</a> | <a href='#snippet-continuous_integration' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 You can add to this by configuring the FrontLoadedReporter Annotation.

docs/ApprovalTests/explanations/MainConcepts.md

@@ -121,7 +121,7 @@ Eventually, all Verify methods call:
 ```cs
 public static void Verify(IApprovalWriter writer, IApprovalNamer namer, IApprovalFailureReporter reporter)
 ```
-<sup><a href='/src/ApprovalTests/Approvals.cs#L31-L33' title='Snippet source file'>snippet source</a> | <a href='#snippet-complete_verify_call' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/ApprovalTests/Approvals.cs#L38-L40' title='Snippet source file'>snippet source</a> | <a href='#snippet-complete_verify_call' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 Most of the time this is hidden in an underlying a Verify call.
@@ -143,7 +143,7 @@ If you simply wanted to format text this is usually done in a separate step befo
 ```cs
 public static void VerifyWithExtension(string text, string fileExtensionWithDot, Func<string, string> scrubber = null)
 ```
-<sup><a href='/src/ApprovalTests/Approvals.cs#L134-L136' title='Snippet source file'>snippet source</a> | <a href='#snippet-verify_with_extension' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/ApprovalTests/Approvals.cs#L141-L143' title='Snippet source file'>snippet source</a> | <a href='#snippet-verify_with_extension' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 

docs/ApprovalUtilities/readme.md

@@ -17,7 +17,7 @@ Guards are convenient functions if incorrect values are passed in.
 ```cs
 Guard.AgainstNullAndEmpty(subdirectory, nameof(subdirectory));
 ```
-<sup><a href='/src/ApprovalTests/Namers/UseApprovalSubdirectoryAttribute.cs#L7-L9' title='Snippet source file'>snippet source</a> | <a href='#snippet-guard_usage' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/ApprovalTests/Namers/UseApprovalSubdirectoryAttribute.cs#L9-L11' title='Snippet source file'>snippet source</a> | <a href='#snippet-guard_usage' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 

src/ApprovalTests/AlwaysWorksReporter.cs

@@ -1,6 +1,13 @@
-class AlwaysWorksReporter(IApprovalFailureReporter reporter) :
-    IEnvironmentAwareReporter
+using ApprovalTests.Core;
+
+class AlwaysWorksReporter : IEnvironmentAwareReporter
 {
+    readonly IApprovalFailureReporter reporter;
+
+    public AlwaysWorksReporter(IApprovalFailureReporter reporter) =>
+        this.reporter = reporter;
+
+
     public void Report(string approved, string received) =>
         reporter.Report(approved, received);
 

src/ApprovalTests/Approvals.cs

@@ -1,8 +1,15 @@
 using ApprovalTests.Approvers;
+using ApprovalTests.Core;
 using ApprovalTests.Html;
+using ApprovalTests.Namers;
+using ApprovalTests.Reporters;
+using ApprovalTests.Scrubber;
+using ApprovalTests.Utilities;
+using ApprovalTests.Writers;
 using ApprovalTests.Xml;
 using ApprovalUtilities.CallStack;
 using ApprovalUtilities.Persistence;
+using ApprovalUtilities.Utilities;
 
 namespace ApprovalTests;
 

src/ApprovalTests/Approvers/FileApprover.cs

@@ -1,3 +1,4 @@
+using ApprovalTests.Core;
 using ApprovalTests.Core.Exceptions;
 using EmptyFiles;
 

src/ApprovalTests/Combinations/CombinationApprovals.cs

@@ -1,4 +1,5 @@
 using System.Globalization;
+using System.Text;
 
 namespace ApprovalTests.Combinations;
 

src/ApprovalTests/Email/EmailApprovals.cs

@@ -1,4 +1,6 @@
 using System.Net.Mail;
+using ApprovalTests.Scrubber;
+using ApprovalTests.Writers;
 
 namespace ApprovalTests.Email;
 

src/ApprovalTests/Events/EventApprovals.cs

@@ -1,4 +1,5 @@
-using ApprovalUtilities.Reflection;
+using System.Text;
+using ApprovalUtilities.Reflection;
 
 namespace ApprovalTests.Events;
 

src/ApprovalTests/ExceptionalExceptions/ExceptionalId.cs

@@ -1,3 +1,5 @@
+using ApprovalUtilities.Utilities;
+
 namespace ApprovalTests.ExceptionalExceptions;
 
 public class ExceptionalId

src/ApprovalTests/Maintenance/ApprovalMaintenance.cs

@@ -1,5 +1,6 @@
 using System.Reflection;
 using ApprovalUtilities.CallStack;
+using ApprovalUtilities.Utilities;
 
 namespace ApprovalTests.Maintenance;
 

src/ApprovalTests/Namers/ApprovalResults.cs

@@ -1,3 +1,5 @@
+using ApprovalUtilities.Utilities;
+
 namespace ApprovalTests.Namers;
 
 public static class ApprovalResults

src/ApprovalTests/Namers/ApprovalsFilename.cs

@@ -1,4 +1,6 @@
-namespace ApprovalTests.Namers;
+using ApprovalUtilities.Utilities;
+
+namespace ApprovalTests.Namers;
 
 public class ApprovalsFilename
 {

src/ApprovalTests/Namers/StackTraceParsers/AttributeStackTraceParser.cs

@@ -1,3 +1,4 @@
+using System.Diagnostics;
 using ApprovalUtilities.CallStack;
 
 namespace ApprovalTests.Namers.StackTraceParsers;

src/ApprovalTests/Namers/StackTraceParsers/IStackTraceParser.cs

@@ -1,3 +1,5 @@
+using System.Diagnostics;
+
 namespace ApprovalTests.Namers.StackTraceParsers;
 
 public interface IStackTraceParser

src/ApprovalTests/Namers/StackTraceParsers/StackTraceParser.cs

@@ -1,3 +1,6 @@
+using ApprovalTests.StackTraceParsers;
+using ApprovalUtilities.Utilities;
+using System.Diagnostics;
 using ApprovalTests.Namers.UnitTestFrameworks;
 
 namespace ApprovalTests.Namers.StackTraceParsers;

src/ApprovalTests/Namers/UnitTestFrameworkNamer.cs

@@ -1,3 +1,4 @@
+using ApprovalTests.Core;
 using ApprovalTests.Namers.StackTraceParsers;
 
 namespace ApprovalTests.Namers;

src/ApprovalTests/Namers/UnitTestFrameworks/MSpecStackTraceParser.cs

@@ -1,3 +1,4 @@
+using System.Diagnostics;
 using System.Reflection;
 using ApprovalTests.Namers.StackTraceParsers;
 using ApprovalUtilities.CallStack;

src/ApprovalTests/Namers/UseApprovalSubdirectoryAttribute.cs

@@ -1,3 +1,5 @@
+using ApprovalUtilities.Utilities;
+
 namespace ApprovalTests.Namers;
 
 public class UseApprovalSubdirectoryAttribute : Attribute

src/ApprovalTests/Reporters/AllFailingTestsClipboardReporter.cs

@@ -1,4 +1,8 @@
-namespace ApprovalTests.Reporters;
+using System.Text;
+using ApprovalTests.Core;
+using TextCopy;
+
+namespace ApprovalTests.Reporters;
 
 public class AllFailingTestsClipboardReporter : IApprovalFailureReporter
 {

src/ApprovalTests/Reporters/ClipboardReporter.cs

@@ -1,3 +1,6 @@
+using ApprovalTests.Core;
+using TextCopy;
+
 namespace ApprovalTests.Reporters;
 
 public class ClipboardReporter : IApprovalFailureReporter

src/ApprovalTests/Reporters/ContinuousIntegration/AppVeyorReporter.cs

@@ -1,3 +1,5 @@
+using ApprovalTests.Core;
+
 namespace ApprovalTests.Reporters.ContinuousIntegration;
 
 public class AppVeyorReporter : IEnvironmentAwareReporter

src/ApprovalTests/Reporters/ContinuousIntegration/BambooReporter.cs

@@ -1,4 +1,6 @@
-namespace ApprovalTests.Reporters.ContinuousIntegration;
+using ApprovalTests.Core;
+
+namespace ApprovalTests.Reporters.ContinuousIntegration;
 
 public class BambooReporter : IEnvironmentAwareReporter
 {

src/ApprovalTests/Reporters/ContinuousIntegration/GoContinuousDeliveryReporter.cs

@@ -1,3 +1,5 @@
+using ApprovalTests.Core;
+
 namespace ApprovalTests.Reporters.ContinuousIntegration;
 
 public class GoContinuousDeliveryReporter : IEnvironmentAwareReporter

src/ApprovalTests/Reporters/ContinuousIntegration/JenkinsReporter.cs

@@ -1,4 +1,6 @@
-namespace ApprovalTests.Reporters.ContinuousIntegration;
+using ApprovalTests.Core;
+
+namespace ApprovalTests.Reporters.ContinuousIntegration;
 
 public class JenkinsReporter : IEnvironmentAwareReporter
 {

src/ApprovalTests/Reporters/ContinuousIntegration/MyGetReporter.cs

@@ -1,4 +1,6 @@
-namespace ApprovalTests.Reporters.ContinuousIntegration;
+using ApprovalTests.Core;
+
+namespace ApprovalTests.Reporters.ContinuousIntegration;
 
 public class MyGetReporter : IEnvironmentAwareReporter
 {

src/ApprovalTests/Reporters/ContinuousIntegration/NCrunchReporter.cs

@@ -1,4 +1,6 @@
-namespace ApprovalTests.Reporters.ContinuousIntegration;
+using ApprovalTests.Core;
+
+namespace ApprovalTests.Reporters.ContinuousIntegration;
 
 public class NCrunchReporter : IEnvironmentAwareReporter
 {

src/ApprovalTests/Reporters/ContinuousIntegration/TeamCityReporter.cs

@@ -1,4 +1,6 @@
-namespace ApprovalTests.Reporters.ContinuousIntegration;
+using ApprovalTests.Core;
+
+namespace ApprovalTests.Reporters.ContinuousIntegration;
 
 public class TeamCityReporter : IEnvironmentAwareReporter
 {

src/ApprovalTests/Reporters/ContinuousIntegration/TfsReporter.cs

@@ -1,4 +1,7 @@
-namespace ApprovalTests.Reporters.ContinuousIntegration;
+using ApprovalTests.Core;
+using ApprovalTests.Utilities;
+
+namespace ApprovalTests.Reporters.ContinuousIntegration;
 
 public class TfsReporter : IEnvironmentAwareReporter
 {

src/ApprovalTests/Reporters/ContinuousIntegration/TfsVnextReporter.cs

@@ -1,3 +1,5 @@
+using ApprovalTests.Core;
+
 namespace ApprovalTests.Reporters.ContinuousIntegration;
 
 public class TfsVnextReporter : IEnvironmentAwareReporter

src/ApprovalTests/Reporters/DefaultFrontLoaderReporter.cs

@@ -1,4 +1,6 @@
-namespace ApprovalTests.Reporters;
+using ApprovalTests.Reporters.ContinuousIntegration;
+
+namespace ApprovalTests.Reporters;
 
 public class DefaultFrontLoaderReporter : FirstWorkingReporter
 {

src/ApprovalTests/Reporters/DiffReporter.cs

@@ -1,4 +1,7 @@
-namespace ApprovalTests.Reporters;
+using ApprovalTests.Core;
+using DiffEngine;
+
+namespace ApprovalTests.Reporters;
 
 public class DiffReporter : IEnvironmentAwareReporter
 {

src/ApprovalTests/Reporters/DiffToolReporter.cs

@@ -1,3 +1,6 @@
+using ApprovalTests.Core;
+using DiffEngine;
+
 namespace ApprovalTests.Reporters;
 
 public class DiffToolReporter(DiffTool diffTool) : IEnvironmentAwareReporter

src/ApprovalTests/Reporters/ExecutableQueryFailure.cs

@@ -1,3 +1,4 @@
+using ApprovalTests.Core;
 using ApprovalUtilities.Persistence;
 
 namespace ApprovalTests.Reporters;

src/ApprovalTests/Reporters/FileLauncherReporter.cs

@@ -1,3 +1,6 @@
+using System.Diagnostics;
+using ApprovalTests.Core;
+
 namespace ApprovalTests.Reporters;
 
 public class FileLauncherReporter : IApprovalFailureReporter

src/ApprovalTests/Reporters/FileLauncherWithDelayReporter.cs

@@ -1,4 +1,7 @@
-public class FileLauncherWithDelayReporter(int seconds = 2) :
+using ApprovalTests.Core;
+using ApprovalTests.Reporters;
+
+public class FileLauncherWithDelayReporter(int seconds = 2) :
     IApprovalFailureReporter
 {
     public static readonly FileLauncherWithDelayReporter INSTANCE = new();

src/ApprovalTests/Reporters/FirstWorkingReporter.cs

@@ -1,3 +1,5 @@
+using ApprovalTests.Core;
+
 namespace ApprovalTests.Reporters;
 
 public class FirstWorkingReporter(IEnumerable<IEnvironmentAwareReporter> reporters) :

src/ApprovalTests/Reporters/FrontLoadedReporterAttribute.cs

@@ -1,3 +1,5 @@
+using ApprovalTests.Core;
+
 namespace ApprovalTests.Reporters;
 
 [AttributeUsage(AttributeTargets.Assembly)]

src/ApprovalTests/Reporters/FrontLoadedReporterDisposer.cs

@@ -1,3 +1,5 @@
+using ApprovalTests.Core;
+
 namespace ApprovalTests.Reporters;
 
 public class FrontLoadedReporterDisposer : IDisposable

src/ApprovalTests/Reporters/InlineTextReporter.cs

@@ -1,3 +1,7 @@
+using ApprovalTests.Core;
+using ApprovalUtilities.Utilities;
+using TextCopy;
+
 namespace ApprovalTests.Reporters;
 
 public class InlineTextReporter : IApprovalFailureReporter

src/ApprovalTests/Reporters/IntroductionReporter.cs

@@ -1,4 +1,7 @@
-namespace ApprovalTests.Reporters;
+using System.Diagnostics;
+using ApprovalTests.Core;
+
+namespace ApprovalTests.Reporters;
 
 public class IntroductionReporter : IApprovalFailureReporter
 {

src/ApprovalTests/Reporters/InvalidReporterConfiguration.cs

@@ -1,3 +1,5 @@
+using ApprovalTests.Core;
+
 namespace ApprovalTests.Reporters;
 
 public class InvalidReporterConfiguration(Type reporter) :

src/ApprovalTests/Reporters/MachineSpecificReporter.cs

@@ -1,4 +1,8 @@
-namespace ApprovalTests.Reporters;
+using System.Text;
+using ApprovalTests.Core;
+using ApprovalTests.Namers;
+
+namespace ApprovalTests.Reporters;
 
 public class MachineSpecificReporter : IEnvironmentAwareReporter
 {

src/ApprovalTests/Reporters/MultiReporter.cs

@@ -1,3 +1,5 @@
+using ApprovalTests.Core;
+
 namespace ApprovalTests.Reporters;
 
 public class MultiReporter : IEnvironmentAwareReporter, IApprovalReporterWithCleanUp

src/ApprovalTests/Reporters/PowershellClipboardReporter.cs

@@ -1,3 +1,6 @@
+using ApprovalTests.Core;
+using TextCopy;
+
 namespace ApprovalTests.Reporters;
 
 public class PowerShellClipboardReporter : IApprovalFailureReporter

src/ApprovalTests/Reporters/QuietReporter.cs

@@ -1,4 +1,6 @@
+using System.Diagnostics;
 using System.Runtime.InteropServices;
+using ApprovalTests.Core;
 
 namespace ApprovalTests.Reporters;