C#: Address review comments and make more early returns in Populate.

michaelnebel · michaelnebel · commit 7c670cdc3fe2 · 2025-11-07T14:50:20.000+01:00
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/CommentBlock.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/CommentBlock.cs
@@ -11,11 +11,12 @@ private CommentBlock(Context cx, Comments.CommentBlock init)
         public override void Populate(TextWriter trapFile)
         {
             trapFile.commentblock(this);
-            if (!Context.OnlyScaffold)
+            Symbol.CommentLines.ForEach((l, child) => trapFile.commentblock_child(this, l, child));
+            if (Context.OnlyScaffold)
             {
-                WriteLocationToTrap(trapFile.commentblock_location, this, Context.CreateLocation(Symbol.Location));
+                return;
             }
-            Symbol.CommentLines.ForEach((l, child) => trapFile.commentblock_child(this, l, child));
+            WriteLocationToTrap(trapFile.commentblock_location, this, Context.CreateLocation(Symbol.Location));
         }
 
         public override bool NeedsPopulation => true;
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/CommentLine.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/CommentLine.cs
@@ -21,12 +21,14 @@ private CommentLine(Context cx, Microsoft.CodeAnalysis.Location loc, CommentLine
 
         public override void Populate(TextWriter trapFile)
         {
-            location = Context.CreateLocation(Location);
             trapFile.commentline(this, Type == CommentLineType.MultilineContinuation ? CommentLineType.Multiline : Type, Text, RawText);
-            if (!Context.OnlyScaffold)
+            if (Context.OnlyScaffold)
             {
-                WriteLocationToTrap(trapFile.commentline_location, this, location);
+                return;
             }
+            location = Context.CreateLocation(Location);
+            WriteLocationToTrap(trapFile.commentline_location, this, location);
+
         }
 
         public override Microsoft.CodeAnalysis.Location? ReportingLocation => location?.Symbol;
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Compilations/CompilerDiagnostic.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Compilations/CompilerDiagnostic.cs
@@ -21,6 +21,11 @@ public CompilerDiagnostic(Context cx, Microsoft.CodeAnalysis.Diagnostic diag, Co
 
         protected override void Populate(TextWriter trapFile)
         {
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
+
             var key = diagnostic.Id;
             var messageCount = compilation.messageCounts.AddOrUpdate(key, 1, (_, c) => c + 1);
             if (messageCount > limit)
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Constructor.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Constructor.cs
@@ -29,9 +29,17 @@ public override void Populate(TextWriter trapFile)
             ContainingType!.PopulateGenerics();
 
             trapFile.constructors(this, Symbol.ContainingType.Name, ContainingType, (Constructor)OriginalDefinition);
-            if (Context.ExtractLocation(Symbol) && (!IsDefault || IsBestSourceLocation))
+
+            if (Symbol.IsImplicitlyDeclared)
             {
-                WriteLocationToTrap(trapFile.constructor_location, this, Location);
+                var lineCounts = new LineCounts() { Total = 2, Code = 1, Comment = 0 };
+                trapFile.numlines(this, lineCounts);
+            }
+            ExtractCompilerGenerated(trapFile);
+
+            if (Context.OnlyScaffold)
+            {
+                return;
             }
 
             if (MakeSynthetic)
@@ -40,12 +48,11 @@ public override void Populate(TextWriter trapFile)
                 Statements.SyntheticEmptyBlock.Create(Context, this, 0, Location);
             }
 
-            if (Symbol.IsImplicitlyDeclared)
+            if (Context.ExtractLocation(Symbol) && (!IsDefault || IsBestSourceLocation))
             {
-                var lineCounts = new LineCounts() { Total = 2, Code = 1, Comment = 0 };
-                trapFile.numlines(this, lineCounts);
+                WriteLocationToTrap(trapFile.constructor_location, this, Location);
             }
-            ExtractCompilerGenerated(trapFile);
+
         }
 
         protected override void ExtractInitializers(TextWriter trapFile)
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Destructor.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Destructor.cs
@@ -15,6 +15,7 @@ public override void Populate(TextWriter trapFile)
             ContainingType!.PopulateGenerics();
 
             trapFile.destructors(this, $"~{Symbol.ContainingType.Name}", ContainingType, OriginalDefinition(Context, this, Symbol));
+
             if (Context.ExtractLocation(Symbol))
             {
                 WriteLocationToTrap(trapFile.destructor_location, this, Location);
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Event.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Event.cs
@@ -37,7 +37,6 @@ public override void Populate(TextWriter trapFile)
                 Method.Create(Context, remover);
 
             PopulateModifiers(trapFile);
-            BindComments();
 
             var declSyntaxReferences = IsSourceDeclaration
                 ? Symbol.DeclaringSyntaxReferences.Select(d => d.GetSyntax()).ToArray()
@@ -51,6 +50,13 @@ public override void Populate(TextWriter trapFile)
                     TypeMention.Create(Context, syntax.ExplicitInterfaceSpecifier!.Name, this, explicitInterface);
             }
 
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
+
+            BindComments();
+
             if (Context.ExtractLocation(Symbol))
             {
                 WriteLocationsToTrap(trapFile.event_location, this, Locations);
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/ExtractionMessage.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/ExtractionMessage.cs
@@ -28,6 +28,11 @@ private ExtractionMessage(Context cx, Message msg, bool bypassLimit) : base(cx)
 
         protected override void Populate(TextWriter trapFile)
         {
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
+
             // For the time being we're counting the number of messages per severity, we could introduce other groupings in the future
             var key = msg.Severity.ToString();
             groupedMessageCounts.AddOrUpdate(key, 1, (_, c) => c + 1);
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Field.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Field.cs
@@ -49,12 +49,17 @@ public override void Populate(TextWriter trapFile)
                 }
             }
 
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
+
             if (Context.ExtractLocation(Symbol))
             {
                 WriteLocationsToTrap(trapFile.field_location, this, Locations);
             }
 
-            if (!IsSourceDeclaration || !Symbol.FromSource() || Context.OnlyScaffold)
+            if (!IsSourceDeclaration || !Symbol.FromSource())
                 return;
 
             Context.BindComments(this, Location.Symbol);
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Indexer.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Indexer.cs
@@ -19,10 +19,6 @@ public override void Populate(TextWriter trapFile)
 
             var type = Type.Create(Context, Symbol.Type);
             trapFile.indexers(this, Symbol.GetName(useMetadataName: true), ContainingType!, type.TypeRef, OriginalDefinition);
-            if (Context.ExtractLocation(Symbol))
-            {
-                WriteLocationsToTrap(trapFile.indexer_location, this, Locations);
-            }
 
             var getter = BodyDeclaringSymbol.GetMethod;
             var setter = BodyDeclaringSymbol.SetMethod;
@@ -42,27 +38,9 @@ public override void Populate(TextWriter trapFile)
                 Parameter.Create(Context, Symbol.Parameters[i], this, original);
             }
 
