From 79a56c83a9c5b4c03e9fa7ed338281cbeeeb34c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emma=20S=C3=B6derberg?= <emma.m.soderberg@gmail.com>
Date: Fri, 21 May 2021 14:34:17 +0200
Subject: [PATCH] Extract and update incremental trace hook

---
 src/template/incremental/Notification.tt | 4 +---
 src/template/trace/TraceHooks.tt         | 6 ++++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/template/incremental/Notification.tt b/src/template/incremental/Notification.tt
index 480c4c9f..ef4359c9 100644
--- a/src/template/incremental/Notification.tt
+++ b/src/template/incremental/Notification.tt
@@ -234,9 +234,7 @@ $endif
   #resetVisit
   #resetCache
   #(signature)_handler.notifyDependencies();
-  $if (TraceFlush)
-  $HostClass.this.state().trace().flushIncAttr($HostClass.this, "#signature", "", "");
-  $endif
+  $include(AttrDecl.traceFlushIncAttr)
 }
 $endif
 $endif
diff --git a/src/template/trace/TraceHooks.tt b/src/template/trace/TraceHooks.tt
index b07e1673..143e31d5 100644
--- a/src/template/trace/TraceHooks.tt
+++ b/src/template/trace/TraceHooks.tt
@@ -323,6 +323,12 @@ state().trace().flushAttr("#getAspectName", this, "#hostClassName.#signatureJava
 $endif
 ]]
 
+AttrDecl.traceFlushIncAttr [[
+$if (TraceFlush)
+state().trace().flushIncAttr("#getAspectName", fNode, fAttrID, "", "");
+$endif
+]]
+
 CollEq.traceContributionCheckBegin [[
 $if (TraceColl)
 state().trace().contributionCheckBegin("#getAspectName", this, "#collectionId", "#escapeConditionForTemplate");
-- 
GitLab