C#: Addressed review comments from hvitved

Author: michaelnebel

csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll

@@ -131,7 +131,7 @@ module Public {
     not exists(getComponentSpecificCsv(sc))
   }
 
-  /** Gets a textual representation of this component used for flow summaries */
+  /** Gets a textual representation of this component used for flow summaries. */
   private string getComponentCsv(SummaryComponent sc) {
     result = getComponentSpecificCsv(sc)
     or
@@ -1016,7 +1016,7 @@ module Private {
     /**
      * A query predicate for outputting flow summaries in semi-colon separated format in QL tests.
      * The syntax is: "namespace;type;overrides;name;signature;ext;inputspec;outputspec;kind",
-     * ext is hardcoded to empty
+     * ext is hardcoded to empty.
      */
     query predicate summary(string csv) {
       exists(

csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImplSpecific.qll

@@ -138,7 +138,7 @@ SummaryComponent interpretComponentSpecific(string c) {
   )
 }
 
-/** Gets the textual representation of the content in the format used for flow summaries */
+/** Gets the textual representation of the content in the format used for flow summaries. */
 private string getContentSpecificCsv(Content c) {
   c = TElementContent() and result = "Element"
   or
@@ -147,14 +147,14 @@ private string getContentSpecificCsv(Content c) {
   exists(Property p | c = TPropertyContent(p) and result = "Property[" + p.getQualifiedName() + "]")
 }
 
-/** Gets the textual representation of a summary component in the format used for flow summaries */
+/** Gets the textual representation of a summary component in the format used for flow summaries. */
 string getComponentSpecificCsv(SummaryComponent sc) {
   exists(Content c | sc = TContentSummaryComponent(c) and result = getContentSpecificCsv(c))
   or
-  exists(ReturnKind jrk |
-    sc = TReturnSummaryComponent(jrk) and
-    result = "ReturnValue[" + jrk + "]" and
-    not jrk instanceof NormalReturnKind
+  exists(ReturnKind rk |
+    sc = TReturnSummaryComponent(rk) and
+    result = "ReturnValue[" + rk + "]" and
+    not rk instanceof NormalReturnKind
   )
 }
 

csharp/ql/test/shared/FlowSummaries.qll

@@ -2,22 +2,17 @@ import semmle.code.csharp.dataflow.FlowSummary
 import semmle.code.csharp.dataflow.internal.FlowSummaryImpl::Private::TestOutput
 
 abstract class IncludeSummarizedCallable extends RelevantSummarizedCallable {
-  /** Gets the qualified parameter types of this callable as a comma-separated string */
+  /** Gets the qualified parameter types of this callable as a comma-separated string. */
   private string parameterQualifiedTypeNamesToString() {
     result =
-      concat(int i |
-        exists(this.getParameter(i))
+      concat(Parameter p, int i |
+        p = this.getParameter(i)
       |
-        this.getParameter(i).getType().getQualifiedName(), ", " order by i
+        p.getType().getQualifiedName(), ", " order by i
       )
   }
 
-  /* Gets a string representation of the input type signature of callable */
-  private string getCallableSignature() {
-    result = "(" + parameterQualifiedTypeNamesToString() + ")"
-  }
-
-  /* Gets a string representing, whether the declaring type is an interface */
+  /* Gets a string representing, whether the declaring type is an interface. */
   private string getCallableOverride() {
     if
       this.getDeclaringType() instanceof Interface or
@@ -31,8 +26,8 @@ abstract class IncludeSummarizedCallable extends RelevantSummarizedCallable {
     exists(string namespace, string type |
       this.getDeclaringType().hasQualifiedName(namespace, type) and
       result =
-        namespace + ";" + type + ";" + this.getCallableOverride() + ";" + this.getName() + ";" +
-          this.getCallableSignature()
+        namespace + ";" + type + ";" + this.getCallableOverride() + ";" + this.getName() + ";" + "("
+          + parameterQualifiedTypeNamesToString() + ")"
     )
   }
 }

java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll

@@ -131,7 +131,7 @@ module Public {
     not exists(getComponentSpecificCsv(sc))
   }
 
-  /** Gets a textual representation of this component used for flow summaries */
+  /** Gets a textual representation of this component used for flow summaries. */
   private string getComponentCsv(SummaryComponent sc) {
     result = getComponentSpecificCsv(sc)
     or
@@ -1016,7 +1016,7 @@ module Private {
     /**
      * A query predicate for outputting flow summaries in semi-colon separated format in QL tests.
      * The syntax is: "namespace;type;overrides;name;signature;ext;inputspec;outputspec;kind",
-     * ext is hardcoded to empty
+     * ext is hardcoded to empty.
      */
     query predicate summary(string csv) {
       exists(

java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImplSpecific.qll

@@ -91,7 +91,7 @@ private string getContentSpecificCsv(Content c) {
   c instanceof MapValueContent and result = "MapValue"
 }
 
-/** Gets the textual representation of the content in the format used for flow summaries */
+/** Gets the textual representation of the content in the format used for flow summaries. */
 string getComponentSpecificCsv(SummaryComponent sc) {
   exists(Content c | sc = TContentSummaryComponent(c) and result = getContentSpecificCsv(c))
 }

ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImpl.qll

@@ -131,7 +131,7 @@ module Public {
     not exists(getComponentSpecificCsv(sc))
   }
 
-  /** Gets a textual representation of this component used for flow summaries */
+  /** Gets a textual representation of this component used for flow summaries. */
   private string getComponentCsv(SummaryComponent sc) {
     result = getComponentSpecificCsv(sc)
     or
@@ -1016,7 +1016,7 @@ module Private {
     /**
      * A query predicate for outputting flow summaries in semi-colon separated format in QL tests.
      * The syntax is: "namespace;type;overrides;name;signature;ext;inputspec;outputspec;kind",
-     * ext is hardcoded to empty
+     * ext is hardcoded to empty.
      */
     query predicate summary(string csv) {
       exists(

ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImplSpecific.qll

@@ -69,7 +69,7 @@ SummaryComponent interpretComponentSpecific(string c) {
   result = FlowSummary::SummaryComponent::argument(any(int i | i >= 0))
 }
 
-/** Gets the textual representation of a summary component in the format used for flow summaries */
+/** Gets the textual representation of a summary component in the format used for flow summaries. */
 string getComponentSpecificCsv(SummaryComponent sc) {
   sc = TArgumentSummaryComponent(-2) and result = "BlockArgument"
 }