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

Author: michaelnebel

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/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();

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

@@ -74,7 +74,7 @@ public override void Populate(TextWriter trapFile)
                 WriteLocationsToTrap(trapFile.property_location, this, Locations);
             }
 
-            if (IsSourceDeclaration && Symbol.FromSource())
+            if (IsSourceDeclaration && Symbol.FromSource() && !Context.OnlyScaffold)
             {
                 var expressionBody = ExpressionBody;
                 if (expressionBody is not null)

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

@@ -222,7 +222,7 @@ protected void PopulateType(TextWriter trapFile, bool constructUnderlyingTupleTy
 
         private IEnumerable<BaseTypeSyntax> GetBaseTypeDeclarations()
         {
-            if (!IsSourceDeclaration || !Symbol.FromSource())
+            if (!IsSourceDeclaration || !Symbol.FromSource() || Context.OnlyScaffold)
             {
                 return Enumerable.Empty<BaseTypeSyntax>();
             }

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

@@ -32,7 +32,7 @@ public override void Populate(TextWriter trapFile)
                 WriteLocationsToTrap(trapFile.type_location, this, locations);
             }
 
-            if (IsSourceDeclaration)
+            if (IsSourceDeclaration && !Context.OnlyScaffold)
             {
                 var declSyntaxReferences = Symbol.DeclaringSyntaxReferences
                     .Select(d => d.GetSyntax())

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

@@ -31,7 +31,7 @@ public override void Populate(TextWriter trapFile)
                 WriteLocationsToTrap(trapFile.operator_location, this, Locations);
             }
 
-            if (IsSourceDeclaration)
+            if (IsSourceDeclaration && !Context.OnlyScaffold)
             {
                 var declSyntaxReferences = Symbol.DeclaringSyntaxReferences.Select(s => s.GetSyntax()).ToArray();
                 foreach (var declaration in declSyntaxReferences.OfType<OperatorDeclarationSyntax>())