natas_hw
/
mps-coderules
mirror of https://github.com/JetBrains/mps-coderules
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bring reporting in line with MPS core reporting facilities. Cleanup the API.

This commit is contained in:
Fedor Isakov 2018-10-25 12:30:52 +02:00
parent d091b291c3
commit 0282f28a5c
16 changed files with 2407 additions and 1530 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

240
coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
View File

@ -57,6 +57,7 @@
<import index="z8tp" ref="r:5bfbd177-208e-4d27-b74c-2ebd2a92eb80(jetbrains.mps.lang.smodel.types.structure)" />
<import index="7n8k" ref="r:475a2e92-d7d4-41c3-98e3-172d70b6f018(jetbrains.mps.logic.program)" />
<import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
<import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
<import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
</imports>
<registry>
@ -564,6 +565,9 @@
<concept id="7400021826774799413" name="jetbrains.mps.lang.smodel.structure.NodePointerExpression" flags="ng" index="2tJFMh">
<child id="7400021826774799510" name="ref" index="2tJFKM" />
</concept>
<concept id="1138676077309" name="jetbrains.mps.lang.smodel.structure.EnumMemberReference" flags="nn" index="uoxfO">
<reference id="1138676095763" name="enumMember" index="uo_Cq" />
</concept>
<concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
<child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
</concept>
@ -607,6 +611,9 @@
<child id="6039268229364358388" name="body" index="1pnPq1" />
<child id="6039268229364358387" name="concept" index="1pnPq6" />
</concept>
<concept id="1146171026731" name="jetbrains.mps.lang.smodel.structure.Property_HasValue_Enum" flags="nn" index="3t7uKx">
<child id="1146171026732" name="value" index="3t7uKA" />
</concept>
<concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
<concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
<concept id="1144100932627" name="jetbrains.mps.lang.smodel.structure.OperationParm_Inclusion" flags="ng" index="1xIGOp" />
@ -14018,6 +14025,7 @@
</node>
<node concept="bUwia" id="oI9YrdoXd">
<property role="TrG5h" value="reporting" />
<property role="3GE5qa" value="reporting" />
<node concept="3aamgX" id="oI9YrDh3R" role="3acgRq">
<ref role="30HIoZ" to="z8tp:6nJA6bpveD5" resolve="SNodeTypeOperation" />
<node concept="b5Tf3" id="oI9YrDhNx" role="1lVwrX" />
@ -14053,6 +14061,10 @@
<node concept="1Koe21" id="oI9Ys2xiM" role="150oIE">
<node concept="3clFb_" id="oI9Ys2xiN" role="1Koe22">
<property role="TrG5h" value="context" />
<node concept="37vLTG" id="1FOQehwQxOt" role="3clF46">
<property role="TrG5h" value="operand" />
<node concept="3Tqbb2" id="1FOQehwQy99" role="1tU5fm" />
</node>
<node concept="3Tm6S6" id="oI9Ys2xiO" role="1B3o_S" />
<node concept="3cqZAl" id="oI9Ys2xiP" role="3clF45" />
<node concept="3clFbS" id="oI9Ys2xiQ" role="3clF47">
@ -14073,15 +14085,18 @@
</node>
<node concept="liA8E" id="oI9Ys2xiX" role="2OqNvi">
<ref role="37wK5l" to="9x2e:oI9Ys2ypk" resolve="report" />
<node concept="10Nm6u" id="oI9Ys2xiY" role="37wK5m">
<node concept="29HgVG" id="oI9Ys2xiZ" role="lGtFl">
<node concept="3NFfHV" id="oI9Ys2xj0" role="3NFExx">
<node concept="3clFbS" id="oI9Ys2xj1" role="2VODD2">
<node concept="3clFbF" id="oI9Ys2xj2" role="3cqZAp">
<node concept="2OqwBi" id="oI9Ys2xj6" role="3clFbG">
<node concept="30H73N" id="oI9Ys2xj7" role="2Oq$k0" />
<node concept="3TrEf2" id="oI9Ys2xj8" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
<node concept="Rm8GO" id="1FOQehwoRqu" role="37wK5m">
<ref role="Rm8GQ" to="2gg1:~MessageStatus.OK" resolve="OK" />
<ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
<node concept="1sPUBX" id="1FOQehwwtLS" role="lGtFl">
<ref role="v9R2y" node="1FOQehwoVSb" resolve="ReportKind_MessageStatus" />
<node concept="3NFfHV" id="1FOQehwwum9" role="1sPUBK">
<node concept="3clFbS" id="1FOQehwwuma" role="2VODD2">
<node concept="3clFbF" id="1FOQehwwuCr" role="3cqZAp">
<node concept="2OqwBi" id="1FOQehwwuO4" role="3clFbG">
<node concept="30H73N" id="1FOQehwwuCq" role="2Oq$k0" />
<node concept="3TrEf2" id="1FOQehwwvv7" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
</node>
</node>
</node>
@ -14089,30 +14104,24 @@
</node>
</node>
</node>
<node concept="Xl_RD" id="oI9Ys2Cw5" role="37wK5m">
<property role="Xl_RC" value="" />
<node concept="17Uvod" id="oI9Ys2CHr" role="lGtFl">
<property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
<property role="2qtEX9" value="value" />
<node concept="3zFVjK" id="oI9Ys2CHs" role="3zH0cK">
<node concept="3clFbS" id="oI9Ys2CHt" role="2VODD2">
<node concept="3clFbF" id="oI9Ys2CRv" role="3cqZAp">
<node concept="2OqwBi" id="oI9Ys2Biv" role="3clFbG">
<node concept="1PxgMI" id="oI9Ys2AX7" role="2Oq$k0">
<property role="1BlNFB" value="true" />
<node concept="chp4Y" id="oI9Ys2B3k" role="3oSUPX">
<ref role="cht4Q" to="wq2x:oI9Ys1jH2" resolve="SNodeReportOperation" />
</node>
<node concept="2OqwBi" id="oI9Ys2_2a" role="1m5AlR">
<node concept="30H73N" id="oI9Ys2$QF" role="2Oq$k0" />
<node concept="3TrEf2" id="oI9Ys2An6" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
<node concept="2OqwBi" id="1FOQehwQzuX" role="37wK5m">
<node concept="liA8E" id="1FOQehwQzWd" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
</node>
<node concept="2JrnkZ" id="1FOQehwQzv2" role="2Oq$k0">
<node concept="37vLTw" id="1FOQehwQy9N" role="2JrQYb">
<ref role="3cqZAo" node="1FOQehwQxOt" resolve="operand" />
<node concept="29HgVG" id="1FOQehwQ$FF" role="lGtFl">
<node concept="3NFfHV" id="1FOQehwQ_1w" role="3NFExx">
<node concept="3clFbS" id="1FOQehwQ_1x" role="2VODD2">
<node concept="3clFbF" id="1FOQehwQ_nG" role="3cqZAp">
<node concept="2OqwBi" id="1FOQehwQ_nI" role="3clFbG">
<node concept="30H73N" id="1FOQehwQ_nJ" role="2Oq$k0" />
<node concept="3TrEf2" id="1FOQehwQ_nK" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
</node>
</node>
</node>
<node concept="3TrcHB" id="oI9Ys2B$c" role="2OqNvi">
<ref role="3TsBF5" to="wq2x:oI9Ys1lGD" resolve="kind" />
</node>
</node>
</node>
</node>
@ -14162,6 +14171,10 @@
<ref role="3uigEE" to="6pyv:18kNIl1vDPZ" resolve="TemplateApplicationSession" />
</node>
</node>
<node concept="37vLTG" id="1FOQehwQCqe" role="3clF46">
<property role="TrG5h" value="operand" />
<node concept="3Tqbb2" id="1FOQehwQCIr" role="1tU5fm" />
</node>
<node concept="3Tm6S6" id="oI9Ys2xjr" role="1B3o_S" />
<node concept="3cqZAl" id="oI9Ys2xjs" role="3clF45" />
<node concept="3clFbS" id="oI9Ys2xjt" role="3clF47">
@ -14203,15 +14216,18 @@
<node concept="raruj" id="oI9Ys2xk7" role="lGtFl" />
<node concept="liA8E" id="oI9Ys2EaM" role="2OqNvi">
<ref role="37wK5l" to="9x2e:oI9Ys2ypk" resolve="report" />
<node concept="10Nm6u" id="oI9Ys2EaN" role="37wK5m">
<node concept="29HgVG" id="oI9Ys2EaO" role="lGtFl">
<node concept="3NFfHV" id="oI9Ys2EaP" role="3NFExx">
<node concept="3clFbS" id="oI9Ys2EaQ" role="2VODD2">
<node concept="3clFbF" id="oI9Ys2EaR" role="3cqZAp">
<node concept="2OqwBi" id="oI9Ys2EaS" role="3clFbG">
<node concept="30H73N" id="oI9Ys2EaT" role="2Oq$k0" />
<node concept="3TrEf2" id="oI9Ys2EaU" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
<node concept="Rm8GO" id="1FOQehwwvIu" role="37wK5m">
<ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
<ref role="Rm8GQ" to="2gg1:~MessageStatus.OK" resolve="OK" />
<node concept="1sPUBX" id="1FOQehwwvIv" role="lGtFl">
<ref role="v9R2y" node="1FOQehwoVSb" resolve="ReportKind_MessageStatus" />
<node concept="3NFfHV" id="1FOQehwwvIw" role="1sPUBK">
<node concept="3clFbS" id="1FOQehwwvIx" role="2VODD2">
<node concept="3clFbF" id="1FOQehwwvIy" role="3cqZAp">
<node concept="2OqwBi" id="1FOQehwwvIz" role="3clFbG">
<node concept="30H73N" id="1FOQehwwvI$" role="2Oq$k0" />
<node concept="3TrEf2" id="1FOQehwwvI_" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
</node>
</node>
</node>
@ -14219,30 +14235,24 @@
</node>
</node>
</node>
<node concept="Xl_RD" id="oI9Ys2EaV" role="37wK5m">
<property role="Xl_RC" value="" />
<node concept="17Uvod" id="oI9Ys2EaW" role="lGtFl">
<property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
<property role="2qtEX9" value="value" />
<node concept="3zFVjK" id="oI9Ys2EaX" role="3zH0cK">
<node concept="3clFbS" id="oI9Ys2EaY" role="2VODD2">
<node concept="3clFbF" id="oI9Ys2EaZ" role="3cqZAp">
<node concept="2OqwBi" id="oI9Ys2Eb0" role="3clFbG">
<node concept="1PxgMI" id="oI9Ys2Eb1" role="2Oq$k0">
<property role="1BlNFB" value="true" />
<node concept="chp4Y" id="oI9Ys2Eb2" role="3oSUPX">
<ref role="cht4Q" to="wq2x:oI9Ys1jH2" resolve="SNodeReportOperation" />
</node>
<node concept="2OqwBi" id="oI9Ys2Eb3" role="1m5AlR">
<node concept="30H73N" id="oI9Ys2Eb4" role="2Oq$k0" />
<node concept="3TrEf2" id="oI9Ys2Eb5" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:hqOqNr4" resolve="operation" />
<node concept="2OqwBi" id="1FOQehwQB0Z" role="37wK5m">
<node concept="liA8E" id="1FOQehwQB10" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
</node>
<node concept="2JrnkZ" id="1FOQehwQB11" role="2Oq$k0">
<node concept="37vLTw" id="1FOQehwQB12" role="2JrQYb">
<ref role="3cqZAo" node="1FOQehwQCqe" resolve="operand" />
<node concept="29HgVG" id="1FOQehwQB13" role="lGtFl">
<node concept="3NFfHV" id="1FOQehwQB14" role="3NFExx">
<node concept="3clFbS" id="1FOQehwQB15" role="2VODD2">
<node concept="3clFbF" id="1FOQehwQB16" role="3cqZAp">
<node concept="2OqwBi" id="1FOQehwQB17" role="3clFbG">
<node concept="30H73N" id="1FOQehwQB18" role="2Oq$k0" />
<node concept="3TrEf2" id="1FOQehwQB19" role="2OqNvi">
<ref role="3Tt5mk" to="tpee:hqOq$gm" resolve="operand" />
</node>
</node>
</node>
<node concept="3TrcHB" id="oI9Ys2Eb6" role="2OqNvi">
<ref role="3TsBF5" to="wq2x:oI9Ys1lGD" resolve="kind" />
</node>
</node>
</node>
</node>
@ -14446,13 +14456,6 @@
<ref role="3uigEE" to="i348:7P_FdVQ_k3b" resolve="QueryTemplate.QueryObservable" />
</node>
</node>
<node concept="37vLTG" id="7P_FdVPsJk7" role="3clF46">
<property role="TrG5h" value="parameters" />
<node concept="3uibUv" id="3IIf9OAgMw$" role="1tU5fm">
<ref role="3uigEE" to="33ny:~List" resolve="List" />
<node concept="3qTvmN" id="3IIf9OAm5Tq" role="11_B2D" />
</node>
</node>
<node concept="3uibUv" id="7P_FdVPsJka" role="3clF45">
<ref role="3uigEE" to="i348:7P_FdVPsDC0" resolve="QueryTemplate.QueryConfigurable" />
</node>
@ -15399,5 +15402,108 @@
</node>
</node>
</node>
<node concept="jVnub" id="1FOQehwoVSb">
<property role="3GE5qa" value="reporting" />
<property role="TrG5h" value="ReportKind_MessageStatus" />
<node concept="3aamgX" id="1FOQehwoVTh" role="3aUrZf">
<property role="36QftV" value="true" />
<ref role="30HIoZ" to="wq2x:oI9Ys1jH2" resolve="SNodeReportOperation" />
<node concept="14YyZ8" id="1FOQehwoWyC" role="1lVwrX">
<node concept="14ZrTv" id="1FOQehwoWyI" role="14ZwWg">
<node concept="30G5F_" id="1FOQehwoWyJ" role="150hEN">
<node concept="3clFbS" id="1FOQehwoWyK" role="2VODD2">
<node concept="3clFbF" id="1FOQehwoYWo" role="3cqZAp">
<node concept="2OqwBi" id="1FOQehwp0sg" role="3clFbG">
<node concept="2OqwBi" id="1FOQehwoZ9C" role="2Oq$k0">
<node concept="30H73N" id="1FOQehwoYWn" role="2Oq$k0" />
<node concept="3TrcHB" id="1FOQehwoZIb" role="2OqNvi">
<ref role="3TsBF5" to="wq2x:oI9Ys1lGD" resolve="kind" />
</node>
</node>
<node concept="3t7uKx" id="1FOQehwp18E" role="2OqNvi">
<node concept="uoxfO" id="1FOQehwp18G" role="3t7uKA">
<ref role="uo_Cq" to="wq2x:oI9Ys1lFi" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="gft3U" id="1FOQehwp1AY" role="150oIE">
<node concept="Rm8GO" id="1FOQehwp1L3" role="gfFT$">
<ref role="Rm8GQ" to="2gg1:~MessageStatus.OK" resolve="OK" />
<ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
</node>
</node>
</node>
<node concept="14ZrTv" id="1FOQehwp1Lh" role="14ZwWg">
<node concept="30G5F_" id="1FOQehwp1Li" role="150hEN">
<node concept="3clFbS" id="1FOQehwp1Lj" role="2VODD2">
<node concept="3clFbF" id="1FOQehwp1Lk" role="3cqZAp">
<node concept="2OqwBi" id="1FOQehwp1Ll" role="3clFbG">
<node concept="2OqwBi" id="1FOQehwp1Lm" role="2Oq$k0">
<node concept="30H73N" id="1FOQehwp1Ln" role="2Oq$k0" />
<node concept="3TrcHB" id="1FOQehwp1Lo" role="2OqNvi">
<ref role="3TsBF5" to="wq2x:oI9Ys1lGD" resolve="kind" />
</node>
</node>
<node concept="3t7uKx" id="1FOQehwp1Lp" role="2OqNvi">
<node concept="uoxfO" id="1FOQehwp1Lq" role="3t7uKA">
<ref role="uo_Cq" to="wq2x:oI9Ys1lFj" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="gft3U" id="1FOQehwp1Lr" role="150oIE">
<node concept="Rm8GO" id="1FOQehwp2do" role="gfFT$">
<ref role="Rm8GQ" to="2gg1:~MessageStatus.WARNING" resolve="WARNING" />
<ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
</node>
</node>
</node>
<node concept="14ZrTv" id="1FOQehwp2dF" role="14ZwWg">
<node concept="30G5F_" id="1FOQehwp2dG" role="150hEN">
<node concept="3clFbS" id="1FOQehwp2dH" role="2VODD2">
<node concept="3clFbF" id="1FOQehwp2dI" role="3cqZAp">
<node concept="2OqwBi" id="1FOQehwp2dJ" role="3clFbG">
<node concept="2OqwBi" id="1FOQehwp2dK" role="2Oq$k0">
<node concept="30H73N" id="1FOQehwp2dL" role="2Oq$k0" />
<node concept="3TrcHB" id="1FOQehwp2dM" role="2OqNvi">
<ref role="3TsBF5" to="wq2x:oI9Ys1lGD" resolve="kind" />
</node>
</node>
<node concept="3t7uKx" id="1FOQehwp2dN" role="2OqNvi">
<node concept="uoxfO" id="1FOQehwp2dO" role="3t7uKA">
<ref role="uo_Cq" to="wq2x:oI9Ys1lFm" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="gft3U" id="1FOQehwp2dP" role="150oIE">
<node concept="Rm8GO" id="1FOQehwp2Ey" role="gfFT$">
<ref role="Rm8GQ" to="2gg1:~MessageStatus.ERROR" resolve="ERROR" />
<ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
</node>
</node>
</node>
<node concept="j$LIH" id="1FOQehwp3v1" role="14YRTM">
<node concept="1lLz0L" id="1FOQehwp3DE" role="1lHHLF">
<property role="1lMjX7" value="error" />
<property role="1lLB17" value="unsupported report kind" />
</node>
</node>
</node>
</node>
<node concept="j$LIH" id="1FOQehwp307" role="jxRDz">
<node concept="1lLz0L" id="1FOQehwp3aL" role="1lHHLF">
<property role="1lMjX7" value="error" />
<property role="1lLB17" value="invalid switch usage" />
</node>
</node>
</node>
</model>

