From 77be3869a4fae3e9f6f6aef5ffd6f330f3751b31 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Mon, 2 Sep 2019 16:25:33 +0200
Subject: [PATCH] Introduce target specification to provide feedback
 constraint.

One should be able to report issues with a target.
The target is normally inferred from the rule's origin, but sometimes it is
necessary to specify the issue's target explicitly.
---
 .../generator/template/main@generator.mps     | 103 +++++---
 .../languageModels/behavior.mps               |  25 ++
 .../languageModels/editor.mps                 |  34 +++
 .../languageModels/structure.mps              |  23 ++
 .../models/jetbrains.mps.logic.predicate.mps  | 228 ++++++++++++++----
 5 files changed, 345 insertions(+), 68 deletions(-)

diff --git a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
index a5305dc0..22d9b769 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
@@ -2252,45 +2252,54 @@
         </node>
       </node>
     </node>
-    <node concept="3aamgX" id="4jcOV4hx2aj" role="3acgRq">
+    <node concept="3aamgX" id="1laj_RThP$$" role="3acgRq">
+      <ref role="30HIoZ" to="wq2x:1laj_RThOpY" resolve="TargetSpec" />
+      <node concept="j$LIH" id="1laj_RThSCA" role="1lVwrX">
+        <node concept="1lLz0L" id="1laj_RThSCD" role="1lHHLF">
+          <property role="1lMjX7" value="h1lM37o/error" />
+          <property role="1lLB17" value="unexpected node" />
+        </node>
+      </node>
+    </node>
+    <node concept="3aamgX" id="1laj_RThrmw" role="3acgRq">
       <ref role="30HIoZ" to="wq2x:4jcOV4hu088" resolve="ProvideFeedbackConstraint" />
-      <node concept="1Koe21" id="4jcOV4hxR3N" role="1lVwrX">
-        <node concept="3clFb_" id="4jcOV4hxR3O" role="1Koe22">
+      <node concept="1Koe21" id="1laj_RThtfb" role="1lVwrX">
+        <node concept="3clFb_" id="1laj_RThtfc" role="1Koe22">
           <property role="TrG5h" value="context" />
-          <node concept="3cqZAl" id="4jcOV4hxR3P" role="3clF45" />
-          <node concept="3Tm1VV" id="4jcOV4hxR3Q" role="1B3o_S" />
-          <node concept="3clFbS" id="4jcOV4hxR3R" role="3clF47">
-            <node concept="3clFbF" id="4jcOV4hxR3S" role="3cqZAp">
-              <node concept="2OqwBi" id="4jcOV4hxR3T" role="3clFbG">
-                <node concept="2OqwBi" id="4jcOV4hxR3U" role="2Oq$k0">
-                  <node concept="2ShNRf" id="4jcOV4hxR3V" role="2Oq$k0">
-                    <node concept="1pGfFk" id="4jcOV4hxR3W" role="2ShVmc">
+          <node concept="3cqZAl" id="1laj_RThtfd" role="3clF45" />
+          <node concept="3Tm1VV" id="1laj_RThtfe" role="1B3o_S" />
+          <node concept="3clFbS" id="1laj_RThtff" role="3clF47">
+            <node concept="3clFbF" id="1laj_RThtfg" role="3cqZAp">
+              <node concept="2OqwBi" id="1laj_RThtfh" role="3clFbG">
+                <node concept="2OqwBi" id="1laj_RThtfi" role="2Oq$k0">
+                  <node concept="2ShNRf" id="1laj_RThtfj" role="2Oq$k0">
+                    <node concept="1pGfFk" id="1laj_RThtfk" role="2ShVmc">
                       <ref role="37wK5l" to="i348:4sSe4$oM2B4" resolve="PredicateBuilder" />
-                      <node concept="10M0yZ" id="4jcOV4hxRdl" role="37wK5m">
+                      <node concept="10M0yZ" id="1laj_RThtfl" role="37wK5m">
                         <ref role="3cqZAo" to="cxk7:4jcOV4hx9DP" resolve="FEEDBACK_SYM" />
                         <ref role="1PxDUh" to="cxk7:4jcOV4hx9Du" resolve="ProvideFeedbackPredicate" />
                       </node>
                     </node>
                   </node>
-                  <node concept="liA8E" id="4jcOV4hxR3Y" role="2OqNvi">
+                  <node concept="liA8E" id="1laj_RThtfm" role="2OqNvi">
                     <ref role="37wK5l" to="i348:4sSe4$oM2Bb" resolve="withArguments" />
