Formatting and Cleanup

.editorconfig

@@ -129,6 +129,8 @@ csharp_style_unused_value_expression_statement_preference = discard_variable:sil
 # 'using' directive preferences
 csharp_using_directive_placement = outside_namespace:silent
 
+
+
 #### C# Formatting Rules ####
 
 # New line preferences
@@ -181,6 +183,11 @@ csharp_style_namespace_declarations = block_scoped:silent
 csharp_style_prefer_method_group_conversion = true:silent
 csharp_style_prefer_top_level_statements = true:silent
 csharp_style_prefer_primary_constructors = false:silent
+csharp_style_prefer_null_check_over_type_check = true:suggestion
+csharp_style_prefer_local_over_anonymous_function = true:suggestion
+csharp_style_implicit_object_creation_when_type_is_apparent = true:suggestion
+csharp_style_prefer_tuple_swap = true:suggestion
+csharp_style_prefer_utf8_string_literals = true:suggestion
 
 #### Naming styles ####
 [*.{cs,vb}]
@@ -375,3 +382,8 @@ dotnet_naming_style.s_camelcase.capitalization = camel_case
 tab_width = 4
 indent_size = 4
 end_of_line = crlf
+
+dotnet_style_prefer_collection_expression = true:suggestion
+dotnet_style_namespace_match_folder = true:suggestion
+
+dotnet_diagnostic.CA1811.severity = warning

perf/Comparison/Program.cs

@@ -4,4 +4,4 @@
 using Comparison;
 
 BenchmarkRunner.Run<Simple>();
-// new Simple().PretenderTest();
+// new Simple().PretenderTest();

perf/Comparison/Simple.cs

@@ -11,8 +11,8 @@ public string MoqTest()
         {
             var mock = new Moq.Mock<ISimpleInterface>();
 
-             mock.Setup(i => i.Foo(Moq.It.IsAny<string>()))
-                .Returns("2");
+            mock.Setup(i => i.Foo(Moq.It.IsAny<string>()))
+               .Returns("2");
 
             var simpleInterface = mock.Object;
             return simpleInterface.Foo("1");
@@ -46,4 +46,4 @@ public interface ISimpleInterface
             string Foo(string bar);
         }
     }
-}
+}

src/Pretender.SourceGenerator/CSharpSyntaxUtilities.cs

@@ -53,4 +53,4 @@ public static string FormatLiteral(object? value, ITypeSymbol type)
             string FormatNumber() => $"({type.ToFullDisplayString()})({Convert.ToString(value, CultureInfo.InvariantCulture)})";
         }
     }
-}
+}

src/Pretender.SourceGenerator/DiagnosticDescriptors.cs

@@ -4,7 +4,7 @@ namespace Pretender.SourceGenerator
 {
     internal static class DiagnosticDescriptors
     {
-        public static DiagnosticDescriptor UnsupportedLanguageVersion { get; } = new (
+        public static DiagnosticDescriptor UnsupportedLanguageVersion { get; } = new(
             "PRTND001",
             "Unsupported language version",
             "",
@@ -28,4 +28,4 @@ internal static class DiagnosticDescriptors
             DiagnosticSeverity.Error,
             isEnabledByDefault: true);
     }
-}
+}

src/Pretender.SourceGenerator/Emitter/CommonSyntax.cs

@@ -18,4 +18,4 @@ internal static class CommonSyntax
         public static ParameterSyntax CalledParameter { get; } = Parameter(CalledIdentifier)
             .WithType(ParseTypeName("Called"));
     }
-}
+}

src/Pretender.SourceGenerator/Emitter/CreateEmitter.cs

@@ -1,8 +1,8 @@
-using Microsoft.CodeAnalysis.Operations;
-using System.Collections.Immutable;
+using System.Collections.Immutable;
 using Microsoft.CodeAnalysis;
-using Pretender.SourceGenerator.Writing;
+using Microsoft.CodeAnalysis.Operations;
 using Pretender.SourceGenerator.Parser;
+using Pretender.SourceGenerator.Writing;
 
 namespace Pretender.SourceGenerator.Emitter
 {
@@ -85,4 +85,4 @@ public void Emit(IndentedTextWriter writer, CancellationToken cancellationToken)
             }
         }
     }
-}
+}

src/Pretender.SourceGenerator/Emitter/GrandEmitter.cs

@@ -108,4 +108,4 @@ public string Emit(CancellationToken cancellationToken)
             return writer.ToString();
         }
     }
-}
+}

src/Pretender.SourceGenerator/Emitter/MatcherArgumentEmitter.cs

@@ -79,4 +79,4 @@ public override void EmitArgumentMatcher(IndentedTextWriter writer, Cancellation
             }
         }
     }
-}
+}

