C#: Fix violations

Author: calumgrant

csharp/extractor/Semmle.Extraction.CIL/Factories.cs

@@ -56,7 +56,7 @@ public T Populate<T>(T e) where T : ILabelledEntity
         }
 
 #if DEBUG_LABELS
-        Dictionary<string, ILabelledEntity> debugLabels = new Dictionary<string, ILabelledEntity>();
+        private readonly Dictionary<string, ILabelledEntity> debugLabels = new Dictionary<string, ILabelledEntity>();
 #endif
 
         public IExtractedEntity Create(Handle h)
@@ -66,7 +66,7 @@ public IExtractedEntity Create(Handle h)
         }
 
         // Lazily cache primitive types.
-        PrimitiveType[] primitiveTypes = new PrimitiveType[(int)PrimitiveTypeCode.Object + 1];
+        private readonly PrimitiveType[] primitiveTypes = new PrimitiveType[(int)PrimitiveTypeCode.Object + 1];
 
         public PrimitiveType Create(PrimitiveTypeCode code)
         {

csharp/extractor/Semmle.Extraction/FreshEntity.cs

@@ -43,9 +43,11 @@ public string DebugTuples
         {
             get
             {
-                var writer = new StringWriter();
-                Populate(writer);
-                return writer.ToString();
+                using (var writer = new StringWriter())
+                {
+                    Populate(writer);
+                    return writer.ToString();
+                }
             }
         }
 

csharp/extractor/Semmle.Extraction/Id.cs

@@ -103,34 +103,6 @@ public void AppendTo(TextWriter tb)
             tb.Write(TrapBuilder.ToString());
             tb.Write("\"");
         }
-
-        class IdTrapBuilder
-        {
-            public readonly List<string> Fragments = new List<string>();
-
-            public void Append(object arg)
-            {
-                if (arg is IEntity)
-                {
-                    var key = ((IEntity)arg).Label;
-                    Fragments.Add("{#");
-                    Fragments.Add(key.Value.ToString());
-                    Fragments.Add("}");
-                }
-                else
-                    Fragments.Add(arg.ToString());
-            }
-
-            public void Append(string arg)
-            {
-                Fragments.Add(arg);
-            }
-
-            public void AppendLine()
-            {
-                throw new NotImplementedException();
-            }
-        }
     }
 
     /// <summary>