-                    <node concept="10Nm6u" id="4jcOV4hxR3Z" role="37wK5m">
-                      <node concept="5jKBG" id="4jcOV4hxR40" role="lGtFl">
+                    <node concept="10Nm6u" id="1laj_RThtfn" role="37wK5m">
+                      <node concept="5jKBG" id="1laj_RThtfo" role="lGtFl">
                         <ref role="v9R2y" node="1HWyn8iTl_Y" resolve="LateParameter_expression" />
                       </node>
                     </node>
-                    <node concept="Xl_RD" id="4jcOV4hxRwG" role="37wK5m">
-                      <node concept="17Uvod" id="4jcOV4hxRwK" role="lGtFl">
+                    <node concept="Xl_RD" id="1laj_RThtfp" role="37wK5m">
+                      <node concept="17Uvod" id="1laj_RThtfq" role="lGtFl">
                         <property role="2qtEX9" value="value" />
                         <property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
-                        <node concept="3zFVjK" id="4jcOV4hxRwL" role="3zH0cK">
-                          <node concept="3clFbS" id="4jcOV4hxRwM" role="2VODD2">
-                            <node concept="3clFbF" id="4jcOV4hxTS4" role="3cqZAp">
-                              <node concept="2OqwBi" id="3czCaDvmo6_" role="3clFbG">
-                                <node concept="24Tkf9" id="3czCaDvmo6B" role="2OqNvi" />
-                                <node concept="2OqwBi" id="4jcOV4hxU8e" role="2Oq$k0">
-                                  <node concept="30H73N" id="4jcOV4hxTS3" role="2Oq$k0" />
-                                  <node concept="3TrcHB" id="4jcOV4hxUmI" role="2OqNvi">
+                        <node concept="3zFVjK" id="1laj_RThtfr" role="3zH0cK">
+                          <node concept="3clFbS" id="1laj_RThtfs" role="2VODD2">
+                            <node concept="3clFbF" id="1laj_RThtft" role="3cqZAp">
+                              <node concept="2OqwBi" id="1laj_RThtfu" role="3clFbG">
+                                <node concept="24Tkf9" id="1laj_RThtfv" role="2OqNvi" />
+                                <node concept="2OqwBi" id="1laj_RThtfw" role="2Oq$k0">
+                                  <node concept="30H73N" id="1laj_RThtfx" role="2Oq$k0" />
+                                  <node concept="3TrcHB" id="1laj_RThtfy" role="2OqNvi">
                                     <ref role="3TsBF5" to="wq2x:3czCaDvmnOz" resolve="severity" />
                                   </node>
                                 </node>
@@ -2300,12 +2309,52 @@
                         </node>
                       </node>
                     </node>
+                    <node concept="10Nm6u" id="1laj_RTCekd" role="37wK5m">
+                      <node concept="1W57fq" id="1laj_RTCe_g" role="lGtFl">
+                        <node concept="3IZrLx" id="1laj_RTCe_h" role="3IZSJc">
+                          <node concept="3clFbS" id="1laj_RTCe_i" role="2VODD2">
+                            <node concept="3clFbF" id="1laj_RTCeHH" role="3cqZAp">
+                              <node concept="2OqwBi" id="1laj_RTCfh3" role="3clFbG">
+                                <node concept="2OqwBi" id="1laj_RTCeVX" role="2Oq$k0">
+                                  <node concept="30H73N" id="1laj_RTCeHG" role="2Oq$k0" />
+                                  <node concept="3TrEf2" id="1laj_RTCf6n" role="2OqNvi">
+                                    <ref role="3Tt5mk" to="wq2x:1laj_RTdQq9" resolve="target" />
+                                  </node>
+                                </node>
+                                <node concept="3x8VRR" id="1laj_RTCfrM" role="2OqNvi" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="gft3U" id="1laj_RTCfws" role="UU_$l">
+                          <node concept="10M0yZ" id="1laj_RTNZGH" role="gfFT$">
+                            <ref role="3cqZAo" to="cxk7:1laj_RTNVH9" resolve="NO_ARGUMENT" />
+                            <ref role="1PxDUh" to="cxk7:6Kcfpq7B0Wu" resolve="AbstractPredicate" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="5jKBG" id="1laj_RTCeke" role="lGtFl">
+                        <ref role="v9R2y" node="1HWyn8iTl_Y" resolve="LateParameter_expression" />
+                        <node concept="3NFfHV" id="1laj_RTCekf" role="5jGum">
+                          <node concept="3clFbS" id="1laj_RTCekg" role="2VODD2">
+                            <node concept="3clFbF" id="1laj_RTCekh" role="3cqZAp">
+                              <node concept="2OqwBi" id="1laj_RTCeki" role="3clFbG">
+                                <node concept="30H73N" id="1laj_RTCekj" role="2Oq$k0" />
+                                <node concept="3TrEf2" id="1laj_RTCekk" role="2OqNvi">
+                                  <ref role="3Tt5mk" to="wq2x:1laj_RTdQq9" resolve="target" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
                   </node>
                 </node>
