Code cleanup

Author: NikolayPianikov

CSharpInteractive/Composition.cs

@@ -149,13 +149,13 @@ private static void Setup()
                 .Bind().To<Settings>()
                 .Bind().To<Info>()
                 .Bind().To<ConsoleSource>()
-                .Bind(typeof(LoadFileCodeSource)).To(ctx => new Func<string, ICodeSource>(name =>
+                .Bind(LoadFileCode).To(ctx => new Func<string, ICodeSource>(name =>
                 {
                     ctx.Inject<LoadFileCodeSource>(out var loadFileCodeSource);
                     loadFileCodeSource.Name = name;
                     return loadFileCodeSource;
                 }))
-                .Bind(typeof(LineCodeSource)).To(ctx => new Func<string, ICodeSource>(line =>
+                .Bind(LineCode).To(ctx => new Func<string, ICodeSource>(line =>
                 {
                     ctx.Inject<LineCodeSource>(out var lineCodeSource);
                     lineCodeSource.Line = line;

CSharpInteractive/Core/BuildMessageLogWriter.cs

@@ -4,11 +4,12 @@ namespace CSharpInteractive.Core;
 
 using HostApi;
 using Pure.DI;
+using static Pure.DI.Tag;
 
 internal class BuildMessageLogWriter(
     ILog<BuildMessageLogWriter> log,
-    [Tag(Tag.Base)] IStdOut stdOut,
-    [Tag(Tag.Base)] IStdErr stdErr)
+    [Tag(Base)] IStdOut stdOut,
+    [Tag(Base)] IStdErr stdErr)
     : IBuildMessageLogWriter
 {
     public void Write(ProcessInfo processInfo, BuildMessage message)

CSharpInteractive/Core/BuildRunner.cs

@@ -9,6 +9,7 @@ namespace CSharpInteractive.Core;
 
 using HostApi;
 using Pure.DI;
+using static Pure.DI.Tag;
 
 internal class BuildRunner(
     IProcessRunner processRunner,
@@ -17,8 +18,8 @@ internal class BuildRunner(
     Func<IBuildContext> buildContextFactory,
     IBuildOutputProcessor buildOutputProcessor,
     Func<IProcessMonitor> monitorFactory,
-    [Tag(Tag.Base)] IBuildMessagesProcessor defaultBuildMessagesProcessor,
-    [Tag(Tag.Custom)] IBuildMessagesProcessor customBuildMessagesProcessor,
+    [Tag(Base)] IBuildMessagesProcessor defaultBuildMessagesProcessor,
+    [Tag(Custom)] IBuildMessagesProcessor customBuildMessagesProcessor,
     IProcessResultHandler processResultHandler,
     IStartInfoDescription startInfoDescription,
     ICommandLineStatisticsRegistry statisticsRegistry)

CSharpInteractive/Core/CISpecific.cs

@@ -4,12 +4,13 @@
 namespace CSharpInteractive.Core;
 
 using Pure.DI;
+using static Pure.DI.Tag;
 
 internal class CISpecific<T>(
     ICISettings settings,
-    [Tag(Tag.Base)] Func<T> defaultFactory,
-    [Tag(Tag.TeamCity)] Func<T> teamcityFactory,
-    [Tag(Tag.Ansi)] Func<T> ansiFactory)
+    [Tag(Base)] Func<T> defaultFactory,
+    [Tag(TeamCity)] Func<T> teamcityFactory,
+    [Tag(Ansi)] Func<T> ansiFactory)
     : ICISpecific<T>
 {
     public T Instance => settings.CIType switch

CSharpInteractive/Core/DotnetEnvironment.cs

@@ -5,10 +5,11 @@ namespace CSharpInteractive.Core;
 
 using System.Runtime.InteropServices;
 using Pure.DI;
+using static Pure.DI.Tag;
 
 internal class DotNetEnvironment(
-    [Tag(Tag.TargetFrameworkMoniker)] string targetFrameworkMoniker,
-    [Tag(Tag.ModuleFile)] string moduleFile,
+    [Tag(TargetFrameworkMoniker)] string targetFrameworkMoniker,
+    [Tag(ModuleFile)] string moduleFile,
     IEnvironment environment,
     IFileExplorer fileExplorer)
     : IDotNetEnvironment, ITraceSource

CSharpInteractive/Core/ProcessInFlowRunner.cs

@@ -6,9 +6,10 @@ namespace CSharpInteractive.Core;
 using HostApi;
 using JetBrains.TeamCity.ServiceMessages.Write.Special;
 using Pure.DI;
+using static Pure.DI.Tag;
 
 internal class ProcessInFlowRunner(
-    [Tag(Tag.Base)] IProcessRunner baseProcessRunner,
+    [Tag(Base)] IProcessRunner baseProcessRunner,
     ICISettings ciSettings,
     ITeamCityWriter teamCityWriter,
     IFlowContext flowContext)

CSharpInteractive/Core/ReliableBuildContext.cs

@@ -6,12 +6,13 @@ namespace CSharpInteractive.Core;
 using HostApi;
 using JetBrains.TeamCity.ServiceMessages;
 using Pure.DI;
+using static Pure.DI.Tag;
 
 internal class ReliableBuildContext(
     ICISettings ciSettings,
     IFileSystem fileSystem,
     IMessagesReader messagesReader,
-    [Tag(Tag.Base)] IBuildContext baseBuildContext)
+    [Tag(Base)] IBuildContext baseBuildContext)
     : IBuildContext
 {
     private readonly Dictionary<string, Output> _sources = new();

CSharpInteractive/Core/RuntimeExplorer.cs

@@ -3,9 +3,10 @@
 namespace CSharpInteractive.Core;
 
 using Pure.DI;
+using static Pure.DI.Tag;
 
 internal class RuntimeExplorer(
-    [Tag(Tag.RuntimePath)] string runtimePath,
+    [Tag(RuntimePath)] string runtimePath,
     IFileSystem fileSystem) : IRuntimeExplorer
 {
     public bool TryFindRuntimeAssembly(string assemblyPath, [MaybeNullWhen(false)] out string runtimeAssemblyPath)

CSharpInteractive/Core/ScriptContentReplacer.cs

@@ -4,6 +4,7 @@ namespace CSharpInteractive.Core;
 
 using NuGet.Packaging;
 using Pure.DI;
+using static Pure.DI.Tag;
 
 internal class ScriptContentReplacer(
     INuGetReferenceResolver nuGetReferenceResolver,
@@ -13,7 +14,7 @@ internal class ScriptContentReplacer(
     IFileSystem fileSystem,
     IUniqueNameGenerator uniqueNameGenerator,
     IEnvironment environment,
-    [Tag(typeof(LineCodeSource))] Func<string, ICodeSource> codeSourceFactory)
+    [Tag(LineCode)] Func<string, ICodeSource> codeSourceFactory)
     : IScriptContentReplacer
 {
     [SuppressMessage("Performance", "CA1806:Do not ignore method results")]

CSharpInteractive/Core/Settings.cs

@@ -4,13 +4,14 @@ namespace CSharpInteractive.Core;
 
 using System.Collections.Immutable;
 using Pure.DI;
+using static Pure.DI.Tag;
 
 internal class Settings(
     RunningMode runningMode,
     IEnvironment environment,
     ICommandLineParser commandLineParser,
     ICodeSource consoleCodeSource,
-    [Tag(typeof(LoadFileCodeSource))] Func<string, ICodeSource> fileCodeSourceFactory)
+    [Tag(LoadFileCode)] Func<string, ICodeSource> fileCodeSourceFactory)
     : ISettings, ISettingSetter<VerbosityLevel>
 {
     private readonly object _lockObject = new();