360
coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
View File

@ -818,118 +818,6 @@
</node>
</node>
<node concept="2tJIrI" id="3mz2_dYD2C2" role="jymVt" />
<node concept="2YIFZL" id="5lxnBcTU7J1" role="jymVt">
<property role="TrG5h" value="scheduleMarkTypesAndErrors" />
<node concept="37vLTG" id="5lxnBcTUdcU" role="3clF46">
<property role="TrG5h" value="mpsProject" />
<node concept="3uibUv" id="5lxnBcTUdcV" role="1tU5fm">
<ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
</node>
</node>
<node concept="37vLTG" id="5lxnBcTUdcW" role="3clF46">
<property role="TrG5h" value="editorComponent" />
<node concept="3uibUv" id="5lxnBcTUdcX" role="1tU5fm">
<ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
</node>
</node>
<node concept="37vLTG" id="5lxnBcTUdcY" role="3clF46">
<property role="TrG5h" value="root" />
<node concept="3Tqbb2" id="5lxnBcTUdcZ" role="1tU5fm" />
</node>
<node concept="37vLTG" id="5lxnBcTUdd0" role="3clF46">
<property role="TrG5h" value="typeNodes" />
<node concept="3uibUv" id="5lxnBcTUdd1" role="1tU5fm">
<ref role="3uigEE" to="33ny:~Map" resolve="Map" />
<node concept="3uibUv" id="5lxnBcTUdd2" role="11_B2D">
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
</node>
<node concept="3Tqbb2" id="5lxnBcTUdd3" role="11_B2D" />
</node>
</node>
<node concept="37vLTG" id="5lxnBcTUdd4" role="3clF46">
<property role="TrG5h" value="errors" />
<node concept="3uibUv" id="5lxnBcTUdd5" role="1tU5fm">
<ref role="3uigEE" to="33ny:~Map" resolve="Map" />
<node concept="3uibUv" id="5lxnBcTUdd6" role="11_B2D">
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
</node>
<node concept="17QB3L" id="5lxnBcTUdd7" role="11_B2D" />
</node>
</node>
<node concept="37vLTG" id="5lxnBcTUdd8" role="3clF46">
<property role="TrG5h" value="traceTabs" />
<node concept="_YKpA" id="5lxnBcTUdd9" role="1tU5fm">
<node concept="3uibUv" id="5lxnBcTUdda" role="_ZDj9">
<ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
</node>
</node>
</node>
<node concept="37vLTG" id="5lxnBcTZ$Eq" role="3clF46">
<property role="TrG5h" value="subscribeScheduler" />
<node concept="3uibUv" id="5lxnBcTZ$Zz" role="1tU5fm">
<ref role="3uigEE" to="unkn:~Scheduler" resolve="Scheduler" />
</node>
</node>
<node concept="3uibUv" id="5lxnBcTUcR8" role="3clF45">
<ref role="3uigEE" to="unkn:~Completable" resolve="Completable" />
</node>
<node concept="3Tm1VV" id="5lxnBcTU7J4" role="1B3o_S" />
<node concept="3clFbS" id="5lxnBcTU7J5" role="3clF47">
<node concept="3clFbF" id="5lxnBcTZ$b9" role="3cqZAp">
<node concept="2OqwBi" id="5lxnBcTZ$ba" role="3clFbG">
<node concept="2YIFZM" id="5lxnBcTZ$bb" role="2Oq$k0">
<ref role="37wK5l" node="3mz2_dYD3JK" resolve="get" />
<ref role="1Pybhc" node="41ox5VnpFrR" resolve="HighlightingPlugin" />
<node concept="37vLTw" id="5lxnBcTZ$bc" role="37wK5m">
<ref role="3cqZAo" node="5lxnBcTUdcU" resolve="mpsProject" />
</node>
</node>
<node concept="liA8E" id="5lxnBcTZ$bd" role="2OqNvi">
<ref role="37wK5l" node="41ox5VnqGYM" resolve="doSchedule" />
<node concept="2OqwBi" id="78H58oeVNNQ" role="37wK5m">
<node concept="2OqwBi" id="78H58oeVMVa" role="2Oq$k0">
<node concept="2OqwBi" id="78H58oeVMny" role="2Oq$k0">
<node concept="2ShNRf" id="78H58oeV$X9" role="2Oq$k0">
<node concept="1pGfFk" id="78H58oeVM8w" role="2ShVmc">
<ref role="37wK5l" node="78H58oeTywK" resolve="HighlightingTask" />
<node concept="37vLTw" id="5lxnBcTZ$bf" role="37wK5m">
<ref role="3cqZAo" node="5lxnBcTUdcY" resolve="root" />
</node>
<node concept="37vLTw" id="5lxnBcTZ$be" role="37wK5m">
<ref role="3cqZAo" node="5lxnBcTUdcW" resolve="editorComponent" />
</node>
</node>
</node>
<node concept="liA8E" id="78H58oeVMGT" role="2OqNvi">
<ref role="37wK5l" node="78H58oeTnR1" resolve="withMessages" />
<node concept="37vLTw" id="5lxnBcTZ$bg" role="37wK5m">
<ref role="3cqZAo" node="5lxnBcTUdd0" resolve="typeNodes" />
</node>
</node>
</node>
<node concept="liA8E" id="78H58oeVNme" role="2OqNvi">
<ref role="37wK5l" node="78H58oeToTl" resolve="withErrors" />
<node concept="37vLTw" id="5lxnBcTZ$bh" role="37wK5m">
<ref role="3cqZAo" node="5lxnBcTUdd4" resolve="errors" />
</node>
</node>
</node>
<node concept="liA8E" id="78H58oeVOyO" role="2OqNvi">
<ref role="37wK5l" node="78H58oeTpjT" resolve="withTracetabs" />
<node concept="37vLTw" id="5lxnBcTZ$bi" role="37wK5m">
<ref role="3cqZAo" node="5lxnBcTUdd8" resolve="traceTabs" />
</node>
</node>
</node>
<node concept="37vLTw" id="5lxnBcTZ_qs" role="37wK5m">
<ref role="3cqZAo" node="5lxnBcTZ$Eq" resolve="subscribeScheduler" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="5lxnBcTTFV3" role="jymVt" />
<node concept="2YIFZL" id="78H58of26Si" role="jymVt">
<property role="TrG5h" value="scheduleHighlighting" />
<node concept="37vLTG" id="78H58of26Sj" role="3clF46">
@ -1447,85 +1335,143 @@
<property role="TrG5h" value="e" />
</node>
</node>
<node concept="2Gpval" id="78H58oeV3lB" role="3cqZAp">
<node concept="3clFbS" id="5lxnBcTZ0TO" role="2LFqv$">
<node concept="3cpWs8" id="5lxnBcTZ0TP" role="3cqZAp">
<node concept="3cpWsn" id="5lxnBcTZ0TQ" role="3cpWs9">
<property role="TrG5h" value="node" />
<node concept="3uibUv" id="5lxnBcTZ0TR" role="1tU5fm">
<ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
</node>
<node concept="2OqwBi" id="5lxnBcTZ0TS" role="33vP2m">
<node concept="2OqwBi" id="78H58oeVi72" role="2Oq$k0">
<node concept="2GrUjf" id="78H58oeV3o9" role="2Oq$k0">
<ref role="2Gs0qQ" node="78H58oeV3o7" resolve="e" />
<node concept="3clFbH" id="1FOQehx16pS" role="3cqZAp" />
<node concept="1DcWWT" id="1FOQehx1cWH" role="3cqZAp">
<node concept="3clFbS" id="1FOQehx1cWK" role="2LFqv$">
<node concept="3clFbJ" id="1FOQehx1ubh" role="3cqZAp">
<node concept="3clFbS" id="1FOQehx1ubj" role="3clFbx">
<node concept="3cpWs8" id="1FOQehx1Lkl" role="3cqZAp">
<node concept="3cpWsn" id="1FOQehx1Lkm" role="3cpWs9">
<property role="TrG5h" value="nri" />
<node concept="3uibUv" id="1FOQehx1Lkn" role="1tU5fm">
<ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
</node>
<node concept="3AY5_j" id="78H58oeVjWC" role="2OqNvi" />
</node>
<node concept="liA8E" id="5lxnBcTZ0TW" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
<node concept="2OqwBi" id="5lxnBcTZ0TX" role="37wK5m">
<node concept="2JrnkZ" id="5lxnBcTZ0TY" role="2Oq$k0">
<node concept="37vLTw" id="5lxnBcTZ0TZ" role="2JrQYb">
<ref role="3cqZAo" node="5lxnBcTZ0SY" resolve="mdl" />
<node concept="1eOMI4" id="1FOQehx1TRz" role="33vP2m">
<node concept="10QFUN" id="1FOQehx1TRw" role="1eOMHV">
<node concept="3uibUv" id="1FOQehx1TR_" role="10QFUM">
<ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
</node>
<node concept="37vLTw" id="1FOQehx1TRA" role="10QFUP">
<ref role="3cqZAo" node="1FOQehx1cWL" resolve="it" />
</node>
</node>
<node concept="liA8E" id="5lxnBcTZ0U0" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
</node>
</node>
</node>
<node concept="3cpWs8" id="5lxnBcTZ0TP" role="3cqZAp">
<node concept="3cpWsn" id="5lxnBcTZ0TQ" role="3cpWs9">
<property role="TrG5h" value="node" />
<node concept="3uibUv" id="5lxnBcTZ0TR" role="1tU5fm">
<ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
</node>
<node concept="2OqwBi" id="5lxnBcTZ0TS" role="33vP2m">
<node concept="2OqwBi" id="1FOQehx1qi8" role="2Oq$k0">
<node concept="37vLTw" id="1FOQehx22o1" role="2Oq$k0">
<ref role="3cqZAo" node="1FOQehx1Lkm" resolve="nri" />
</node>
<node concept="liA8E" id="1FOQehx24jI" role="2OqNvi">
<ref role="37wK5l" to="d6hs:~NodeFlavouredItem.getNode():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getNode" />
</node>
</node>
<node concept="liA8E" id="5lxnBcTZ0TW" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
<node concept="2OqwBi" id="5lxnBcTZ0TX" role="37wK5m">
<node concept="2JrnkZ" id="5lxnBcTZ0TY" role="2Oq$k0">
<node concept="37vLTw" id="5lxnBcTZ0TZ" role="2JrQYb">
<ref role="3cqZAo" node="5lxnBcTZ0SY" resolve="mdl" />
</node>
</node>
<node concept="liA8E" id="5lxnBcTZ0U0" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbJ" id="5lxnBcTZ0U1" role="3cqZAp">
<node concept="3y3z36" id="5lxnBcTZ0U2" role="3clFbw">
<node concept="37vLTw" id="5lxnBcTZ0U3" role="3uHU7B">
<ref role="3cqZAo" node="5lxnBcTZ0TQ" resolve="node" />
</node>
<node concept="10Nm6u" id="5lxnBcTZ0U4" role="3uHU7w" />
</node>
<node concept="3clFbS" id="5lxnBcTZ0U5" role="3clFbx">
<node concept="3clFbJ" id="1FOQehx2gvv" role="3cqZAp">
<node concept="3clFbS" id="1FOQehx2gvx" role="3clFbx">
<node concept="3clFbF" id="5lxnBcTZ0U6" role="3cqZAp">
<node concept="2OqwBi" id="5lxnBcTZ0U7" role="3clFbG">
<node concept="37vLTw" id="5lxnBcTZ0U8" role="2Oq$k0">
<ref role="3cqZAo" node="5lxnBcTZ0T4" resolve="messageList" />
</node>
<node concept="TSZUe" id="5lxnBcTZ0U9" role="2OqNvi">
<node concept="2OqwBi" id="5lxnBcTZ0Ua" role="25WWJ7">
<node concept="37vLTw" id="5lxnBcTZ0Ub" role="2Oq$k0">
<ref role="3cqZAo" node="52a_GfIDucr" resolve="messageDisplay" />
</node>
<node concept="liA8E" id="5lxnBcTZ0Uc" role="2OqNvi">
<ref role="37wK5l" node="4vBwiiVsgIX" resolve="errorMessage" />
<node concept="37vLTw" id="5lxnBcTZ0Ud" role="37wK5m">
<ref role="3cqZAo" node="5lxnBcTZ0TQ" resolve="node" />
</node>
<node concept="2OqwBi" id="1FOQehx2B9O" role="37wK5m">
<node concept="37vLTw" id="1FOQehx2_bF" role="2Oq$k0">
<ref role="3cqZAo" node="1FOQehx1Lkm" resolve="nri" />
</node>
<node concept="liA8E" id="1FOQehx2Dl8" role="2OqNvi">
<ref role="37wK5l" to="d6hs:~ReportItem.getMessage():java.lang.String" resolve="getMessage" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbC" id="1FOQehx2mse" role="3clFbw">
<node concept="2OqwBi" id="1FOQehx2qlw" role="3uHU7w">
<node concept="37vLTw" id="1FOQehx2onP" role="2Oq$k0">
<ref role="3cqZAo" node="1FOQehx1Lkm" resolve="nri" />
</node>
<node concept="liA8E" id="1FOQehx2spE" role="2OqNvi">
<ref role="37wK5l" to="d6hs:~ReportItem.getSeverity():jetbrains.mps.errors.MessageStatus" resolve="getSeverity" />
</node>
</node>
<node concept="Rm8GO" id="1FOQehx2kl_" role="3uHU7B">
<ref role="Rm8GQ" to="2gg1:~MessageStatus.ERROR" resolve="ERROR" />
<ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="1FOQehx27FW" role="3cqZAp" />
</node>
<node concept="2ZW3vV" id="1FOQehx1$n8" role="3clFbw">
<node concept="3uibUv" id="1FOQehx1Air" role="2ZW6by">
<ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
</node>
<node concept="37vLTw" id="1FOQehx1urd" role="2ZW6bz">
<ref role="3cqZAo" node="1FOQehx1cWL" resolve="it" />
</node>
</node>
</node>
<node concept="3clFbJ" id="5lxnBcTZ0U1" role="3cqZAp">
<node concept="3y3z36" id="5lxnBcTZ0U2" role="3clFbw">
<node concept="37vLTw" id="5lxnBcTZ0U3" role="3uHU7B">
<ref role="3cqZAo" node="5lxnBcTZ0TQ" resolve="node" />
</node>
<node concept="10Nm6u" id="5lxnBcTZ0U4" role="3uHU7w" />
</node>
<node concept="3clFbS" id="5lxnBcTZ0U5" role="3clFbx">
<node concept="3clFbF" id="5lxnBcTZ0U6" role="3cqZAp">
<node concept="2OqwBi" id="5lxnBcTZ0U7" role="3clFbG">
<node concept="37vLTw" id="5lxnBcTZ0U8" role="2Oq$k0">
<ref role="3cqZAo" node="5lxnBcTZ0T4" resolve="messageList" />
</node>
<node concept="TSZUe" id="5lxnBcTZ0U9" role="2OqNvi">
<node concept="2OqwBi" id="5lxnBcTZ0Ua" role="25WWJ7">
<node concept="37vLTw" id="5lxnBcTZ0Ub" role="2Oq$k0">
<ref role="3cqZAo" node="52a_GfIDucr" resolve="messageDisplay" />
</node>
<node concept="liA8E" id="5lxnBcTZ0Uc" role="2OqNvi">
<ref role="37wK5l" node="4vBwiiVsgIX" resolve="errorMessage" />
<node concept="37vLTw" id="5lxnBcTZ0Ud" role="37wK5m">
<ref role="3cqZAo" node="5lxnBcTZ0TQ" resolve="node" />
</node>
<node concept="2OqwBi" id="78H58oeVtd5" role="37wK5m">
<node concept="2GrUjf" id="78H58oeV3ob" role="2Oq$k0">
<ref role="2Gs0qQ" node="78H58oeV3o7" resolve="e" />
</node>
<node concept="3AV6Ez" id="78H58oeVvfN" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="1FOQehx1s9E" role="3cqZAp" />
</node>
<node concept="3cpWsn" id="1FOQehx1cWL" role="1Duv9x">
<property role="TrG5h" value="it" />
<node concept="3uibUv" id="1FOQehx1cWP" role="1tU5fm">
<ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
</node>
</node>
<node concept="2OqwBi" id="78H58oeUzS0" role="2GsD0m">
<node concept="37vLTw" id="78H58oeUwOI" role="2Oq$k0">
<node concept="2OqwBi" id="1FOQehx1cWQ" role="1DdaDG">
<node concept="37vLTw" id="1FOQehx1cWR" role="2Oq$k0">
<ref role="3cqZAo" node="78H58oeTHIN" resolve="task" />
</node>
<node concept="2OwXpG" id="78H58oeUA8d" role="2OqNvi">
<ref role="2Oxat5" node="78H58oeTtbF" resolve="errors" />
<node concept="2OwXpG" id="1FOQehx1cWS" role="2OqNvi">
<ref role="2Oxat5" node="1FOQehx0XQm" resolve="reportItems" />
</node>
</node>
<node concept="2GrKxI" id="78H58oeV3o7" role="2Gsz3X">
<property role="TrG5h" value="e" />
</node>
</node>
</node>
</node>
@ -2041,41 +1987,40 @@
</node>
</node>
<node concept="2tJIrI" id="78H58oeToXj" role="jymVt" />
<node concept="3clFb_" id="78H58oeToTl" role="jymVt">
<property role="TrG5h" value="withErrors" />
<node concept="37vLTG" id="78H58oeToTm" role="3clF46">
<property role="TrG5h" value="errors" />
<node concept="3rvAFt" id="78H58of1A9C" role="1tU5fm">
<node concept="3uibUv" id="78H58of1AWv" role="3rvQeY">
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
<node concept="3clFb_" id="1FOQehx0V$P" role="jymVt">
<property role="TrG5h" value="withReportItems" />
<node concept="37vLTG" id="1FOQehx0V$Q" role="3clF46">
<property role="TrG5h" value="reportItems" />
<node concept="3vKaQO" id="1FOQehx0WAl" role="1tU5fm">
<node concept="3uibUv" id="1FOQehx0X5a" role="3O5elw">
<ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
</node>
<node concept="17QB3L" id="78H58of1BoY" role="3rvSg0" />
</node>
</node>
<node concept="3uibUv" id="78H58oeToTq" role="3clF45">
<node concept="3uibUv" id="1FOQehx0V$U" role="3clF45">
<ref role="3uigEE" node="78H58oeT9Hs" resolve="HighlightingTask" />
</node>
<node concept="3Tm1VV" id="78H58oeToTr" role="1B3o_S" />
<node concept="3clFbS" id="78H58oeToTs" role="3clF47">
<node concept="3clFbF" id="78H58oeTtbL" role="3cqZAp">
<node concept="37vLTI" id="78H58oeTtbN" role="3clFbG">
<node concept="2OqwBi" id="78H58oeTtIH" role="37vLTJ">
<node concept="Xjq3P" id="78H58oeTu7o" role="2Oq$k0" />
<node concept="2OwXpG" id="78H58oeTtIK" role="2OqNvi">
<ref role="2Oxat5" node="78H58oeTtbF" resolve="errors" />
<node concept="3Tm1VV" id="1FOQehx0V$V" role="1B3o_S" />
<node concept="3clFbS" id="1FOQehx0V$W" role="3clF47">
<node concept="3clFbF" id="1FOQehx0XQr" role="3cqZAp">
<node concept="37vLTI" id="1FOQehx0XQt" role="3clFbG">
<node concept="2OqwBi" id="1FOQehx0Y$0" role="37vLTJ">
<node concept="Xjq3P" id="1FOQehx0YHE" role="2Oq$k0" />
<node concept="2OwXpG" id="1FOQehx0Y$3" role="2OqNvi">
<ref role="2Oxat5" node="1FOQehx0XQm" resolve="reportItems" />
</node>
</node>
<node concept="37vLTw" id="78H58oeTtbR" role="37vLTx">
<ref role="3cqZAo" node="78H58oeToTm" resolve="errors" />
<node concept="37vLTw" id="1FOQehx0XQx" role="37vLTx">
<ref role="3cqZAo" node="1FOQehx0V$Q" resolve="reportItems" />
</node>
</node>
</node>
<node concept="3clFbF" id="78H58oeTuMd" role="3cqZAp">
<node concept="Xjq3P" id="78H58oeTuMb" role="3clFbG" />
<node concept="3clFbF" id="1FOQehx0V_3" role="3cqZAp">
<node concept="Xjq3P" id="1FOQehx0V_4" role="3clFbG" />
</node>
</node>
</node>
<node concept="2tJIrI" id="78H58oeTpnV" role="jymVt" />
<node concept="2tJIrI" id="1FOQehx0V$O" role="jymVt" />
<node concept="3clFb_" id="78H58oeTpjT" role="jymVt">
<property role="TrG5h" value="withTracetabs" />
<node concept="37vLTG" id="78H58oeTpjU" role="3clF46">
@ -2121,16 +2066,6 @@
<node concept="3Tqbb2" id="78H58of1BCf" role="3rvSg0" />
</node>
</node>
<node concept="312cEg" id="78H58oeTtbF" role="jymVt">
<property role="TrG5h" value="errors" />
<node concept="3Tmbuc" id="78H58oeTxCw" role="1B3o_S" />
<node concept="3rvAFt" id="78H58of1C77" role="1tU5fm">
<node concept="3uibUv" id="78H58of1C78" role="3rvQeY">
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
</node>
<node concept="17QB3L" id="78H58of1C79" role="3rvSg0" />
</node>
</node>
<node concept="312cEg" id="78H58oeTuSP" role="jymVt">
<property role="TrG5h" value="ttabs" />
<node concept="3Tmbuc" id="78H58oeTxG0" role="1B3o_S" />
@ -2152,6 +2087,15 @@
<ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
</node>
</node>
<node concept="312cEg" id="1FOQehx0XQm" role="jymVt">
<property role="TrG5h" value="reportItems" />
<node concept="3Tmbuc" id="1FOQehx0Z5q" role="1B3o_S" />
<node concept="3vKaQO" id="1FOQehx0XQp" role="1tU5fm">
<node concept="3uibUv" id="1FOQehx0XQq" role="3O5elw">
<ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
</node>
</node>
</node>
</node>
<node concept="312cEu" id="4vBwiiVsgHb">
<property role="3GE5qa" value="highlighting" />

