Merge Extractor.Standalone and OutputPath

Author: tamasvajk

csharp/extractor/Semmle.Extraction.CIL/Analyser.cs

@@ -33,7 +33,7 @@ public static void ExtractCIL(Layout layout, string assemblyPath, ILogger logger
             {
                 var canonicalPathCache = CanonicalPathCache.Create(logger, 1000);
                 var pathTransformer = new PathTransformer(canonicalPathCache);
-                var extractor = new Extractor(false, assemblyPath, logger, pathTransformer);
+                var extractor = new Extractor(assemblyPath, logger, pathTransformer);
                 var transformedAssemblyPath = pathTransformer.Transform(assemblyPath);
                 var project = layout.LookupProjectOrDefault(transformedAssemblyPath);
                 using var trapWriter = project.CreateTrapWriter(logger, transformedAssemblyPath.WithSuffix(".cil"), trapCompression, discardDuplicates: true);

csharp/extractor/Semmle.Extraction.CSharp/Analyser.cs

@@ -76,7 +76,7 @@ public void EndInitialize(
             layout = new Layout();
             this.options = options;
             this.compilation = compilation;
-            extractor = new Extraction.Extractor(false, GetOutputName(compilation, commandLineArguments), Logger, PathTransformer);
+            extractor = new Extraction.Extractor(GetOutputName(compilation, commandLineArguments), Logger, PathTransformer);
             LogDiagnostics();
 
             SetReferencePaths();
@@ -126,7 +126,7 @@ public void InitializeStandalone(CSharpCompilation compilationIn, CommonOptions
         {
             compilation = compilationIn;
             layout = new Layout();
-            extractor = new Extraction.Extractor(true, null, Logger, PathTransformer);
+            extractor = new Extraction.Extractor(null, Logger, PathTransformer);
             this.options = options;
             LogExtractorInfo(Extraction.Extractor.Version);
             SetReferencePaths();

csharp/extractor/Semmle.Extraction.CSharp/Entities/Assembly.cs

@@ -65,7 +65,7 @@ private class AssemblyConstructorFactory : CachedEntityFactory<Microsoft.CodeAna
 
         public static Assembly CreateOutputAssembly(Context cx)
         {
-            if (cx.Extractor.OutputPath == null)
+            if (cx.Extractor.Standalone)
                 throw new InternalError("Attempting to create the output assembly in standalone extraction mode");
             return AssemblyConstructorFactory.Instance.CreateEntity(cx, outputAssemblyCacheKey, null);
         }

csharp/extractor/Semmle.Extraction.CSharp/Entities/Attribute.cs

@@ -53,7 +53,7 @@ public override void Populate(TextWriter trapFile)
 
             if (attributeSyntax is object)
             {
-                if (Context.Extractor.OutputPath != null)
+                if (!Context.Extractor.Standalone)
                 {
                     trapFile.attribute_location(this, Assembly.CreateOutputAssembly(Context));
                 }

csharp/extractor/Semmle.Extraction.CSharp/Entities/CachedSymbol.cs

@@ -83,7 +83,7 @@ public virtual IEnumerable<Extraction.Entities.Location> Locations
                 {
                     // Some built in operators lack locations, so loc is null.
                     yield return Context.CreateLocation(ReportingLocation);
-                    if (Context.Extractor.OutputPath != null && loc.Kind == LocationKind.SourceFile)
+                    if (!Context.Extractor.Standalone && loc.Kind == LocationKind.SourceFile)
                         yield return Assembly.CreateOutputAssembly(Context);
                 }
             }

csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/NamedType.cs

@@ -108,7 +108,7 @@ public override IEnumerable<Extraction.Entities.Location> Locations
                 foreach (var l in GetLocations(Symbol))
                     yield return Context.CreateLocation(l);
 
-                if (Context.Extractor.OutputPath != null && Symbol.DeclaringSyntaxReferences.Any())
+                if (!Context.Extractor.Standalone && Symbol.DeclaringSyntaxReferences.Any())
                     yield return Assembly.CreateOutputAssembly(Context);
             }
         }

csharp/extractor/Semmle.Extraction/Extractor.cs

@@ -9,21 +9,18 @@ namespace Semmle.Extraction
     /// </summary>
     public class Extractor
     {
-        public bool Standalone
-        {
-            get; private set;
-        }
+        public bool Standalone => OutputPath is null;
+
+        public string OutputPath { get; }
 
         /// <summary>
         /// Creates a new extractor instance for one compilation unit.
         /// </summary>
-        /// <param name="standalone">If the extraction is standalone.</param>
         /// <param name="outputPath">The name of the output DLL/EXE, or null if not specified (standalone extraction).</param>
         /// <param name="logger">The object used for logging.</param>
         /// <param name="pathTransformer">The object used for path transformations.</param>
-        public Extractor(bool standalone, string outputPath, ILogger logger, PathTransformer pathTransformer)
+        public Extractor(string outputPath, ILogger logger, PathTransformer pathTransformer)
         {
-            Standalone = standalone;
             OutputPath = outputPath;
             Logger = logger;
             PathTransformer = pathTransformer;
@@ -102,12 +99,6 @@ public void MissingNamespace(string fqdn, bool fromSource)
 
         public IEnumerable<string> MissingNamespaces => missingNamespaces;
 
-        public string OutputPath
-        {
-            get;
-            private set;
-        }
-
         public ILogger Logger { get; private set; }
 
         public static string Version => $"{ThisAssembly.Git.BaseTag} ({ThisAssembly.Git.Sha})";