C#: Use dependency injection in the auto builder for Diagnostic classifier.

michaelnebel · mbg · commit df6f5d52b9d2 · 2023-03-03T13:05:28.000Z
diff --git a/cpp/autobuilder/Semmle.Autobuild.Cpp/CppAutobuilder.cs b/cpp/autobuilder/Semmle.Autobuild.Cpp/CppAutobuilder.cs
@@ -22,12 +22,7 @@ public CppAutobuildOptions(IBuildActions actions) : base(actions)
 
     public class CppAutobuilder : Autobuilder<CppAutobuildOptions>
     {
-        private readonly DiagnosticClassifier classifier;
-
-        public CppAutobuilder(IBuildActions actions, CppAutobuildOptions options) : base(actions, options) =>
-            classifier = new DiagnosticClassifier();
-
-        protected override DiagnosticClassifier DiagnosticClassifier => classifier;
+        public CppAutobuilder(IBuildActions actions, CppAutobuildOptions options) : base(actions, options, new DiagnosticClassifier()) { }
 
         public override BuildScript GetBuildScript()
         {
diff --git a/csharp/autobuilder/Semmle.Autobuild.CSharp/CSharpAutobuilder.cs b/csharp/autobuilder/Semmle.Autobuild.CSharp/CSharpAutobuilder.cs
@@ -1,4 +1,4 @@
-using Semmle.Extraction.CSharp;
+﻿using Semmle.Extraction.CSharp;
 using Semmle.Util.Logging;
 using Semmle.Autobuild.Shared;
 using Semmle.Util;
@@ -36,13 +36,8 @@ public class CSharpAutobuilder : Autobuilder<CSharpAutobuildOptions>
 
         private readonly AutoBuildRule autoBuildRule;
 
-        protected override DiagnosticClassifier DiagnosticClassifier { get; }
-
-        public CSharpAutobuilder(IBuildActions actions, CSharpAutobuildOptions options) : base(actions, options)
-        {
+        public CSharpAutobuilder(IBuildActions actions, CSharpAutobuildOptions options) : base(actions, options, new CSharpDiagnosticClassifier()) =>
             this.autoBuildRule = new AutoBuildRule(this);
-            this.DiagnosticClassifier = new CSharpDiagnosticClassifier();
-        }
 
         public override BuildScript GetBuildScript()
         {
diff --git a/csharp/autobuilder/Semmle.Autobuild.Shared/Autobuilder.cs b/csharp/autobuilder/Semmle.Autobuild.Shared/Autobuilder.cs
@@ -190,10 +190,11 @@ private void FindFiles(string dir, int depth, int maxDepth, IList<(string, int)>
         /// solution file and tools.
         /// </summary>
         /// <param name="options">The command line options.</param>
-        protected Autobuilder(IBuildActions actions, TAutobuildOptions options)
+        protected Autobuilder(IBuildActions actions, TAutobuildOptions options, DiagnosticClassifier diagnosticClassifier)
         {
             Actions = actions;
             Options = options;
+            DiagnosticClassifier = diagnosticClassifier;
 
             pathsLazy = new Lazy<IEnumerable<(string, int)>>(() =>
             {
@@ -264,7 +265,7 @@ protected string RequireEnvironmentVariable(string name)
 
         public string DiagnosticsDir { get; }
 
-        protected abstract DiagnosticClassifier DiagnosticClassifier { get; }
+        protected DiagnosticClassifier DiagnosticClassifier { get; }
 
         private readonly ILogger logger = new ConsoleLogger(Verbosity.Info);
 

Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,7 @@ public CppAutobuildOptions(IBuildActions actions) : base(actions)`
`22`	`22`
`23`	`23`	`public class CppAutobuilder : Autobuilder<CppAutobuildOptions>`
`24`	`24`	`{`
`25`		`- private readonly DiagnosticClassifier classifier;`
`26`		`-`
`27`		`- public CppAutobuilder(IBuildActions actions, CppAutobuildOptions options) : base(actions, options) =>`
`28`		`- classifier = new DiagnosticClassifier();`
`29`		`-`
`30`		`- protected override DiagnosticClassifier DiagnosticClassifier => classifier;`
	`25`	`+ public CppAutobuilder(IBuildActions actions, CppAutobuildOptions options) : base(actions, options, new DiagnosticClassifier()) { }`
`31`	`26`
`32`	`27`	`public override BuildScript GetBuildScript()`
`33`	`28`	`{`