Remove specific standalone/tracing extractor state classes

Author: tamasvajk

csharp/extractor/Semmle.Extraction.CSharp/Extractor/StandaloneAnalyser.cs

@@ -16,7 +16,7 @@ public StandaloneAnalyser(IProgressMonitor pm, ILogger logger, bool addAssemblyT
         public void Initialize(string outputPath, IEnumerable<(string, string)> compilationInfos, CSharpCompilation compilationIn, CommonOptions options)
         {
             compilation = compilationIn;
-            extractor = new StandaloneExtractor(Directory.GetCurrentDirectory(), outputPath, compilationInfos, Logger, PathTransformer, options);
+            extractor = new Extraction.Extractor(Directory.GetCurrentDirectory(), [], outputPath, compilationInfos, Logger, PathTransformer, ExtractorMode.Standalone, options.QlTest);
             this.options = options;
             LogExtractorInfo(Extraction.Extractor.Version);
             SetReferencePaths();

csharp/extractor/Semmle.Extraction.CSharp/Extractor/TracingAnalyser.cs

@@ -46,7 +46,7 @@ public void EndInitialize(
                 throw new InternalError("EndInitialize called without BeginInitialize returning true");
             this.options = options;
             this.compilation = compilation;
-            this.extractor = new TracingExtractor(cwd, args, GetOutputName(compilation, commandLineArguments), Logger, PathTransformer, options);
+            this.extractor = new Extraction.Extractor(cwd, args, GetOutputName(compilation, commandLineArguments), [], Logger, PathTransformer, ExtractorMode.None, options.QlTest);
             LogDiagnostics();
 
             SetReferencePaths();

csharp/extractor/Semmle.Extraction/Extractor/Extractor.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Reflection;
-using System.IO;
 using Semmle.Util.Logging;
 using CompilationInfo = (string key, string value);
 
@@ -9,27 +8,31 @@ namespace Semmle.Extraction
     /// <summary>
     /// Implementation of the main extractor state.
     /// </summary>
-    public abstract class Extractor
+    public class Extractor
     {
         public string Cwd { get; init; }
         public string[] Args { get; init; }
-        public abstract ExtractorMode Mode { get; }
+        public ExtractorMode Mode { get; }
         public string OutputPath { get; }
         public IEnumerable<CompilationInfo> CompilationInfos { get; }
 
         /// <summary>
         /// Creates a new extractor instance for one compilation unit.
         /// </summary>
-        /// <param name="logger">The object used for logging.</param>
-        /// <param name="pathTransformer">The object used for path transformations.</param>
-        protected Extractor(string cwd, string[] args, string outputPath, IEnumerable<CompilationInfo> compilationInfos, ILogger logger, PathTransformer pathTransformer)
+        public Extractor(string cwd, string[] args, string outputPath, IEnumerable<CompilationInfo> compilationInfos, ILogger logger, PathTransformer pathTransformer, ExtractorMode mode, bool isQlTest)
         {
             OutputPath = outputPath;
             Logger = logger;
             PathTransformer = pathTransformer;
             CompilationInfos = compilationInfos;
             Cwd = cwd;
             Args = args;
+
+            Mode = mode;
+            if (isQlTest)
+            {
+                Mode |= ExtractorMode.QlTest;
+            }
         }
 
         // Limit the number of error messages in the log file