79
coderules/solutions/jetbrains.mps.coderules/models/service.mps
View File

@ -33,6 +33,7 @@
<import index="e0w6" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex.observers(jetbrains.mps.coderules/)" />
<import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.coderules.aspect)" />
<import index="7n8k" ref="r:475a2e92-d7d4-41c3-98e3-172d70b6f018(jetbrains.mps.logic.program)" />
<import index="d6hs" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors.item(MPS.Core/)" />
</imports>
<registry>
<language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@ -1494,52 +1495,6 @@
</node>
</node>
<node concept="2tJIrI" id="3F6vMxq$Y7S" role="jymVt" />
<node concept="3clFbW" id="3IIf9OAgFCl" role="jymVt">
<node concept="3cqZAl" id="3IIf9OAgFCm" role="3clF45" />
<node concept="3Tm1VV" id="3IIf9OAgFCn" role="1B3o_S" />
<node concept="3clFbS" id="3IIf9OAgFCo" role="3clF47">
<node concept="3clFbF" id="3IIf9OAgFCp" role="3cqZAp">
<node concept="37vLTI" id="3IIf9OAgFCq" role="3clFbG">
<node concept="2OqwBi" id="3IIf9OAgFCr" role="37vLTJ">
<node concept="Xjq3P" id="3IIf9OAgFCs" role="2Oq$k0" />
<node concept="2OwXpG" id="3IIf9OAgFCt" role="2OqNvi">
<ref role="2Oxat5" node="443LGHBSt7P" resolve="repository" />
</node>
</node>
<node concept="37vLTw" id="3IIf9OAgFCu" role="37vLTx">
<ref role="3cqZAo" node="3IIf9OAgFCv" resolve="repository" />
</node>
</node>
</node>
<node concept="3clFbF" id="3IIf9OAgHRc" role="3cqZAp">
<node concept="37vLTI" id="3IIf9OAgHRe" role="3clFbG">
<node concept="2OqwBi" id="3IIf9OAgJUJ" role="37vLTJ">
<node concept="Xjq3P" id="3IIf9OAgJZk" role="2Oq$k0" />
<node concept="2OwXpG" id="3IIf9OAgJUM" role="2OqNvi">
<ref role="2Oxat5" node="3IIf9OAgHR7" resolve="parameter" />
</node>
</node>
<node concept="37vLTw" id="3IIf9OAgHRi" role="37vLTx">
<ref role="3cqZAo" node="3IIf9OAgHzP" resolve="parameter" />
</node>
</node>
</node>
</node>
<node concept="37vLTG" id="3IIf9OAgFCv" role="3clF46">
<property role="TrG5h" value="repository" />
<node concept="3uibUv" id="3IIf9OAgFCw" role="1tU5fm">
<ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
</node>
</node>
<node concept="37vLTG" id="3IIf9OAgHzP" role="3clF46">
<property role="TrG5h" value="parameter" />
<node concept="3uibUv" id="3IIf9OAgO$P" role="1tU5fm">
<ref role="3uigEE" to="33ny:~List" resolve="List" />
<node concept="3qTvmN" id="3IIf9OAm23N" role="11_B2D" />
</node>
</node>
</node>
<node concept="2tJIrI" id="3IIf9OAgFCk" role="jymVt" />
<node concept="3clFb_" id="1pPth$lMSHK" role="jymVt">
<property role="TrG5h" value="info" />
<property role="1EzhhJ" value="false" />
@ -1553,7 +1508,7 @@
</node>
</node>
</node>
<node concept="2tJIrI" id="3F6vMxq_0xa" role="jymVt" />
<node concept="2tJIrI" id="1FOQehwo8s$" role="jymVt" />
<node concept="3clFb_" id="55Q$YFtJK$_" role="jymVt">
<property role="TrG5h" value="schedule" />
<property role="1EzhhJ" value="false" />
@ -1862,9 +1817,6 @@
</node>
</node>
</node>
<node concept="37vLTw" id="3IIf9OAgKDg" role="37wK5m">
<ref role="3cqZAo" node="3IIf9OAgHR7" resolve="parameter" />
</node>
</node>
</node>
<node concept="10Nm6u" id="7WKNeR9$atX" role="3K4GZi" />
@ -2558,14 +2510,6 @@
<ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
</node>
</node>
<node concept="312cEg" id="3IIf9OAgHR7" role="jymVt">
<property role="TrG5h" value="parameter" />
<node concept="3Tm6S6" id="3IIf9OAgHR8" role="1B3o_S" />
<node concept="3uibUv" id="3IIf9OAgPa_" role="1tU5fm">
<ref role="3uigEE" to="33ny:~List" resolve="List" />
<node concept="3qTvmN" id="3IIf9OAm4oj" role="11_B2D" />
</node>
</node>
</node>
<node concept="312cEu" id="7nPD14NbIif">
<property role="TrG5h" value="MultiTrace" />
@ -4968,5 +4912,24 @@
</node>
</node>
</node>
<node concept="3HP615" id="5KrJ7UHMRRs">
<property role="TrG5h" value="ReportSink" />
<node concept="2tJIrI" id="5KrJ7UHMRRU" role="jymVt" />
<node concept="3clFb_" id="5KrJ7UHMRSa" role="jymVt">
<property role="1EzhhJ" value="true" />
<property role="TrG5h" value="report" />
<node concept="37vLTG" id="5KrJ7UHMRTK" role="3clF46">
<property role="TrG5h" value="reportItem" />
<node concept="3uibUv" id="5KrJ7UHMVA7" role="1tU5fm">
<ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
</node>
</node>
<node concept="3cqZAl" id="5KrJ7UHMRSc" role="3clF45" />
<node concept="3Tm1VV" id="5KrJ7UHMRSd" role="1B3o_S" />
<node concept="3clFbS" id="5KrJ7UHMRSe" role="3clF47" />
</node>
<node concept="2tJIrI" id="5KrJ7UHMRRZ" role="jymVt" />
<node concept="3Tm1VV" id="5KrJ7UHMRRt" role="1B3o_S" />
</node>
</model>

