Fix naming issues based on .editorconfig updates.

Author: tillig

bench/Autofac.BenchmarkProfiling/Program.cs

@@ -84,7 +84,7 @@ private static void Main(string[] args)
 
         // Workload method is generated differently when BenchmarkDotNet actually runs; we'll need to wrap it in the set of parameters.
         // It's way slower than they way they do it, but it should still give us good profiler results.
-        void workloadAction(int repeat)
+        void WorkloadAction(int repeat)
         {
             while (repeat > 0)
             {
@@ -96,13 +96,13 @@ void workloadAction(int repeat)
         setupAction.InvokeSingle();
 
         // Warmup.
-        workloadAction(100);
+        WorkloadAction(100);
 
         // Now start a new thread.
         var runThread = new Thread(new ThreadStart(() =>
         {
             // Do a lot.
-            workloadAction(10000);
+            WorkloadAction(10000);
         }))
         {
             Name = "Workload Thread"

src/Autofac/Builder/BuildCallbackManager.cs

@@ -12,15 +12,15 @@ internal static class BuildCallbackManager
 {
     private const string BuildCallbacksExecutedKey = nameof(BuildCallbacksExecutedKey);
 
-    private static readonly TypedService CallbackServiceType = new(typeof(BuildCallbackService));
+    private static readonly TypedService _callbackServiceType = new(typeof(BuildCallbackService));
 
     /// <summary>
     /// Executes the newly-registered build callbacks for a given scope/container..
     /// </summary>
     /// <param name="scope">The new scope/container.</param>
     internal static void RunBuildCallbacks(ILifetimeScope scope)
     {
-        var buildCallbackServices = scope.ComponentRegistry.ServiceRegistrationsFor(CallbackServiceType);
+        var buildCallbackServices = scope.ComponentRegistry.ServiceRegistrationsFor(_callbackServiceType);
 
         foreach (var srv in buildCallbackServices)
         {
@@ -30,7 +30,7 @@ internal static void RunBuildCallbacks(ILifetimeScope scope)
                 continue;
             }
 
-            var request = new ResolveRequest(CallbackServiceType, srv, Enumerable.Empty<Parameter>());
+            var request = new ResolveRequest(_callbackServiceType, srv, Enumerable.Empty<Parameter>());
             var component = (BuildCallbackService)scope.ResolveComponent(request);
             srv.Registration.Metadata[BuildCallbacksExecutedKey] = true;
 

src/Autofac/Builder/ReflectionActivatorData.cs

@@ -11,8 +11,8 @@ namespace Autofac.Builder;
 /// </summary>
 public class ReflectionActivatorData
 {
-    private static readonly IConstructorFinder DefaultConstructorFinder = new DefaultConstructorFinder();
-    private static readonly IConstructorSelector DefaultConstructorSelector = new MostParametersConstructorSelector();
+    private static readonly IConstructorFinder _defaultConstructorFinder = new DefaultConstructorFinder();
+    private static readonly IConstructorSelector _defaultConstructorSelector = new MostParametersConstructorSelector();
 
     private Type _implementer = default!;
     private IConstructorFinder _constructorFinder;
@@ -26,8 +26,8 @@ public ReflectionActivatorData(Type implementer)
     {
         ImplementationType = implementer;
 
-        _constructorFinder = DefaultConstructorFinder;
-        _constructorSelector = DefaultConstructorSelector;
+        _constructorFinder = _defaultConstructorFinder;
+        _constructorSelector = _defaultConstructorSelector;
     }
 
     /// <summary>

src/Autofac/Core/Activators/Reflection/AutowiringPropertyInjector.cs

@@ -17,7 +17,7 @@ internal static class AutowiringPropertyInjector
     /// </summary>
     internal const string InstanceTypeNamedParameter = "Autofac.AutowiringPropertyInjector.InstanceType";
 
-    private static readonly MethodInfo CallPropertySetterOpenGenericMethod =
+    private static readonly MethodInfo _callPropertySetterOpenGenericMethod =
         typeof(AutowiringPropertyInjector).GetDeclaredMethod(nameof(CallPropertySetter));
 
     /// <summary>
@@ -164,7 +164,7 @@ private static IEnumerable<PropertyInfo> GetInjectableProperties(Type instanceTy
 
         // Create a delegate TDeclaringType -> { TDeclaringType.Property = TValue; }
         var propertySetterAsAction = setMethod.CreateDelegate(typeof(Action<,>).MakeGenericType(typeInput, parameterType));
-        var callPropertySetterClosedGenericMethod = CallPropertySetterOpenGenericMethod.MakeGenericMethod(typeInput, parameterType);
+        var callPropertySetterClosedGenericMethod = _callPropertySetterOpenGenericMethod.MakeGenericMethod(typeInput, parameterType);
         var callPropertySetterDelegate = callPropertySetterClosedGenericMethod.CreateDelegate<Action<object, object?>>(propertySetterAsAction);
 
         return callPropertySetterDelegate;

src/Autofac/Core/Activators/Reflection/ConstructorBinder.cs

@@ -13,7 +13,7 @@ namespace Autofac.Core.Activators.Reflection;
 /// </summary>
 public class ConstructorBinder
 {
-    private static readonly Func<ConstructorInfo, Func<object?[], object>> FactoryBuilder = GetConstructorInvoker;
+    private static readonly Func<ConstructorInfo, Func<object?[], object>> _factoryBuilder = GetConstructorInvoker;
 
     private readonly ParameterInfo[] _constructorArgs;
     private readonly Func<object?[], object>? _factory;
@@ -39,7 +39,7 @@ public ConstructorBinder(ConstructorInfo constructorInfo)
             var factoryCache = ReflectionCacheSet.Shared.Internal.ConstructorBinderFactory;
 
             // Build the invoker.
-            _factory = factoryCache.GetOrAdd(constructorInfo, FactoryBuilder);
+            _factory = factoryCache.GetOrAdd(constructorInfo, _factoryBuilder);
         }
     }
 

src/Autofac/Core/ImplicitRegistrationSource.cs

@@ -13,7 +13,7 @@ namespace Autofac.Core;
 /// </summary>
 public abstract class ImplicitRegistrationSource : IRegistrationSource
 {
-    private static readonly MethodInfo CreateRegistrationMethod = typeof(ImplicitRegistrationSource).GetDeclaredMethod(nameof(CreateRegistration));
+    private static readonly MethodInfo _createRegistrationMethod = typeof(ImplicitRegistrationSource).GetDeclaredMethod(nameof(CreateRegistration));
 
     private readonly Type _type;
 
@@ -69,7 +69,7 @@ public IEnumerable<IComponentRegistration> RegistrationsFor(Service service, Fun
 
         var registrationCreator = methodCache.GetOrAdd(valueType, t =>
         {
-            return CreateRegistrationMethod.MakeGenericMethod(t).CreateDelegate<RegistrationCreator>(this);
+            return _createRegistrationMethod.MakeGenericMethod(t).CreateDelegate<RegistrationCreator>(this);
         });
 
         return registrationAccessor(valueService)

src/Autofac/Core/ReflectionCacheSet.cs

@@ -12,7 +12,7 @@ namespace Autofac.Core;
 /// </summary>
 public sealed class ReflectionCacheSet
 {
-    private static readonly object CacheAllocationLock = new();
+    private static readonly object _cacheAllocationLock = new();
 
     private static WeakReference<ReflectionCacheSet>? _sharedSet;
 
@@ -42,7 +42,7 @@ public static ReflectionCacheSet Shared
         {
             if (!TryGetSharedCache(out var sharedCache))
             {
-                lock (CacheAllocationLock)
+                lock (_cacheAllocationLock)
                 {
                     // Check the cache again inside the lock, another thread may have updated it.
                     if (!TryGetSharedCache(out sharedCache))

src/Autofac/Core/Registration/DefaultRegisteredServicesTracker.cs

@@ -14,7 +14,7 @@ namespace Autofac.Core.Registration;
 /// </summary>
 internal class DefaultRegisteredServicesTracker : Disposable, IRegisteredServicesTracker
 {
-    private static readonly Func<Service, ServiceRegistrationInfo> RegInfoFactory = srv => new ServiceRegistrationInfo(srv);
+    private static readonly Func<Service, ServiceRegistrationInfo> _regInfoFactory = srv => new ServiceRegistrationInfo(srv);
 
     private readonly Func<Service, IEnumerable<ServiceRegistration>> _registrationAccessor;
 
@@ -528,6 +528,6 @@ private void BeginServiceInfoInitialization(Service service, ServiceRegistration
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private ServiceRegistrationInfo GetServiceInfo(Service service)
     {
-        return _serviceInfo.GetOrAdd(service, RegInfoFactory);
+        return _serviceInfo.GetOrAdd(service, _regInfoFactory);
     }
 }

src/Autofac/Core/Resolving/Pipeline/ResolvePipelineBuilder.cs

@@ -32,7 +32,7 @@ internal class ResolvePipelineBuilder : IResolvePipelineBuilder, IEnumerable<IRe
     /// <summary>
     /// Termination action for the end of pipelines.
     /// </summary>
-    private static readonly Action<ResolveRequestContext> TerminateAction = context => { };
+    private static readonly Action<ResolveRequestContext> _terminateAction = context => { };
 
     private MiddlewareDeclaration? _first;
     private MiddlewareDeclaration? _last;
@@ -207,7 +207,7 @@ private static ResolvePipeline BuildPipeline(MiddlewareDeclaration? lastDecl)
     {
         // When we build, we go through the set and construct a single call stack, starting from the end.
         var current = lastDecl;
-        var currentInvoke = TerminateAction;
+        var currentInvoke = _terminateAction;
 
         Action<ResolveRequestContext> Chain(Action<ResolveRequestContext> next, IResolveMiddleware stage)
         {

src/Autofac/Diagnostics/DefaultDiagnosticTracer.cs

@@ -26,7 +26,7 @@ public class DefaultDiagnosticTracer : OperationDiagnosticTracerBase<string>
 {
     private const string RequestExceptionTraced = "__RequestException";
 
-    private static readonly string[] NewLineSplit = new[] { Environment.NewLine };
+    private static readonly string[] _newLineSplit = new[] { Environment.NewLine };
 
     private readonly ConcurrentDictionary<IResolveOperation, IndentingStringBuilder> _operationBuilders = new();
 
@@ -273,7 +273,7 @@ public void AppendException(string message, Exception ex)
             AppendIndent();
             _builder.AppendLine(message);
 
-            var exceptionBody = ex.ToString().Split(NewLineSplit, StringSplitOptions.None);
+            var exceptionBody = ex.ToString().Split(_newLineSplit, StringSplitOptions.None);
 
             Indent();