Clean up files a bit (#1790)

* Remove unnecessary using statements

* Simplify to new(...)

* Minor Fixes

src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.cs

@@ -3,7 +3,6 @@
 
 using System.CommandLine.Hosting;
 using System.CommandLine.NamingConventionBinder;
-using System.CommandLine.Parsing;
 using ApprovalTests;
 using ApprovalTests.Reporters;
 using Xunit;

src/System.CommandLine.Benchmarks/CommandLine/Perf_Parser_Directives_Suggest.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.CommandLine.Benchmarks.Helpers;
-using System.CommandLine.Invocation;
 using System.CommandLine.Parsing;
 using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;

src/System.CommandLine.Benchmarks/CommandLine/Perf_Parser_NestedCommands.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.CommandLine.Parsing;
-using System.Linq;
 using BenchmarkDotNet.Attributes;
 
 namespace System.CommandLine.Benchmarks.CommandLine
@@ -40,7 +39,7 @@ private void GenerateTestNestedCommands(Command parent, int depth, int countPerL
             for (int i = 0; i < countPerLevel; i++)
             {
                 string cmdName = $"{parent.Name}_{depth}.{i}";
-                Command cmd = new Command(cmdName);
+                Command cmd = new(cmdName);
                 parent.AddCommand(cmd);
                 GenerateTestNestedCommands(cmd, depth - 1, countPerLevel);
             }
@@ -73,7 +72,7 @@ public void SetupParser()
         }
 
         [Benchmark]
-        public Parser ParserFromNestedCommands_Ctor() => new Parser(_rootCommand);
+        public Parser ParserFromNestedCommands_Ctor() => new(_rootCommand);
 
         [Benchmark]
         public ParseResult Parser_Parse() => _testParser.Parse(_testSymbolsAsString);

src/System.CommandLine.Benchmarks/CommandLine/Perf_Parser_Simple.cs

@@ -1,5 +1,4 @@
 using BenchmarkDotNet.Attributes;
-using System.CommandLine.Invocation;
 using System.CommandLine.Parsing;
 using System.Threading.Tasks;
 
@@ -25,10 +24,10 @@ public class Perf_Parser_Simple
 
         private static RootCommand BuildCommand()
         {
-            Option<bool> boolOption = new Option<bool>(new[] { "--bool", "-b" }, "Bool option");
-            Option<string> stringOption = new Option<string>(new[] { "--string", "-s" }, "String option");
+            Option<bool> boolOption = new(new[] { "--bool", "-b" }, "Bool option");
+            Option<string> stringOption = new(new[] { "--string", "-s" }, "String option");
 
-            RootCommand command = new RootCommand
+            RootCommand command = new()
             {
                 boolOption,
                 stringOption

src/System.CommandLine.Benchmarks/CommandLine/Perf_Suggestions.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
-using System.CommandLine.Parsing;
 using System.Linq;
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Engines;

src/System.CommandLine.Benchmarks/DragonFruit/Perf_CommandLine_EntryPoint.cs

@@ -20,7 +20,7 @@ namespace System.CommandLine.Benchmarks.DragonFruit
     [InvocationCount(3000)]
     public class Perf_CommandLine_EntryPoint
     {
-        private readonly NullConsole _nullConsole = new NullConsole();
+        private readonly NullConsole _nullConsole = new();
         private Assembly _testAssembly;
         private string _testAssemblyFilePath;
         private string _testAssemblyXmlDocsFilePath;

src/System.CommandLine.Benchmarks/DragonFruit/Perf_CommandLine_Help.cs

@@ -17,7 +17,7 @@ namespace System.CommandLine.Benchmarks.DragonFruit
     [InvocationCount(3000)]
     public class Perf_CommandLine_Help
     {
-        private readonly NullConsole _nullConsole = new NullConsole();
+        private readonly NullConsole _nullConsole = new();
         private Assembly _testAssembly;
         private string _testAssemblyFilePath;
         private string _testAssemblyXmlDocsFilePath;

src/System.CommandLine.Benchmarks/Helpers/NullConsole.cs

@@ -7,7 +7,7 @@ namespace System.CommandLine.Benchmarks.Helpers
 {
     class NullConsole : IConsole
     {
-        readonly NullStreamWriter _nullWriter = new NullStreamWriter();
+        readonly NullStreamWriter _nullWriter = new();
 
         public IStandardStreamWriter Out => _nullWriter;
         public IStandardStreamWriter Error => _nullWriter;

src/System.CommandLine.Benchmarks/Program.cs

@@ -1,11 +1,11 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Immutable;
-using System.IO;
 using BenchmarkDotNet.Running;
 using System.Linq;
 using BenchmarkDotNet.Configs;
+using System.Collections.Immutable;
+using System.IO;
 
 namespace System.CommandLine.Benchmarks
 {

src/System.CommandLine.DragonFruit.Tests/CommandLineTests.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.CommandLine.Rendering;
-using System.ComponentModel;
 using System.Threading.Tasks;
 using FluentAssertions;
 using Xunit;

src/System.CommandLine.DragonFruit.Tests/ConfigureFromMethodTests.cs

@@ -20,7 +20,7 @@ namespace System.CommandLine.DragonFruit.Tests
     public class ConfigureFromMethodTests
     {
         private object[] _receivedValues;
-        private readonly TestConsole _testConsole = new TestConsole();
+        private readonly TestConsole _testConsole = new();
 
         [Fact]
         public async Task Generated_boolean_parameters_will_accept_zero_arguments()

src/System.CommandLine.DragonFruit.Tests/XmlDocReaderTests.cs

@@ -3,7 +3,6 @@
 
 using System.IO;
 using FluentAssertions;
-using System.Linq;
 using Xunit;
 
 namespace System.CommandLine.DragonFruit.Tests

src/System.CommandLine.Generator.Tests/GeneratedCommandHandlerTests.cs

@@ -5,7 +5,6 @@
 using System.CommandLine.Help;
 using System.CommandLine.Invocation;
 using System.CommandLine.IO;
-using System.CommandLine.Parsing;
 using System.Threading.Tasks;
 using FluentAssertions;
 using Xunit;

src/System.CommandLine.Hosting.Tests/HostingHandlerTest.cs

@@ -1,16 +1,10 @@
 using System.CommandLine;
-using System.CommandLine.Binding;
 using System.CommandLine.Invocation;
-using System.CommandLine.IO;
 using System.CommandLine.Parsing;
-using System.Linq;
 using System.Threading.Tasks;
 using FluentAssertions;
-
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Options;
 using Xunit;
 
 

src/System.CommandLine.Hosting/DirectiveConfigurationExtensions.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.CommandLine.Parsing;
 using System.Linq;
 
 using Microsoft.Extensions.Configuration;

src/System.CommandLine.NamingConventionBinder.Tests/HandlerDescriptorTests.cs

@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Binding;
 using System.CommandLine.Tests.Utility;
 using System.IO;
 using System.Linq;

src/System.CommandLine.NamingConventionBinder.Tests/ModelDescriptorTests.cs

@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Binding;
 using System.CommandLine.Tests.Binding;
 using System.CommandLine.Tests.Utility;
 using System.Linq;

src/System.CommandLine.NamingConventionBinder.Tests/ParameterDescriptorTests.cs

@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Binding;
 using System.CommandLine.Tests.Binding;
 using System.Linq;
 using FluentAssertions;

src/System.CommandLine.NamingConventionBinder.Tests/PropertyDescriptorTests.cs

@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Binding;
 using System.CommandLine.Tests.Binding;
 using System.Linq;
 using FluentAssertions;

src/System.CommandLine.NamingConventionBinder/ConstructorDescriptor.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
-using System.CommandLine.Binding;
 using System.Linq;
 using System.Reflection;
 

src/System.CommandLine.NamingConventionBinder/DelegateHandlerDescriptor.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
-using System.CommandLine.Binding;
 using System.Linq;
 
 namespace System.CommandLine.NamingConventionBinder;

src/System.CommandLine.NamingConventionBinder/HandlerDescriptor.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
-using System.CommandLine.Binding;
 using System.Reflection;
 
 namespace System.CommandLine.NamingConventionBinder;

src/System.CommandLine.NamingConventionBinder/IMethodDescriptor.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
-using System.CommandLine.Binding;
 
 namespace System.CommandLine.NamingConventionBinder;
 

src/System.CommandLine.NamingConventionBinder/MethodInfoHandlerDescriptor.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
-using System.CommandLine.Binding;
 using System.Linq;
 using System.Reflection;
 

src/System.CommandLine.Rendering.Tests/ConsoleRendererTests.cs

@@ -17,7 +17,7 @@ namespace System.CommandLine.Rendering.Tests
 {
     public class ConsoleRendererTests
     {
-        private readonly TestTerminal _terminal = new TestTerminal();
+        private readonly TestTerminal _terminal = new();
 
         private readonly ITestOutputHelper _output;
 

src/System.CommandLine.Rendering.Tests/ContainerSpanTests.cs

@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.IO;
 using FluentAssertions;
 using Xunit;
 

src/System.CommandLine.Rendering.Tests/RenderingTestCase.cs

@@ -5,7 +5,7 @@ namespace System.CommandLine.Rendering.Tests
 {
     public class RenderingTestCase
     {
-        private static readonly TextSpanFormatter _formatter = new TextSpanFormatter();
+        private static readonly TextSpanFormatter _formatter = new();
 
         public RenderingTestCase(
             string name,

src/System.CommandLine.Rendering.Tests/TableRenderingTests.cs

@@ -118,7 +118,7 @@ public void Column_widths_are_aligned_to_the_longest_cell_in_file_mode()
                     .Be(lines[2].IndexOf("an option"));
         }
 
-        private TextRendered Cell(string text, int left, int top) => new TextRendered(text, new Point(left, top));
+        private TextRendered Cell(string text, int left, int top) => new(text, new Point(left, top));
     }
 
     public class OptionsHelpView : TableView<Option>

src/System.CommandLine.Rendering.Tests/TerminalModeTests.cs

@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Invocation;
 using System.CommandLine.IO;
 using System.CommandLine.Parsing;
 using System.CommandLine.Tests.Utility;

src/System.CommandLine.Rendering.Tests/TestTerminalTests.cs

@@ -11,7 +11,7 @@ namespace System.CommandLine.Rendering.Tests
 {
     public class TestTerminalTests : TerminalTests
     {
-        protected TestTerminal _terminal = new TestTerminal();
+        protected TestTerminal _terminal = new();
 
         protected override ITerminal GetTerminal() => _terminal;
 

src/System.CommandLine.Rendering.Tests/TextStyleRenderingTests.cs

@@ -11,8 +11,8 @@ namespace System.CommandLine.Rendering.Tests
 {
     public class TextStyleRenderingTests
     {
-        private readonly TextSpanFormatter _textSpanFormatter = new TextSpanFormatter();
-        private readonly TestTerminal _terminal = new TestTerminal();
+        private readonly TextSpanFormatter _textSpanFormatter = new();
+        private readonly TestTerminal _terminal = new();
 
         [Fact]
         public void BackgroundColorSpans_are_replaced_with_ANSI_codes_during_ANSI_rendering()

src/System.CommandLine.Rendering.Tests/Views/ScreenViewTests.cs

@@ -161,7 +161,7 @@ void BeforeRenderAction()
 
         private class TestSynchronizationContext : SynchronizationContext
         {
-            private readonly List<Action> _postActions = new List<Action>();
+            private readonly List<Action> _postActions = new();
             public void InvokePostCallbacks()
             {
                 while (_postActions.FirstOrDefault() is Action postAction)

src/System.CommandLine.Rendering.Tests/WordWrappingTests.cs

@@ -11,7 +11,7 @@ namespace System.CommandLine.Rendering.Tests
 {
     public class WordWrappingTests
     {
-        private readonly TestTerminal _terminal = new TestTerminal();
+        private readonly TestTerminal _terminal = new();
 
         [Theory]
         [MemberData(nameof(TestCases))]
@@ -185,6 +185,6 @@ IEnumerable<RenderingTestCase> TestCases()
         }
 
         private static TextRendered Line(int left, int top, string text) =>
-            new TextRendered(text, new Point(left, top));
+            new(text, new Point(left, top));
     }
 }

src/System.CommandLine.Rendering/AnsiRenderingSpanVisitor.cs

@@ -82,7 +82,7 @@ public override void VisitCursorControlSpan(CursorControlSpan cursorControlSpan)
         }
 
         private static readonly Dictionary<string, AnsiControlCode> _foregroundColorControlCodeMappings =
-            new Dictionary<string, AnsiControlCode>
+            new()
             {
                 [nameof(ForegroundColorSpan.Reset)] = Color.Foreground.Default,
                 [nameof(ForegroundColorSpan.Black)] = Color.Foreground.Black,
@@ -104,7 +104,7 @@ public override void VisitCursorControlSpan(CursorControlSpan cursorControlSpan)
             };
 
         private static readonly Dictionary<string, AnsiControlCode> _backgroundColorControlCodeMappings =
-            new Dictionary<string, AnsiControlCode>
+            new()
             {
                 [nameof(BackgroundColorSpan.Reset)] = Color.Background.Default,
                 [nameof(BackgroundColorSpan.Black)] = Color.Background.Black,
@@ -126,7 +126,7 @@ public override void VisitCursorControlSpan(CursorControlSpan cursorControlSpan)
             };
 
         private static readonly Dictionary<string, AnsiControlCode> _styleControlCodeMappings =
-            new Dictionary<string, AnsiControlCode>
+            new()
             {
                 [nameof(StyleSpan.AttributesOff)] = Ansi.Text.AttributesOff,
                 [nameof(StyleSpan.BlinkOff)] = Ansi.Text.BlinkOff,