22
coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
View File

@ -1237,25 +1237,25 @@
</node>
</node>
</node>
<node concept="3clFbF" id="78H58of3nRc" role="3cqZAp">
<node concept="37vLTI" id="78H58of3nRd" role="3clFbG">
<node concept="2OqwBi" id="78H58of3nRe" role="37vLTx">
<node concept="37vLTw" id="78H58of3nRf" role="2Oq$k0">
<node concept="3clFbF" id="1FOQehx4mRi" role="3cqZAp">
<node concept="37vLTI" id="1FOQehx4mRj" role="3clFbG">
<node concept="2OqwBi" id="1FOQehx4mRk" role="37vLTx">
<node concept="37vLTw" id="1FOQehx4mRl" role="2Oq$k0">
<ref role="3cqZAo" node="78H58of3fK7" resolve="task" />
</node>
<node concept="liA8E" id="78H58of3fKp" role="2OqNvi">
<ref role="37wK5l" to="o35r:78H58oeToTl" resolve="withErrors" />
<node concept="2OqwBi" id="78H58of3fKq" role="37wK5m">
<node concept="37vLTw" id="78H58of3fKr" role="2Oq$k0">
<node concept="liA8E" id="1FOQehx4mRm" role="2OqNvi">
<ref role="37wK5l" to="o35r:1FOQehx0V$P" resolve="withReportItems" />
<node concept="2OqwBi" id="1FOQehx4mRn" role="37wK5m">
<node concept="37vLTw" id="1FOQehx4mRo" role="2Oq$k0">
<ref role="3cqZAo" node="5lxnBcU09rm" resolve="prev" />
</node>
<node concept="liA8E" id="78H58of3fKs" role="2OqNvi">
<ref role="37wK5l" to="fjx4:7lt0LtQA50U" resolve="getErrors" />
<node concept="liA8E" id="1FOQehx4mRp" role="2OqNvi">
<ref role="37wK5l" to="fjx4:1FOQehx4yMT" resolve="getReportItems" />
</node>
</node>
</node>
</node>
<node concept="37vLTw" id="78H58of3nRk" role="37vLTJ">
<node concept="37vLTw" id="1FOQehx4mRq" role="37vLTJ">
<ref role="3cqZAo" node="78H58of3fK7" resolve="task" />
</node>
</node>

