Update coll tracing for collection contributikons and renaming

src/jastadd/ast/Trace.jrag

@@ -100,7 +100,7 @@ aspect Trace {
   syn String AttrDecl.traceEndAttr() = trace("end " + traceSignature());
   syn String AttrDecl.traceEndCachedAttr() = trace("end cached " + traceSignature());
 
-  syn String CollEq.getConditionStringified() = getCondition().replace("\n", " ").replace("\"", "\\\"");
+  syn String CollEq.escapeConditionForTemplate() = getCondition().replace("\n", " ").replace("\"", "\\\"");
 }
 
 aspect NewTrace {

src/template/ast/Collections.tt

@@ -238,11 +238,9 @@ CollEq.contributeStatement [[
 $if(#hasCondition)
     if (#getCondition) {
       $include(CollEq.addValueToCollection)
-      $include(CollEq.traceContributionCheckMatch)
     }
 $else
     $include(CollEq.addValueToCollection)
-    $include(CollEq.traceContributionCheckMatch)
 $endif
     $include(CollEq.traceContributionCheckEnd)
 ]]
@@ -251,9 +249,11 @@ CollEq.addValueToCollection [[
 $if(#iterableValue)
 for (#elementType value : #getValue) {
   collection.$CombOp(value);
+  $include(CollEq.traceContributionCheckMatch)
 }
 $else
 collection.$CombOp(#getValue);
+$include(CollEq.traceContributionCheckMatch)
 $endif
 ]]
 

src/template/trace/TraceHooks.tt

@@ -325,18 +325,22 @@ $endif
 
 CollEq.traceContributionCheckBegin [[
 $if (TraceColl)
-state().trace().contributionCheckBegin(this, "#collectionId", "#getConditionStringified");
+state().trace().contributionCheckBegin(this, "#collectionId", "#escapeConditionForTemplate");
 $endif
 ]]
 
 CollEq.traceContributionCheckEnd [[
 $if (TraceColl)
-state().trace().contributionCheckEnd(this, "#collectionId", "#getConditionStringified");
+state().trace().contributionCheckEnd(this, "#collectionId", "#escapeConditionForTemplate");
 $endif
 ]]
 
 CollEq.traceContributionCheckMatch [[
 $if (TraceColl)
-state().trace().contributionCheckMatch(this, "#collectionId", "#getConditionStringified", #getValue);
+$if(#iterableValue)
+state().trace().contributionCheckMatch(this, "#collectionId", "#escapeConditionForTemplate", value);
+$else
+state().trace().contributionCheckMatch(this, "#collectionId", "#escapeConditionForTemplate", #getValue);
+$endif
 $endif
 ]]