Refactor GetVariableName to remove transientId parameter and update dependent code accordingly. Clean up unused code and adjust ReSharper settings.

Author: Nikolay Pianikov

build/Core/Targets/ReadmeTarget.cs

@@ -2,6 +2,7 @@
 // ReSharper disable ConvertIfStatementToSwitchStatement
 // ReSharper disable ClassNeverInstantiated.Global
 // ReSharper disable InconsistentNaming
+// ReSharper disable ArrangeRedundantParentheses
 namespace Build.Core.Targets;
 
 using Pure.DI.Benchmarks.Benchmarks;

src/Pure.DI.Core/Core/Code/IVariableNameProvider.cs

@@ -4,7 +4,7 @@ interface INameProvider
 {
     IDisposable Root();
 
-    string GetVariableName(IDependencyNode node, int transientId);
+    string GetVariableName(IDependencyNode node);
 
     string GetOverrideVariableName(MdOverride @override);
 

src/Pure.DI.Core/Core/Code/VarDeclaration.cs

@@ -1,8 +1,9 @@
-namespace Pure.DI.Core.Code;
+// ReSharper disable NotAccessedPositionalProperty.Global
+namespace Pure.DI.Core.Code;
 
 record VarDeclaration(
     INameProvider NameProvider,
-    IVarStateTracker stateTracker,
+    IVarStateTracker StateTracker,
     int PerLifetimeId,
     IDependencyNode Node)
 {
@@ -21,7 +22,7 @@ public bool IsDeclared
                 return;
             }
 
-            stateTracker.OnStateChanging(Node.BindingId);
+            StateTracker.OnStateChanging(Node.BindingId);
             _isDeclared = value;
         }
     }
@@ -34,7 +35,7 @@ public bool IsDeclared
     /// <summary>
     /// Gets the variable name.
     /// </summary>
-    public string Name { get; } = NameProvider.GetVariableName(Node, PerLifetimeId);
+    public string Name { get; } = NameProvider.GetVariableName(Node);
 
     /// <summary>
     /// Resets the declaration to its default state.

src/Pure.DI.Core/Core/Code/VariableNameProvider.cs

@@ -18,7 +18,7 @@ public IDisposable Root()
         });
     }
 
-    public string GetVariableName(IDependencyNode node, int transientId) =>
+    public string GetVariableName(IDependencyNode node) =>
         node switch
         {
             { Construct.Source: { Kind: MdConstructKind.Override, State: DpOverride @override } } => GetOverrideVariableName(@override.Source),

tests/Pure.DI.GeneratedCodeReview/Program.cs

@@ -2,6 +2,10 @@
 using Shouldly;
 using static Pure.DI.Tag;
 using static Pure.DI.Lifetime;
+// ReSharper disable InvertIf
+// ReSharper disable LocalizableElement
+// ReSharper disable NotAccessedPositionalProperty.Global
+// ReSharper disable ClassNeverInstantiated.Global
 
 DI.Setup(nameof(Composition))
     .Bind<IClock>().As(Singleton).To<SystemClock>()
@@ -10,12 +14,12 @@
     .Bind<IConfiguration>().As(Singleton).To<AppConfiguration>()
     .Bind<IEnvironmentInfo>().As(Singleton).To<EnvironmentInfo>()
     .Bind<IRepository<TT>>().As(PerBlock).To<InMemoryRepository<TT>>()
-    .Bind<IExternalApiClient>(Public, default).As(Singleton).To<PublicApiClient>()
+    .Bind<IExternalApiClient>(Public, null).As(Singleton).To<PublicApiClient>()
     .Bind<IExternalApiClient>(Internal).As(Singleton).To<InternalApiClient>()
-    .Bind<INotificationSender>(Email, default).To<EmailNotificationSender>()
+    .Bind<INotificationSender>(Email, null).To<EmailNotificationSender>()
     .Bind<INotificationSender>(Sms).To<SmsNotificationSender>()
     .Bind<INotificationSender>(Push).To<PushNotificationSender>()
-    .Bind<IPaymentGateway>(Card, default).As(Singleton).To<StripePaymentGateway>()
+    .Bind<IPaymentGateway>(Card, null).As(Singleton).To<StripePaymentGateway>()
     .Bind<IPaymentGateway>(Wallet).As(Singleton).To<WalletPaymentGateway>()
  #pragma warning disable DIW003
     .Bind<IPaymentGateway>(Offline).To<OfflinePaymentGateway>()
@@ -142,7 +146,7 @@ interface ICache
     string GetOrAdd(string key, Func<string> valueFactory);
 }
 
-interface IRepository<T>
+interface IRepository<in T>
 {
     void Save(T entity);
     int Count { get; }

tests/Pure.DI.UsageTests/BaseClassLibrary/DefaultBclBindingsScenario.cs

@@ -16,15 +16,13 @@ namespace Pure.DI.UsageTests.BCL.DefaultBclBindingsScenario;
 
 using System.Globalization;
 using System.Security.Cryptography;
-using System.Text.Json;
 using Shouldly;
 using Xunit;
 
 // {
 //# using Pure.DI;
 //# using System.Globalization;
 //# using System.Security.Cryptography;
-//# using System.Text.Json;
 // }
 
 public class Scenario
@@ -60,12 +58,6 @@ public void Run()
 }
 
 // {
-interface IPlugin;
-
-class SearchPlugin : IPlugin;
-
-class ExportPlugin : IPlugin;
-
 class ReportService(
     CultureInfo culture,
     IFormatProvider formatProvider,