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

C#: Update the extractor to use the BestOrDefault extension method to choose between multiple locations.

Browse Source
This commit is contained in:
Michael Nebel
2024-06-25 15:50:44 +02:00
parent dd65d960be
commit e15a47d58c
12 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,12 +82,12 @@ namespace Semmle.Extraction.CSharp.Entities
/// The location which is stored in the database and is used when highlighting source code. /// The location which is stored in the database and is used when highlighting source code.
/// It's generally short, e.g. a method name. /// It's generally short, e.g. a method name.
/// </summary> /// </summary>
public override Microsoft.CodeAnalysis.Location? ReportingLocation => Symbol.Locations.FirstOrDefault(); public override Microsoft.CodeAnalysis.Location? ReportingLocation => Symbol.Locations.BestOrDefault();
/// <summary> /// <summary>
/// The full text span of the entity, e.g. for binding comments. /// The full text span of the entity, e.g. for binding comments.
/// </summary> /// </summary>
public virtual Microsoft.CodeAnalysis.Location? FullLocation => Symbol.Locations.FirstOrDefault(); public virtual Microsoft.CodeAnalysis.Location? FullLocation => Symbol.Locations.BestOrDefault();
public virtual IEnumerable<Extraction.Entities.Location> Locations public virtual IEnumerable<Extraction.Entities.Location> Locations
{ {

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

@@ -1,4 +1,3 @@
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using System.IO; using System.IO;

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

@@ -24,7 +24,7 @@ namespace Semmle.Extraction.CSharp.Entities
.OfType<ConversionOperatorDeclarationSyntax>() .OfType<ConversionOperatorDeclarationSyntax>()
.Select(s => s.FixedLocation()) .Select(s => s.FixedLocation())
.Concat(Symbol.Locations) .Concat(Symbol.Locations)
.FirstOrDefault(); .BestOrDefault();
} }
} }

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

@@ -93,7 +93,7 @@ namespace Semmle.Extraction.CSharp.Entities
.OfType<IndexerDeclarationSyntax>() .OfType<IndexerDeclarationSyntax>()
.Select(s => s.GetLocation()) .Select(s => s.GetLocation())
.Concat(Symbol.Locations) .Concat(Symbol.Locations)
.First(); .Best();
} }
} }

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

@@ -111,7 +111,7 @@ namespace Semmle.Extraction.CSharp.Entities
.OfType<PropertyDeclarationSyntax>() .OfType<PropertyDeclarationSyntax>()
.Select(s => s.GetLocation()) .Select(s => s.GetLocation())
.Concat(Symbol.Locations) .Concat(Symbol.Locations)
.First(); .Best();
} }
} }

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

@@ -11,7 +11,7 @@ namespace Semmle.Extraction.CSharp.Entities
public static DynamicType Create(Context cx, IDynamicTypeSymbol type) => DynamicTypeFactory.Instance.CreateEntityFromSymbol(cx, type); public static DynamicType Create(Context cx, IDynamicTypeSymbol type) => DynamicTypeFactory.Instance.CreateEntityFromSymbol(cx, type);
public override Microsoft.CodeAnalysis.Location? ReportingLocation => Context.Compilation.ObjectType.Locations.FirstOrDefault(); public override Microsoft.CodeAnalysis.Location? ReportingLocation => Context.Compilation.ObjectType.Locations.BestOrDefault();
public override void Populate(TextWriter trapFile) public override void Populate(TextWriter trapFile)
{ {

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

@@ -124,7 +124,7 @@ namespace Semmle.Extraction.CSharp.Entities
); );
} }
public override Microsoft.CodeAnalysis.Location? ReportingLocation => GetLocations(Symbol).FirstOrDefault(); public override Microsoft.CodeAnalysis.Location? ReportingLocation => GetLocations(Symbol).BestOrDefault();
private bool IsAnonymousType() => Symbol.IsAnonymousType || Symbol.Name.Contains("__AnonymousType"); private bool IsAnonymousType() => Symbol.IsAnonymousType || Symbol.Name.Contains("__AnonymousType");

2
csharp/extractor/Semmle.Extraction.CSharp/Extractor/TracingAnalyser.cs
View File

@@ -130,7 +130,7 @@ namespace Semmle.Extraction.CSharp
return Path.ChangeExtension(entryPointFile, ".exe"); return Path.ChangeExtension(entryPointFile, ".exe");
} }
var entryPointFilename = entry.Locations.First().SourceTree!.FilePath; var entryPointFilename = entry.Locations.Best().SourceTree!.FilePath;
return Path.ChangeExtension(entryPointFilename, ".exe"); return Path.ChangeExtension(entryPointFilename, ".exe");
} }

2
csharp/extractor/Semmle.Extraction.CSharp/Populators/Locations.cs
View File

@@ -107,7 +107,7 @@ namespace Semmle.Extraction.CSharp.Populators
{ {
return symbol.DeclaringSyntaxReferences.Any() ? return symbol.DeclaringSyntaxReferences.Any() ?
symbol.DeclaringSyntaxReferences.First().GetSyntax().FixedLocation() : symbol.DeclaringSyntaxReferences.First().GetSyntax().FixedLocation() :
symbol.Locations.First(); symbol.Locations.Best();
} }
} }
} }

2
csharp/extractor/Semmle.Extraction/Context.cs
View File

@@ -379,7 +379,7 @@ namespace Semmle.Extraction
{ {
if (!(optionalSymbol is null)) if (!(optionalSymbol is null))
{ {
ExtractionError(message, optionalSymbol.ToDisplayString(), CreateLocation(optionalSymbol.Locations.FirstOrDefault())); ExtractionError(message, optionalSymbol.ToDisplayString(), CreateLocation(optionalSymbol.Locations.BestOrDefault()));
} }
else if (!(optionalEntity is null)) else if (!(optionalEntity is null))
{ {

2
csharp/extractor/Semmle.Extraction/InternalError.cs
View File

@@ -13,7 +13,7 @@ namespace Semmle.Extraction
{ {
Text = msg; Text = msg;
EntityText = symbol.ToString() ?? ""; EntityText = symbol.ToString() ?? "";
Location = symbol.Locations.FirstOrDefault(); Location = symbol.Locations.BestOrDefault();
} }
public InternalError(SyntaxNode node, string msg) public InternalError(SyntaxNode node, string msg)

2
csharp/extractor/Semmle.Extraction/Message.cs
View File

@@ -27,7 +27,7 @@ namespace Semmle.Extraction
public static Message Create(Context cx, string text, ISymbol symbol, string? stackTrace = null, Severity severity = Severity.Error) public static Message Create(Context cx, string text, ISymbol symbol, string? stackTrace = null, Severity severity = Severity.Error)
{ {
return new Message(text, symbol.ToString(), cx.CreateLocation(symbol.Locations.FirstOrDefault()), stackTrace, severity); return new Message(text, symbol.ToString(), cx.CreateLocation(symbol.Locations.BestOrDefault()), stackTrace, severity);
} }
public static Message Create(Context cx, string text, SyntaxNode node, string? stackTrace = null, Severity severity = Severity.Error) public static Message Create(Context cx, string text, SyntaxNode node, string? stackTrace = null, Severity severity = Severity.Error)