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

Merge pull request #2061 from hvitved/csharp/local-function-label

Browse Source 
C#: Prepend enclosing method in local function TRAP labels
This commit is contained in:
Calum Grant
2019-10-01 15:19:04 +01:00
committed by GitHub
parent e048207e2f 413926f675
commit b4da63b3f2
8 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,9 +11,17 @@ namespace Semmle.Extraction.CSharp.Entities
{
}
Method ContainingMethod =>
symbol.OriginalDefinition.ContainingSymbol is IMethodSymbol m
? Method.Create(Context, m)
: throw new InternalError(symbol, "Unable to determine local function's containing callable");
public override void WriteId(TextWriter trapFile)
{
trapFile.WriteSubId(ContainingMethod);
trapFile.Write(".(");
trapFile.WriteSubId(Location);
trapFile.Write(')');
if (symbol.IsGenericMethod && !IsSourceDeclaration)
{
trapFile.Write('<');
@@ -41,7 +49,7 @@ namespace Semmle.Extraction.CSharp.Entities
// the "static" modifier is present.
if (symbol.DeclaringSyntaxReferences.SingleOrDefault().GetSyntax() is LocalFunctionStatementSyntax fn)
{
foreach(var modifier in fn.Modifiers)
foreach (var modifier in fn.Modifiers)
{
Modifier.HasModifier(Context, trapFile, this, modifier.Text);
}