housekeeping: Cleanup code base (#6)

SimonCropp · web-flow · commit aa689dc76723 · 2021-07-14T12:34:56.000+10:00
diff --git a/src/Splat.DependencyInjection.SourceGenerator.Tests/RegisterLazySingletonTests.cs b/src/Splat.DependencyInjection.SourceGenerator.Tests/RegisterLazySingletonTests.cs
@@ -2,15 +2,13 @@
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
-using System;
 using System.Threading;
 using System.Threading.Tasks;
 
 using VerifyXunit;
 
 using Xunit;
 using Xunit.Abstractions;
-using Xunit.Sdk;
 
 namespace Splat.DependencyInjection.SourceGenerator.Tests
 {
@@ -34,14 +32,14 @@ public RegisterLazySingletonTests(ITestOutputHelper testOutputHelper)
         [InlineData(LazyThreadSafetyMode.None, "Test2")]
         public Task ConstructionAndMultiplePropertyInjectionWithLazyMode(LazyThreadSafetyMode mode, string contract)
         {
-            string arguments = string.Empty;
+            string arguments;
             if (string.IsNullOrWhiteSpace(contract))
             {
-                arguments = "LazyThreadSafetyMode." + mode.ToString();
+                arguments = $"LazyThreadSafetyMode.{mode}";
             }
             else
             {
-                arguments = '"' + contract + '"' + ", LazyThreadSafetyMode." + mode.ToString();
+                arguments = $"\"{contract}\", LazyThreadSafetyMode.{mode}";
             }
 
             var source = @$"
diff --git a/src/Splat.DependencyInjection.SourceGenerator.Tests/Splat.DependencyInjection.SourceGenerator.Tests.csproj b/src/Splat.DependencyInjection.SourceGenerator.Tests/Splat.DependencyInjection.SourceGenerator.Tests.csproj
@@ -24,7 +24,7 @@
     <PackageReference Include="Verify.Xunit" Version="11.20.3" />
     <PackageRefernece Include="Microsoft.CodeAnalysis.CSharp" Version="3.10.0" PrivateAssets="all" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <ProjectReference Include="..\Splat.DependencyInjection.SourceGenerator\Splat.DependencyInjection.SourceGenerator.csproj" />
   </ItemGroup>
diff --git a/src/Splat.DependencyInjection.SourceGenerator.Tests/TestBase.cs b/src/Splat.DependencyInjection.SourceGenerator.Tests/TestBase.cs
@@ -7,8 +7,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-using ICSharpCode.Decompiler.Metadata;
-
 using Microsoft.CodeAnalysis;
 
 using NuGet.LibraryModel;
@@ -51,7 +49,7 @@ public async Task InitializeAsync()
             var inputGroup = await NuGetPackageHelper.DownloadPackageFilesAndFolder(_splatLibrary, targetFrameworks, packageOutputDirectory: null).ConfigureAwait(false);
 
             var framework = targetFrameworks[0];
-            EventCompiler = new EventBuilderCompiler(inputGroup, inputGroup, framework);
+            EventCompiler = new(inputGroup, inputGroup, framework);
         }
 
         public Task DisposeAsync()
@@ -120,7 +118,7 @@ public static class DIRegister
         static DIRegister()
         {{
             SplatRegistrations.{_testMethod}<ITest1, TestConcrete1>({arguments});
-            SplatRegistrations.{_testMethod}<ITest2, TestConcrete2>();        
+            SplatRegistrations.{_testMethod}<ITest2, TestConcrete2>();
         }}
     }}
 