276
coderules/solutions/jetbrains.mps.controlflow/models/service.mps
View File

@ -23,6 +23,8 @@
<import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
<import index="7n8k" ref="r:475a2e92-d7d4-41c3-98e3-172d70b6f018(jetbrains.mps.logic.program)" />
<import index="unkn" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex(jetbrains.mps.coderules/)" />
<import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
<import index="d6hs" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors.item(MPS.Core/)" />
</imports>
<registry>
<language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@ -75,7 +77,6 @@
<child id="1165602531693" name="superclass" index="1zkMxy" />
</concept>
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
<property id="1176718929932" name="isFinal" index="3TUv4t" />
<child id="1068431790190" name="initializer" index="33vP2m" />
</concept>
<concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
@ -127,7 +128,6 @@
<property id="521412098689998745" name="nonStatic" index="2bfB8j" />
<child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
</concept>
<concept id="1171903607971" name="jetbrains.mps.baseLanguage.structure.WildCardType" flags="in" index="3qTvmN" />
<concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
<concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
<reference id="1107535924139" name="classifier" index="3uigEE" />
@ -160,9 +160,7 @@
</concept>
</language>
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
<concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
<child id="1145404616321" name="leftExpression" index="2JrQYb" />
</concept>
<concept id="7400021826771268254" name="jetbrains.mps.lang.smodel.structure.SNodePointerType" flags="ig" index="2sp9CU" />
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
</language>
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
@ -171,6 +169,9 @@
</concept>
</language>
<language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
<concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
<child id="540871147943773366" name="argument" index="25WWJ7" />
</concept>
<concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
<child id="1151688676805" name="elementType" index="_ZDj9" />
</concept>
@ -178,17 +179,10 @@
<child id="1237721435807" name="elementType" index="HW$YZ" />
</concept>
<concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
<concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
<child id="1197683466920" name="keyType" index="3rvQeY" />
<child id="1197683475734" name="valueType" index="3rvSg0" />
</concept>
<concept id="1197686869805" name="jetbrains.mps.baseLanguage.collections.structure.HashMapCreator" flags="nn" index="3rGOSV">
<child id="1197687026896" name="keyType" index="3rHrn6" />
<child id="1197687035757" name="valueType" index="3rHtpV" />
</concept>
<concept id="1197932370469" name="jetbrains.mps.baseLanguage.collections.structure.MapElement" flags="nn" index="3EllGN">
<child id="1197932505799" name="map" index="3ElQJh" />
<child id="1197932525128" name="key" index="3ElVtu" />
<concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
<concept id="7125221305512719026" name="jetbrains.mps.baseLanguage.collections.structure.CollectionType" flags="in" index="3vKaQO" />
<concept id="5686963296372573083" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerType" flags="in" index="3O5elB">
<child id="5686963296372573084" name="elementType" index="3O5elw" />
</concept>
</language>
</registry>
@ -383,35 +377,7 @@
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="7lt0LtQ_OM3" role="jymVt" />
<node concept="3clFb_" id="oI9Ys2yFM" role="jymVt">
<property role="1EzhhJ" value="false" />
<property role="TrG5h" value="report" />
<node concept="37vLTG" id="oI9Ys2yFN" role="3clF46">
<property role="TrG5h" value="target" />
<node concept="3Tqbb2" id="oI9Ys2yFO" role="1tU5fm" />
</node>
<node concept="37vLTG" id="oI9Ys2yFP" role="3clF46">
<property role="TrG5h" value="kind" />
<node concept="3uibUv" id="oI9Ys2yFQ" role="1tU5fm">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
</node>
<node concept="37vLTG" id="oI9Ys2yFR" role="3clF46">
<property role="TrG5h" value="text" />
<node concept="17QB3L" id="oI9Ys2yFS" role="1tU5fm" />
</node>
<node concept="10P_77" id="oI9Ys2yFT" role="3clF45" />
<node concept="3Tm1VV" id="oI9Ys2yFU" role="1B3o_S" />
<node concept="3clFbS" id="oI9Ys2yFX" role="3clF47">
<node concept="3clFbF" id="oI9Ys2yG0" role="3cqZAp">
<node concept="3clFbT" id="oI9Ys2yFZ" role="3clFbG" />
</node>
</node>
<node concept="2AHcQZ" id="oI9Ys2yFY" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="1FOQehvIsJr" role="jymVt" />
<node concept="3Tm1VV" id="7lt0LtQ_OIT" role="1B3o_S" />
<node concept="3uibUv" id="7lt0LtQ_OLT" role="1zkMxy">
<ref role="3uigEE" to="cxk7:3F6vMxqo13Y" resolve="DefaultSessionSolver" />
@ -441,36 +407,6 @@
</node>
</node>
</node>
<node concept="2tJIrI" id="78H58oeu9$M" role="jymVt" />
<node concept="3clFbW" id="78H58oeu9xt" role="jymVt">
<node concept="37vLTG" id="78H58oeu9xu" role="3clF46">
<property role="TrG5h" value="repository" />
<node concept="3uibUv" id="78H58oeu9xv" role="1tU5fm">
<ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
</node>
</node>
<node concept="37vLTG" id="78H58oeu9xw" role="3clF46">
<property role="TrG5h" value="params" />
<node concept="3uibUv" id="78H58oeu9xx" role="1tU5fm">
<ref role="3uigEE" to="33ny:~List" resolve="List" />
<node concept="3qTvmN" id="78H58oeu9xy" role="11_B2D" />
</node>
</node>
<node concept="3cqZAl" id="78H58oeu9xz" role="3clF45" />
<node concept="3Tm1VV" id="78H58oeu9x$" role="1B3o_S" />
<node concept="3clFbS" id="78H58oeu9x_" role="3clF47">
<node concept="XkiVB" id="78H58oeu9xA" role="3cqZAp">
<ref role="37wK5l" to="1yqb:3IIf9OAgFCl" resolve="EvaluateRulesStep" />
<node concept="37vLTw" id="78H58oeu9xB" role="37wK5m">
<ref role="3cqZAo" node="78H58oeu9xu" resolve="repository" />
</node>
<node concept="37vLTw" id="78H58oeu9xC" role="37wK5m">
<ref role="3cqZAo" node="78H58oeu9xw" resolve="params" />
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="78H58oeu6Qq" role="jymVt" />
<node concept="2tJIrI" id="6Yb9hAqJRts" role="jymVt" />
<node concept="3clFb_" id="6Yb9hAqJSaM" role="jymVt">
<property role="TrG5h" value="scheduleWithTrace" />
@ -566,16 +502,16 @@
<node concept="3clFb_" id="78H58oeuats" role="jymVt">
<property role="1EzhhJ" value="false" />
<property role="TrG5h" value="report" />
<node concept="37vLTG" id="78H58oeuatt" role="3clF46">
<property role="TrG5h" value="target" />
<node concept="3Tqbb2" id="78H58oeuatu" role="1tU5fm" />
</node>
<node concept="37vLTG" id="78H58oeuatv" role="3clF46">
<property role="TrG5h" value="kind" />
<node concept="3uibUv" id="78H58oeuatw" role="1tU5fm">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
<node concept="3uibUv" id="1FOQehwpupN" role="1tU5fm">
<ref role="3uigEE" to="2gg1:~MessageStatus" resolve="MessageStatus" />
</node>
</node>
<node concept="37vLTG" id="78H58oeuatt" role="3clF46">
<property role="TrG5h" value="target" />
<node concept="2sp9CU" id="1FOQehwMiYP" role="1tU5fm" />
</node>
<node concept="37vLTG" id="78H58oeuatx" role="3clF46">
<property role="TrG5h" value="text" />
<node concept="17QB3L" id="78H58oeuaty" role="1tU5fm" />
@ -586,51 +522,32 @@
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
<node concept="3clFbS" id="78H58oeuatE" role="3clF47">
<node concept="3clFbJ" id="oI9Ysbre7" role="3cqZAp">
<node concept="2OqwBi" id="oI9YsbrVU" role="3clFbw">
<node concept="Xl_RD" id="oI9Ysbruj" role="2Oq$k0">
<property role="Xl_RC" value="error" />
<node concept="3clFbF" id="1FOQehx4EW8" role="3cqZAp">
<node concept="2OqwBi" id="1FOQehx4Gp2" role="3clFbG">
<node concept="37vLTw" id="1FOQehx4EW6" role="2Oq$k0">
<ref role="3cqZAo" node="1FOQehx4tIV" resolve="reportItems" />
</node>
<node concept="liA8E" id="oI9Ysbsor" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
<node concept="37vLTw" id="oI9YsbsD8" role="37wK5m">
<ref role="3cqZAo" node="78H58oeuatv" resolve="kind" />
</node>
</node>
</node>
<node concept="3clFbS" id="oI9Ysbre9" role="3clFbx">
<node concept="3clFbF" id="oI9Ysbt3k" role="3cqZAp">
<node concept="37vLTI" id="oI9YsbvTv" role="3clFbG">
<node concept="37vLTw" id="oI9YsbwpJ" role="37vLTx">
<ref role="3cqZAo" node="78H58oeuatx" resolve="text" />
</node>
<node concept="3EllGN" id="oI9YsbtHt" role="37vLTJ">
<node concept="2OqwBi" id="oI9YsbuMb" role="3ElVtu">
<node concept="2JrnkZ" id="oI9YsbuyC" role="2Oq$k0">
<node concept="37vLTw" id="oI9Ysbu8v" role="2JrQYb">
<ref role="3cqZAo" node="78H58oeuatt" resolve="target" />
</node>
</node>
<node concept="liA8E" id="oI9Ysbv9O" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
</node>
<node concept="TSZUe" id="1FOQehx4HQH" role="2OqNvi">
<node concept="2ShNRf" id="1FOQehx4If8" role="25WWJ7">
<node concept="1pGfFk" id="1FOQehx4Jls" role="2ShVmc">
<ref role="37wK5l" node="1FOQehwow5Q" resolve="ControlflowReportItem" />
<node concept="37vLTw" id="1FOQehx47KN" role="37wK5m">
<ref role="3cqZAo" node="78H58oeuatv" resolve="kind" />
</node>
<node concept="37vLTw" id="oI9Ysbt3j" role="3ElQJh">
<ref role="3cqZAo" node="7lt0LtQ_XxI" resolve="errors" />
<node concept="37vLTw" id="1FOQehx47KO" role="37wK5m">
<ref role="3cqZAo" node="78H58oeuatt" resolve="target" />
</node>
<node concept="37vLTw" id="1FOQehx47KP" role="37wK5m">
<ref role="3cqZAo" node="78H58oeuatx" resolve="text" />
</node>
</node>
</node>
</node>
<node concept="3cpWs6" id="oI9YsbwWO" role="3cqZAp">
<node concept="3clFbT" id="oI9Ysbxg1" role="3cqZAk">
<property role="3clFbU" value="true" />
</node>
</node>
</node>
</node>
<node concept="3cpWs6" id="oI9Ysby3S" role="3cqZAp">
<node concept="3clFbT" id="oI9Ysbyzu" role="3cqZAk">
<property role="3clFbU" value="false" />
<node concept="3clFbT" id="1FOQehxPxp2" role="3cqZAk">
<property role="3clFbU" value="true" />
</node>
</node>
</node>
@ -664,24 +581,23 @@
</node>
</node>
<node concept="2tJIrI" id="78H58oeubmD" role="jymVt" />
<node concept="3clFb_" id="7lt0LtQA50U" role="jymVt">
<property role="TrG5h" value="getErrors" />
<node concept="3rvAFt" id="7lt0LtQA50V" role="3clF45">
<node concept="17QB3L" id="7lt0LtQA50W" role="3rvSg0" />
<node concept="3uibUv" id="7lt0LtQA50X" role="3rvQeY">
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
</node>
</node>
<node concept="3Tm1VV" id="7lt0LtQA50Y" role="1B3o_S" />
<node concept="3clFbS" id="7lt0LtQA50Z" role="3clF47">
<node concept="3clFbF" id="7lt0LtQA510" role="3cqZAp">
<node concept="37vLTw" id="7lt0LtQA511" role="3clFbG">
<ref role="3cqZAo" node="7lt0LtQ_XxI" resolve="errors" />
<node concept="3clFb_" id="1FOQehx4yMT" role="jymVt">
<property role="TrG5h" value="getReportItems" />
<node concept="3Tm1VV" id="1FOQehx4yMX" role="1B3o_S" />
<node concept="3clFbS" id="1FOQehx4yMY" role="3clF47">
<node concept="3clFbF" id="1FOQehx4BDl" role="3cqZAp">
<node concept="37vLTw" id="1FOQehx4BDk" role="3clFbG">
<ref role="3cqZAo" node="1FOQehx4tIV" resolve="reportItems" />
</node>
</node>
</node>
<node concept="3vKaQO" id="1FOQehx4$tY" role="3clF45">
<node concept="3uibUv" id="1FOQehx4_l3" role="3O5elw">
<ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
</node>
</node>
</node>
<node concept="2tJIrI" id="6Yb9hAqJXrR" role="jymVt" />
<node concept="2tJIrI" id="1FOQehx4yMS" role="jymVt" />
<node concept="3clFb_" id="6kREIVl0T6j" role="jymVt">
<property role="TrG5h" value="getTraceTabComponents" />
<node concept="_YKpA" id="6kREIVl0T6k" role="3clF45">
@ -699,25 +615,6 @@
</node>
</node>
<node concept="2tJIrI" id="78H58oeuecU" role="jymVt" />
<node concept="312cEg" id="7lt0LtQ_XxI" role="jymVt">
<property role="TrG5h" value="errors" />
<property role="3TUv4t" value="false" />
<node concept="3Tm6S6" id="7lt0LtQ_XxJ" role="1B3o_S" />
<node concept="3rvAFt" id="7lt0LtQ_XxK" role="1tU5fm">
<node concept="17QB3L" id="7lt0LtQ_XxL" role="3rvSg0" />
<node concept="3uibUv" id="7lt0LtQ_XxM" role="3rvQeY">
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
</node>
</node>
<node concept="2ShNRf" id="7lt0LtQ_XxN" role="33vP2m">
<node concept="3rGOSV" id="7lt0LtQ_XxO" role="2ShVmc">
<node concept="3uibUv" id="7lt0LtQ_XxP" role="3rHrn6">
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
</node>
<node concept="17QB3L" id="7lt0LtQ_XxQ" role="3rHtpV" />
</node>
</node>
</node>
<node concept="312cEg" id="6IQb_RxsBvb" role="jymVt">
<property role="TrG5h" value="traceTabComponents" />
<node concept="3Tmbuc" id="78H58of7l2T" role="1B3o_S" />
@ -734,11 +631,88 @@
</node>
</node>
</node>
<node concept="2tJIrI" id="78H58oeubno" role="jymVt" />
<node concept="312cEg" id="1FOQehx4tIV" role="jymVt">
<property role="TrG5h" value="reportItems" />
<node concept="3Tm6S6" id="1FOQehx4tIW" role="1B3o_S" />
<node concept="_YKpA" id="1FOQehx4wLX" role="1tU5fm">
<node concept="3uibUv" id="1FOQehx4x9c" role="_ZDj9">
<ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
</node>
</node>
<node concept="2ShNRf" id="1FOQehx4yzm" role="33vP2m">
<node concept="Tc6Ow" id="1FOQehx4yv6" role="2ShVmc">
<node concept="3uibUv" id="1FOQehx4yv7" role="HW$YZ">
<ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
</node>
</node>
</node>
</node>
<node concept="3Tm1VV" id="78H58oeu6dH" role="1B3o_S" />
<node concept="3uibUv" id="78H58oeu6eG" role="1zkMxy">
<ref role="3uigEE" to="1yqb:1pPth$lBNWG" resolve="EvaluateRulesStep" />
</node>
</node>
<node concept="312cEu" id="1FOQehwovmW">
<property role="TrG5h" value="ControlflowReportItem" />
<node concept="2tJIrI" id="1FOQehwov_X" role="jymVt" />
<node concept="3clFbW" id="1FOQehwow5Q" role="jymVt">
<node concept="37vLTG" id="1FOQehwownE" role="3clF46">
<property role="TrG5h" value="stat" />
<node concept="3uibUv" id="1FOQehwozrM" role="1tU5fm">
<ref role="3uigEE" to="2gg1:~MessageStatus" resolve="MessageStatus" />
</node>
</node>
<node concept="37vLTG" id="1FOQehwozse" role="3clF46">
<property role="TrG5h" value="nodeRef" />
<node concept="3uibUv" id="1FOQehwozyA" role="1tU5fm">
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
</node>
</node>
<node concept="37vLTG" id="1FOQehwozzD" role="3clF46">
<property role="TrG5h" value="message" />
<node concept="17QB3L" id="1FOQehwozKs" role="1tU5fm" />
</node>
<node concept="3cqZAl" id="1FOQehwow5S" role="3clF45" />
<node concept="3Tm1VV" id="1FOQehwow5T" role="1B3o_S" />
<node concept="3clFbS" id="1FOQehwow5U" role="3clF47">
<node concept="XkiVB" id="1FOQehwozvf" role="3cqZAp">
<ref role="37wK5l" to="d6hs:~NodeReportItemBase.&lt;init&gt;(jetbrains.mps.errors.MessageStatus,org.jetbrains.mps.openapi.model.SNodeReference,java.lang.String)" resolve="NodeReportItemBase" />
<node concept="37vLTw" id="1FOQehwozDB" role="37wK5m">
<ref role="3cqZAo" node="1FOQehwownE" resolve="stat" />
</node>
<node concept="37vLTw" id="1FOQehwozGd" role="37wK5m">
<ref role="3cqZAo" node="1FOQehwozse" resolve="nodeRef" />
</node>
<node concept="37vLTw" id="1FOQehwozJ1" role="37wK5m">
<ref role="3cqZAo" node="1FOQehwozzD" resolve="message" />
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="1FOQehwowbp" role="jymVt" />
<node concept="3Tm1VV" id="1FOQehwovmX" role="1B3o_S" />
<node concept="3uibUv" id="1FOQehwovnW" role="1zkMxy">
<ref role="3uigEE" to="d6hs:~NodeReportItemBase" resolve="NodeReportItemBase" />
</node>
<node concept="3clFb_" id="1FOQehwovo1" role="jymVt">
<property role="1EzhhJ" value="false" />
<property role="TrG5h" value="getIssueKind" />
<property role="DiZV1" value="false" />
<property role="od$2w" value="false" />
<node concept="3Tm1VV" id="1FOQehwovo2" role="1B3o_S" />
<node concept="17QB3L" id="1FOQehwozNz" role="3clF45" />
<node concept="3clFbS" id="1FOQehwovoe" role="3clF47">
<node concept="3clFbF" id="1FOQehwovF_" role="3cqZAp">
<node concept="Xl_RD" id="1FOQehx4DGR" role="3clFbG">
<property role="Xl_RC" value="control flow" />
</node>
</node>
</node>
<node concept="2AHcQZ" id="1FOQehwovof" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="1FOQehwovCw" role="jymVt" />
</node>
</model>