-                <node concept="liA8E" id="4jcOV4hxR41" role="2OqNvi">
+                <node concept="liA8E" id="1laj_RThtfz" role="2OqNvi">
                   <ref role="37wK5l" to="i348:4sSe4$oM2Bs" resolve="toPredicate" />
                 </node>
-                <node concept="raruj" id="4jcOV4hxR42" role="lGtFl" />
+                <node concept="raruj" id="1laj_RThtf$" role="lGtFl" />
               </node>
             </node>
           </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
index 95719705..b7692a32 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/behavior.mps
@@ -1558,5 +1558,30 @@
       <node concept="3clFbS" id="4jcOV4hEGlY" role="2VODD2" />
     </node>
   </node>
+  <node concept="13h7C7" id="1laj_RThOqN">
+    <property role="3GE5qa" value="constraint" />
+    <ref role="13h7C2" to="wq2x:1laj_RThOpY" resolve="TargetSpec" />
+    <node concept="13hLZK" id="1laj_RThOqO" role="13h7CW">
+      <node concept="3clFbS" id="1laj_RThOqP" role="2VODD2" />
+    </node>
+    <node concept="13i0hz" id="1laj_RThOrj" role="13h7CS">
+      <property role="TrG5h" value="code" />
+      <ref role="13i0hy" node="1HWyn8iQiyf" resolve="code" />
+      <node concept="3Tm1VV" id="1laj_RThOrk" role="1B3o_S" />
+      <node concept="3clFbS" id="1laj_RThOrn" role="3clF47">
+        <node concept="3clFbF" id="1laj_RTj8jx" role="3cqZAp">
+          <node concept="2OqwBi" id="1laj_RTj8td" role="3clFbG">
+            <node concept="13iPFW" id="1laj_RTj8jw" role="2Oq$k0" />
+            <node concept="3TrEf2" id="1laj_RTj8_A" role="2OqNvi">
+              <ref role="3Tt5mk" to="wq2x:1laj_RThOqm" resolve="code" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tqbb2" id="1laj_RThOro" role="3clF45">
+        <ref role="ehGHo" to="tpee:fz3vP1J" resolve="Expression" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
index 66feb88f..b0b428c2 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/editor.mps
@@ -4952,6 +4952,29 @@
           <property role="1cu_pB" value="gtguBGO/firstEditableCell" />
           <ref role="1NtTu8" to="wq2x:4jcOV4hwicZ" resolve="message" />
         </node>
+        <node concept="3EZMnI" id="1laj_RTdP9f" role="3EZMnx">
+          <node concept="VPM3Z" id="1laj_RTdP9h" role="3F10Kt" />
+          <node concept="3F0ifn" id="1laj_RTdP9u" role="3EZMnx">
+            <property role="3F0ifm" value="," />
+            <node concept="11L4FC" id="1laj_RTdQq3" role="3F10Kt">
+              <property role="VOm3f" value="true" />
+            </node>
+          </node>
+          <node concept="3F1sOY" id="1laj_RTdQ_7" role="3EZMnx">
+            <property role="1$x2rV" value="&lt;no target&gt;" />
+            <ref role="1NtTu8" to="wq2x:1laj_RTdQq9" resolve="target" />
+          </node>
+          <node concept="l2Vlx" id="1laj_RTdP9k" role="2iSdaV" />
+          <node concept="pkWqt" id="1laj_RTdQ_c" role="pqm2j">
+            <node concept="3clFbS" id="1laj_RTdQ_d" role="2VODD2">
+              <node concept="3clFbF" id="1laj_RTgHb$" role="3cqZAp">
+                <node concept="3clFbT" id="1laj_RTgHbz" role="3clFbG">
+                  <property role="3clFbU" value="true" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="VPM3Z" id="4jcOV4hvop8" role="3F10Kt">
           <property role="VOm3f" value="false" />
         </node>
