hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-17 01:03:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Michael Nebel
2025-09-17 14:30:19 +02:00
parent cab9d81376
commit 61f6512c74
17 changed files with 43 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
csharp/extractor/Semmle.Extraction.CSharp/Entities/Attribute.cs
View File

@@ -59,6 +59,12 @@ namespace Semmle.Extraction.CSharp.Entities
{
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)

2
csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/CachedSymbol.cs
View File

@@ -109,7 +109,7 @@ namespace Semmle.Extraction.CSharp.Entities
/// </summary>
protected void BindComments()
{
if (!Symbol.IsImplicitlyDeclared && IsSourceDeclaration && Symbol.FromSource())
if (!Symbol.IsImplicitlyDeclared && IsSourceDeclaration && Symbol.FromSource() && !Context.OnlyScaffold)
Context.BindComments(this, FullLocation);
}

5
csharp/extractor/Semmle.Extraction.CSharp/Entities/CommentBlock.cs
View File

@@ -11,7 +11,10 @@ namespace Semmle.Extraction.CSharp.Entities
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));
}

5
csharp/extractor/Semmle.Extraction.CSharp/Entities/CommentLine.cs
View File

@@ -23,7 +23,10 @@ namespace Semmle.Extraction.CSharp.Entities
{
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;

2
csharp/extractor/Semmle.Extraction.CSharp/Entities/Constructor.cs
View File

@@ -179,7 +179,7 @@ namespace Semmle.Extraction.CSharp.Entities
/// </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)

2
csharp/extractor/Semmle.Extraction.CSharp/Entities/Field.cs
View File

@@ -54,7 +54,7 @@ namespace Semmle.Extraction.CSharp.Entities
WriteLocationsToTrap(trapFile.field_location, this, Locations);
}
if (!IsSourceDeclaration || !Symbol.FromSource())
if (!IsSourceDeclaration || !Symbol.FromSource() || Context.OnlyScaffold)
return;
Context.BindComments(this, Location.Symbol);

8
csharp/extractor/Semmle.Extraction.CSharp/Entities/Indexer.cs
View File

@@ -42,7 +42,7 @@ namespace Semmle.Extraction.CSharp.Entities
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 @@ namespace Semmle.Extraction.CSharp.Entities
PopulateAttributes();
PopulateModifiers(trapFile);
if (Context.OnlyScaffold)
{
return;
}
BindComments();
var declSyntaxReferences = IsSourceDeclaration

4
csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs
View File

@@ -48,7 +48,7 @@ namespace Semmle.Extraction.CSharp.Entities
protected virtual void PopulateMethodBody(TextWriter trapFile)
{
if (!IsSourceDeclaration)
if (!IsSourceDeclaration || Context.OnlyScaffold)
return;
var block = Block;
@@ -94,7 +94,7 @@ namespace Semmle.Extraction.CSharp.Entities
{
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);

2
csharp/extractor/Semmle.Extraction.CSharp/Entities/OrdinaryMethod.cs
View File

@@ -34,7 +34,7 @@ namespace Semmle.Extraction.CSharp.Entities
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>())
{

2
csharp/extractor/Semmle.Extraction.CSharp/Entities/Parameter.cs
View File

@@ -140,7 +140,7 @@ namespace Semmle.Extraction.CSharp.Entities
Context.PopulateLater(defaultValueExpressionCreation);
}
if (!IsSourceDeclaration || !Symbol.FromSource())
if (!IsSourceDeclaration || !Symbol.FromSource() || Context.OnlyScaffold)
return;
BindComments();

2
csharp/extractor/Semmle.Extraction.CSharp/Entities/Property.cs
View File

@@ -74,7 +74,7 @@ namespace Semmle.Extraction.CSharp.Entities
WriteLocationsToTrap(trapFile.property_location, this, Locations);
}
if (IsSourceDeclaration && Symbol.FromSource())
if (IsSourceDeclaration && Symbol.FromSource() && !Context.OnlyScaffold)
{
var expressionBody = ExpressionBody;
if (expressionBody is not null)

2
csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/NamedType.cs
View File

@@ -81,7 +81,7 @@ namespace Semmle.Extraction.CSharp.Entities
}
// Class location
if (!Symbol.IsGenericType || Symbol.IsReallyUnbound())
if ((!Symbol.IsGenericType || Symbol.IsReallyUnbound()) && !Context.OnlyScaffold)
{
WriteLocationsToTrap(trapFile.type_location, this, Locations);
}

2
csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Type.cs
View File

@@ -222,7 +222,7 @@ namespace Semmle.Extraction.CSharp.Entities
private IEnumerable<BaseTypeSyntax> GetBaseTypeDeclarations()
{
if (!IsSourceDeclaration || !Symbol.FromSource())
if (!IsSourceDeclaration || !Symbol.FromSource() || Context.OnlyScaffold)
{
return Enumerable.Empty<BaseTypeSyntax>();
}

2
csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/TypeParameter.cs
View File

@@ -32,7 +32,7 @@ namespace Semmle.Extraction.CSharp.Entities
WriteLocationsToTrap(trapFile.type_location, this, locations);
}
if (IsSourceDeclaration)
if (IsSourceDeclaration && !Context.OnlyScaffold)
{
var declSyntaxReferences = Symbol.DeclaringSyntaxReferences
.Select(d => d.GetSyntax())

2
csharp/extractor/Semmle.Extraction.CSharp/Entities/UserOperator.cs
View File

@@ -31,7 +31,7 @@ namespace Semmle.Extraction.CSharp.Entities
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>())

10
csharp/extractor/Semmle.Extraction.CSharp/Entities/UsingDirective.cs
View File

@@ -32,7 +32,10 @@ namespace Semmle.Extraction.CSharp.Entities
{
var ns = Namespace.Create(Context, namespaceSymbol);
trapFile.using_namespace_directives(this, ns);
trapFile.using_directive_location(this, Context.CreateLocation(ReportingLocation));
if (!Context.OnlyScaffold)
{
trapFile.using_directive_location(this, Context.CreateLocation(ReportingLocation));
}
}
else
{
@@ -46,7 +49,10 @@ namespace Semmle.Extraction.CSharp.Entities
// A "using static"
var m = Type.Create(Context, (ITypeSymbol?)info.Symbol);
trapFile.using_static_directives(this, m.TypeRef);
trapFile.using_directive_location(this, Context.CreateLocation(ReportingLocation));
if (!Context.OnlyScaffold)
{
trapFile.using_directive_location(this, Context.CreateLocation(ReportingLocation));
}
}
if (node.GlobalKeyword.IsKind(SyntaxKind.GlobalKeyword))

3
csharp/extractor/Semmle.Extraction.CSharp/Extractor/Context.cs
View File

@@ -559,7 +559,8 @@ namespace Semmle.Extraction.CSharp
public bool ExtractLocation(ISymbol symbol) =>
SymbolEqualityComparer.Default.Equals(symbol, symbol.OriginalDefinition) &&
scope.InScope(symbol);
scope.InScope(symbol) &&
!OnlyScaffold;
/// <summary>
/// Gets the locations of the symbol that are either