14
coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.program.mps
View File

@ -20,6 +20,7 @@
<import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
<import index="9x2e" ref="r:0730b0d1-7e2f-4982-aac3-8069c5060a9c(jetbrains.mps.lang.typesystem2.reporting)" />
<import index="i348" ref="r:42a15dec-83a9-4fe1-80d6-3bf898c512bd(jetbrains.mps.lang.coderules.template)" />
<import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
</imports>
<registry>
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@ -258,6 +259,7 @@
<concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
</language>
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
<concept id="7400021826771268254" name="jetbrains.mps.lang.smodel.structure.SNodePointerType" flags="ig" index="2sp9CU" />
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
</language>
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
@ -3211,16 +3213,16 @@
<node concept="3clFb_" id="oI9Ys3m9o" role="jymVt">
<property role="1EzhhJ" value="false" />
<property role="TrG5h" value="report" />
<node concept="37vLTG" id="oI9Ys3m9p" role="3clF46">
<property role="TrG5h" value="target" />
<node concept="3Tqbb2" id="oI9Ys3m9q" role="1tU5fm" />
</node>
<node concept="37vLTG" id="oI9Ys3m9r" role="3clF46">
<property role="TrG5h" value="kind" />
<node concept="3uibUv" id="oI9Ys3m9s" role="1tU5fm">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
<node concept="3uibUv" id="1FOQehwpsz0" role="1tU5fm">
<ref role="3uigEE" to="2gg1:~MessageStatus" resolve="MessageStatus" />
</node>
</node>
<node concept="37vLTG" id="oI9Ys3m9p" role="3clF46">
<property role="TrG5h" value="target" />
<node concept="2sp9CU" id="1FOQehwMiYP" role="1tU5fm" />
</node>
<node concept="37vLTG" id="oI9Ys3m9t" role="3clF46">
<property role="TrG5h" value="text" />
<node concept="17QB3L" id="oI9Ys3m9u" role="1tU5fm" />