@@ -5131,5 +5154,16 @@
       </node>
     </node>
   </node>
+  <node concept="24kQdi" id="1laj_RThP7V">
+    <property role="3GE5qa" value="constraint" />
+    <ref role="1XX52x" to="wq2x:1laj_RThOpY" resolve="TargetSpec" />
+    <node concept="3EZMnI" id="1laj_RThP8i" role="2wV5jI">
+      <node concept="3F1sOY" id="1laj_RThP8p" role="3EZMnx">
+        <property role="1$x2rV" value="&lt;no target&gt;" />
+        <ref role="1NtTu8" to="wq2x:1laj_RThOqm" resolve="code" />
+      </node>
+      <node concept="l2Vlx" id="1laj_RThP8l" role="2iSdaV" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
index 6c0ece89..8b09116e 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
@@ -1283,6 +1283,12 @@
       <property role="20lbJX" value="fLJekj4/_1" />
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
+    <node concept="1TJgyj" id="1laj_RTdQq9" role="1TKVEi">
+      <property role="IQ2ns" value="1534124788593157769" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="target" />
+      <ref role="20lvS9" node="1laj_RThOpY" resolve="TargetSpec" />
+    </node>
     <node concept="1TJgyi" id="3czCaDvmnOz" role="1TKVEl">
       <property role="TrG5h" value="severity" />
       <property role="IQ2nx" value="4957570047283824112" />
@@ -1356,6 +1362,7 @@
       <property role="3tVfz5" value="6958395097963222" />
       <ref role="2wpffI" node="oI9Ys1lFm" />
     </node>
+    <node concept="asaX9" id="1laj_RSAvJW" role="lGtFl" />
   </node>
   <node concept="25R3W" id="3czCaDvmnMw">
     <property role="TrG5h" value="FeedbackSeverity" />
@@ -1432,5 +1439,21 @@
       <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
     </node>
   </node>
+  <node concept="1TIwiD" id="1laj_RThOpY">
+    <property role="EcuMT" value="1534124788594198142" />
+    <property role="3GE5qa" value="constraint" />
+    <property role="TrG5h" value="TargetSpec" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="PrWs8" id="1laj_RThOqk" role="PzmwI">
+      <ref role="PrY4T" node="1HWyn8iLEBo" resolve="LateParameter" />
+    </node>
+    <node concept="1TJgyj" id="1laj_RThOqm" role="1TKVEi">
+      <property role="IQ2ns" value="1534124788594198166" />
+      <property role="20lmBu" value="fLJjDmT/aggregation" />
+      <property role="20kJfa" value="code" />
+      <property role="20lbJX" value="fLJekj4/_1" />
+      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps
index e5da17ac..214b00de 100644
--- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps
+++ b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps
@@ -20,6 +20,8 @@
     <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.unification)" />
     <import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
+    <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
+    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -285,6 +287,19 @@
     <property role="TrG5h" value="AbstractPredicate" />
     <property role="1sVAO0" value="true" />
     <node concept="2tJIrI" id="6Kcfpq7B16q" role="jymVt" />
+    <node concept="Wx3nA" id="1laj_RTNVH9" role="jymVt">
+      <property role="TrG5h" value="NO_ARGUMENT" />
+      <node concept="3Tm1VV" id="1laj_RTNXH9" role="1B3o_S" />
+      <node concept="3uibUv" id="1laj_RTNWrk" role="1tU5fm">
+        <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+      </node>
+      <node concept="2ShNRf" id="1laj_RTNXtv" role="33vP2m">
+        <node concept="1pGfFk" id="1laj_RTNXt5" role="2ShVmc">
+          <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1laj_RTNUao" role="jymVt" />
     <node concept="3clFbW" id="6Kcfpq7B1f7" role="jymVt">
       <node concept="37vLTG" id="6Kcfpq7BmCY" role="3clF46">
         <property role="TrG5h" value="arguments" />
@@ -8526,6 +8541,12 @@
           <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
         </node>
       </node>
+      <node concept="37vLTG" id="1laj_RTCg1Z" role="3clF46">
+        <property role="TrG5h" value="details" />
+        <node concept="3uibUv" id="1laj_RTCgaw" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+        </node>
+      </node>
       <node concept="3cqZAl" id="4jcOV4hx9Dz" role="3clF45" />
       <node concept="3Tm1VV" id="4jcOV4hx9D$" role="1B3o_S" />
       <node concept="3clFbS" id="4jcOV4hx9D_" role="3clF47">
