Change the gatherer/rewriter classes I wrote to be only designed to be used once

Putting a cancellation token and the rest of the parameters in the constructor is a bit weird, but does simplify things.

Author: Exanite

sources/SilkTouch/SilkTouch/Mods/ExtractNestedTyping.cs

@@ -101,8 +101,8 @@ public override async Task ExecuteAsync(IModContext ctx, CancellationToken ct =
         }
 
         // Find missing handle types
-        var handleDiscoverer = new MissingHandleTypeDiscoverer(logger);
-        var missingHandleTypes = handleDiscoverer.GetMissingHandleTypes(compilation, ct);
+        var handleDiscoverer = new MissingHandleTypeDiscoverer(logger, compilation, ct);
+        var missingHandleTypes = handleDiscoverer.GetMissingHandleTypes();
 
         // Second pass to modify project based on gathered data
         if (cfg.GenerateEmptyStructsForMissingHandleTypes)
@@ -296,7 +296,7 @@ string nativeTypeName
         }
     }
 
-    private class MissingHandleTypeDiscoverer(ILogger logger) : SymbolVisitor
+    private class MissingHandleTypeDiscoverer(ILogger logger, Compilation compilation, CancellationToken ct) : SymbolVisitor
     {
         private readonly HashSet<IErrorTypeSymbol> _nonHandleTypes = new(SymbolEqualityComparer.Default);
         private readonly Dictionary<IErrorTypeSymbol, string> _missingTypes = new(SymbolEqualityComparer.Default);
@@ -307,10 +307,8 @@ private class MissingHandleTypeDiscoverer(ILogger logger) : SymbolVisitor
         /// <summary>
         /// Gets all missing handle types that are found and the namespace that they should be created in.
         /// </summary>
-        public Dictionary<IErrorTypeSymbol, string> GetMissingHandleTypes(Compilation compilation, CancellationToken ct)
+        public Dictionary<IErrorTypeSymbol, string> GetMissingHandleTypes()
         {
-            Clear();
-
             // We need to find and generate all missing handle types
             // Handle types are types that are only referenced through a pointer
             // We do this by parsing through the list of type errors
@@ -390,17 +388,6 @@ public Dictionary<IErrorTypeSymbol, string> GetMissingHandleTypes(Compilation co
             return new Dictionary<IErrorTypeSymbol, string>(_missingTypes.Where(kvp => !_nonHandleTypes.Contains(kvp.Key)), SymbolEqualityComparer.Default);
         }
 
-        /// <summary>
-        /// Resets internal state.
-        /// </summary>
-        private void Clear()
-        {
-            _nonHandleTypes.Clear();
-            _missingTypes.Clear();
-            _currentNamespace = null;
-            _pointerTypeDepth = 0;
-        }
-
         public override void VisitMethod(IMethodSymbol symbol)
         {
             base.VisitMethod(symbol);

sources/SilkTouch/SilkTouch/Mods/TransformHandles.cs

@@ -168,8 +168,6 @@ private class HandleTypeDiscoverer(Project project, Compilation compilation, Can
         /// </summary>
         public async Task<List<INamedTypeSymbol>> GetHandleTypesAsync()
         {
-            Clear();
-
             Visit(compilation.GlobalNamespace);
 
             var results = new List<INamedTypeSymbol>();
@@ -218,11 +216,6 @@ public async Task<List<INamedTypeSymbol>> GetHandleTypesAsync()
             return results;
         }
 
-        /// <summary>
-        /// Clears all internal state
-        /// </summary>
-        private void Clear() => _emptyStructs.Clear();
-
         public override void VisitNamespace(INamespaceSymbol symbol)
         {
             base.VisitNamespace(symbol);