-            if (IsSourceDeclaration && !Context.OnlyScaffold)
-            {
-                var expressionBody = ExpressionBody;
-                if (expressionBody is not null)
-                {
-                    // The expression may need to reference parameters in the getter.
-                    // So we need to arrange that the expression is populated after the getter.
-                    Context.PopulateLater(() => Expression.CreateFromNode(new ExpressionNodeInfo(Context, expressionBody, this, 0).SetType(Symbol.GetAnnotatedType())));
-                }
-            }
-
             PopulateAttributes();
             PopulateModifiers(trapFile);
 
-            if (Context.OnlyScaffold)
-            {
-                return;
-            }
-
-            BindComments();
-
             var declSyntaxReferences = IsSourceDeclaration
                 ? Symbol.DeclaringSyntaxReferences.
                 Select(d => d.GetSyntax()).OfType<IndexerDeclarationSyntax>().ToArray()
@@ -76,6 +54,28 @@ public override void Populate(TextWriter trapFile)
                     TypeMention.Create(Context, syntax.ExplicitInterfaceSpecifier!.Name, this, explicitInterface);
             }
 
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
+
+            if (Context.ExtractLocation(Symbol))
+            {
+                WriteLocationsToTrap(trapFile.indexer_location, this, Locations);
+            }
+
+            if (IsSourceDeclaration)
+            {
+                var expressionBody = ExpressionBody;
+                if (expressionBody is not null)
+                {
+                    // The expression may need to reference parameters in the getter.
+                    // So we need to arrange that the expression is populated after the getter.
+                    Context.PopulateLater(() => Expression.CreateFromNode(new ExpressionNodeInfo(Context, expressionBody, this, 0).SetType(Symbol.GetAnnotatedType())));
+                }
+            }
+
+            BindComments();
 
             foreach (var syntax in declSyntaxReferences)
                 TypeMention.Create(Context, syntax.Type, this, type);
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/LocalVariable.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/LocalVariable.cs
@@ -41,6 +41,11 @@ public void PopulateManual(Expression parent, bool isVar)
                 trapFile.localvars(this, Kinds.VariableKind.None, Symbol.Name, @var, Type.Create(Context, parent.Type).TypeRef, parent);
             }
 
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
+
             WriteLocationToTrap(trapFile.localvar_location, this, Location);
 
             DefineConstantValue(trapFile);
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs
@@ -94,7 +94,7 @@ public void Overrides(TextWriter trapFile)
             {
                 trapFile.explicitly_implements(this, explicitInterface.TypeRef);
 
-                if (IsSourceDeclaration && !Context.OnlyScaffold)
+                if (IsSourceDeclaration)
                 {
                     foreach (var syntax in Symbol.DeclaringSyntaxReferences.Select(d => d.GetSyntax()).OfType<MethodDeclarationSyntax>())
                         TypeMention.Create(Context, syntax.ExplicitInterfaceSpecifier!.Name, this, explicitInterface);
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/NamespaceDeclaration.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/NamespaceDeclaration.cs
@@ -35,7 +35,6 @@ public override void Populate(TextWriter trapFile)
 
             var ns = Namespace.Create(Context, @namespace);
             trapFile.namespace_declarations(this, ns);
-            WriteLocationToTrap(trapFile.namespace_declaration_location, this, Context.CreateLocation(node.Name.GetLocation()));
 
             var visitor = new Populators.TypeOrNamespaceVisitor(Context, trapFile, this);
 
@@ -48,6 +47,12 @@ public override void Populate(TextWriter trapFile)
             {
                 trapFile.parent_namespace_declaration(this, parent);
             }
+
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
+            WriteLocationToTrap(trapFile.namespace_declaration_location, this, Context.CreateLocation(node.Name.GetLocation()));
         }
 
         public static NamespaceDeclaration Create(Context cx, BaseNamespaceDeclarationSyntax decl, NamespaceDeclaration parent)
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/OrdinaryMethod.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/OrdinaryMethod.cs
@@ -34,7 +34,17 @@ public override void Populate(TextWriter trapFile)
             var returnType = Type.Create(Context, Symbol.ReturnType);
             trapFile.methods(this, Name, ContainingType, returnType.TypeRef, OriginalDefinition);
 
-            if (IsSourceDeclaration && !Context.OnlyScaffold)
+            PopulateGenerics(trapFile);
+            Overrides(trapFile);
+            ExtractRefReturn(trapFile, Symbol, this);
+            ExtractCompilerGenerated(trapFile);
+
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
+
+            if (IsSourceDeclaration)
             {
                 foreach (var declaration in Symbol.DeclaringSyntaxReferences.Select(s => s.GetSyntax()).OfType<MethodDeclarationSyntax>())
                 {
@@ -47,11 +57,6 @@ public override void Populate(TextWriter trapFile)
             {
                 WriteLocationsToTrap(trapFile.method_location, this, Locations);
             }
-
-            PopulateGenerics(trapFile);
-            Overrides(trapFile);
-            ExtractRefReturn(trapFile, Symbol, this);
-            ExtractCompilerGenerated(trapFile);
         }
 
         private bool IsCompilerGeneratedDelegate() =>
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Parameter.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Parameter.cs
@@ -115,6 +115,11 @@ public override void Populate(TextWriter trapFile)
             var type = Type.Create(Context, Symbol.Type);
             trapFile.@params(this, Name, type.TypeRef, Ordinal, ParamKind, Parent!, Original);
 
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
+
             if (Context.ExtractLocation(Symbol))
             {
                 var locations = Context.GetLocations(Symbol);
@@ -140,7 +145,7 @@ Symbol.ContainingSymbol is IMethodSymbol ms &&
                 Context.PopulateLater(defaultValueExpressionCreation);
             }
 
-            if (!IsSourceDeclaration || !Symbol.FromSource() || Context.OnlyScaffold)
+            if (!IsSourceDeclaration || !Symbol.FromSource())
                 return;
 
             BindComments();
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/PreprocessorDirectives/PreprocessorDirective.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/PreprocessorDirectives/PreprocessorDirective.cs
@@ -13,10 +13,15 @@ public sealed override void Populate(TextWriter trapFile)
             PopulatePreprocessor(trapFile);
 
             trapFile.preprocessor_directive_active(this, Symbol.IsActive);
-            WriteLocationToTrap(trapFile.preprocessor_directive_location, this, Context.CreateLocation(ReportingLocation));
 
             var compilation = Compilation.Create(Context);
             trapFile.preprocessor_directive_compilation(this, compilation);
+
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
+            WriteLocationToTrap(trapFile.preprocessor_directive_location, this, Context.CreateLocation(ReportingLocation));
         }
 
         protected abstract void PopulatePreprocessor(TextWriter trapFile);
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Property.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Property.cs
@@ -40,7 +40,6 @@ public override void Populate(TextWriter trapFile)
         {
             PopulateAttributes();
             PopulateModifiers(trapFile);
-            BindComments();
             PopulateNullability(trapFile, Symbol.GetAnnotatedType());
             PopulateRefKind(trapFile, Symbol.RefKind);
 
@@ -69,12 +68,19 @@ public override void Populate(TextWriter trapFile)
                     TypeMention.Create(Context, syntax.ExplicitInterfaceSpecifier!.Name, this, explicitInterface);
             }
 
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
+
+            BindComments();
+
             if (Context.ExtractLocation(Symbol))
             {
                 WriteLocationsToTrap(trapFile.property_location, this, Locations);
             }
 
-            if (IsSourceDeclaration && Symbol.FromSource() && !Context.OnlyScaffold)
+            if (IsSourceDeclaration && Symbol.FromSource())
             {
                 var expressionBody = ExpressionBody;
                 if (expressionBody is not null)
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/TypeMention.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/TypeMention.cs
@@ -59,6 +59,11 @@ private static Type GetArrayElementType(Type type)
 
         protected override void Populate(TextWriter trapFile)
         {
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
+
             switch (syntax.Kind())
             {
                 case SyntaxKind.ArrayType:
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/DynamicType.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/DynamicType.cs
@@ -16,10 +16,14 @@ private DynamicType(Context cx, IDynamicTypeSymbol init)
         public override void Populate(TextWriter trapFile)
         {
             trapFile.types(this, Kinds.TypeKind.DYNAMIC, "dynamic");
-            WriteLocationToTrap(trapFile.type_location, this, Location);
 
             trapFile.has_modifiers(this, Modifier.Create(Context, "public"));
             trapFile.parent_namespace(this, Namespace.Create(Context, Context.Compilation.GlobalNamespace));
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
+            WriteLocationToTrap(trapFile.type_location, this, Location);
         }
 
         public override void WriteId(EscapingTextWriter trapFile)
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/TupleType.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/TupleType.cs
@@ -51,6 +51,10 @@ public override void Populate(TextWriter trapFile)
                     trapFile.tuple_element(this, index++, element);
             }
 
+            if (Context.OnlyScaffold)
+            {
+                return;
+            }
             // Note: symbol.Locations seems to be very inconsistent
             // about what locations are available for a tuple type.
             // Sometimes it's the source code, and sometimes it's empty.
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/TypeParameter.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/TypeParameter.cs
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/UserOperator.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/UserOperator.cs
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/UsingDirective.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/UsingDirective.cs
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/OverlayInfo.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/OverlayInfo.cs

Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,12 @@ private CommentBlock(Context cx, Comments.CommentBlock init)`
`11`	`11`	`public override void Populate(TextWriter trapFile)`
`12`	`12`	`{`
`13`	`13`	`trapFile.commentblock(this);`
`14`		`- if (!Context.OnlyScaffold)`
	`14`	`+ Symbol.CommentLines.ForEach((l, child) => trapFile.commentblock_child(this, l, child));`
	`15`	`+ if (Context.OnlyScaffold)`
`15`	`16`	`{`
`16`		`- WriteLocationToTrap(trapFile.commentblock_location, this, Context.CreateLocation(Symbol.Location));`
	`17`	`+ return;`
`17`	`18`	`}`
`18`		`- Symbol.CommentLines.ForEach((l, child) => trapFile.commentblock_child(this, l, child));`
	`19`	`+ WriteLocationToTrap(trapFile.commentblock_location, this, Context.CreateLocation(Symbol.Location));`
`19`	`20`	`}`
`20`	`21`
`21`	`22`	`public override bool NeedsPopulation => true;`
Original file line number	Diff line number	Diff line change
`@@ -21,12 +21,14 @@ private CommentLine(Context cx, Microsoft.CodeAnalysis.Location loc, CommentLine`
`21`	`21`
`22`	`22`	`public override void Populate(TextWriter trapFile)`
`23`	`23`	`{`
`24`		`- location = Context.CreateLocation(Location);`
`25`	`24`	`trapFile.commentline(this, Type == CommentLineType.MultilineContinuation ? CommentLineType.Multiline : Type, Text, RawText);`
`26`		`- if (!Context.OnlyScaffold)`
	`25`	`+ if (Context.OnlyScaffold)`
`27`	`26`	`{`
`28`		`- WriteLocationToTrap(trapFile.commentline_location, this, location);`
	`27`	`+ return;`
`29`	`28`	`}`
	`29`	`+ location = Context.CreateLocation(Location);`
	`30`	`+ WriteLocationToTrap(trapFile.commentline_location, this, location);`
	`31`	`+`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`public override Microsoft.CodeAnalysis.Location? ReportingLocation => location?.Symbol;`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,17 @@ public override void Populate(TextWriter trapFile)`
`29`	`29`	`ContainingType!.PopulateGenerics();`
`30`	`30`
`31`	`31`	`trapFile.constructors(this, Symbol.ContainingType.Name, ContainingType, (Constructor)OriginalDefinition);`
`32`		`- if (Context.ExtractLocation(Symbol) && (!IsDefault \|\| IsBestSourceLocation))`
	`32`	`+`
	`33`	`+ if (Symbol.IsImplicitlyDeclared)`
`33`	`34`	`{`
`34`		`- WriteLocationToTrap(trapFile.constructor_location, this, Location);`
	`35`	`+ var lineCounts = new LineCounts() { Total = 2, Code = 1, Comment = 0 };`
	`36`	`+ trapFile.numlines(this, lineCounts);`
	`37`	`+ }`
	`38`	`+ ExtractCompilerGenerated(trapFile);`
	`39`	`+`
	`40`	`+ if (Context.OnlyScaffold)`
	`41`	`+ {`
	`42`	`+ return;`
`35`	`43`	`}`
`36`	`44`
`37`	`45`	`if (MakeSynthetic)`
`@@ -40,12 +48,11 @@ public override void Populate(TextWriter trapFile)`
`40`	`48`	`Statements.SyntheticEmptyBlock.Create(Context, this, 0, Location);`
`41`	`49`	`}`
`42`	`50`
`43`		`- if (Symbol.IsImplicitlyDeclared)`
	`51`	`+ if (Context.ExtractLocation(Symbol) && (!IsDefault \|\| IsBestSourceLocation))`
`44`	`52`	`{`
`45`		`- var lineCounts = new LineCounts() { Total = 2, Code = 1, Comment = 0 };`
`46`		`- trapFile.numlines(this, lineCounts);`
	`53`	`+ WriteLocationToTrap(trapFile.constructor_location, this, Location);`
`47`	`54`	`}`
`48`		`- ExtractCompilerGenerated(trapFile);`
	`55`	`+`
`49`	`56`	`}`
`50`	`57`
`51`	`58`	`protected override void ExtractInitializers(TextWriter trapFile)`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ public override void Populate(TextWriter trapFile)`
`15`	`15`	`ContainingType!.PopulateGenerics();`
`16`	`16`
`17`	`17`	`trapFile.destructors(this, $"~{Symbol.ContainingType.Name}", ContainingType, OriginalDefinition(Context, this, Symbol));`
	`18`	`+`
`18`	`19`	`if (Context.ExtractLocation(Symbol))`
`19`	`20`	`{`
`20`	`21`	`WriteLocationToTrap(trapFile.destructor_location, this, Location);`
Original file line number	Diff line number	Diff line change
`@@ -49,12 +49,17 @@ public override void Populate(TextWriter trapFile)`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
	`52`	`+ if (Context.OnlyScaffold)`
	`53`	`+ {`
	`54`	`+ return;`
	`55`	`+ }`
	`56`	`+`
`52`	`57`	`if (Context.ExtractLocation(Symbol))`
`53`	`58`	`{`
`54`	`59`	`WriteLocationsToTrap(trapFile.field_location, this, Locations);`
`55`	`60`	`}`
`56`	`61`
`57`		`- if (!IsSourceDeclaration \|\| !Symbol.FromSource() \|\| Context.OnlyScaffold)`
	`62`	`+ if (!IsSourceDeclaration \|\| !Symbol.FromSource())`
`58`	`63`	`return;`
`59`	`64`
`60`	`65`	`Context.BindComments(this, Location.Symbol);`