@@ -8537,6 +8558,9 @@
           <node concept="37vLTw" id="4jcOV4hxwVj" role="37wK5m">
             <ref role="3cqZAo" node="4jcOV4hxwdM" resolve="severity" />
           </node>
+          <node concept="37vLTw" id="1laj_RTCgJu" role="37wK5m">
+            <ref role="3cqZAo" node="1laj_RTCg1Z" resolve="details" />
+          </node>
         </node>
       </node>
     </node>
@@ -8588,7 +8612,7 @@
               <ref role="3cqZAo" node="4jcOV4hx9DL" resolve="FEEDBACK" />
             </node>
             <node concept="3cmrfG" id="4jcOV4hx9DW" role="37wK5m">
-              <property role="3cmrfH" value="2" />
+              <property role="3cmrfH" value="3" />
             </node>
             <node concept="3Tm1VV" id="4jcOV4hx9DX" role="1B3o_S" />
             <node concept="3clFb_" id="4jcOV4hx9DY" role="jymVt">
@@ -8644,6 +8668,14 @@
                           <ref role="3cqZAo" node="4jcOV4hx9E6" resolve="args" />
                         </node>
                       </node>
+                      <node concept="AH0OO" id="1laj_RTCfGt" role="37wK5m">
+                        <node concept="3cmrfG" id="1laj_RTCfGu" role="AHEQo">
+                          <property role="3cmrfH" value="2" />
+                        </node>
+                        <node concept="37vLTw" id="1laj_RTCfGv" role="AHHXb">
+                          <ref role="3cqZAo" node="4jcOV4hx9E6" resolve="args" />
+                        </node>
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -8800,6 +8832,99 @@
               </node>
             </node>
           </node>
+          <node concept="3cpWs8" id="1laj_RTNK7P" role="3cqZAp">
+            <node concept="3cpWsn" id="1laj_RTNK7Q" role="3cpWs9">
+              <property role="TrG5h" value="details" />
+              <node concept="3uibUv" id="1laj_RTNK7O" role="1tU5fm">
+                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+              </node>
+              <node concept="2OqwBi" id="1laj_RTNK7R" role="33vP2m">
+                <node concept="2OqwBi" id="1laj_RTNK7S" role="2Oq$k0">
+                  <node concept="37vLTw" id="1laj_RTNK7T" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4jcOV4hx9Fc" resolve="invocation" />
+                  </node>
+                  <node concept="liA8E" id="1laj_RTNK7U" role="2OqNvi">
+                    <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments()" resolve="arguments" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="1laj_RTNK7V" role="2OqNvi">
+                  <ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
+                  <node concept="3cmrfG" id="1laj_RTNK7W" role="37wK5m">
+                    <property role="3cmrfH" value="2" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="1laj_RTNLWc" role="3cqZAp">
+            <node concept="3cpWsn" id="1laj_RTNLWd" role="3cpWs9">
+              <property role="TrG5h" value="target" />
+              <node concept="3uibUv" id="1laj_RTNLWe" role="1tU5fm">
+                <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+              </node>
+              <node concept="10Nm6u" id="1laj_RTNMdA" role="33vP2m" />
+            </node>
+          </node>
+          <node concept="3clFbJ" id="1laj_RTNMuF" role="3cqZAp">
+            <node concept="3clFbS" id="1laj_RTNMuH" role="3clFbx">
+              <node concept="3clFbF" id="1laj_RTNNqq" role="3cqZAp">
+                <node concept="37vLTI" id="1laj_RTNNBn" role="3clFbG">
+                  <node concept="1eOMI4" id="1laj_RTNNIo" role="37vLTx">
+                    <node concept="10QFUN" id="1laj_RTNNIl" role="1eOMHV">
+                      <node concept="3uibUv" id="1laj_RTNNIq" role="10QFUM">
+                        <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+                      </node>
+                      <node concept="37vLTw" id="1laj_RTNNIr" role="10QFUP">
+                        <ref role="3cqZAo" node="1laj_RTNK7Q" resolve="details" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="1laj_RTNOd_" role="37vLTJ">
+                    <ref role="3cqZAo" node="1laj_RTNLWd" resolve="target" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="1laj_RTNON5" role="3cqZAp" />
+            </node>
+            <node concept="2ZW3vV" id="1laj_RTNN87" role="3clFbw">
+              <node concept="3uibUv" id="1laj_RTNNob" role="2ZW6by">
+                <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+              </node>
+              <node concept="37vLTw" id="1laj_RTNMJz" role="2ZW6bz">
+                <ref role="3cqZAo" node="1laj_RTNK7Q" resolve="details" />
+              </node>
+            </node>
+            <node concept="3eNFk2" id="1laj_RTNOfz" role="3eNLev">
+              <node concept="2ZW3vV" id="1laj_RTNOA6" role="3eO9$A">
+                <node concept="3uibUv" id="1laj_RTNODR" role="2ZW6by">
+                  <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+                </node>
+                <node concept="37vLTw" id="1laj_RTNOv0" role="2ZW6bz">
+                  <ref role="3cqZAo" node="1laj_RTNK7Q" resolve="details" />
+                </node>
+              </node>
+              <node concept="3clFbS" id="1laj_RTNOf_" role="3eOfB_">
+                <node concept="3clFbF" id="1laj_RTNONm" role="3cqZAp">
+                  <node concept="37vLTI" id="1laj_RTNONn" role="3clFbG">
+                    <node concept="37vLTw" id="1laj_RTNONs" role="37vLTJ">
+                      <ref role="3cqZAo" node="1laj_RTNLWd" resolve="target" />
+                    </node>
+                    <node concept="2YIFZM" id="1laj_RTNOVA" role="37vLTx">
+                      <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
+                      <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String)" resolve="deserialize" />
+                      <node concept="2YIFZM" id="1laj_RTNP7j" role="37wK5m">
+                        <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
+                        <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
+                        <node concept="37vLTw" id="1laj_RTNPlL" role="37wK5m">
+                          <ref role="3cqZAo" node="1laj_RTNK7Q" resolve="details" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
           <node concept="3clFbF" id="4jcOV4hxxyi" role="3cqZAp">
             <node concept="2OqwBi" id="4jcOV4hxxRr" role="3clFbG">
               <node concept="2OqwBi" id="4jcOV4hxxGB" role="2Oq$k0">
