hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-28 18:25:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

C#: Address review comments.

Browse Source
This commit is contained in:
Michael Nebel
2025-03-06 11:48:35 +01:00
parent 5c931fa897
commit fb3ce464be
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,20 @@ namespace Semmle.Extraction.CSharp.Entities
symbol.ContainingType is not null && ConstructedOrParentIsConstructed(symbol.ContainingType);
}
/// <summary>
/// A hashset containing the C# contextual keywords that could be confused with types (and typing).
///
/// For the list of all contextual keywords, see
/// https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/keywords/#contextual-keywords
/// </summary>
private readonly HashSet<string> ContextualKeywordTypes = [
"dynamic",
"nint",
"nuint",
"var"
];
/// <summary>
/// Returns true in case we suspect this is a broken type.
/// </summary>
@@ -40,8 +54,9 @@ namespace Semmle.Extraction.CSharp.Entities
// (1) public class { ... } is a broken type as it doesn't have a name.
// (2) public class var { ... } is an allowed type, but it overrides the `var` keyword for all uses.
// It is probably a better heuristic to treat it as a broken type.
return string.IsNullOrEmpty(symbol.Name) || symbol.Name == "var";
// The same goes for other contextual keywords that could be used as type names.
// It is probably a better heuristic to treat these as broken types.
return string.IsNullOrEmpty(symbol.Name) || ContextualKeywordTypes.Contains(symbol.Name);
}
public Kinds.TypeKind GetTypeKind(Context cx, bool constructUnderlyingTupleType)

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

@@ -47,7 +47,7 @@ namespace Semmle.Extraction.CSharp
public static string? GetAdjustedPath(ExtractionContext extractionContext, string sourcePath)
{
if (extractionContext.Mode.HasFlag(ExtractorMode.BinaryLog)
if (extractionContext.IsBinaryLog
&& extractionContext is BinaryLogExtractionContext binaryLogExtractionContext
&& binaryLogExtractionContext.GetAdjustedPath(sourcePath) is string adjustedPath)
{

1
csharp/extractor/Semmle.Extraction.CSharp/Extractor/ExtractionContext.cs
View File

@@ -16,6 +16,7 @@ namespace Semmle.Extraction.CSharp
public string OutputPath { get; }
public IEnumerable<CompilationInfo> CompilationInfos { get; }
public bool IsStandalone => Mode.HasFlag(ExtractorMode.Standalone);
public bool IsBinaryLog => Mode.HasFlag(ExtractorMode.BinaryLog);
/// <summary>
/// Creates a new extractor instance for one compilation unit.