Refactoring

NikolayPianikov · NikolayPianikov · commit 38636d95c75e · 2025-02-11T16:21:24.000+03:00
diff --git a/CSharpInteractive.Tests/Integration/Core/DotNetScript.cs b/CSharpInteractive.Tests/Integration/Core/DotNetScript.cs
@@ -12,7 +12,7 @@ public static CommandLine Create(params string[] lines) =>
 
     public static CommandLine Create() =>
         new(
-            Composition.Shared.Root.DotNetEnvironment.Path,
+            Composition.Shared.Root.DotNetEnvironment.Value.Path,
             Path.Combine(Path.GetDirectoryName(typeof(DotNetScript).Assembly.Location)!, "dotnet-csi.dll"));
 
     public static CommandLine CreateForScript(string scriptName, string? workingDirectory, IEnumerable<string> args, params string[] lines)
@@ -27,7 +27,7 @@ public static string GetWorkingDirectory()
     {
         var uniqueNameGenerator = new UniqueNameGenerator();
         var environment = Composition.Shared.Root.Environment;
-        var tempDirectory = environment.GetPath(SpecialFolder.Temp);
+        var tempDirectory = environment.Value.GetPath(SpecialFolder.Temp);
         return Path.Combine(tempDirectory, uniqueNameGenerator.Generate());
     }
 }
diff --git a/CSharpInteractive.Tests/Integration/NuGetTests.cs b/CSharpInteractive.Tests/Integration/NuGetTests.cs
@@ -18,7 +18,7 @@ public void ShouldSupportRestore()
 
         // When
         var nuget = Composition.Shared.Root.NuGet;
-        var result = nuget.Restore(new NuGetRestoreSettings("IoC.Container").WithVersionRange(VersionRange.Parse("1.3.6")).WithTargetFrameworkMoniker("net5.0").WithPackagesPath(tempPath)).ToList();
+        var result = nuget.Value.Restore(new NuGetRestoreSettings("IoC.Container").WithVersionRange(VersionRange.Parse("1.3.6")).WithTargetFrameworkMoniker("net5.0").WithPackagesPath(tempPath)).ToList();
 
         // Then
         result.Count.ShouldBe(1);
@@ -32,7 +32,7 @@ public void ShouldSupportRestoreForDefaults()
 
         // When
         var nuget = Composition.Shared.Root.NuGet;
-        var result = nuget.Restore(new NuGetRestoreSettings("IoC.Container")).ToList();
+        var result = nuget.Value.Restore(new NuGetRestoreSettings("IoC.Container")).ToList();
 
         // Then
         result.Count.ShouldBeGreaterThan(0);