7
coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
View File

@ -1126,13 +1126,6 @@
<ref role="3uigEE" node="7P_FdVQ_k3b" resolve="QueryTemplate.QueryObservable" />
</node>
</node>
<node concept="37vLTG" id="7P_FdVPsGBf" role="3clF46">
<property role="TrG5h" value="parameters" />
<node concept="3uibUv" id="3IIf9OAgMKI" role="1tU5fm">
<ref role="3uigEE" to="33ny:~List" resolve="List" />
<node concept="3qTvmN" id="3IIf9OAm5rX" role="11_B2D" />
</node>
</node>
<node concept="3uibUv" id="7P_FdVPsDNI" role="3clF45">
<ref role="3uigEE" node="7P_FdVPsDC0" resolve="QueryTemplate.QueryConfigurable" />
</node>

2
coderules/solutions/jetbrains.mps.reporting.runtime/jetbrains.mps.reporting.runtime.msd
View File

@ -9,6 +9,7 @@
<dependencies>
<dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
<dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
<dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
@ -23,6 +24,7 @@
<dependencyVersions>
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
<module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
<module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
<module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
<module reference="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.reporting.runtime)" version="0" />

14
coderules/solutions/jetbrains.mps.reporting.runtime/models/jetbrains.mps.lang.typesystem2.reporting.mps
View File

@ -11,6 +11,7 @@
<imports>
<import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
<import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
<import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
</imports>
<registry>
@ -112,6 +113,7 @@
</concept>
</language>
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
<concept id="7400021826771268254" name="jetbrains.mps.lang.smodel.structure.SNodePointerType" flags="ig" index="2sp9CU" />
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
</language>
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
@ -158,16 +160,16 @@
<node concept="3clFb_" id="oI9Ys2ypk" role="jymVt">
<property role="1EzhhJ" value="true" />
<property role="TrG5h" value="report" />
<node concept="37vLTG" id="oI9Ys2yue" role="3clF46">
<property role="TrG5h" value="target" />
<node concept="3Tqbb2" id="oI9Ys2yvH" role="1tU5fm" />
</node>
<node concept="37vLTG" id="oI9Ys2y$v" role="3clF46">
<property role="TrG5h" value="kind" />
<node concept="3uibUv" id="oI9Ys2yAc" role="1tU5fm">
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
<node concept="3uibUv" id="1FOQehwp95V" role="1tU5fm">
<ref role="3uigEE" to="2gg1:~MessageStatus" resolve="MessageStatus" />
</node>
</node>
<node concept="37vLTG" id="oI9Ys2yue" role="3clF46">
<property role="TrG5h" value="target" />
<node concept="2sp9CU" id="1FOQehwMiYP" role="1tU5fm" />
</node>
<node concept="37vLTG" id="oI9Ys2yxf" role="3clF46">
<property role="TrG5h" value="text" />
<node concept="17QB3L" id="oI9Ys2yyP" role="1tU5fm" />

6
coderules/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
View File

@ -2158,6 +2158,12 @@
<ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
</node>
</node>
<node concept="1SiIV0" id="1FOQehws5Z7" role="3bR37C">
<node concept="3bR9La" id="1FOQehws5Z8" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
</node>
</node>
</node>
</node>
<node concept="2sgV4H" id="7Ant4WkHLmd" role="1l3spa">

43
coderules/solutions/jetbrains.mps.typechecking.test/models/jetbrains.mps.typechecking@tests.mps
View File

@ -50,6 +50,7 @@
<import index="sppd" ref="r:0e60ac07-77c3-4d5c-b40d-73e8fd128592(jetbrains.mps.typechecking.testlang.sandbox.test)" />
<import index="qulx" ref="r:ec0979fb-ae37-4823-9eaa-8550d9f5c6fd(jetbrains.mps.typechecking.testlang.structure)" />
<import index="7n8k" ref="r:475a2e92-d7d4-41c3-98e3-172d70b6f018(jetbrains.mps.logic.program)" />
<import index="2gg1" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors(MPS.Core/)" />
</imports>
<registry>
<language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
@ -125,6 +126,7 @@
</concept>
<concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
<concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
<concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
<concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
<child id="5680397130376446158" name="type" index="1tU5fm" />
</concept>
@ -261,6 +263,7 @@
<concept id="1140725362528" name="jetbrains.mps.lang.smodel.structure.Link_SetTargetOperation" flags="nn" index="2oxUTD">
<child id="1140725362529" name="linkTarget" index="2oxUTC" />
</concept>
<concept id="7400021826771268254" name="jetbrains.mps.lang.smodel.structure.SNodePointerType" flags="ig" index="2sp9CU" />
<concept id="1138661924179" name="jetbrains.mps.lang.smodel.structure.Property_SetOperation" flags="nn" index="tyxLq">
<child id="1138662048170" name="value" index="tz02z" />
</concept>
@ -448,8 +451,8 @@
<node concept="3cpWs8" id="6QH_LDtdVHj" role="3cqZAp">
<node concept="3cpWsn" id="6QH_LDtdVHk" role="3cpWs9">
<property role="TrG5h" value="typesCache" />
<node concept="3uibUv" id="443LGHByist" role="1tU5fm">
<ref role="3uigEE" to="qox2:443LGHBxJ1f" resolve="TypecheckingCache.Clearable" />
<node concept="3uibUv" id="1FOQehxeuXN" role="1tU5fm">
<ref role="3uigEE" to="tj24:6QH_LDtfe19" resolve="TypeCache" />
</node>
<node concept="2OqwBi" id="6QH_LDtdVHl" role="33vP2m">
<node concept="37vLTw" id="6QH_LDtdVHm" role="2Oq$k0">
@ -482,8 +485,8 @@
<node concept="3cpWs8" id="6QH_LDtdXLJ" role="3cqZAp">
<node concept="3cpWsn" id="6QH_LDtdXLK" role="3cpWs9">
<property role="TrG5h" value="typeCache2" />
<node concept="3uibUv" id="443LGHBynwC" role="1tU5fm">
<ref role="3uigEE" to="qox2:443LGHBxJ1f" resolve="TypecheckingCache.Clearable" />
<node concept="3uibUv" id="1FOQehxevl5" role="1tU5fm">
<ref role="3uigEE" to="tj24:6QH_LDtfe19" resolve="TypeCache" />
</node>
<node concept="2OqwBi" id="6QH_LDtdXLL" role="33vP2m">
<node concept="37vLTw" id="6QH_LDtdXLM" role="2Oq$k0">
@ -677,8 +680,8 @@
<node concept="3cpWs8" id="6QH_LDtdZNt" role="3cqZAp">
<node concept="3cpWsn" id="6QH_LDtdZNu" role="3cpWs9">
<property role="TrG5h" value="typesCache3" />
<node concept="3uibUv" id="443LGHByr8Z" role="1tU5fm">
<ref role="3uigEE" to="qox2:443LGHBxJ1f" resolve="TypecheckingCache.Clearable" />
<node concept="3uibUv" id="1FOQehxesGr" role="1tU5fm">
<ref role="3uigEE" to="tj24:6QH_LDtfe19" resolve="TypeCache" />
</node>
<node concept="2OqwBi" id="6QH_LDtdZNv" role="33vP2m">
<node concept="37vLTw" id="6QH_LDtdZNw" role="2Oq$k0">
@ -1065,6 +1068,34 @@
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="3clFb_" id="1FOQehvP35a" role="jymVt">
<property role="1EzhhJ" value="false" />
<property role="TrG5h" value="report" />
<node concept="37vLTG" id="1FOQehvP35d" role="3clF46">
<property role="TrG5h" value="kind" />
<node concept="3uibUv" id="1FOQehwpwXb" role="1tU5fm">
<ref role="3uigEE" to="2gg1:~MessageStatus" resolve="MessageStatus" />
</node>
</node>
<node concept="37vLTG" id="1FOQehvP35b" role="3clF46">
<property role="TrG5h" value="target" />
<node concept="2sp9CU" id="1FOQehwMiYP" role="1tU5fm" />
</node>
<node concept="37vLTG" id="1FOQehvP35f" role="3clF46">
<property role="TrG5h" value="text" />
<node concept="17QB3L" id="1FOQehvP35g" role="1tU5fm" />
</node>
<node concept="10P_77" id="1FOQehvP35h" role="3clF45" />
<node concept="3Tm1VV" id="1FOQehvP35i" role="1B3o_S" />
<node concept="3clFbS" id="1FOQehvP35o" role="3clF47">
<node concept="3clFbF" id="1FOQehvP35r" role="3cqZAp">
<node concept="3clFbT" id="1FOQehvP35q" role="3clFbG" />
</node>
</node>
<node concept="2AHcQZ" id="1FOQehvP35p" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
</node>
</node>
</node>

22
coderules/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps
View File