@@ -642,7 +640,7 @@ protected Task TestFail(string source, string contractParameter, [CallerFilePath
 
             GeneratorDriver? driver = null;
 
-            Assert.Throws<InvalidOperationException>(() => utility.RunGenerator<Generator>(EventCompiler, out var _, out var _, out driver, source));
+            Assert.Throws<InvalidOperationException>(() => utility.RunGenerator<Generator>(EventCompiler, out _, out _, out driver, source));
 
             VerifySettings settings = new();
             settings.UseParameters(contractParameter);
@@ -686,7 +684,7 @@ private GeneratorDriver Generate(string source)
 
             var utility = new SourceGeneratorUtility(x => TestOutputHelper.WriteLine(x));
 
-            utility.RunGenerator<Generator>(EventCompiler, out var _, out var _, out var driver, source);
+            utility.RunGenerator<Generator>(EventCompiler, out _, out _, out var driver, source);
 
             return driver;
         }
diff --git a/src/Splat.DependencyInjection.SourceGenerator/Constants.cs b/src/Splat.DependencyInjection.SourceGenerator/Constants.cs
@@ -8,12 +8,9 @@ internal static class Constants
     {
         public const string ClassName = "SplatRegistrations";
         public const string NamespaceName = "Splat";
-        public const string Locator = "Splat.Locator";
         public const string LocatorCurrent = "Splat.Locator.Current";
         public const string LocatorGetService = "GetService";
 
-        public const string LazyModeType = "global::System.Threading.LazyThreadSafetyMode";
-
         public const string ConstructorAttribute = "global::Splat.DependencyInjectionConstructorAttribute";
         public const string PropertyAttribute = "global::Splat.DependencyInjectionPropertyAttribute";
 
diff --git a/src/Splat.DependencyInjection.SourceGenerator/Metadata/ParameterMetadata.cs b/src/Splat.DependencyInjection.SourceGenerator/Metadata/ParameterMetadata.cs
@@ -2,10 +2,6 @@
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace Splat.DependencyInjection.SourceGenerator.Metadata
 {
     internal record ParameterMetadata(string ParameterName, string ParameterValue);
diff --git a/src/Splat.DependencyInjection.SourceGenerator/MetadataExtractor.cs b/src/Splat.DependencyInjection.SourceGenerator/MetadataExtractor.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
@@ -96,22 +95,22 @@ public static IEnumerable<MethodMetadata> GetValidMethods(GeneratorExecutionCont
         private static IEnumerable<ParameterMetadata> GetRegisterParameters(IMethodSymbol methodSymbol, SemanticModel semanticModel, InvocationExpressionSyntax invocationExpression)
         {
             for (int i = 0; i < invocationExpression.ArgumentList.Arguments.Count; ++i)
-{
+            {
                 var argument = invocationExpression.ArgumentList.Arguments[i];
                 var argumentName = methodSymbol.Parameters[i].Name;
                 var expression = argument.Expression;
 
                 if (expression is LiteralExpressionSyntax literal)
                 {
-                    yield return new ParameterMetadata(argumentName, literal.ToString());
+                    yield return new(argumentName, literal.ToString());
                 }
                 else
                 {
                     var mode = semanticModel.GetSymbolInfo(expression);
 
                     if (mode.Symbol is not null)
                     {
-                        yield return new ParameterMetadata(argumentName, mode.Symbol.ToDisplayString());
+                        yield return new(argumentName, mode.Symbol.ToDisplayString());
                     }
                 }
             }
@@ -177,7 +176,7 @@ private static IEnumerable<PropertyDependencyMetadata> GetPropertyDependencies(I
                     throw new ContextDiagnosticException(Diagnostic.Create(DiagnosticWarnings.PropertyMustPublicBeSettable, property.SetMethod?.Locations.FirstOrDefault(), property.ToDisplayString(RoslynCommonHelpers.TypeFormat)));
                 }
 
-                yield return new PropertyDependencyMetadata(property);
+                yield return new(property);
             }
         }
     }
diff --git a/src/Splat.DependencyInjection.SourceGenerator/SourceGeneratorHelpers.cs b/src/Splat.DependencyInjection.SourceGenerator/SourceGeneratorHelpers.cs
@@ -29,7 +29,7 @@ public static string Generate(GeneratorExecutionContext context, Compilation com
 
             methods = MetadataDependencyChecker.CheckMetadata(context, methods);
 
-            var invocations = Generate(compilation, methods);
+            var invocations = Generate(methods);
 
             var staticConstructor = ConstructorDeclaration(default, new[] { SyntaxKind.StaticKeyword }, Array.Empty<ParameterSyntax>(), Constants.ClassName, Block(invocations.ToList(), 2), 1);
 
@@ -42,12 +42,10 @@ public static string Generate(GeneratorExecutionContext context, Compilation com
             return compilationUnit.ToFullString();
         }
 
-        private static IEnumerable<StatementSyntax> Generate(Compilation compilation, IEnumerable<MethodMetadata> methodMetadatas)
+        private static IEnumerable<StatementSyntax> Generate(IEnumerable<MethodMetadata> methodMetadatas)
         {
             foreach (var methodMetadata in methodMetadatas)
             {
-                var semanticModel = compilation.GetSemanticModel(methodMetadata.MethodInvocation.SyntaxTree);
-
                 var typeConstructorArguments = new List<ArgumentSyntax>();
 
                 foreach (var parameter in methodMetadata.ConstructorDependencies)
@@ -111,13 +109,7 @@ private static BlockSyntax GetLazyBlock(MethodMetadata methodMetadata, Expressio
             const string lazyTypeValueProperty = "Value";
             const string lazyVariableName = "lazy";
 
-            var lambdaArguments = new ArgumentSyntax[]
-            {
-                Argument(ParenthesizedLambdaExpression(MemberAccessExpression(SyntaxKind.SimpleMemberAccessExpression, lazyVariableName, lazyTypeValueProperty))),
-                Argument($"typeof({methodMetadata.InterfaceTypeName})")
-            };
-
-            var lazyArguments = new List<ArgumentSyntax>()
+            var lazyArguments = new List<ArgumentSyntax>
             {
                 Argument(ParenthesizedLambdaExpression(call))
             };
diff --git a/src/Splat.DependencyInjection.SourceGenerator/SyntaxReceiver.cs b/src/Splat.DependencyInjection.SourceGenerator/SyntaxReceiver.cs
@@ -11,9 +11,9 @@ namespace Splat.DependencyInjection.SourceGenerator
 {
     internal class SyntaxReceiver : ISyntaxReceiver
     {
-        public List<InvocationExpressionSyntax> Register { get; } = new List<InvocationExpressionSyntax>();
+        public List<InvocationExpressionSyntax> Register { get; } = new();
 
-        public List<InvocationExpressionSyntax> RegisterLazySingleton { get; } = new List<InvocationExpressionSyntax>();
+        public List<InvocationExpressionSyntax> RegisterLazySingleton { get; } = new();
 
         public void OnVisitSyntaxNode(SyntaxNode syntaxNode)
         {
@@ -35,11 +35,6 @@ public void OnVisitSyntaxNode(SyntaxNode syntaxNode)
 
         private void HandleSimpleName(SimpleNameSyntax simpleName, InvocationExpressionSyntax invocationExpression)
         {
-            if (simpleName is null)
-            {
-                return;
-            }
-
             var methodName = simpleName.Identifier.Text;
 
             if (string.Equals(methodName, nameof(Register)))

Original file line number	Diff line number	Diff line change
`@@ -2,15 +2,13 @@`
`2`	`2`	`// ReactiveUI Association Incorporated licenses this file to you under the MIT license.`
`3`	`3`	`// See the LICENSE file in the project root for full license information.`
`4`	`4`
`5`		`-using System;`
`6`	`5`	`using System.Threading;`
`7`	`6`	`using System.Threading.Tasks;`
`8`	`7`
`9`	`8`	`using VerifyXunit;`
`10`	`9`
`11`	`10`	`using Xunit;`
`12`	`11`	`using Xunit.Abstractions;`
`13`		`-using Xunit.Sdk;`
`14`	`12`
`15`	`13`	`namespace Splat.DependencyInjection.SourceGenerator.Tests`
`16`	`14`	`{`
`@@ -34,14 +32,14 @@ public RegisterLazySingletonTests(ITestOutputHelper testOutputHelper)`
`34`	`32`	`[InlineData(LazyThreadSafetyMode.None, "Test2")]`
`35`	`33`	`public Task ConstructionAndMultiplePropertyInjectionWithLazyMode(LazyThreadSafetyMode mode, string contract)`
`36`	`34`	`{`
`37`		`- string arguments = string.Empty;`
	`35`	`+ string arguments;`
`38`	`36`	`if (string.IsNullOrWhiteSpace(contract))`
`39`	`37`	`{`
`40`		`- arguments = "LazyThreadSafetyMode." + mode.ToString();`
	`38`	`+ arguments = $"LazyThreadSafetyMode.{mode}";`
`41`	`39`	`}`
`42`	`40`	`else`
`43`	`41`	`{`
`44`		`- arguments = '"' + contract + '"' + ", LazyThreadSafetyMode." + mode.ToString();`
	`42`	`+ arguments = $"\"{contract}\", LazyThreadSafetyMode.{mode}";`
`45`	`43`	`}`
`46`	`44`
`47`	`45`	`var source = @$"`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`using System;`
`6`	`6`	`using System.Collections.Generic;`
`7`	`7`	`using System.Linq;`
`8`		`-using System.Reflection;`
`9`	`8`
`10`	`9`	`using Microsoft.CodeAnalysis;`
`11`	`10`	`using Microsoft.CodeAnalysis.CSharp.Syntax;`
`@@ -96,22 +95,22 @@ public static IEnumerable<MethodMetadata> GetValidMethods(GeneratorExecutionCont`
`96`	`95`	`private static IEnumerable<ParameterMetadata> GetRegisterParameters(IMethodSymbol methodSymbol, SemanticModel semanticModel, InvocationExpressionSyntax invocationExpression)`
`97`	`96`	`{`
`98`	`97`	`for (int i = 0; i < invocationExpression.ArgumentList.Arguments.Count; ++i)`
`99`		`-{`
	`98`	`+ {`
`100`	`99`	`var argument = invocationExpression.ArgumentList.Arguments[i];`
`101`	`100`	`var argumentName = methodSymbol.Parameters[i].Name;`
`102`	`101`	`var expression = argument.Expression;`
`103`	`102`
`104`	`103`	`if (expression is LiteralExpressionSyntax literal)`
`105`	`104`	`{`
`106`		`- yield return new ParameterMetadata(argumentName, literal.ToString());`
	`105`	`+ yield return new(argumentName, literal.ToString());`
`107`	`106`	`}`
`108`	`107`	`else`
`109`	`108`	`{`
`110`	`109`	`var mode = semanticModel.GetSymbolInfo(expression);`
`111`	`110`
`112`	`111`	`if (mode.Symbol is not null)`
`113`	`112`	`{`
`114`		`- yield return new ParameterMetadata(argumentName, mode.Symbol.ToDisplayString());`
	`113`	`+ yield return new(argumentName, mode.Symbol.ToDisplayString());`
`115`	`114`	`}`
`116`	`115`	`}`
`117`	`116`	`}`
`@@ -177,7 +176,7 @@ private static IEnumerable<PropertyDependencyMetadata> GetPropertyDependencies(I`
`177`	`176`	`throw new ContextDiagnosticException(Diagnostic.Create(DiagnosticWarnings.PropertyMustPublicBeSettable, property.SetMethod?.Locations.FirstOrDefault(), property.ToDisplayString(RoslynCommonHelpers.TypeFormat)));`
`178`	`177`	`}`
`179`	`178`
`180`		`- yield return new PropertyDependencyMetadata(property);`
	`179`	`+ yield return new(property);`
`181`	`180`	`}`
`182`	`181`	`}`
`183`	`182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@ namespace Splat.DependencyInjection.SourceGenerator`
`11`	`11`	`{`
`12`	`12`	`internal class SyntaxReceiver : ISyntaxReceiver`
`13`	`13`	`{`
`14`		`- public List<InvocationExpressionSyntax> Register { get; } = new List<InvocationExpressionSyntax>();`
	`14`	`+ public List<InvocationExpressionSyntax> Register { get; } = new();`
`15`	`15`
`16`		`- public List<InvocationExpressionSyntax> RegisterLazySingleton { get; } = new List<InvocationExpressionSyntax>();`
	`16`	`+ public List<InvocationExpressionSyntax> RegisterLazySingleton { get; } = new();`
`17`	`17`
`18`	`18`	`public void OnVisitSyntaxNode(SyntaxNode syntaxNode)`
`19`	`19`	`{`
`@@ -35,11 +35,6 @@ public void OnVisitSyntaxNode(SyntaxNode syntaxNode)`
`35`	`35`
`36`	`36`	`private void HandleSimpleName(SimpleNameSyntax simpleName, InvocationExpressionSyntax invocationExpression)`
`37`	`37`	`{`
`38`		`- if (simpleName is null)`
`39`		`- {`
`40`		`- return;`
`41`		`- }`
`42`		`-`
`43`	`38`	`var methodName = simpleName.Identifier.Text;`
`44`	`39`
`45`	`40`	`if (string.Equals(methodName, nameof(Register)))`