src/Pretender.SourceGenerator/Emitter/NoopArgumentEmitter.cs

@@ -16,4 +16,4 @@ public override void EmitArgumentMatcher(IndentedTextWriter writer, Cancellation
             // Intentional no-op
         }
     }
-}
+}

src/Pretender.SourceGenerator/Emitter/PretendEmitter.cs

@@ -182,4 +182,4 @@ int IEqualityComparer<PretendEmitter>.GetHashCode(PretendEmitter obj)
             }
         }
     }
-}
+}

src/Pretender.SourceGenerator/Emitter/SetupActionEmitter.cs

@@ -79,4 +79,4 @@ public void Emit(IndentedTextWriter writer, CancellationToken cancellationToken)
             writer.WriteLine("}, setupExpression);");
         }
     }
-}
+}

src/Pretender.SourceGenerator/Emitter/SetupArgumentEmitter.cs

@@ -35,4 +35,4 @@ protected void EmitIfReturnFalseCheck(IndentedTextWriter writer, string left, st
             }
         }
     }
-}
+}

src/Pretender.SourceGenerator/Emitter/SetupEmitter.cs

@@ -45,4 +45,4 @@ public void Emit(IndentedTextWriter writer, int index, CancellationToken cancell
             }
         }
     }
-}
+}

src/Pretender.SourceGenerator/Emitter/VerifyEmitter.cs

@@ -40,4 +40,4 @@ public void Emit(IndentedTextWriter writer, int index, CancellationToken cancell
             }
         }
     }
-}
+}

src/Pretender.SourceGenerator/Fakes/IKnownFake.cs

@@ -7,4 +7,4 @@ internal interface IKnownFake
     {
         bool TryConstruct(INamedTypeSymbol typeSymbol, KnownTypeSymbols knownTypeSymbols, CancellationToken cancellationToken, out INamedTypeSymbol? fakeType);
     }
-}
+}

src/Pretender.SourceGenerator/Fakes/ILoggerFake.cs

@@ -16,4 +16,4 @@ public bool TryConstruct(INamedTypeSymbol typeSymbol, KnownTypeSymbols knownType
             return false;
         }
     }
-}
+}

src/Pretender.SourceGenerator/IncrementalValuesProviderExtensions.cs

@@ -34,4 +34,4 @@ internal static class IncrementalValuesProviderExtensions
             });
         }
     }
-}
+}

src/Pretender.SourceGenerator/InterceptsLocationInfo.cs

@@ -45,4 +45,4 @@ public AttributeSyntax ToAttributeSyntax()
                     })));
         }
     }
-}
+}

src/Pretender.SourceGenerator/Invocation/CreateInvocation.cs

@@ -128,4 +128,4 @@ int IEqualityComparer<CreateInvocation>.GetHashCode(CreateInvocation obj)
             }
         }
     }
-}
+}

src/Pretender.SourceGenerator/Invocation/PretendInvocation.cs

@@ -81,4 +81,4 @@ public static bool IsCandidateSyntaxNode(SyntaxNode node)
             return new PretendInvocation(typeSymbol, location, fillExisting);
         }
     }
-}
+}

src/Pretender.SourceGenerator/Invocation/SetupInvocation.cs

@@ -54,4 +54,4 @@ private static bool IsSetupOperation(IInvocationOperation operation)
             return true;
         }
     }
-}
+}

src/Pretender.SourceGenerator/Invocation/VerifyInvocation.cs

@@ -60,4 +60,4 @@ private static bool IsVerifyOperation(IInvocationOperation operation)
             return true;
         }
     }
-}
+}

src/Pretender.SourceGenerator/InvocationOperationExtensions.cs

@@ -45,4 +45,4 @@ public static bool IsValidCreateOperation(this IOperation? operation, Compilatio
             return false;
         }
     }
-}
+}

src/Pretender.SourceGenerator/KnownBlocks.cs