@@ -8820,6 +8945,9 @@
                   <node concept="37vLTw" id="1laj_RS1ySD" role="37wK5m">
                     <ref role="3cqZAo" node="1laj_RS1ySx" resolve="severity" />
                   </node>
+                  <node concept="37vLTw" id="1laj_RTNPse" role="37wK5m">
+                    <ref role="3cqZAo" node="1laj_RTNLWd" resolve="target" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -8868,93 +8996,111 @@
           <property role="TrG5h" value="severity" />
           <node concept="17QB3L" id="1laj_RS1pSM" role="1tU5fm" />
         </node>
+        <node concept="37vLTG" id="1laj_RTChCL" role="3clF46">
+          <property role="TrG5h" value="target" />
+          <node concept="3uibUv" id="1laj_RTNP$B" role="1tU5fm">
+            <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+          </node>
+        </node>
         <node concept="3uibUv" id="1laj_RS1rxx" role="3clF45">
           <ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
         </node>
         <node concept="3Tm6S6" id="1laj_RS1mvM" role="1B3o_S" />
         <node concept="3clFbS" id="1laj_RS1mcK" role="3clF47">
-          <node concept="2ignYC" id="1laj_RS1mIz" role="3cqZAp">
-            <node concept="3KbdKl" id="1laj_RS1mI$" role="3KbHQx">
-              <node concept="3clFbS" id="1laj_RS1mI_" role="3Kbo56">
-                <node concept="3cpWs6" id="1laj_RS1mIA" role="3cqZAp">
-                  <node concept="2YIFZM" id="1laj_RS1qPM" role="3cqZAk">
-                    <ref role="37wK5l" to="w7la:~EvaluationFeedback.debug(java.lang.String)" resolve="debug" />
+          <node concept="2ignYC" id="1laj_RTCh2Q" role="3cqZAp">
+            <node concept="3KbdKl" id="1laj_RTCh2R" role="3KbHQx">
+              <node concept="3clFbS" id="1laj_RTCh2S" role="3Kbo56">
+                <node concept="3cpWs6" id="1laj_RTCh2T" role="3cqZAp">
+                  <node concept="2YIFZM" id="1laj_RTCh2U" role="3cqZAk">
                     <ref role="1Pybhc" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