@ -1462,25 +1462,25 @@
</node>
</node>
</node>
<node concept="3clFbF" id="78H58of3nRc" role="3cqZAp">
<node concept="37vLTI" id="78H58of3nRd" role="3clFbG">
<node concept="2OqwBi" id="78H58of3nRe" role="37vLTx">
<node concept="37vLTw" id="78H58of3nRf" role="2Oq$k0">
<node concept="3clFbF" id="1FOQehx4b_Y" role="3cqZAp">
<node concept="37vLTI" id="1FOQehx4b_Z" role="3clFbG">
<node concept="2OqwBi" id="1FOQehx4bA0" role="37vLTx">
<node concept="37vLTw" id="1FOQehx4bA1" role="2Oq$k0">
<ref role="3cqZAo" node="78H58of3fK7" resolve="task" />
</node>
<node concept="liA8E" id="78H58of3fKp" role="2OqNvi">
<ref role="37wK5l" to="o35r:78H58oeToTl" resolve="withErrors" />
<node concept="2OqwBi" id="78H58of3fKq" role="37wK5m">
<node concept="37vLTw" id="78H58of3fKr" role="2Oq$k0">
<node concept="liA8E" id="1FOQehx4bA2" role="2OqNvi">
<ref role="37wK5l" to="o35r:1FOQehx0V$P" resolve="withReportItems" />
<node concept="2OqwBi" id="1FOQehx4bA3" role="37wK5m">
<node concept="37vLTw" id="1FOQehx4bA4" role="2Oq$k0">
<ref role="3cqZAo" node="5lxnBcU09rm" resolve="prev" />
</node>
<node concept="liA8E" id="78H58of3fKs" role="2OqNvi">
<ref role="37wK5l" to="tj24:7lt0LtQA50U" resolve="getErrors" />
<node concept="liA8E" id="1FOQehx4bA5" role="2OqNvi">
<ref role="37wK5l" to="tj24:1FOQehx3WGd" resolve="getReportItems" />
</node>
</node>
</node>
</node>
<node concept="37vLTw" id="78H58of3nRk" role="37vLTJ">
<node concept="37vLTw" id="1FOQehx4bA6" role="37vLTJ">
<ref role="3cqZAo" node="78H58of3fK7" resolve="task" />
</node>
</node>

1
coderules/solutions/jetbrains.mps.typechecking/jetbrains.mps.typechecking.msd
View File

@ -32,6 +32,7 @@
<language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="2" />
<language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="11" />
<language slang="l:cba985fe-1e96-4f16-9f8d-b07434405d4f:jetbrains.mps.lang.smodel.types" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
</languageVersions>
<dependencyVersions>

1641
coderules/solutions/jetbrains.mps.typechecking/models/jetbrains.mps.typechecking.mps
View File

File diff suppressed because it is too large Load Diff

76
coderules/solutions/jetbrains.mps.typechecking/models/plugin.mps
View File

@ -9,6 +9,8 @@
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="11" />
<use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
<use id="cba985fe-1e96-4f16-9f8d-b07434405d4f" name="jetbrains.mps.lang.smodel.types" version="0" />
<use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
</languages>
<imports>
<import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
@ -27,6 +29,7 @@
<import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
<import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
<import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
<import index="tj24" ref="r:0fbbb63a-fd15-46e1-8136-78049f6d6e63(jetbrains.mps.typechecking.service)" />
</imports>
<registry>
<language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
@ -202,6 +205,14 @@
<concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
<concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
</language>
<language id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access">
<concept id="8974276187400348173" name="jetbrains.mps.lang.access.structure.CommandClosureLiteral" flags="nn" index="1QHqEC" />
<concept id="8974276187400348170" name="jetbrains.mps.lang.access.structure.BaseExecuteCommandStatement" flags="nn" index="1QHqEJ">
<child id="1423104411234567454" name="repo" index="ukAjM" />
<child id="8974276187400348171" name="commandClosureLiteral" index="1QHqEI" />
</concept>
<concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
</language>
<language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
<concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
<child id="1199569906740" name="parameter" index="1bW2Oz" />
@ -1596,19 +1607,6 @@
</node>
<node concept="312cEu" id="4Z$O9mrQIzY">
<property role="TrG5h" value="TypecheckingCache" />
<node concept="2tJIrI" id="4Z$O9mrTfe4" role="jymVt" />
<node concept="3HP615" id="443LGHBxJ1f" role="jymVt">
<property role="2bfB8j" value="false" />
<property role="TrG5h" value="Clearable" />
<node concept="3clFb_" id="443LGHBy7NY" role="jymVt">
<property role="1EzhhJ" value="true" />
<property role="TrG5h" value="clear" />
<node concept="3cqZAl" id="443LGHBy7O0" role="3clF45" />
<node concept="3Tm1VV" id="443LGHBy7O1" role="1B3o_S" />
<node concept="3clFbS" id="443LGHBy7O2" role="3clF47" />
</node>
<node concept="3Tm1VV" id="443LGHBxJ1g" role="1B3o_S" />
</node>
<node concept="2tJIrI" id="443LGHBxDpo" role="jymVt" />
<node concept="3HP615" id="6QH_LDtb$zi" role="jymVt">
<property role="2bfB8j" value="false" />
@ -1616,15 +1614,14 @@
<node concept="3clFb_" id="6QH_LDtb_6x" role="jymVt">
<property role="1EzhhJ" value="true" />
<property role="TrG5h" value="createCache" />
<node concept="3uibUv" id="443LGHBxRki" role="3clF45">
<ref role="3uigEE" node="443LGHBxJ1f" resolve="TypecheckingCache.Clearable" />
<node concept="3uibUv" id="1FOQehxex$4" role="3clF45">
<ref role="3uigEE" to="tj24:6QH_LDtfe19" resolve="TypeCache" />
</node>
<node concept="3Tm1VV" id="6QH_LDtb_6$" role="1B3o_S" />
<node concept="3clFbS" id="6QH_LDtb_6_" role="3clF47" />
</node>
<node concept="3Tm1VV" id="6QH_LDtb$zj" role="1B3o_S" />
</node>
<node concept="2tJIrI" id="4Z$O9mrQI$u" role="jymVt" />
<node concept="2tJIrI" id="4Z$O9mrTG7X" role="jymVt" />
<node concept="2YIFZL" id="4Z$O9mrQIG1" role="jymVt">
<property role="TrG5h" value="get" />
@ -1715,16 +1712,27 @@
</node>
<node concept="1bVj0M" id="443LGHBoCbS" role="37wK5m">
<node concept="3clFbS" id="443LGHBoCbT" role="1bW5cS">
<node concept="3clFbF" id="443LGHBoCbU" role="3cqZAp">
<node concept="2OqwBi" id="443LGHBoCbV" role="3clFbG">
<node concept="37vLTw" id="443LGHBoCbW" role="2Oq$k0">
<ref role="3cqZAo" node="443LGHBoCc4" resolve="instance" />
</node>
<node concept="liA8E" id="443LGHBoCbX" role="2OqNvi">
<ref role="37wK5l" node="14$_tTxApBG" resolve="dispose" />
<node concept="3clFbH" id="1FOQehxKH4k" role="3cqZAp" />
<node concept="1QHqEK" id="1FOQehxKJrN" role="3cqZAp">
<node concept="1QHqEC" id="1FOQehxKJrP" role="1QHqEI">
<node concept="3clFbS" id="1FOQehxKJrR" role="1bW5cS">
<node concept="3clFbF" id="443LGHBoCbU" role="3cqZAp">
<node concept="2OqwBi" id="443LGHBoCbV" role="3clFbG">
<node concept="37vLTw" id="443LGHBoCbW" role="2Oq$k0">
<ref role="3cqZAo" node="443LGHBoCc4" resolve="instance" />
</node>
<node concept="liA8E" id="443LGHBoCbX" role="2OqNvi">
<ref role="37wK5l" node="14$_tTxApBG" resolve="dispose" />
</node>
</node>
</node>
</node>
</node>
<node concept="37vLTw" id="1FOQehxKJx9" role="ukAjM">
<ref role="3cqZAo" node="443LGHBoCc2" resolve="repos" />
</node>
</node>
<node concept="3clFbH" id="1FOQehxKJ3E" role="3cqZAp" />
<node concept="3SKdUt" id="443LGHBoCbY" role="3cqZAp">
<node concept="3SKdUq" id="443LGHBoCbZ" role="3SKWNk">
<property role="3SKdUp" value="remove the mapping" />
@ -1854,8 +1862,8 @@
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
</node>
</node>
<node concept="3uibUv" id="443LGHBxUi3" role="3clF45">
<ref role="3uigEE" node="443LGHBxJ1f" resolve="TypecheckingCache.Clearable" />
<node concept="3uibUv" id="1FOQehxetAn" role="3clF45">
<ref role="3uigEE" to="tj24:6QH_LDtfe19" resolve="TypeCache" />
</node>
<node concept="3Tm1VV" id="4Z$O9mrQJgs" role="1B3o_S" />
<node concept="3clFbS" id="4Z$O9mrQJgt" role="3clF47">
@ -1967,8 +1975,8 @@
<ref role="3uigEE" node="6QH_LDtb$zi" resolve="TypecheckingCache.CacheFactory" />
</node>
</node>
<node concept="3uibUv" id="443LGHBxYaT" role="3clF45">
<ref role="3uigEE" node="443LGHBxJ1f" resolve="TypecheckingCache.Clearable" />
<node concept="3uibUv" id="1FOQehxewiF" role="3clF45">
<ref role="3uigEE" to="tj24:6QH_LDtfe19" resolve="TypeCache" />
</node>
<node concept="3Tm1VV" id="6QH_LDtbsGA" role="1B3o_S" />
<node concept="3clFbS" id="6QH_LDtbsGB" role="3clF47">
@ -2028,8 +2036,8 @@
<node concept="3cpWs8" id="443LGHBxRRf" role="3cqZAp">
<node concept="3cpWsn" id="443LGHBxRRg" role="3cpWs9">
<property role="TrG5h" value="newCache" />
<node concept="3uibUv" id="443LGHBxRRb" role="1tU5fm">
<ref role="3uigEE" node="443LGHBxJ1f" resolve="TypecheckingCache.Clearable" />
<node concept="3uibUv" id="1FOQehxexg7" role="1tU5fm">
<ref role="3uigEE" to="tj24:6QH_LDtfe19" resolve="TypeCache" />
</node>
<node concept="2OqwBi" id="443LGHBxRRh" role="33vP2m">
<node concept="37vLTw" id="443LGHBxRRi" role="2Oq$k0">
@ -2201,8 +2209,8 @@
<property role="TrG5h" value="setCache" />
<node concept="37vLTG" id="4Z$O9mrT_Xw" role="3clF46">
<property role="TrG5h" value="newCache" />
<node concept="3uibUv" id="443LGHBxSQ4" role="1tU5fm">
<ref role="3uigEE" node="443LGHBxJ1f" resolve="TypecheckingCache.Clearable" />
<node concept="3uibUv" id="1FOQehxe_Ym" role="1tU5fm">
<ref role="3uigEE" to="tj24:6QH_LDtfe19" resolve="TypeCache" />
</node>
</node>
<node concept="37vLTG" id="443LGHB6d9m" role="3clF46">
@ -2309,7 +2317,7 @@
<ref role="3cqZAo" node="4Z$O9mrQJ$h" resolve="cache" />
</node>
<node concept="liA8E" id="4Z$O9mrT9b$" role="2OqNvi">
<ref role="37wK5l" node="443LGHBy7NY" resolve="clear" />
<ref role="37wK5l" to="tj24:1FOQehxelEi" resolve="clear" />
</node>
</node>
</node>
@ -2747,8 +2755,8 @@
<node concept="312cEg" id="4Z$O9mrQJ$h" role="jymVt">
<property role="TrG5h" value="cache" />
<node concept="3Tm6S6" id="4Z$O9mrQJ$i" role="1B3o_S" />
<node concept="3uibUv" id="443LGHBxTVr" role="1tU5fm">
<ref role="3uigEE" node="443LGHBxJ1f" resolve="TypecheckingCache.Clearable" />
<node concept="3uibUv" id="1FOQehxeuA4" role="1tU5fm">
<ref role="3uigEE" to="tj24:6QH_LDtfe19" resolve="TypeCache" />
</node>
</node>
<node concept="2tJIrI" id="4Z$O9mrQJzI" role="jymVt" />

1134
coderules/solutions/jetbrains.mps.typechecking/models/service.mps
View File

File diff suppressed because it is too large Load Diff