C#: Address review comment.

calumgrant · calumgrant · commit 4c7d413fa478 · 2020-04-07T19:58:48.000+01:00
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Constructor.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Constructor.cs
@@ -114,7 +114,7 @@ public override void WriteId(TextWriter trapFile)
         {
             if (symbol.IsStatic) trapFile.Write("static");
             trapFile.WriteSubId(ContainingType);
-            AddParametersToId(Context, trapFile, symbol, symbol);
+            AddParametersToId(Context, trapFile, symbol);
             trapFile.Write(";constructor");
         }
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs
@@ -134,7 +134,7 @@ protected static void BuildMethodId(Method m, TextWriter trapFile)
                 }
             }
 
-            AddParametersToId(m.Context, trapFile, m.symbol, m.symbol);
+            AddParametersToId(m.Context, trapFile, m.symbol);
             switch (m.symbol.MethodKind)
             {
                 case MethodKind.PropertyGet:
@@ -204,21 +204,21 @@ protected static void AddSignatureTypeToId(Context cx, TextWriter trapFile, IMet
             type.BuildTypeId(cx, trapFile, false, symbolBeingDefined, (cx0, tb0, type0, g) => AddSignatureTypeToId(cx, tb0, method, type0, g));
         }
 
-        protected static void AddParametersToId(Context cx, TextWriter trapFile, IMethodSymbol method, ISymbol symbolBeingDefined)
+        protected static void AddParametersToId(Context cx, TextWriter trapFile, IMethodSymbol method)
         {
             trapFile.Write('(');
             int index = 0;
 
             if (method.MethodKind == MethodKind.ReducedExtension)
             {
                 trapFile.WriteSeparator(",", ref index);
-                AddSignatureTypeToId(cx, trapFile, method, method.ReceiverType, symbolBeingDefined);
+                AddSignatureTypeToId(cx, trapFile, method, method.ReceiverType, method);
             }
 
             foreach (var param in method.Parameters)
             {
                 trapFile.WriteSeparator(",", ref index);
-                AddSignatureTypeToId(cx, trapFile, method, param.Type, symbolBeingDefined);
+                AddSignatureTypeToId(cx, trapFile, method, param.Type, method);
                 switch (param.RefKind)
                 {
                     case RefKind.Out:

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public override void WriteId(TextWriter trapFile)`
`114`	`114`	`{`
`115`	`115`	`if (symbol.IsStatic) trapFile.Write("static");`
`116`	`116`	`trapFile.WriteSubId(ContainingType);`
`117`		`- AddParametersToId(Context, trapFile, symbol, symbol);`
	`117`	`+ AddParametersToId(Context, trapFile, symbol);`
`118`	`118`	`trapFile.Write(";constructor");`
`119`	`119`	`}`
`120`	`120`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ protected static void BuildMethodId(Method m, TextWriter trapFile)`
`134`	`134`	`}`
`135`	`135`	`}`
`136`	`136`
`137`		`- AddParametersToId(m.Context, trapFile, m.symbol, m.symbol);`
	`137`	`+ AddParametersToId(m.Context, trapFile, m.symbol);`
`138`	`138`	`switch (m.symbol.MethodKind)`
`139`	`139`	`{`
`140`	`140`	`case MethodKind.PropertyGet:`
`@@ -204,21 +204,21 @@ protected static void AddSignatureTypeToId(Context cx, TextWriter trapFile, IMet`
`204`	`204`	`type.BuildTypeId(cx, trapFile, false, symbolBeingDefined, (cx0, tb0, type0, g) => AddSignatureTypeToId(cx, tb0, method, type0, g));`
`205`	`205`	`}`
`206`	`206`
`207`		`- protected static void AddParametersToId(Context cx, TextWriter trapFile, IMethodSymbol method, ISymbol symbolBeingDefined)`
	`207`	`+ protected static void AddParametersToId(Context cx, TextWriter trapFile, IMethodSymbol method)`
`208`	`208`	`{`
`209`	`209`	`trapFile.Write('(');`
`210`	`210`	`int index = 0;`
`211`	`211`
`212`	`212`	`if (method.MethodKind == MethodKind.ReducedExtension)`
`213`	`213`	`{`
`214`	`214`	`trapFile.WriteSeparator(",", ref index);`
`215`		`- AddSignatureTypeToId(cx, trapFile, method, method.ReceiverType, symbolBeingDefined);`
	`215`	`+ AddSignatureTypeToId(cx, trapFile, method, method.ReceiverType, method);`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`foreach (var param in method.Parameters)`
`219`	`219`	`{`
`220`	`220`	`trapFile.WriteSeparator(",", ref index);`
`221`		`- AddSignatureTypeToId(cx, trapFile, method, param.Type, symbolBeingDefined);`
	`221`	`+ AddSignatureTypeToId(cx, trapFile, method, param.Type, method);`
`222`	`222`	`switch (param.RefKind)`
`223`	`223`	`{`
`224`	`224`	`case RefKind.Out:`