C#: Only scaffold assemblies in overlay mode, only extract expressions when not scaffolding and only extract attributes when they are in source code in overlay mode.

Author: michaelnebel

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

@@ -57,6 +57,13 @@ public sealed override void WriteQuotedId(EscapingTextWriter trapFile)
 
         public override void Populate(TextWriter trapFile)
         {
+            // In this case, we don't extract the attribute again, as it was extracted using * ID
+            // originally and we re-use that.
+            if (Context.OnlyScaffold && (ReportingLocation is null || !ReportingLocation.IsInSource))
+            {
+                return;
+            }
+
             var type = Type.Create(Context, Symbol.AttributeClass);
             trapFile.attributes(this, kind, type.TypeRef, entity);
 

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

@@ -34,6 +34,11 @@ internal Expression(IExpressionInfo info, bool shouldPopulate = true)
 
         protected sealed override void Populate(TextWriter trapFile)
         {
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
+
             var type = Type.HasValue ? Entities.Type.Create(Context, Type.Value) : NullType.Create(Context);
             trapFile.expressions(this, Kind, type.TypeRef);
             if (info.Parent.IsTopLevelParent)

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

@@ -536,7 +536,9 @@ public Context(ExtractionContext extractionContext, Compilation c, TrapWriter tr
             ShouldAddAssemblyTrapPrefix = shouldAddAssemblyTrapPrefix;
             Compilation = c;
             this.scope = scope;
-            OnlyScaffold = overlayInfo.IsOverlayMode && scope is SourceScope ss && overlayInfo.OnlyMakeScaffold(ss.SourceTree.FilePath);
+            OnlyScaffold = overlayInfo.IsOverlayMode && (
+                IsAssemblyScope
+                || (scope is SourceScope ss && overlayInfo.OnlyMakeScaffold(ss.SourceTree.FilePath)));
         }
 
         public bool FromSource => scope is SourceScope;