-                    <node concept="37vLTw" id="1laj_RS1r8O" role="37wK5m">
+                    <ref role="37wK5l" to="w7la:~EvaluationFeedback.debug(java.lang.String,java.lang.Object)" resolve="debug" />
+                    <node concept="37vLTw" id="1laj_RTCh2V" role="37wK5m">
                       <ref role="3cqZAo" node="1laj_RS1nNJ" resolve="msg" />
                     </node>
+                    <node concept="37vLTw" id="1laj_RTNPY5" role="37wK5m">
+                      <ref role="3cqZAo" node="1laj_RTChCL" resolve="target" />
+                    </node>
                   </node>
                 </node>
               </node>
-              <node concept="Xl_RD" id="1laj_RS1mIC" role="3Kbmr1">
+              <node concept="Xl_RD" id="1laj_RTCh2Y" role="3Kbmr1">
                 <property role="Xl_RC" value="DEBUG" />
               </node>
             </node>
-            <node concept="3KbdKl" id="1laj_RS1mID" role="3KbHQx">
-              <node concept="3clFbS" id="1laj_RS1mIE" role="3Kbo56">
-                <node concept="3cpWs6" id="1laj_RS1s7O" role="3cqZAp">
-                  <node concept="2YIFZM" id="1laj_RS1sHP" role="3cqZAk">
-                    <ref role="37wK5l" to="w7la:~EvaluationFeedback.info(java.lang.String)" resolve="info" />
+            <node concept="3KbdKl" id="1laj_RTCh2Z" role="3KbHQx">
+              <node concept="3clFbS" id="1laj_RTCh30" role="3Kbo56">
+                <node concept="3cpWs6" id="1laj_RTCh31" role="3cqZAp">
+                  <node concept="2YIFZM" id="1laj_RTCh32" role="3cqZAk">
                     <ref role="1Pybhc" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
-                    <node concept="37vLTw" id="1laj_RS1sHQ" role="37wK5m">
+                    <ref role="37wK5l" to="w7la:~EvaluationFeedback.info(java.lang.String,java.lang.Object)" resolve="info" />
+                    <node concept="37vLTw" id="1laj_RTCh33" role="37wK5m">
                       <ref role="3cqZAo" node="1laj_RS1nNJ" resolve="msg" />
                     </node>
+                    <node concept="37vLTw" id="1laj_RTNQfD" role="37wK5m">
+                      <ref role="3cqZAo" node="1laj_RTChCL" resolve="target" />
+                    </node>
                   </node>
                 </node>
               </node>
-              <node concept="Xl_RD" id="1laj_RS1mIH" role="3Kbmr1">
+              <node concept="Xl_RD" id="1laj_RTCh36" role="3Kbmr1">
                 <property role="Xl_RC" value="INFO" />
               </node>
             </node>
-            <node concept="3KbdKl" id="1laj_RS1mII" role="3KbHQx">
-              <node concept="3clFbS" id="1laj_RS1mIJ" role="3Kbo56">
-                <node concept="3cpWs6" id="1laj_RS1tjA" role="3cqZAp">
-                  <node concept="2YIFZM" id="1laj_RS1tTV" role="3cqZAk">
-                    <ref role="37wK5l" to="w7la:~EvaluationFeedback.warn(java.lang.String)" resolve="warn" />
+            <node concept="3KbdKl" id="1laj_RTCh37" role="3KbHQx">
+              <node concept="3clFbS" id="1laj_RTCh38" role="3Kbo56">
+                <node concept="3cpWs6" id="1laj_RTCh39" role="3cqZAp">
+                  <node concept="2YIFZM" id="1laj_RTCh3a" role="3cqZAk">
                     <ref role="1Pybhc" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
-                    <node concept="37vLTw" id="1laj_RS1tTW" role="37wK5m">
+                    <ref role="37wK5l" to="w7la:~EvaluationFeedback.warn(java.lang.String,java.lang.Object)" resolve="warn" />
+                    <node concept="37vLTw" id="1laj_RTCh3b" role="37wK5m">
                       <ref role="3cqZAo" node="1laj_RS1nNJ" resolve="msg" />
                     </node>
+                    <node concept="37vLTw" id="1laj_RTNQx3" role="37wK5m">
+                      <ref role="3cqZAo" node="1laj_RTChCL" resolve="target" />
+                    </node>
                   </node>
                 </node>
               </node>
-              <node concept="Xl_RD" id="1laj_RS1mIM" role="3Kbmr1">
+              <node concept="Xl_RD" id="1laj_RTCh3e" role="3Kbmr1">
                 <property role="Xl_RC" value="WARN" />
               </node>
             </node>
