Fix Type.GetQualifiedName()

Author: tamasvajk

csharp/extractor/Semmle.Extraction.CIL/Entities/Method.cs

@@ -62,9 +62,10 @@ protected internal void WriteMethodId(TextWriter trapFile, Type parent, string m
                 param.WriteId(trapFile, this);
             }
             trapFile.Write(')');
-            trapFile.Write(";cil-method");
         }
 
+        public override string IdSuffix => ";cil-method";
+
         protected IEnumerable<IExtractionProduct> PopulateFlags
         {
             get

csharp/extractor/Semmle.Extraction.CIL/Entities/Namespace.cs

@@ -22,9 +22,10 @@ public override void WriteId(TextWriter trapFile)
                 trapFile.Write('.');
             }
             trapFile.Write(Name);
-            trapFile.Write(";namespace");
         }
 
+        public override string IdSuffix => ";namespacee";
+
         public override bool Equals(object? obj)
         {
             if (obj is Namespace ns && Name == ns.Name)

csharp/extractor/Semmle.Extraction.CIL/Entities/Type.cs

@@ -45,12 +45,9 @@ protected Type(Context cx) : base(cx) { }
         /// </param>
         public abstract void WriteId(TextWriter trapFile, bool inContext);
 
-        public sealed override void WriteId(TextWriter trapFile)
-        {
-            WriteId(trapFile, false);
-            trapFile.Write(";cil-type");
-        }
+        public sealed override void WriteId(TextWriter trapFile) => WriteId(trapFile, false);
 
+        public override string IdSuffix => ";cil-type";
 
         /// <summary>
         /// Returns the friendly qualified name of types, such as

csharp/extractor/Semmle.Extraction.CIL/Entities/TypeContainer.cs

@@ -1,5 +1,3 @@
-using System;
-using Microsoft.CodeAnalysis;
 using System.Collections.Generic;
 using System.IO;
 
@@ -14,6 +12,16 @@ protected TypeContainer(Context cx) : base(cx)
         {
         }
 
+        public abstract string IdSuffix { get; }
+
+        public override void WriteQuotedId(TextWriter trapFile)
+        {
+            trapFile.Write("@\"");
+            WriteId(trapFile);
+            trapFile.Write(IdSuffix);
+            trapFile.Write('\"');
+        }
+
         public abstract IEnumerable<Type> MethodParameters { get; }
         public abstract IEnumerable<Type> TypeParameters { get; }
     }