@@ -26,18 +26,6 @@ public InterceptsLocationAttribute(string filePath, int line, int column)
             }
             """;
 
-        public static NamespaceDeclarationSyntax OurNamespace { get; }
-            = NamespaceDeclaration(IdentifierName("Pretender.SourceGeneration"));
-
-        public static UsingDirectiveSyntax PretenderUsing { get; }
-            = UsingDirective(ParseName("Pretender"));
-
-        public static UsingDirectiveSyntax PretenderInternalsUsing { get; }
-            = UsingDirective(ParseName("Pretender.Internals"));
-
-        public static UsingDirectiveSyntax CompilerServicesUsing { get; }
-            = UsingDirective(ParseName("System.Runtime.CompilerServices"));
-
         public static MemberAccessExpressionSyntax TaskCompletedTask = MemberAccessExpression(
             SyntaxKind.SimpleMemberAccessExpression,
             IdentifierName("Task"),
@@ -67,9 +55,9 @@ public static InvocationExpressionSyntax ValueTaskFromResult(TypeSyntax resultTy
                     .AddTypeArgumentListArguments(resultType));
 
             // ValueTask.FromResult<T>(value)
-            return InvocationExpression(memberAccess, 
+            return InvocationExpression(memberAccess,
                 ArgumentList(
                     SingletonSeparatedList(Argument(resultValue))));
         }
     }
-}
+}

src/Pretender.SourceGenerator/Parser/CreateParser.cs

@@ -35,4 +35,4 @@ public CreateParser(CreateInvocation createInvocation, ImmutableArray<Intercepts
             return (emitter, null);
         }
     }
-}
+}

src/Pretender.SourceGenerator/Parser/KnownTypeSymbols.cs

@@ -138,4 +138,4 @@ public string GetPretendName(INamedTypeSymbol type)
             return firstName;
         }
     }
-}
+}

src/Pretender.SourceGenerator/Parser/MethodStrategy.cs

@@ -83,4 +83,4 @@ public override void EmitMethodGetter(IndentedTextWriter writer, CancellationTok
             throw new NotImplementedException();
         }
     }
-}
+}

src/Pretender.SourceGenerator/Parser/PretendParser.cs

@@ -64,4 +64,4 @@ public PretendParser(PretendInvocation pretendInvocation, KnownTypeSymbols known
             return (new PretendEmitter(PretendInvocation.PretendType, _knownTypeSymbols, PretendInvocation.FillExisting), null);
         }
     }
-}
+}

src/Pretender.SourceGenerator/Parser/SetupActionParser.cs

@@ -201,4 +201,4 @@ public InvocationCandidate(IMethodSymbol methodSymbol, ImmutableArray<IArgumentO
             public ImmutableArray<IArgumentOperation> Arguments { get; }
         }
     }
-}
+}

src/Pretender.SourceGenerator/Parser/SetupParser.cs

@@ -46,4 +46,4 @@ public SetupParser(SetupInvocation setupInvocation, KnownTypeSymbols knownTypeSy
             return (new SetupEmitter(setupActionEmitter, operation), setupActionDiagnostics);
         }
     }
-}
+}

src/Pretender.SourceGenerator/Parser/VerifyParser.cs

@@ -56,4 +56,4 @@ public VerifyParser(VerifyInvocation verifyInvocation, KnownTypeSymbols knownTyp
             return (emitter, setupActionDiagnostics);
         }
     }
-}
+}

src/Pretender.SourceGenerator/PretenderSettings.cs

@@ -36,6 +36,6 @@ public PretenderSettings(PretendBehavior behavior)
             Behavior = behavior;
         }
 
-        public PretendBehavior Behavior {  get; }
+        public PretendBehavior Behavior { get; }
     }
-}
+}

src/Pretender.SourceGenerator/PretenderSourceGenerator.cs

@@ -139,4 +139,4 @@ private static IncrementalValuesProvider<T> ReportDiagnostics<T>(IncrementalGene
                 .Where(e => e != null)!;
         }
     }
-}
+}

src/Pretender.SourceGenerator/ScaffoldTypeOptions.cs

@@ -1,7 +1,7 @@
-using Microsoft.CodeAnalysis.CSharp.Syntax;
+using System.Collections.Immutable;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
-using System.Collections.Immutable;
 
 namespace Pretender.SourceGenerator;
 
@@ -11,5 +11,5 @@ public class ScaffoldTypeOptions
     public Func<IMethodSymbol, BlockSyntax> AddMethodBody { get; set; } = (_) => Block();
 
     // TODO: Is there a better symbol for constructors, methods?
-    public Func<(ParameterSyntax FirstParameter, StatementSyntax[] AdditionalBodyStatements)>? CustomizeConstructor { get; set;  }
-}
+    public Func<(ParameterSyntax FirstParameter, StatementSyntax[] AdditionalBodyStatements)>? CustomizeConstructor { get; set; }
+}

src/Pretender.SourceGenerator/SetupArguments/LiteralArgumentEmitter.cs

@@ -29,4 +29,4 @@ public override int GetHashCode()
                 : 1337; // TODO: Magic value?
         }
     }
-}
+}

src/Pretender.SourceGenerator/SetupArguments/LocalReferenceArgumentEmitter.cs

@@ -27,4 +27,4 @@ public override int GetHashCode()
             return SymbolEqualityComparer.Default.GetHashCode(_localReferenceOperation.Local);
         }
     }
-}
+}

src/Pretender.SourceGenerator/SetupArguments/SetupArgumentParser.cs

@@ -275,4 +275,4 @@ public void ExitScope()
             }
         }
     }
-}
+}