Update trace output of coll contribution conditions

src/jastadd/ast/Trace.jrag

@@ -99,6 +99,8 @@ aspect Trace {
   syn String AttrDecl.traceBeginAttr() = trace("begin " + traceSignature());
   syn String AttrDecl.traceEndAttr() = trace("end " + traceSignature());
   syn String AttrDecl.traceEndCachedAttr() = trace("end cached " + traceSignature());
+
+  syn String CollEq.getConditionNoNewline() = getCondition().replace("\n", " ");
 }
 
 aspect NewTrace {

src/template/trace/TraceHooks.tt

@@ -325,18 +325,18 @@ $endif
 
 CollEq.traceContributionCheckBegin [[
 $if (TraceColl)
-state().trace().contributionCheckBegin(this, "#collectionId", "#getCondition");
+state().trace().contributionCheckBegin(this, "#collectionId", "#getConditionNoNewline");
 $endif
 ]]
 
 CollEq.traceContributionCheckEnd [[
 $if (TraceColl)
-state().trace().contributionCheckEnd(this, "#collectionId", "#getCondition");
+state().trace().contributionCheckEnd(this, "#collectionId", "#getConditionNoNewline");
 $endif
 ]]
 
 CollEq.traceContributionCheckMatch [[
 $if (TraceColl)
-state().trace().contributionCheckMatch(this, "#collectionId", "#getCondition", #getValue);
+state().trace().contributionCheckMatch(this, "#collectionId", "#getConditionNoNewline", #getValue);
 $endif
 ]]