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

C#: Fix type ID generation from merge

Browse Source
This commit is contained in:
Calum Grant
2019-11-06 12:43:12 +00:00
parent ce188c0c22
commit a261cbaeef
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
csharp/extractor/Semmle.Extraction.CSharp/SymbolExtensions.cs
View File

@@ -234,12 +234,7 @@ namespace Semmle.Extraction.CSharp
public static void BuildNamedTypeId(this INamedTypeSymbol named, Context cx, TextWriter trapFile, Action<Context, TextWriter, ITypeSymbol> subTermAction)
{
bool prefixAssembly = false;
if (named.IsAnonymous()) prefixAssembly = true;
if (named.ContainingAssembly is null) prefixAssembly = false;
if (prefixAssembly)
BuildAssembly(named.ContainingAssembly, trapFile);
bool prefixAssembly = !(named.ContainingAssembly is null);
if (named.IsTupleType)
{
@@ -263,6 +258,8 @@ namespace Semmle.Extraction.CSharp
}
else if (named.ContainingNamespace != null)
{
if (prefixAssembly)
BuildAssembly(named.ContainingAssembly, trapFile);
named.ContainingNamespace.BuildNamespace(cx, trapFile);
}