Fix mods leaking into jobs where they're not welcome

Perksey · Nov 5, 2023 · ea692b6 · ea692b6
1 parent 689b973
commit ea692b6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 17 deletions.
diff --git a/sources/SilkTouchX/SilkTouchGenerator.cs b/sources/SilkTouchX/SilkTouchGenerator.cs
@@ -69,7 +69,10 @@ public async Task<GeneratedSyntax> GenerateSyntaxAsync(
     )
     {
         // Prepare the mods
-        foreach (var mod in _mods)
+        var jobMods =
+            job.Mods?.Select(x => _mods.First(y => y.GetType().Name == x)).ToArray()
+            ?? Array.Empty<IMod>();
+        foreach (var mod in jobMods)
         {
             _logger.LogDebug("Using mod {0} for {1}", mod.GetType().Name, key);
             await mod.BeforeJobAsync(key, job);
@@ -93,7 +96,7 @@ public async Task<GeneratedSyntax> GenerateSyntaxAsync(
 
         // Mod the response files
         // ReSharper disable once LoopCanBeConvertedToQuery
-        foreach (var mod in _mods)
+        foreach (var mod in jobMods)
         {
             _logger.LogInformation(
                 "Applying {0} mod to response files for {1}...",
@@ -186,7 +189,7 @@ await Task.Run(
 
         // Mod the bindings
         // ReSharper disable once LoopCanBeConvertedToQuery
-        foreach (var mod in _mods)
+        foreach (var mod in jobMods)
         {
             _logger.LogInformation(
                 "Applying {0} mod to syntax trees for {1}...",

diff --git a/sources/SilkTouchX/test.json b/sources/SilkTouchX/test.json
@@ -46,20 +46,6 @@
           "GLFWmonitor",
           "GLFWwindow"
         ]
-      },
-      "AddVTables": {
-        "VTables": [
-          {
-            "Kind": "DllImport",
-            "IsDefault": true
-          },
-          {
-            "Kind": "StaticWrapper"
-          },
-          {
-            "Kind": "ThisThread"
-          }
-        ]
       }
     }
   }