resolve comments

packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/perf/PluginInitializer.cs

@@ -11,7 +11,7 @@ internal static class PluginInitializer
         public static void Initialize()
         {
             PluginHandler pluginHandler = new PluginHandler();
-            pluginHandler.LoadPlugin(null!, new CommandLineOptions
+            pluginHandler.LoadPlugin(new CommandLineOptions
             {
                 OutputDirectory = Path.Combine(Directory.GetParent(Assembly.GetExecutingAssembly().Location)!.FullName, "Projects", "Model"),
                 PluginName = "CodeModelPlugin"

packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/CodeModelPlugin.cs

@@ -47,7 +47,7 @@ public CodeModelPlugin(GeneratorContext context)
             Configuration = context.Configuration;
             _inputLibrary = new InputLibrary(Configuration.OutputDirectory);
             TypeFactory = new TypeFactory();
-            Emitter = null!;
+            Emitter = new Emitter(Console.OpenStandardOutput());
         }
 
         // for mocking
@@ -60,7 +60,7 @@ protected CodeModelPlugin()
         internal bool IsNewProject { get; set; }
         private InputLibrary _inputLibrary;
 
-        public virtual Emitter Emitter { get; internal set; }
+        public virtual Emitter Emitter { get; }
 
         // Extensibility points to be implemented by a plugin
         public virtual TypeFactory TypeFactory { get; }

packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/StartUp/GeneratorRunner.cs

@@ -8,10 +8,10 @@ namespace Microsoft.TypeSpec.Generator
 {
     internal class GeneratorRunner
     {
-        public async Task RunAsync(Emitter emitter, CommandLineOptions options)
+        public async Task RunAsync(CommandLineOptions options)
         {
             PluginHandler pluginHandler = new();
-            pluginHandler.LoadPlugin(emitter, options);
+            pluginHandler.LoadPlugin(options);
 
             var csharpGen = new CSharpGen();
             await csharpGen.ExecuteAsync();

packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/StartUp/PluginHandler.cs

@@ -5,24 +5,23 @@
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.ComponentModel.Composition.Hosting;
-using Microsoft.TypeSpec.Generator.EmitterRpc;
 
 namespace Microsoft.TypeSpec.Generator
 {
     internal class PluginHandler
     {
-        public void LoadPlugin(Emitter emitter, CommandLineOptions options)
+        public void LoadPlugin(CommandLineOptions options)
         {
             using DirectoryCatalog directoryCatalog = new(AppContext.BaseDirectory);
             using CompositionContainer container = new(directoryCatalog);
 
             container.ComposeExportedValue(new GeneratorContext(Configuration.Load(options.OutputDirectory)));
             container.ComposeParts(this);
 
-            SelectPlugin(emitter, options);
+            SelectPlugin(options);
         }
 
-        internal void SelectPlugin(Emitter emitter, CommandLineOptions options)
+        internal void SelectPlugin(CommandLineOptions options)
         {
             bool loaded = false;
             foreach (var plugin in Plugins!)
@@ -31,7 +30,6 @@ internal void SelectPlugin(Emitter emitter, CommandLineOptions options)
                 {
                     CodeModelPlugin.Instance = plugin.Value;
                     CodeModelPlugin.Instance.IsNewProject = options.IsNewProject;
-                    CodeModelPlugin.Instance.Emitter = emitter;
                     loaded = true;
                     CodeModelPlugin.Instance.Configure();
                     break;

packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/src/StartUp/Program.cs

@@ -31,17 +31,15 @@ public static async Task<int> Main(string[] args)
 
         private static async Task<int> Run(CommandLineOptions options, GeneratorRunner runner)
         {
-            using var emitter = new Emitter(Console.OpenStandardOutput());
-
             if (options.ShouldDebug)
             {
-                emitter.Debug("Attempting to attach debugger..");
+                Console.Error.WriteLine("Attempting to attach debugger..");
                 Debugger.Launch();
             }
 
             try
             {
-                await runner.RunAsync(emitter, options);
+                await runner.RunAsync(options);
             }
             catch (Exception e)
             {
@@ -50,6 +48,8 @@ private static async Task<int> Run(CommandLineOptions options, GeneratorRunner r
                 return 1;
             }
 
+            (CodeModelPlugin.Instance.Emitter as IDisposable)?.Dispose();
+
             return 0;
         }
     }

packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator/test/StartUp/PluginHandlerTests.cs

@@ -23,7 +23,7 @@ public void SelectPluginFindsMatchingPlugin()
             };
             CommandLineOptions options = new() { PluginName = "MockPlugin" };
 
-            Assert.DoesNotThrow(() => pluginHandler.SelectPlugin(null!, options));
+            Assert.DoesNotThrow(() => pluginHandler.SelectPlugin(options));
             mockPlugin.Verify(p => p.Configure(), Times.Once);
         }
 
@@ -41,7 +41,7 @@ public void SelectPluginThrowsWhenNoMatch()
             };
             CommandLineOptions options = new() { PluginName = "NonExistentPlugin" };
 
-            Assert.Throws<System.InvalidOperationException>(() => pluginHandler.SelectPlugin(null!, options));
+            Assert.Throws<System.InvalidOperationException>(() => pluginHandler.SelectPlugin(options));
             mockPlugin.Verify(p => p.Configure(), Times.Never);
         }
     }