C#: Sprinkle uses of OnlyScaffold to extract less when in overlay mode.

Author: michaelnebel

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

@@ -59,6 +59,12 @@ public override void Populate(TextWriter trapFile)
         {
             var type = Type.Create(Context, Symbol.AttributeClass);
             trapFile.attributes(this, kind, type.TypeRef, entity);
+
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
+
             WriteLocationToTrap(trapFile.attribute_location, this, Location);
 
             if (attributeSyntax is not null)

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

@@ -109,7 +109,7 @@ public virtual IEnumerable<Location> Locations
         /// </summary>
         protected void BindComments()
         {
-            if (!Symbol.IsImplicitlyDeclared && IsSourceDeclaration && Symbol.FromSource())
+            if (!Symbol.IsImplicitlyDeclared && IsSourceDeclaration && Symbol.FromSource() && !Context.OnlyScaffold)
                 Context.BindComments(this, FullLocation);
         }
 

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

@@ -11,7 +11,10 @@ private CommentBlock(Context cx, Comments.CommentBlock init)
         public override void Populate(TextWriter trapFile)
         {
             trapFile.commentblock(this);
-            WriteLocationToTrap(trapFile.commentblock_location, this, Context.CreateLocation(Symbol.Location));
+            if (!Context.OnlyScaffold)
+            {
+                WriteLocationToTrap(trapFile.commentblock_location, this, Context.CreateLocation(Symbol.Location));
+            }
             Symbol.CommentLines.ForEach((l, child) => trapFile.commentblock_child(this, l, child));
         }
 

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

@@ -23,7 +23,10 @@ public override void Populate(TextWriter trapFile)
         {
             location = Context.CreateLocation(Location);
             trapFile.commentline(this, Type == CommentLineType.MultilineContinuation ? CommentLineType.Multiline : Type, Text, RawText);
-            WriteLocationToTrap(trapFile.commentline_location, this, location);
+            if (!Context.OnlyScaffold)
+            {
+                WriteLocationToTrap(trapFile.commentline_location, this, location);
+            }
         }
 
         public override Microsoft.CodeAnalysis.Location? ReportingLocation => location?.Symbol;

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

@@ -179,7 +179,7 @@ Symbol.ContainingType.TypeKind is TypeKind.Class or TypeKind.Struct &&
         /// </summary>
         private bool IsBestSourceLocation => ReportingLocation is not null && Context.IsLocationInContext(ReportingLocation);
 
-        private bool MakeSynthetic => IsPrimary || (IsDefault && IsBestSourceLocation);
+        private bool MakeSynthetic => (IsPrimary || (IsDefault && IsBestSourceLocation)) && !Context.OnlyScaffold;
 
         [return: NotNullIfNotNull(nameof(constructor))]
         public static new Constructor? Create(Context cx, IMethodSymbol? constructor)

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

@@ -54,7 +54,7 @@ public override void Populate(TextWriter trapFile)
                 WriteLocationsToTrap(trapFile.field_location, this, Locations);
             }
 
-            if (!IsSourceDeclaration || !Symbol.FromSource())
+            if (!IsSourceDeclaration || !Symbol.FromSource() || Context.OnlyScaffold)
                 return;
 
             Context.BindComments(this, Location.Symbol);

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

@@ -42,7 +42,7 @@ public override void Populate(TextWriter trapFile)
                 Parameter.Create(Context, Symbol.Parameters[i], this, original);
             }
 
-            if (IsSourceDeclaration)
+            if (IsSourceDeclaration && !Context.OnlyScaffold)
             {
                 var expressionBody = ExpressionBody;
                 if (expressionBody is not null)
@@ -55,6 +55,12 @@ public override void Populate(TextWriter trapFile)
 
             PopulateAttributes();
             PopulateModifiers(trapFile);
+
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
+
             BindComments();
 
             var declSyntaxReferences = IsSourceDeclaration

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

@@ -48,7 +48,7 @@ protected virtual void ExtractInitializers(TextWriter trapFile)
 
         protected virtual void PopulateMethodBody(TextWriter trapFile)
         {
-            if (!IsSourceDeclaration)
+            if (!IsSourceDeclaration || Context.OnlyScaffold)
                 return;
 
             var block = Block;
@@ -94,7 +94,7 @@ public void Overrides(TextWriter trapFile)
             {
                 trapFile.explicitly_implements(this, explicitInterface.TypeRef);
 
-                if (IsSourceDeclaration)
+                if (IsSourceDeclaration && !Context.OnlyScaffold)
                 {
                     foreach (var syntax in Symbol.DeclaringSyntaxReferences.Select(d => d.GetSyntax()).OfType<MethodDeclarationSyntax>())
                         TypeMention.Create(Context, syntax.ExplicitInterfaceSpecifier!.Name, this, explicitInterface);

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

@@ -34,7 +34,7 @@ public override void Populate(TextWriter trapFile)
             var returnType = Type.Create(Context, Symbol.ReturnType);
             trapFile.methods(this, Name, ContainingType, returnType.TypeRef, OriginalDefinition);
 
-            if (IsSourceDeclaration)
+            if (IsSourceDeclaration && !Context.OnlyScaffold)
             {
                 foreach (var declaration in Symbol.DeclaringSyntaxReferences.Select(s => s.GetSyntax()).OfType<MethodDeclarationSyntax>())
                 {

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

@@ -140,7 +140,7 @@ Symbol.ContainingSymbol is IMethodSymbol ms &&
                 Context.PopulateLater(defaultValueExpressionCreation);
             }
 
-            if (!IsSourceDeclaration || !Symbol.FromSource())
+            if (!IsSourceDeclaration || !Symbol.FromSource() || Context.OnlyScaffold)
                 return;
 
             BindComments();