-            <node concept="3KbdKl" id="1laj_RS1mIN" role="3KbHQx">
-              <node concept="3clFbS" id="1laj_RS1mIO" role="3Kbo56">
-                <node concept="3cpWs6" id="1laj_RS1uA6" role="3cqZAp">
-                  <node concept="2YIFZM" id="1laj_RS1vcJ" role="3cqZAk">
-                    <ref role="37wK5l" to="w7la:~EvaluationFeedback.error(java.lang.String)" resolve="error" />
+            <node concept="3KbdKl" id="1laj_RTCh3f" role="3KbHQx">
+              <node concept="3clFbS" id="1laj_RTCh3g" role="3Kbo56">
+                <node concept="3cpWs6" id="1laj_RTCh3h" role="3cqZAp">
+                  <node concept="2YIFZM" id="1laj_RTCh3i" role="3cqZAk">
+                    <ref role="37wK5l" to="w7la:~EvaluationFeedback.error(java.lang.String,java.lang.Object)" resolve="error" />
                     <ref role="1Pybhc" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
-                    <node concept="37vLTw" id="1laj_RS1vcK" role="37wK5m">
+                    <node concept="37vLTw" id="1laj_RTCh3j" role="37wK5m">
                       <ref role="3cqZAo" node="1laj_RS1nNJ" resolve="msg" />
                     </node>
+                    <node concept="37vLTw" id="1laj_RTNR07" role="37wK5m">
+                      <ref role="3cqZAo" node="1laj_RTChCL" resolve="target" />
+                    </node>
                   </node>
                 </node>
               </node>
-              <node concept="Xl_RD" id="1laj_RS1mIR" role="3Kbmr1">
+              <node concept="Xl_RD" id="1laj_RTCh3m" role="3Kbmr1">
                 <property role="Xl_RC" value="ERROR" />
               </node>
             </node>
-            <node concept="37vLTw" id="1laj_RS1pWU" role="3KbGdf">
+            <node concept="37vLTw" id="1laj_RTCh3n" role="3KbGdf">
               <ref role="3cqZAo" node="1laj_RS1p_c" resolve="severity" />
             </node>
-            <node concept="3clFbS" id="1laj_RS1mIY" role="3Kb1Dw">
-              <node concept="YS8fn" id="1laj_RS1mIZ" role="3cqZAp">
-                <node concept="2ShNRf" id="1laj_RS1mJ0" role="YScLw">
-                  <node concept="1pGfFk" id="1laj_RS1mJ1" role="2ShVmc">
+            <node concept="3clFbS" id="1laj_RTCh3o" role="3Kb1Dw">
+              <node concept="YS8fn" id="1laj_RTCh3p" role="3cqZAp">
+                <node concept="2ShNRf" id="1laj_RTCh3q" role="YScLw">
+                  <node concept="1pGfFk" id="1laj_RTCh3r" role="2ShVmc">
                     <ref role="37wK5l" to="wyt6:~IllegalArgumentException.&lt;init&gt;(java.lang.String)" resolve="IllegalArgumentException" />
-                    <node concept="3cpWs3" id="1laj_RS1wMd" role="37wK5m">
-                      <node concept="Xl_RD" id="1laj_RS1wMT" role="3uHU7w">
+                    <node concept="3cpWs3" id="1laj_RTCh3s" role="37wK5m">
+                      <node concept="Xl_RD" id="1laj_RTCh3t" role="3uHU7w">
                         <property role="Xl_RC" value="'" />
                       </node>
-                      <node concept="3cpWs3" id="1laj_RS1wAH" role="3uHU7B">
-                        <node concept="Xl_RD" id="1laj_RS1w7D" role="3uHU7B">
-                          <property role="Xl_RC" value="uknown severity '" />
+                      <node concept="3cpWs3" id="1laj_RTCh3u" role="3uHU7B">
+                        <node concept="Xl_RD" id="1laj_RTCh3v" role="3uHU7B">
+                          <property role="Xl_RC" value="unknown severity '" />
                         </node>
-                        <node concept="37vLTw" id="1laj_RS1wFD" role="3uHU7w">
+                        <node concept="37vLTw" id="1laj_RTCh3w" role="3uHU7w">
                           <ref role="3cqZAo" node="1laj_RS1p_c" resolve="severity" />
                         </node>
                       </node>