diff --git a/CSharpInteractive.Tests/Integration/TestTool.cs b/CSharpInteractive.Tests/Integration/TestTool.cs
@@ -21,7 +21,7 @@ private static readonly (string, string)[] TeamCityVars =
     public static IProcessResult Run(in CommandLine commandLine)
     {
         var events = new List<Output>();
-        var result = Composition.Shared.Root.CommandLineRunner.Run(commandLine, output =>
+        var result = Composition.Shared.Root.CommandLineRunner.Value.Run(commandLine, output =>
         {
             output.Handled = true;
             events.Add(output);
@@ -70,7 +70,7 @@ private static IEnumerable<IServiceMessage> ParseMessagesInternal(this IEnumerab
         var parser = Composition.Shared.Root.ServiceMessageParser;
         foreach (var line in lines)
         {
-            foreach (var message in parser.ParseServiceMessages(line))
+            foreach (var message in parser.Value.ParseServiceMessages(line))
             {
                 yield return message;
             }
diff --git a/CSharpInteractive/Core/BuildEngine.cs b/CSharpInteractive/Core/BuildEngine.cs
@@ -36,9 +36,6 @@ public void LogMessageEvent(BuildMessageEventArgs e)
         switch (e.Importance)
         {
             case MessageImportance.High:
-                log.Info([new Text(message)]);
-                break;
-
             case MessageImportance.Normal:
                 log.Info([new Text(message)]);
                 break;
diff --git a/CSharpInteractive/Core/FilePathResolver.cs b/CSharpInteractive/Core/FilePathResolver.cs
@@ -1,5 +1,5 @@
 // ReSharper disable ClassNeverInstantiated.Global
-
+// ReSharper disable RedundantExplicitParamsArrayCreation
 namespace CSharpInteractive.Core;
 
 using HostApi;
diff --git a/CSharpInteractive/Core/HostService.cs b/CSharpInteractive/Core/HostService.cs
@@ -1,7 +1,7 @@
 // ReSharper disable UnusedMember.Global
 // ReSharper disable ClassNeverInstantiated.Global
 // ReSharper disable HeapView.PossibleBoxingAllocation
-
+// ReSharper disable RedundantExplicitParamsArrayCreation
 namespace CSharpInteractive.Core;
 
 using HostApi;
diff --git a/CSharpInteractive/Core/Info.cs b/CSharpInteractive/Core/Info.cs
@@ -1,5 +1,5 @@
 // ReSharper disable ClassNeverInstantiated.Global
-
+// ReSharper disable RedundantExplicitParamsArrayCreation
 namespace CSharpInteractive.Core;
 
 using System.Reflection;
diff --git a/CSharpInteractive/Core/InteractiveRunner.cs b/CSharpInteractive/Core/InteractiveRunner.cs
@@ -1,7 +1,7 @@
 // ReSharper disable ClassNeverInstantiated.Global
 // ReSharper disable SwitchStatementHandlesSomeKnownEnumValuesWithDefault
 // ReSharper disable UnusedType.Global
-
+// ReSharper disable RedundantExplicitParamsArrayCreation
 namespace CSharpInteractive.Core;
 
 using HostApi;
diff --git a/CSharpInteractive/Core/ProcessManager.cs b/CSharpInteractive/Core/ProcessManager.cs
@@ -1,5 +1,5 @@
 // ReSharper disable ClassNeverInstantiated.Global
-
+// ReSharper disable RedundantExplicitParamsArrayCreation
 namespace CSharpInteractive.Core;
 
 using System.Diagnostics;
diff --git a/CSharpInteractive/Core/StatisticsPresenter.cs b/CSharpInteractive/Core/StatisticsPresenter.cs
@@ -1,5 +1,5 @@
 // ReSharper disable ClassNeverInstantiated.Global
-
+// ReSharper disable RedundantExplicitParamsArrayCreation
 namespace CSharpInteractive.Core;
 
 using HostApi;
diff --git a/CSharpInteractive/Core/SummaryPresenter.cs b/CSharpInteractive/Core/SummaryPresenter.cs
@@ -1,7 +1,7 @@
 // ReSharper disable UnusedType.Global
 // ReSharper disable ClassNeverInstantiated.Global
 // ReSharper disable MemberCanBePrivate.Global
-
+// ReSharper disable RedundantExplicitParamsArrayCreation
 namespace CSharpInteractive.Core;
 
 using HostApi;
diff --git a/CSharpInteractive/Core/TextExtensions.cs b/CSharpInteractive/Core/TextExtensions.cs
@@ -4,7 +4,7 @@ namespace CSharpInteractive.Core;
 
 using HostApi;
 
-internal static partial class TextExtensions
+internal static class TextExtensions
 {
     private static readonly Text[] SingleTab = [Text.Tab];
 
diff --git a/CSharpInteractive/Host.cs b/CSharpInteractive/Host.cs
@@ -327,7 +327,7 @@ public static ICommandLineResult Run(
         TimeSpan timeout = default)
     {
         ArgumentNullException.ThrowIfNull(commandLine);
-        return Root.CommandLineRunner.Run(commandLine, handler, timeout);
+        return Root.CommandLineRunner.Value.Run(commandLine, handler, timeout);
     }
 
     /// <summary>
@@ -352,7 +352,7 @@ public static Task<ICommandLineResult> RunAsync(
         CancellationToken cancellationToken = default)
     {
         ArgumentNullException.ThrowIfNull(commandLine);
-        return Root.CommandLineRunner.RunAsync(commandLine, handler, cancellationToken);
+        return Root.CommandLineRunner.Value.RunAsync(commandLine, handler, cancellationToken);
     }
 
     /// <summary>
@@ -375,7 +375,7 @@ public static IBuildResult Build(
         TimeSpan timeout = default)
     {
         ArgumentNullException.ThrowIfNull(commandLine);
-        return Root.BuildRunner.Build(commandLine, handler, timeout);
+        return Root.BuildRunner.Value.Build(commandLine, handler, timeout);
     }
 
     /// <summary>
@@ -400,7 +400,7 @@ public static Task<IBuildResult> BuildAsync(
         CancellationToken cancellationToken = default)
     {
         ArgumentNullException.ThrowIfNull(commandLine);
-        return Root.BuildRunner.BuildAsync(commandLine, handler, cancellationToken);
+        return Root.BuildRunner.Value.BuildAsync(commandLine, handler, cancellationToken);
     }
 
     /// <summary>
diff --git a/CSharpInteractive/Root.cs b/CSharpInteractive/Root.cs
@@ -21,27 +21,27 @@ internal record Root(
     ILog<Root> Log,
     IInfo Info,
     IExitTracker ExitTracker,
-    HostComponents HostComponents,
-    ICommandLineRunner CommandLineRunner,
-    IBuildRunner BuildRunner,
-    IEnvironment Environment,
-    IDotNetEnvironment DotNetEnvironment,
-    INuGet NuGet,
-    IServiceMessageParser ServiceMessageParser,
-    ITeamCityWriter TeamCityWriter,
+    Lazy<HostComponents> HostComponents,
+    Lazy<ICommandLineRunner> CommandLineRunner,
+    Lazy<IBuildRunner> BuildRunner,
+    Lazy<IEnvironment> Environment,
+    Lazy<IDotNetEnvironment> DotNetEnvironment,
+    Lazy<INuGet> NuGet,
+    Lazy<IServiceMessageParser> ServiceMessageParser,
+    Lazy<ITeamCityWriter> TeamCityWriter,
     IConsoleHandler ConsoleHandler) : IServiceProvider
 {
     private readonly Lazy<IServiceProvider> _serviceProvider = new(() =>
     {
         var serviceCollection = new ServiceCollection();
         serviceCollection.AddTransient<IServiceCollection>(_ => serviceCollection);
         serviceCollection.AddTransient(_ => Host);
-        serviceCollection.AddTransient(_ => HostComponents);
-        serviceCollection.AddTransient(_ => NuGet);
-        serviceCollection.AddTransient(_ => CommandLineRunner);
-        serviceCollection.AddTransient(_ => BuildRunner);
-        serviceCollection.AddTransient(_ => ServiceMessageParser);
-        serviceCollection.AddTransient(_ => TeamCityWriter);
+        serviceCollection.AddTransient(_ => HostComponents.Value);
+        serviceCollection.AddTransient(_ => NuGet.Value);
+        serviceCollection.AddTransient(_ => CommandLineRunner.Value);
+        serviceCollection.AddTransient(_ => BuildRunner.Value);
+        serviceCollection.AddTransient(_ => ServiceMessageParser.Value);
+        serviceCollection.AddTransient(_ => TeamCityWriter.Value);
         return serviceCollection.BuildServiceProvider();
     });
 
diff --git a/Samples/Scripts/Integration.csx b/Samples/Scripts/Integration.csx
@@ -1,5 +1,9 @@
+using HostApi;
+
 WriteLine("Hello World!");
 Trace("My trace");
 Info("My info");
+Summary("My summary message");
+Summary("My summary ", "message".WithColor(Color.Header));
 Warning("My warning");
 Error("My error");

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public static CommandLine Create(params string[] lines) =>`
`12`	`12`
`13`	`13`	`public static CommandLine Create() =>`
`14`	`14`	`new(`
`15`		`- Composition.Shared.Root.DotNetEnvironment.Path,`
	`15`	`+ Composition.Shared.Root.DotNetEnvironment.Value.Path,`
`16`	`16`	`Path.Combine(Path.GetDirectoryName(typeof(DotNetScript).Assembly.Location)!, "dotnet-csi.dll"));`
`17`	`17`
`18`	`18`	`public static CommandLine CreateForScript(string scriptName, string? workingDirectory, IEnumerable<string> args, params string[] lines)`
`@@ -27,7 +27,7 @@ public static string GetWorkingDirectory()`
`27`	`27`	`{`
`28`	`28`	`var uniqueNameGenerator = new UniqueNameGenerator();`
`29`	`29`	`var environment = Composition.Shared.Root.Environment;`
`30`		`- var tempDirectory = environment.GetPath(SpecialFolder.Temp);`
	`30`	`+ var tempDirectory = environment.Value.GetPath(SpecialFolder.Temp);`
`31`	`31`	`return Path.Combine(tempDirectory, uniqueNameGenerator.Generate());`
`32`	`32`	`}`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ private static readonly (string, string)[] TeamCityVars =`
`21`	`21`	`public static IProcessResult Run(in CommandLine commandLine)`
`22`	`22`	`{`
`23`	`23`	`var events = new List<Output>();`
`24`		`- var result = Composition.Shared.Root.CommandLineRunner.Run(commandLine, output =>`
	`24`	`+ var result = Composition.Shared.Root.CommandLineRunner.Value.Run(commandLine, output =>`
`25`	`25`	`{`
`26`	`26`	`output.Handled = true;`
`27`	`27`	`events.Add(output);`
`@@ -70,7 +70,7 @@ private static IEnumerable<IServiceMessage> ParseMessagesInternal(this IEnumerab`
`70`	`70`	`var parser = Composition.Shared.Root.ServiceMessageParser;`
`71`	`71`	`foreach (var line in lines)`
`72`	`72`	`{`
`73`		`- foreach (var message in parser.ParseServiceMessages(line))`
	`73`	`+ foreach (var message in parser.Value.ParseServiceMessages(line))`
`74`	`74`	`{`
`75`	`75`	`yield return message;`
`76`	`76`	`}`