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

Consolidate related classes; drop obsolete model

This commit is contained in:
Fedor Isakov 2024-08-29 13:07:15 +02:00
parent 6e343fe17d
commit 5fd41a99e1
10 changed files with 18368 additions and 19371 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14429
coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
View File

File diff suppressed because it is too large Load Diff

14332
coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
View File

File diff suppressed because it is too large Load Diff

75
coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.template.mps
View File

@ -325,7 +325,6 @@
</concept>
</language>
<language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
<concept id="6832197706140896242" name="jetbrains.mps.baseLanguage.javadoc.structure.FieldDocComment" flags="ng" index="z59LJ" />
<concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
<child id="8465538089690331502" name="body" index="TZ5H$" />
</concept>
@ -2004,7 +2003,7 @@
<node concept="2tJIrI" id="36tQV5BD$Uq" role="jymVt" />
<node concept="3Tm1VV" id="4vBwiiV6131" role="1B3o_S" />
</node>
<node concept="2tJIrI" id="4vBwiiV5X32" role="jymVt" />
<node concept="2tJIrI" id="5vVBssDEoXH" role="jymVt" />
<node concept="3clFbW" id="5yr01fEdYJE" role="jymVt">
<node concept="37vLTG" id="5yr01fEdZQ4" role="3clF46">
<property role="TrG5h" value="repository" />
@ -2012,11 +2011,10 @@
<ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
</node>
</node>
<node concept="37vLTG" id="3BoSoEkTsii" role="3clF46">
<property role="TrG5h" value="ruleProcessingSession" />
<node concept="3uibUv" id="3BoSoEkTtAa" role="1tU5fm">
<ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
<node concept="3qTvmN" id="3BoSoEkTtKP" role="11_B2D" />
<node concept="37vLTG" id="5vVBssDBndO" role="3clF46">
<property role="TrG5h" value="macroTemplateIndex" />
<node concept="3uibUv" id="5vVBssDBoao" role="1tU5fm">
<ref role="3uigEE" to="hano:1hX44vNlSIA" resolve="MacroTemplateIndex" />
</node>
</node>
<node concept="3cqZAl" id="5yr01fEdYJG" role="3clF45" />
@ -2035,17 +2033,17 @@
</node>
</node>
</node>
<node concept="3clFbF" id="5Nh6YP0qxI_" role="3cqZAp">
<node concept="37vLTI" id="5Nh6YP0qA7y" role="3clFbG">
<node concept="37vLTw" id="5Nh6YP0qB5K" role="37vLTx">
<ref role="3cqZAo" node="3BoSoEkTsii" resolve="processingSession" />
</node>
<node concept="2OqwBi" id="5Nh6YP0qxR5" role="37vLTJ">
<node concept="Xjq3P" id="5Nh6YP0qxIz" role="2Oq$k0" />
<node concept="2OwXpG" id="5Nh6YP0q_3C" role="2OqNvi">
<ref role="2Oxat5" node="7DvO2Ma0klb" resolve="ruleProcessingSession" />
<node concept="3clFbF" id="5vVBssDBodg" role="3cqZAp">
<node concept="37vLTI" id="5vVBssDBodi" role="3clFbG">
<node concept="2OqwBi" id="5vVBssDBxpW" role="37vLTJ">
<node concept="Xjq3P" id="5vVBssDByqs" role="2Oq$k0" />
<node concept="2OwXpG" id="5vVBssDBxpZ" role="2OqNvi">
<ref role="2Oxat5" node="5vVBssDBodc" resolve="myMacroTemplateIndex" />
</node>
</node>
<node concept="37vLTw" id="5vVBssDBodm" role="37vLTx">
<ref role="3cqZAo" node="5vVBssDBndO" resolve="macroTemplateIndex" />
</node>
</node>
</node>
</node>
@ -2758,13 +2756,8 @@
</node>
</node>
<node concept="2OqwBi" id="At0yqM7Poo" role="33vP2m">
<node concept="2OqwBi" id="At0yqM7Pop" role="2Oq$k0">
<node concept="37vLTw" id="At0yqM7Poq" role="2Oq$k0">
<ref role="3cqZAo" node="7DvO2Ma0klb" />
</node>
<node concept="liA8E" id="At0yqM7Por" role="2OqNvi">
<ref role="37wK5l" to="hano:7DvO2M9Icas" resolve="macroTemplates" />
</node>
<node concept="37vLTw" id="5vVBssDClj$" role="2Oq$k0">
<ref role="3cqZAo" node="5vVBssDBodc" resolve="macroTemplateIndex" />
</node>
<node concept="liA8E" id="At0yqM7Pos" role="2OqNvi">
<ref role="37wK5l" to="hano:7mIqwW51Ay4" resolve="expandMacroTemplate" />
@ -2893,13 +2886,8 @@
</node>
</node>
<node concept="2OqwBi" id="C1f6iEyAq_" role="33vP2m">
<node concept="2OqwBi" id="C1f6iEyAqA" role="2Oq$k0">
<node concept="37vLTw" id="C1f6iEyAqB" role="2Oq$k0">
<ref role="3cqZAo" node="7DvO2Ma0klb" />
</node>
<node concept="liA8E" id="C1f6iEyAqC" role="2OqNvi">
<ref role="37wK5l" to="hano:7DvO2M9Icas" resolve="macroTemplates" />
</node>
<node concept="37vLTw" id="5vVBssDCdR6" role="2Oq$k0">
<ref role="3cqZAo" node="5vVBssDBodc" resolve="macroTemplateIndex" />
</node>
<node concept="liA8E" id="C1f6iEyAqD" role="2OqNvi">
<ref role="37wK5l" to="hano:7mIqwW51Ay4" resolve="expandMacroTemplate" />
@ -3026,13 +3014,8 @@
</node>
</node>
<node concept="2OqwBi" id="5itBwM7W$4B" role="33vP2m">
<node concept="2OqwBi" id="zL5ZaNKHb8" role="2Oq$k0">
<node concept="37vLTw" id="5itBwM7W$4C" role="2Oq$k0">
<ref role="3cqZAo" node="7DvO2Ma0klb" />
</node>
<node concept="liA8E" id="zL5ZaNKHO1" role="2OqNvi">
<ref role="37wK5l" to="hano:7DvO2M9Icas" resolve="macroTemplates" />
</node>
<node concept="37vLTw" id="5vVBssDChbZ" role="2Oq$k0">
<ref role="3cqZAo" node="5vVBssDBodc" resolve="macroTemplateIndex" />
</node>
<node concept="liA8E" id="5itBwM7W$4D" role="2OqNvi">
<ref role="37wK5l" to="hano:5itBwM7WF$n" resolve="callMacroTemplate" />
@ -3724,18 +3707,12 @@
<ref role="3uigEE" node="4VNF0fT1sxk" resolve="DependencyUpdatable" />
</node>
</node>
<node concept="312cEg" id="7DvO2Ma0klb" role="jymVt">
<property role="TrG5h" value="ruleProcessingSession" />
<node concept="3Tm6S6" id="7DvO2Ma0klc" role="1B3o_S" />
<node concept="3uibUv" id="zL5ZaNJgI6" role="1tU5fm">
<ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
</node>
<node concept="z59LJ" id="3swcsd3Gqma" role="lGtFl">
<node concept="TZ5HA" id="3swcsd3Gqmb" role="TZ5H$">
<node concept="1dT_AC" id="3swcsd3Gqmc" role="1dT_Ay">
<property role="1dT_AB" value="FIXME: replace this dependency with one on MacroTemplateIndex" />
</node>
</node>
<node concept="312cEg" id="5vVBssDBodc" role="jymVt">
<property role="TrG5h" value="macroTemplateIndex" />
<property role="3TUv4t" value="true" />
<node concept="3Tm6S6" id="5vVBssDBodd" role="1B3o_S" />
<node concept="3uibUv" id="5vVBssDBodf" role="1tU5fm">
<ref role="3uigEE" to="hano:1hX44vNlSIA" resolve="MacroTemplateIndex" />
</node>
</node>
</node>

5
coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
View File

@ -1887,6 +1887,11 @@
<ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
</node>
</node>
<node concept="1SiIV0" id="7Vnjo8M48MP" role="3bR37C">
<node concept="3bR9La" id="7Vnjo8M48MQ" role="1SiIV1">
<ref role="3bR37D" node="74$3PKm_L$v" resolve="jetbrains.mps.logic.runtime" />
</node>
</node>
</node>
</node>
<node concept="2G$12M" id="5pz4PwHqqGu" role="3989C9">

91
coderules/solutions/jetbrains.mps.coderules.testhelper/models/jetbrains.mps.coderules.testhelper.testutil.mps
View File

@ -27,7 +27,6 @@
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
<import index="et5u" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.messages(MPS.Core/)" />
<import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
<import index="ksgm" ref="r:6285678b-007f-4527-bcf5-6fd38ba8c969(jetbrains.mps.lang.coderules.program)" />
<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/)" />
<import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
@ -901,12 +900,6 @@
<node concept="37vLTw" id="1Pi9pJ$him3" role="37wK5m">
<ref role="3cqZAo" node="WJTIIoJWGP" resolve="ac" />
</node>
<node concept="37vLTw" id="1Pi9pJ$him4" role="37wK5m">
<ref role="3cqZAo" node="tyIfzC1aQx" resolve="repo" />
</node>
<node concept="37vLTw" id="1Pi9pJ$him5" role="37wK5m">
<ref role="3cqZAo" node="2Y70AYEcifV" resolve="messageHandler" />
</node>
</node>
</node>
</node>
@ -947,17 +940,17 @@
<node concept="2ShNRf" id="61G6TdBqAxu" role="33vP2m">
<node concept="1pGfFk" id="3Pxu0s87$zF" role="2ShVmc">
<ref role="37wK5l" to="ugy2:5yr01fEdYJE" />
<node concept="2OqwBi" id="61G6TdBqAxy" role="37wK5m">
<node concept="37vLTw" id="1Pi9pJ$hpAt" role="2Oq$k0">
<node concept="37vLTw" id="5vVBssDPM9U" role="37wK5m">
<ref role="3cqZAo" node="tyIfzC1aQx" resolve="repo" />
</node>
<node concept="2OqwBi" id="5vVBssDBGTr" role="37wK5m">
<node concept="37vLTw" id="1Pi9pJ$hrGu" role="2Oq$k0">
<ref role="3cqZAo" node="1Pi9pJ$gX7O" resolve="ruleProcessingSession" />
</node>
<node concept="liA8E" id="61G6TdBqAx$" role="2OqNvi">
<ref role="37wK5l" to="hano:72RDgIN45VE" resolve="repository" />
<node concept="liA8E" id="5vVBssDBKdA" role="2OqNvi">
<ref role="37wK5l" to="hano:7DvO2M9Icas" resolve="macroTemplates" />
</node>
</node>
<node concept="37vLTw" id="1Pi9pJ$hrGu" role="37wK5m">
<ref role="3cqZAo" node="1Pi9pJ$gX7O" resolve="ruleProcessingSession" />
</node>
</node>
</node>
</node>
@ -989,7 +982,7 @@
</node>
<node concept="2ShNRf" id="1XKnVQwZnw" role="37vLTx">
<node concept="1pGfFk" id="1XKnVQwZnx" role="2ShVmc">
<ref role="37wK5l" to="ksgm:6nFpYlu7fpM" resolve="UpdatesRecorder" />
<ref role="37wK5l" to="hano:6nFpYlu7fpM" resolve="UpdatesRecorder" />
<node concept="37vLTw" id="1XKnVQwZny" role="37wK5m">
<ref role="3cqZAo" node="tyIfzC1aQx" resolve="repo" />
</node>
@ -1026,20 +1019,32 @@
</node>
<node concept="2ShNRf" id="6$7vuu2ugt4" role="37vLTx">
<node concept="1pGfFk" id="6$7vuu2ugt5" role="2ShVmc">
<ref role="37wK5l" to="hano:2gPa6JI$Zi_" resolve="ProgramProducer" />
<ref role="37wK5l" to="hano:5lpFZvO1gf1" />
<node concept="Xl_RD" id="6OXbTDxuaSu" role="37wK5m">
<property role="Xl_RC" value="test" />
</node>
<node concept="37vLTw" id="61G6TdBqAxW" role="37wK5m">
<ref role="3cqZAo" node="61G6TdBqAxt" resolve="macroProcessing" />
</node>
<node concept="37vLTw" id="1Pi9pJ$hx0Y" role="37wK5m">
<ref role="3cqZAo" node="1Pi9pJ$gX7O" resolve="ruleProcessingSession" />
<node concept="2OqwBi" id="5vVBssDN6qb" role="37wK5m">
<node concept="37vLTw" id="1Pi9pJ$hx0Y" role="2Oq$k0">
<ref role="3cqZAo" node="1Pi9pJ$gX7O" resolve="ruleProcessingSession" />
</node>
<node concept="liA8E" id="5vVBssDN9HC" role="2OqNvi">
<ref role="37wK5l" to="hano:20Ay2VeR9qk" resolve="ruleTemplates" />
</node>
</node>
<node concept="37vLTw" id="6OXbTD_ouEx" role="37wK5m">
<ref role="3cqZAo" node="6OXbTD_oqui" resolve="queryTemplates" />
</node>
<node concept="10Nm6u" id="23Habm3pHBH" role="37wK5m" />
<node concept="2OqwBi" id="2sMBLui0$jy" role="37wK5m">
<node concept="37vLTw" id="2sMBLui0$jz" role="2Oq$k0">
<ref role="3cqZAo" node="1Pi9pJ$gX7O" resolve="ruleProcessingSession" />
</node>
<node concept="liA8E" id="2sMBLui0$j$" role="2OqNvi">
<ref role="37wK5l" to="hano:1Pi9pJ$57yb" resolve="planHandler" />
</node>
</node>
</node>
</node>
</node>
@ -1053,7 +1058,7 @@
<ref role="37wK5l" to="hano:6nFpYluWwIS" resolve="setOriginIndex" />
<node concept="2ShNRf" id="6nFpYlv0UyZ" role="37wK5m">
<node concept="HV5vD" id="6nFpYlv0UK1" role="2ShVmc">
<ref role="HV5vE" to="ksgm:70Wv0dJhQb2" resolve="OriginIndex" />
<ref role="HV5vE" to="hano:70Wv0dJhQb2" resolve="OriginIndex" />
</node>
</node>
</node>
@ -1081,7 +1086,7 @@
</node>
</node>
<node concept="liA8E" id="1XKnVQutYi" role="2OqNvi">
<ref role="37wK5l" to="ksgm:6YGKjaPwkND" resolve="activate" />
<ref role="37wK5l" to="hano:6YGKjaPwkND" resolve="activate" />
</node>
</node>
</node>
@ -1530,16 +1535,16 @@
</node>
</node>
<node concept="3uibUv" id="6DQTzHye_9w" role="10QFUM">
<ref role="3uigEE" to="ksgm:7eGEHDlcEJ0" resolve="ProgramEx" />
<ref role="3uigEE" to="hano:7eGEHDlcEJ0" resolve="ProgramEx" />
</node>
</node>
</node>
<node concept="liA8E" id="6DQTzHye_9x" role="2OqNvi">
<ref role="37wK5l" to="ksgm:55xYlrmEqJq" resolve="rulesPlan" />
<ref role="37wK5l" to="hano:55xYlrmEqJq" resolve="rulesPlan" />
</node>
</node>
<node concept="liA8E" id="6DQTzHye_9y" role="2OqNvi">
<ref role="37wK5l" to="ksgm:55xYlrmGsza" resolve="invalidatedRuleIds" />
<ref role="37wK5l" to="hano:55xYlrmGsza" resolve="invalidatedRuleIds" />
</node>
</node>
<node concept="ANE8D" id="6DQTzHyeX$K" role="2OqNvi" />
@ -1568,16 +1573,16 @@
</node>
</node>
<node concept="3uibUv" id="6DQTzHyeCvD" role="10QFUM">
<ref role="3uigEE" to="ksgm:7eGEHDlcEJ0" resolve="ProgramEx" />
<ref role="3uigEE" to="hano:7eGEHDlcEJ0" resolve="ProgramEx" />
</node>
</node>
</node>
<node concept="liA8E" id="6DQTzHyeCvE" role="2OqNvi">
<ref role="37wK5l" to="ksgm:55xYlrmEqJq" resolve="rulesPlan" />
<ref role="37wK5l" to="hano:55xYlrmEqJq" resolve="rulesPlan" />
</node>
</node>
<node concept="liA8E" id="6DQTzHyeCvF" role="2OqNvi">
<ref role="37wK5l" to="ksgm:55xYlrmIHsb" resolve="validatedRuleIds" />
<ref role="37wK5l" to="hano:55xYlrmIHsb" resolve="validatedRuleIds" />
</node>
</node>
<node concept="ANE8D" id="6DQTzHyf2M7" role="2OqNvi" />
@ -1841,7 +1846,7 @@
<ref role="3cqZAo" node="1XKnVQwJTH" resolve="updatesRecorder" />
</node>
<node concept="liA8E" id="1XKnVQx8fX" role="2OqNvi">
<ref role="37wK5l" to="ksgm:1XKnVQioNo" resolve="invalidateChanged" />
<ref role="37wK5l" to="hano:1XKnVQioNo" resolve="invalidateChanged" />
<node concept="2OqwBi" id="1Pi9pJ$h$Zn" role="37wK5m">
<node concept="37vLTw" id="1Pi9pJ$hzcV" role="2Oq$k0">
<ref role="3cqZAo" node="1Pi9pJ$gX7O" resolve="ruleProcessingSession" />
@ -1859,7 +1864,7 @@
<ref role="3cqZAo" node="1XKnVQwJTH" resolve="updatesRecorder" />
</node>
<node concept="liA8E" id="1XKnVQxfAA" role="2OqNvi">
<ref role="37wK5l" to="ksgm:6PD9XvnQtjo" resolve="activateOnReferredModels" />
<ref role="37wK5l" to="hano:6PD9XvnQtjo" resolve="activateOnReferredModels" />
</node>
</node>
</node>
@ -1869,15 +1874,7 @@
<ref role="3cqZAo" node="tyIfzC1aUL" resolve="tplApp" />
</node>
<node concept="liA8E" id="tyIfzC3yam" role="2OqNvi">
<ref role="37wK5l" to="hano:7kTeLbPojCz" resolve="produce" />
<node concept="2OqwBi" id="1Pi9pJ$hDxm" role="37wK5m">
<node concept="37vLTw" id="1Pi9pJ$hDxn" role="2Oq$k0">
<ref role="3cqZAo" node="1Pi9pJ$gX7O" resolve="ruleProcessingSession" />
</node>
<node concept="liA8E" id="1Pi9pJ$hDxo" role="2OqNvi">
<ref role="37wK5l" to="hano:1Pi9pJ$57yb" resolve="planHandler" />
</node>
</node>
<ref role="37wK5l" to="hano:7kTeLbPojCz" resolve="build" />
<node concept="37vLTw" id="6VRLMeOwphC" role="37wK5m">
<ref role="3cqZAo" node="tyIfzC3xp3" resolve="nodes" />
</node>
@ -2340,21 +2337,21 @@
<property role="TrG5h" value="tplApp" />
<node concept="3Tm6S6" id="tyIfzC1aT5" role="1B3o_S" />
<node concept="3uibUv" id="tyIfzC1aUB" role="1tU5fm">
<ref role="3uigEE" to="hano:3GlpCDSxTG7" resolve="ProgramProducer" />
<ref role="3uigEE" to="hano:3GlpCDSxTG7" resolve="ProgramBuilder" />
</node>
</node>
<node concept="312cEg" id="1Pi9pJ$gX7O" role="jymVt">
<property role="TrG5h" value="ruleProcessingSession" />
<property role="TrG5h" value="rulesProcessing" />
<node concept="3Tm6S6" id="1Pi9pJ$gX7P" role="1B3o_S" />
<node concept="3uibUv" id="1Pi9pJ$gZuH" role="1tU5fm">
<ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
<ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RulesProcessing" />
</node>
</node>
<node concept="312cEg" id="1XKnVQwJTH" role="jymVt">
<property role="TrG5h" value="updatesRecorder" />
<node concept="3Tm6S6" id="1XKnVQwJTF" role="1B3o_S" />
<node concept="3uibUv" id="1XKnVQwJTG" role="1tU5fm">
<ref role="3uigEE" to="ksgm:6nFpYlu02jD" resolve="UpdatesRecorder" />
<ref role="3uigEE" to="hano:6nFpYlu02jD" resolve="UpdatesRecorder" />
</node>
</node>
<node concept="312cEg" id="tyIfzC1aZ5" role="jymVt">
@ -3347,7 +3344,7 @@
<node concept="3cpWsn" id="6DQTzHxMCDI" role="3cpWs9">
<property role="TrG5h" value="rulesPlan" />
<node concept="3uibUv" id="6DQTzHxMCkL" role="1tU5fm">
<ref role="3uigEE" to="ksgm:1XKnVPsWNc" resolve="RulesPlan" />
<ref role="3uigEE" to="hano:1XKnVPsWNc" resolve="RulesPlan" />
</node>
<node concept="2OqwBi" id="6DQTzHxMCDJ" role="33vP2m">
<node concept="1eOMI4" id="6DQTzHxMCDK" role="2Oq$k0">
@ -3356,12 +3353,12 @@
<ref role="3cqZAo" node="6DQTzHxMs4e" resolve="prg" />
</node>
<node concept="3uibUv" id="6DQTzHxMCDN" role="10QFUM">
<ref role="3uigEE" to="ksgm:7eGEHDlcEJ0" resolve="ProgramEx" />
<ref role="3uigEE" to="hano:7eGEHDlcEJ0" resolve="ProgramEx" />
</node>
</node>
</node>
<node concept="liA8E" id="6DQTzHxMCDO" role="2OqNvi">
<ref role="37wK5l" to="ksgm:55xYlrmEqJq" resolve="rulesPlan" />
<ref role="37wK5l" to="hano:55xYlrmEqJq" resolve="rulesPlan" />
</node>
</node>
</node>
@ -3384,7 +3381,7 @@
<ref role="3cqZAo" node="6DQTzHxMCDI" resolve="rulesPlan" />
</node>
<node concept="liA8E" id="6DQTzHxMFfV" role="2OqNvi">
<ref role="37wK5l" to="ksgm:55xYlrmGsza" resolve="invalidatedRuleIds" />
<ref role="37wK5l" to="hano:55xYlrmGsza" resolve="invalidatedRuleIds" />
</node>
</node>
<node concept="3$u5V9" id="6DQTzHxMNYF" role="2OqNvi">
@ -3434,7 +3431,7 @@
<ref role="3cqZAo" node="6DQTzHxMCDI" resolve="rulesPlan" />
</node>
<node concept="liA8E" id="6DQTzHxMW79" role="2OqNvi">
<ref role="37wK5l" to="ksgm:55xYlrmIHsb" resolve="validatedRuleIds" />
<ref role="37wK5l" to="hano:55xYlrmIHsb" resolve="validatedRuleIds" />
</node>
</node>
<node concept="3$u5V9" id="6DQTzHxMSR4" role="2OqNvi">

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

@ -33,7 +33,6 @@
<import index="yt73" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.unification(jetbrains.mps.logic.reactor/)" />
<import index="et5u" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.messages(MPS.Core/)" />
<import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
<import index="ksgm" ref="r:6285678b-007f-4527-bcf5-6fd38ba8c969(jetbrains.mps.lang.coderules.program)" />
<import index="xydz" ref="r:b198cb67-efdc-40c0-8817-11ab64523a5b(jetbrains.mps.lang.coderules.result)" />
<import index="pxw9" ref="r:e3417884-ba0a-4330-9cea-64f01ace2e9d(jetbrains.mps.lang.coderules.aspect)" />
<import index="ugy2" ref="r:57b2449f-b7c7-4941-bd75-9c594835f5cd(jetbrains.mps.lang.coderules.template)" />
@ -3215,9 +3214,10 @@
<node concept="3clFbH" id="2Y70AYEbhJy" role="3cqZAp" />
<node concept="3cpWs8" id="6OXbTD_o6iu" role="3cqZAp">
<node concept="3cpWsn" id="6OXbTD_o6iv" role="3cpWs9">
<property role="TrG5h" value="session" />
<property role="TrG5h" value="rulesProcessing" />
<node concept="3uibUv" id="6OXbTD_o6ic" role="1tU5fm">
<ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
<ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RulesProcessing" />
<node concept="3qTvmN" id="3GXzdW$9WNz" role="11_B2D" />
</node>
<node concept="2ShNRf" id="5zsw4w31jsK" role="33vP2m">
<node concept="1pGfFk" id="5zsw4w31jsL" role="2ShVmc">
@ -3225,12 +3225,6 @@
<node concept="37vLTw" id="zL5ZaNDPhd" role="37wK5m">
<ref role="3cqZAo" node="3KN3A4vAiqQ" resolve="ac" />
</node>
<node concept="37vLTw" id="72RDgIN4_KQ" role="37wK5m">
<ref role="3cqZAo" node="6OXbTD_oHcp" resolve="repo" />
</node>
<node concept="37vLTw" id="2Y70AYEbqBu" role="37wK5m">
<ref role="3cqZAo" node="2Y70AYEbnBV" resolve="errorMsgHandler" />
</node>
</node>
</node>
</node>
@ -3370,17 +3364,17 @@
<node concept="2ShNRf" id="61G6TdBqDRl" role="33vP2m">
<node concept="1pGfFk" id="3Pxu0s87EMf" role="2ShVmc">
<ref role="37wK5l" to="ugy2:5yr01fEdYJE" />
<node concept="2OqwBi" id="61G6TdBqDRp" role="37wK5m">
<node concept="37vLTw" id="61G6TdBqDRq" role="2Oq$k0">
<node concept="37vLTw" id="5vVBssDPRQY" role="37wK5m">
<ref role="3cqZAo" node="6OXbTD_oHcp" resolve="repo" />
</node>
<node concept="2OqwBi" id="5vVBssDC9Gt" role="37wK5m">
<node concept="37vLTw" id="61G6TdBqDRt" role="2Oq$k0">
<ref role="3cqZAo" node="6OXbTD_o6iv" resolve="session" />
</node>
<node concept="liA8E" id="61G6TdBqDRr" role="2OqNvi">
<ref role="37wK5l" to="hano:72RDgIN45VE" resolve="repository" />
<node concept="liA8E" id="5vVBssDCaog" role="2OqNvi">
<ref role="37wK5l" to="hano:7DvO2M9Icas" resolve="macroTemplates" />
</node>
</node>
<node concept="37vLTw" id="61G6TdBqDRt" role="37wK5m">
<ref role="3cqZAo" node="6OXbTD_o6iv" resolve="session" />
</node>
</node>
</node>
</node>
@ -3406,24 +3400,36 @@
<node concept="3cpWsn" id="6$7vuu2ugt3" role="3cpWs9">
<property role="TrG5h" value="tplApp" />
<node concept="3uibUv" id="6$7vuu2ugsZ" role="1tU5fm">
<ref role="3uigEE" to="hano:3GlpCDSxTG7" resolve="ProgramProducer" />
<ref role="3uigEE" to="hano:3GlpCDSxTG7" resolve="ProgramBuilder" />
</node>
<node concept="2ShNRf" id="6$7vuu2ugt4" role="33vP2m">
<node concept="1pGfFk" id="6$7vuu2ugt5" role="2ShVmc">
<ref role="37wK5l" to="hano:2gPa6JI$Zi_" resolve="ProgramProducer" />
<ref role="37wK5l" to="hano:5lpFZvO1gf1" />
<node concept="Xl_RD" id="6OXbTDxuaSu" role="37wK5m">
<property role="Xl_RC" value="test" />
</node>
<node concept="37vLTw" id="61G6TdBqDRI" role="37wK5m">
<ref role="3cqZAo" node="61G6TdBqDRk" resolve="macroProcessing" />
</node>
<node concept="37vLTw" id="6OXbTD_oFoC" role="37wK5m">
<ref role="3cqZAo" node="6OXbTD_o6iv" resolve="session" />
<node concept="2OqwBi" id="5vVBssDNe$B" role="37wK5m">
<node concept="37vLTw" id="6OXbTD_oFoC" role="2Oq$k0">
<ref role="3cqZAo" node="6OXbTD_o6iv" resolve="session" />
</node>
<node concept="liA8E" id="5vVBssDNf95" role="2OqNvi">
<ref role="37wK5l" to="hano:20Ay2VeR9qk" resolve="ruleTemplates" />
</node>
</node>
<node concept="37vLTw" id="6OXbTD_ouEx" role="37wK5m">
<ref role="3cqZAo" node="6OXbTD_oqui" resolve="queryTemplates" />
</node>
<node concept="10Nm6u" id="23Habm3pLMS" role="37wK5m" />
<node concept="2OqwBi" id="2sMBLui0DSV" role="37wK5m">
<node concept="37vLTw" id="2sMBLui0DSW" role="2Oq$k0">
<ref role="3cqZAo" node="6OXbTD_o6iv" resolve="session" />
</node>
<node concept="liA8E" id="2sMBLui0DSX" role="2OqNvi">
<ref role="37wK5l" to="hano:1Pi9pJ$57yb" resolve="planHandler" />
</node>
</node>
</node>
</node>
</node>
@ -3437,7 +3443,7 @@
<ref role="37wK5l" to="hano:6nFpYluWwIS" resolve="setOriginIndex" />
<node concept="2ShNRf" id="6nFpYlv0WLN" role="37wK5m">
<node concept="HV5vD" id="6nFpYlv0XzE" role="2ShVmc">
<ref role="HV5vE" to="ksgm:70Wv0dJhQb2" resolve="OriginIndex" />
<ref role="HV5vE" to="hano:70Wv0dJhQb2" resolve="OriginIndex" />
</node>
</node>
</node>
@ -3452,7 +3458,7 @@
<ref role="37wK5l" to="hano:6nFpYluW_Ik" resolve="setUpdatesRecorder" />
<node concept="2ShNRf" id="4hQVL4feBX_" role="37wK5m">
<node concept="1pGfFk" id="4mdCe2gAdbS" role="2ShVmc">
<ref role="37wK5l" to="ksgm:4mdCe2g_MnB" resolve="UpdatesRecorder" />
<ref role="37wK5l" to="hano:4mdCe2g_MnB" resolve="UpdatesRecorder" />
</node>
</node>
</node>
@ -3469,15 +3475,7 @@
<ref role="3cqZAo" node="6$7vuu2ugt3" resolve="tplApp" />
</node>
<node concept="liA8E" id="6$7vuu2ujxU" role="2OqNvi">
<ref role="37wK5l" to="hano:7kTeLbPojCz" resolve="produce" />
<node concept="2OqwBi" id="1Pi9pJ$hR4Y" role="37wK5m">
<node concept="37vLTw" id="1Pi9pJ$hQtp" role="2Oq$k0">
<ref role="3cqZAo" node="6OXbTD_o6iv" resolve="session" />
</node>
<node concept="liA8E" id="1Pi9pJ$hRwu" role="2OqNvi">
<ref role="37wK5l" to="hano:1Pi9pJ$57yb" resolve="planHandler" />
</node>
</node>
<ref role="37wK5l" to="hano:7kTeLbPojCz" resolve="build" />
<node concept="2ShNRf" id="3IIf9O_jdGL" role="37wK5m">
<node concept="2HTt$P" id="3IIf9O_jgA8" role="2ShVmc">
<node concept="3Tqbb2" id="3IIf9O_jhoV" role="2HTBi0" />

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

@ -30,6 +30,7 @@
<dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
<dependency reexport="false">3a8d80d2-32d9-f1f2-4443-6a1111e12ef3(MPS.Boot)</dependency>
<dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
<dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@ -39,6 +40,7 @@
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
<language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
<language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
<language slang="l:acfc188d-d5d6-4598-b370-6f4a983f05b2:jetbrains.mps.baseLanguage.methodReferences" version="0" />
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
<language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
@ -83,6 +85,7 @@
<module reference="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" version="0" />
<module reference="7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)" version="0" />
<module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
<module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
<module reference="a1250a4d-c090-42c3-ad7c-d298a3357dd4(jetbrains.mps.make.runtime)" version="0" />
<module reference="da80355b-a098-4248-9ec8-70d10dd7e9af(jetbrains.mps.reporting.runtime)" version="0" />
<module reference="0b80a2e8-f9f1-47b3-823f-56eb115bca42(jetbrains.mps.typechecking.annotation)" version="0" />

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

@ -60,7 +60,6 @@
<import index="vmdq" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui.awt(MPS.IDEA/)" />
<import index="gspm" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.ui.popup(MPS.IDEA/)" />
<import index="jkm4" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.ui(MPS.IDEA/)" />
<import index="ksgm" ref="r:6285678b-007f-4527-bcf5-6fd38ba8c969(jetbrains.mps.lang.coderules.program)" />
<import index="57ty" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.messages(MPS.Platform/)" />
<import index="1m72" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.components(MPS.IDEA/)" />
<import index="b2d5" ref="r:1a2b3027-99d2-4946-917b-f185130ac75d(jetbrains.mps.ide.findusages.findalgorithm.finders)" />
@ -301,6 +300,7 @@
<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="1171903862077" name="jetbrains.mps.baseLanguage.structure.LowerBoundType" flags="in" index="3qUtgH">
<child id="1171903869531" name="bound" index="3qUvdb" />
</concept>
@ -4746,352 +4746,6 @@
</node>
</node>
</node>
<node concept="312cEu" id="55Q$YFtIVEP">
<property role="3GE5qa" value="launch.step" />
<property role="TrG5h" value="TypecheckingWithTraceStep" />
<node concept="2tJIrI" id="55Q$YFtIVLz" role="jymVt" />
<node concept="3clFbW" id="55Q$YFtIVZ9" role="jymVt">
<node concept="37vLTG" id="6IQb_Rxsk$b" role="3clF46">
<property role="TrG5h" value="editorComponent" />
<node concept="3uibUv" id="6IQb_Rxsk$c" role="1tU5fm">
<ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
</node>
</node>
<node concept="37vLTG" id="55Q$YFtIX9v" role="3clF46">
<property role="TrG5h" value="mpsProject" />
<node concept="3uibUv" id="55Q$YFtIX9w" role="1tU5fm">
<ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
</node>
</node>
<node concept="3cqZAl" id="55Q$YFtIVZb" role="3clF45" />
<node concept="3Tm1VV" id="55Q$YFtIVZc" role="1B3o_S" />
<node concept="3clFbS" id="55Q$YFtIVZd" role="3clF47">
<node concept="XkiVB" id="55Q$YFtIXBZ" role="3cqZAp">
<ref role="37wK5l" to="tj24:3KN3A4vHiEF" resolve="TypecheckingStep" />
<node concept="2OqwBi" id="443LGHBSD_r" role="37wK5m">
<node concept="37vLTw" id="55Q$YFtIYbT" role="2Oq$k0">
<ref role="3cqZAo" node="55Q$YFtIX9v" resolve="mpsProject" />
</node>
<node concept="liA8E" id="443LGHBSEHm" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
<node concept="3clFbF" id="7Mte5SKkuX2" role="3cqZAp">
<node concept="37vLTI" id="7Mte5SKkwQa" role="3clFbG">
<node concept="37vLTw" id="7Mte5SKkxsg" role="37vLTx">
<ref role="3cqZAo" node="55Q$YFtIX9v" resolve="mpsProject" />
</node>
<node concept="2OqwBi" id="7Mte5SKkvl0" role="37vLTJ">
<node concept="Xjq3P" id="7Mte5SKkuX0" role="2Oq$k0" />
<node concept="2OwXpG" id="7Mte5SKkvWJ" role="2OqNvi">
<ref role="2Oxat5" node="443LGHBSGGx" resolve="mpsProject" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="6BMBBPCZ0vC" role="jymVt" />
<node concept="3clFb_" id="Hg6Enc6pha" role="jymVt">
<property role="TrG5h" value="schedule" />
<property role="1EzhhJ" value="false" />
<node concept="3uibUv" id="Hg6Enc6phe" role="3clF45">
<ref role="3uigEE" to="1yqb:FQ_DIt9rOo" resolve="Single" />
<node concept="3uibUv" id="2daneBPWfh1" role="11_B2D">
<ref role="3uigEE" to="1yqb:5lpFZvOkOLg" resolve="AbstractEffect" />
</node>
</node>
<node concept="3Tmbuc" id="Hg6EncFIBw" role="1B3o_S" />
<node concept="3clFbS" id="Hg6Enc6phk" role="3clF47">
<node concept="3cpWs8" id="51ek2rQQCB3" role="3cqZAp">
<node concept="3cpWsn" id="51ek2rQQCB4" role="3cpWs9">
<property role="TrG5h" value="preconfigure" />
<node concept="3uibUv" id="51ek2rQQAtC" role="1tU5fm">
<ref role="3uigEE" to="1yqb:FQ_DIt9rOo" resolve="Single" />
<node concept="3uibUv" id="51ek2rQQAtF" role="11_B2D">
<ref role="3uigEE" to="1yqb:5lpFZvOkOLg" resolve="AbstractEffect" />
</node>
</node>
<node concept="1rXfSq" id="51ek2rQQCB5" role="33vP2m">
<ref role="37wK5l" to="1yqb:51ek2rQHvJ1" resolve="composeEffect" />
<node concept="37vLTw" id="51ek2rQQCB6" role="37wK5m">
<ref role="3cqZAo" node="Hg6Enc6phb" resolve="input" />
</node>
<node concept="1bVj0M" id="51ek2rQQCB7" role="37wK5m">
<node concept="37vLTG" id="51ek2rQQCB8" role="1bW2Oz">
<property role="TrG5h" value="inEff" />
<node concept="3uibUv" id="51ek2rQQCB9" role="1tU5fm">
<ref role="3uigEE" to="1yqb:5lpFZvOkOLg" resolve="AbstractEffect" />
</node>
</node>
<node concept="3clFbS" id="51ek2rQQCBa" role="1bW5cS">
<node concept="3clFbH" id="51ek2rQQCBb" role="3cqZAp" />
<node concept="3cpWs8" id="36y_5CtZto2" role="3cqZAp">
<node concept="3cpWsn" id="36y_5CtZto3" role="3cpWs9">
<property role="TrG5h" value="out" />
<node concept="3uibUv" id="36y_5CtZs3x" role="1tU5fm">
<ref role="3uigEE" to="1yqb:36y_5CtsZff" resolve="AbstractEffect.Builder" />
</node>
<node concept="2YIFZM" id="36y_5CtZto4" role="33vP2m">
<ref role="37wK5l" to="1yqb:36y_5CttgB5" resolve="of" />
<ref role="1Pybhc" to="1yqb:5lpFZvOkOLg" resolve="AbstractEffect" />
</node>
</node>
</node>
<node concept="3clFbH" id="5lpFZvOi2uu" role="3cqZAp" />
<node concept="3clFbF" id="5lpFZvOgEYC" role="3cqZAp">
<node concept="2OqwBi" id="5lpFZvOgGmz" role="3clFbG">
<node concept="37vLTw" id="5lpFZvOgEYA" role="2Oq$k0">
<ref role="3cqZAo" node="51ek2rQQCB8" resolve="inEff" />
</node>
<node concept="liA8E" id="5lpFZvOgIcL" role="2OqNvi">
<ref role="37wK5l" to="1yqb:5lpFZvOa7fB" resolve="doWithValues" />
<node concept="10M0yZ" id="51ek2rQQCBi" role="37wK5m">
<ref role="1PxDUh" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
<ref role="3cqZAo" to="1yqb:2daneBPSu1V" resolve="PROGRAM_PRODUCER" />
</node>
<node concept="10M0yZ" id="799SgOKcPlW" role="37wK5m">
<ref role="3cqZAo" to="1yqb:39eNUjlXwas" resolve="TRACE_TMPL" />
<ref role="1PxDUh" to="1yqb:RZQG98UNsT" resolve="ConfigureEvalStep" />
</node>
<node concept="1bVj0M" id="5lpFZvOgMoY" role="37wK5m">
<node concept="gl6BB" id="5lpFZvOgOFr" role="1bW2Oz">
<property role="TrG5h" value="programProducer" />
<node concept="2jxLKc" id="5lpFZvOgOFs" role="1tU5fm" />
</node>
<node concept="gl6BB" id="5lpFZvOgRM7" role="1bW2Oz">
<property role="TrG5h" value="tmplTrace" />
<node concept="2jxLKc" id="5lpFZvOgRM8" role="1tU5fm" />
</node>
<node concept="3clFbS" id="5lpFZvOgMp0" role="1bW5cS">
<node concept="3clFbH" id="36y_5CtZE1L" role="3cqZAp" />
<node concept="3clFbF" id="1_AnebxCwHo" role="3cqZAp">
<node concept="37vLTI" id="1_AnebxC$nH" role="3clFbG">
<node concept="2OqwBi" id="1_AnebxCxzH" role="37vLTJ">
<node concept="Xjq3P" id="1_AnebxCwHm" role="2Oq$k0" />
<node concept="2OwXpG" id="1_AnebxCyTt" role="2OqNvi">
<ref role="2Oxat5" node="1_AnebxCruV" resolve="templateTraceData" />
</node>
</node>
<node concept="37vLTw" id="5lpFZvOhklu" role="37vLTx">
<ref role="3cqZAo" node="5lpFZvOgRM7" resolve="tmplTrace" />
</node>
</node>
</node>
<node concept="3clFbF" id="51ek2rQQCBl" role="3cqZAp">
<node concept="37vLTI" id="51ek2rQQCBm" role="3clFbG">
<node concept="2ShNRf" id="51ek2rQQCBn" role="37vLTx">
<node concept="1pGfFk" id="51ek2rQQCBo" role="2ShVmc">
<ref role="37wK5l" to="31yc:2daneBOSyP4" resolve="TraceEvents" />
<node concept="2OqwBi" id="51ek2rQQCBp" role="37wK5m">
<node concept="2OqwBi" id="5lpFZvOhs0g" role="2Oq$k0">
<node concept="37vLTw" id="51ek2rQQCBq" role="2Oq$k0">
<ref role="3cqZAo" node="5lpFZvOgOFr" resolve="programProducer" />
</node>
<node concept="liA8E" id="5lpFZvOhBA6" role="2OqNvi">
<ref role="37wK5l" to="hano:3GlpCDSyO$P" resolve="getProgram" />
</node>
</node>
<node concept="liA8E" id="51ek2rQQCBr" role="2OqNvi">
<ref role="37wK5l" to="av0y:~Program.name()" resolve="name" />
</node>
</node>
</node>
</node>
<node concept="2OqwBi" id="51ek2rQQCBs" role="37vLTJ">
<node concept="Xjq3P" id="51ek2rQQCBt" role="2Oq$k0" />
<node concept="2OwXpG" id="51ek2rQQCBu" role="2OqNvi">
<ref role="2Oxat5" node="2daneBOT6rC" resolve="traceEvents" />
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="51ek2rQQCBv" role="3cqZAp">
<node concept="37vLTI" id="51ek2rQQCBw" role="3clFbG">
<node concept="2OqwBi" id="51ek2rQQCBx" role="37vLTJ">
<node concept="Xjq3P" id="51ek2rQQCBy" role="2Oq$k0" />
<node concept="2OwXpG" id="51ek2rQQCBz" role="2OqNvi">
<ref role="2Oxat5" node="3F6vMxqv_px" resolve="msgtrace" />
</node>
</node>
<node concept="2ShNRf" id="51ek2rQQCB$" role="37vLTx">
<node concept="1pGfFk" id="51ek2rQQCB_" role="2ShVmc">
<ref role="37wK5l" to="o35r:4i4XGQZmLRe" resolve="MessageViewInfoTracer" />
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="799SgOKcIVS" role="3cqZAp" />
<node concept="3clFbF" id="36y_5CtZ$Z4" role="3cqZAp">
<node concept="2OqwBi" id="36y_5CtZ$Z6" role="3clFbG">
<node concept="2OqwBi" id="36y_5CtZ$Z7" role="2Oq$k0">
<node concept="37vLTw" id="36y_5CtZ$Z8" role="2Oq$k0">
<ref role="3cqZAo" node="36y_5CtZto3" resolve="of" />
</node>
<node concept="liA8E" id="36y_5CtZ$Z9" role="2OqNvi">
<ref role="37wK5l" to="1yqb:36y_5Ctua_I" resolve="set" />
<node concept="10M0yZ" id="36y_5CtZ$Za" role="37wK5m">
<ref role="1PxDUh" to="1yqb:RZQG98UNsT" resolve="ConfigureEvalStep" />
<ref role="3cqZAo" to="1yqb:RZQG98Ve3Q" resolve="TRACE_EVAL" />
</node>
<node concept="2ShNRf" id="36y_5CtZ$Zb" role="37wK5m">
<node concept="1pGfFk" id="36y_5CtZ$Zc" role="2ShVmc">
<ref role="37wK5l" to="1yqb:7nPD14NbIzp" />
<node concept="2OqwBi" id="36y_5CtZ$Zd" role="37wK5m">
<node concept="37vLTw" id="36y_5CtZ$Ze" role="2Oq$k0">
<ref role="3cqZAo" node="2daneBOT6rC" resolve="traceEvents" />
</node>
<node concept="liA8E" id="36y_5CtZ$Zf" role="2OqNvi">
<ref role="37wK5l" to="31yc:YGS68MEx_L" resolve="trace" />
</node>
</node>
<node concept="37vLTw" id="36y_5CtZ$Zg" role="37wK5m">
<ref role="3cqZAo" node="3F6vMxqv_px" resolve="msgtrace" />
</node>
</node>
</node>
</node>
</node>
<node concept="liA8E" id="36y_5CtZ$Zh" role="2OqNvi">
<ref role="37wK5l" to="1yqb:36y_5Ctua_I" resolve="set" />
<node concept="37vLTw" id="36y_5CtZ$Zn" role="37wK5m">
<ref role="3cqZAo" to="tj24:1G9Y_Qv7rZx" resolve="TRACE_EVENTS" />
</node>
<node concept="37vLTw" id="36y_5CtZ$Zi" role="37wK5m">
<ref role="3cqZAo" node="2daneBOT6rC" resolve="traceEvents" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="5lpFZvOhaxT" role="3cqZAp" />
<node concept="3clFbF" id="36y_5CtZwLg" role="3cqZAp">
<node concept="2OqwBi" id="36y_5CtZxvC" role="3clFbG">
<node concept="37vLTw" id="36y_5CtZwLe" role="2Oq$k0">
<ref role="3cqZAo" node="36y_5CtZto3" resolve="of" />
</node>
<node concept="liA8E" id="36y_5CtZz2n" role="2OqNvi">
<ref role="37wK5l" to="1yqb:36y_5Cttb2J" resolve="skip" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="51ek2rQQHfa" role="3cqZAp" />
<node concept="3clFbF" id="6BMBBPCZdEG" role="3cqZAp">
<node concept="2OqwBi" id="6BMBBPCZn_f" role="3clFbG">
<node concept="liA8E" id="6BMBBPCZq4$" role="2OqNvi">
<ref role="37wK5l" to="1yqb:FQ_DIteSYU" resolve="observeOn" />
<node concept="2YIFZM" id="FQ_DItBJxv" role="37wK5m">
<ref role="37wK5l" to="1yqb:3KwBCAA_eqP" resolve="requireEDT" />
<ref role="1Pybhc" to="1yqb:3KwBCAA_ela" resolve="MPSSchedulers" />
</node>
</node>
<node concept="1rXfSq" id="1PN9XOHxWt7" role="2Oq$k0">
<ref role="37wK5l" to="1yqb:51ek2rQHvJ1" resolve="composeEffect" />
<node concept="3nyPlj" id="1PN9XOHAMrA" role="37wK5m">
<ref role="37wK5l" to="tj24:RZQG98YN6h" resolve="schedule" />
<node concept="37vLTw" id="1PN9XOHAMrB" role="37wK5m">
<ref role="3cqZAo" node="51ek2rQQCB4" resolve="preconfigure" />
</node>
</node>
<node concept="1bVj0M" id="1PN9XOHy2R3" role="37wK5m">
<node concept="37vLTG" id="1PN9XOHy42f" role="1bW2Oz">
<property role="TrG5h" value="effect" />
<node concept="3uibUv" id="1PN9XOHy5DV" role="1tU5fm">
<ref role="3uigEE" to="1yqb:5lpFZvOkOLg" resolve="AbstractEffect" />
</node>
</node>
<node concept="3clFbS" id="1PN9XOHy2R5" role="1bW5cS">
<node concept="3clFbF" id="1PN9XOHya0z" role="3cqZAp">
<node concept="2OqwBi" id="36y_5CtyIZk" role="3clFbG">
<node concept="2OqwBi" id="36y_5Ctyyum" role="2Oq$k0">
<node concept="2YIFZM" id="36y_5CtyvQU" role="2Oq$k0">
<ref role="37wK5l" to="1yqb:36y_5CttgB5" resolve="of" />
<ref role="1Pybhc" to="1yqb:5lpFZvOkOLg" resolve="AbstractEffect" />
</node>
<node concept="liA8E" id="36y_5CtyzPF" role="2OqNvi">
<ref role="37wK5l" to="1yqb:36y_5Ctua_I" resolve="set" />
<node concept="37vLTw" id="36y_5CtyASE" role="37wK5m">
<ref role="3cqZAo" to="tj24:1PN9XOHxyoK" resolve="MESSAGES" />
</node>
<node concept="2OqwBi" id="36y_5CtyvQY" role="37wK5m">
<node concept="37vLTw" id="36y_5CtyvQZ" role="2Oq$k0">
<ref role="3cqZAo" node="3F6vMxqv_px" resolve="msgtrace" />
</node>
<node concept="liA8E" id="36y_5CtyvR0" role="2OqNvi">
<ref role="37wK5l" to="o35r:1PN9XOHveCX" resolve="messages" />
</node>
</node>
</node>
</node>
<node concept="liA8E" id="36y_5CtyKFD" role="2OqNvi">
<ref role="37wK5l" to="1yqb:36y_5Cttb2J" resolve="skip" />
</node>
</node>
</node>
<node concept="3clFbH" id="1PN9XOHyg8y" role="3cqZAp" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2AHcQZ" id="Hg6Enc6phl" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
<node concept="37vLTG" id="Hg6Enc6phb" role="3clF46">
<property role="TrG5h" value="input" />
<node concept="3uibUv" id="FQ_DIt6mly" role="1tU5fm">
<ref role="3uigEE" to="1yqb:FQ_DIt9rOo" resolve="Single" />
<node concept="3uibUv" id="FQ_DIt6mlz" role="11_B2D">
<ref role="3uigEE" to="1yqb:5lpFZvOkOLg" resolve="AbstractEffect" />
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="55Q$YFtIVL_" role="jymVt" />
<node concept="312cEg" id="443LGHBSGGx" role="jymVt">
<property role="TrG5h" value="mpsProject" />
<node concept="3Tm6S6" id="443LGHBSGGy" role="1B3o_S" />
<node concept="3uibUv" id="443LGHBSIBM" role="1tU5fm">
<ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
</node>
</node>
<node concept="312cEg" id="3F6vMxqv_px" role="jymVt">
<property role="TrG5h" value="msgtrace" />
<node concept="3Tm6S6" id="6kREIVkHFzh" role="1B3o_S" />
<node concept="3uibUv" id="6IQb_Rx4498" role="1tU5fm">
<ref role="3uigEE" to="o35r:6IQb_Rx3pZ8" resolve="MessageViewInfoTracer" />
</node>
</node>
<node concept="312cEg" id="2daneBOT6rC" role="jymVt">
<property role="TrG5h" value="traceEvents" />
<node concept="3Tm6S6" id="2daneBOT6rD" role="1B3o_S" />
<node concept="3uibUv" id="2daneBOT8sK" role="1tU5fm">
<ref role="3uigEE" to="31yc:2ceN1hCYUQN" resolve="TraceEvents" />
</node>
</node>
<node concept="312cEg" id="1_AnebxCruV" role="jymVt">
<property role="TrG5h" value="templateTraceData" />
<node concept="3Tm6S6" id="1_AnebxCruW" role="1B3o_S" />
<node concept="3uibUv" id="1_AnebxCruY" role="1tU5fm">
<ref role="3uigEE" to="hano:39eNUjlSJ9Q" resolve="TemplateTrace" />
</node>
</node>
<node concept="3Tm1VV" id="55Q$YFtIVEQ" role="1B3o_S" />
<node concept="3uibUv" id="NKt6yn8c2j" role="1zkMxy">
<ref role="3uigEE" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
</node>
</node>
<node concept="Zd50a" id="3NRKQ2BK6Oq">
<property role="TrG5h" value="TypecheckingKeymap" />
<property role="3GE5qa" value="action" />
@ -6544,9 +6198,10 @@
<node concept="3clFbH" id="1PN9XOG$1BG" role="3cqZAp" />
<node concept="3cpWs8" id="6nFpYluoeMU" role="3cqZAp">
<node concept="3cpWsn" id="6nFpYluoeMV" role="3cpWs9">
<property role="TrG5h" value="processingSession" />
<property role="TrG5h" value="rulesProcessing" />
<node concept="3uibUv" id="6nFpYluoeMW" role="1tU5fm">
<ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RuleProcessingSession" />
<ref role="3uigEE" to="hano:CGeqIk8WWU" resolve="RulesProcessing" />
<node concept="3qTvmN" id="3GXzdW$9e0q" role="11_B2D" />
</node>
<node concept="2ShNRf" id="6nFpYluoeMX" role="33vP2m">
<node concept="1pGfFk" id="6nFpYluoeMY" role="2ShVmc">
@ -6554,16 +6209,6 @@
<node concept="37vLTw" id="zL5ZaNDTUJ" role="37wK5m">
<ref role="3cqZAo" node="3KN3A4vDlEh" resolve="clique" />
</node>
<node concept="37vLTw" id="6nFpYluoeN9" role="37wK5m">
<ref role="3cqZAo" node="7WKNeR8SQxI" resolve="repository" />
</node>
<node concept="2YIFZM" id="2Y70AYEc4aH" role="37wK5m">
<ref role="37wK5l" to="31yc:2mhJggjuVj0" resolve="get" />
<ref role="1Pybhc" to="31yc:4MaHsBDdlvx" resolve="MessageLog" />
<node concept="37vLTw" id="2Y70AYEc4nY" role="37wK5m">
<ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
</node>
</node>
</node>
</node>
</node>
@ -6580,8 +6225,13 @@
<node concept="37vLTw" id="61G6TdBDyzQ" role="37wK5m">
<ref role="3cqZAo" node="7WKNeR8SQxI" resolve="repository" />
</node>
<node concept="37vLTw" id="61G6TdBDyzS" role="37wK5m">
<ref role="3cqZAo" node="6nFpYluoeMV" resolve="session" />
<node concept="2OqwBi" id="5vVBssDBVVw" role="37wK5m">
<node concept="37vLTw" id="61G6TdBDyzS" role="2Oq$k0">
<ref role="3cqZAo" node="6nFpYluoeMV" resolve="processingSession" />
</node>
<node concept="liA8E" id="5vVBssDBYA_" role="2OqNvi">
<ref role="37wK5l" to="hano:7DvO2M9Icas" resolve="macroTemplates" />
</node>
</node>
</node>
</node>
@ -6644,7 +6294,7 @@
<node concept="TSZUe" id="7WKNeR8TcX_" role="2OqNvi">
<node concept="2ShNRf" id="7WKNeR8TcXE" role="25WWJ7">
<node concept="1pGfFk" id="7WKNeR8TcXF" role="2ShVmc">
<ref role="37wK5l" to="1yqb:1imVejVB$_h" resolve="ApplyTemplatesStep" />
<ref role="37wK5l" to="tj24:1imVejVB$_h" />
<node concept="37vLTw" id="6nFpYluoiGj" role="37wK5m">
<ref role="3cqZAo" node="6nFpYluoeMV" resolve="session" />
</node>
@ -6693,7 +6343,7 @@
</node>
<node concept="2ShNRf" id="7WKNeR8TcYh" role="3K4E3e">
<node concept="1pGfFk" id="7WKNeR8TcYi" role="2ShVmc">
<ref role="37wK5l" node="55Q$YFtIVZ9" resolve="TypecheckingWithTraceStep" />
<ref role="37wK5l" to="tj24:55Q$YFtIVZ9" resolve="TypecheckingWithTraceStep" />
<node concept="37vLTw" id="7WKNeR8Ti$q" role="37wK5m">
<ref role="3cqZAo" node="6hqFpWnfwwm" resolve="editorComponent" />
</node>
@ -6722,16 +6372,13 @@
<node concept="2OqwBi" id="7WKNeR8SQy_" role="3clFbG">
<node concept="2ShNRf" id="7WKNeR8SQyA" role="2Oq$k0">
<node concept="1pGfFk" id="7WKNeR8SQyB" role="2ShVmc">
<ref role="37wK5l" to="1yqb:1pPth$lK1ZL" resolve="CoderulesHelper" />
<node concept="37vLTw" id="7W7Inqm62NJ" role="37wK5m">
<ref role="3cqZAo" node="3KN3A4vDlEh" resolve="clique" />
</node>
<ref role="37wK5l" to="tj24:1pPth$lK1ZL" resolve="CoderulesHelper" />
<node concept="2ShNRf" id="7WKNeR8SQyC" role="37wK5m">
<node concept="YeOm9" id="7WKNeR8SQyD" role="2ShVmc">
<node concept="1Y3b0j" id="7WKNeR8SQyE" role="YeSDq">
<property role="2bfB8j" value="true" />
<ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
<ref role="1Y3XeK" to="1yqb:3F6vMxqaxpm" resolve="CoderulesHelper.ProgressCallback" />
<ref role="1Y3XeK" to="tj24:3F6vMxqaxpm" resolve="CoderulesHelper.ProgressCallback" />
<node concept="3Tm1VV" id="7WKNeR8SQyF" role="1B3o_S" />
<node concept="3clFb_" id="3MwxBzG61n7" role="jymVt">
<property role="TrG5h" value="done" />
@ -6980,7 +6627,7 @@
</node>
</node>
<node concept="liA8E" id="7WKNeR8SQzo" role="2OqNvi">
<ref role="37wK5l" to="1yqb:1PN9XOHs$pt" resolve="executeAsync" />
<ref role="37wK5l" to="tj24:1PN9XOHs$pt" resolve="executeAsync" />
<node concept="1bVj0M" id="1PN9XOHuyuK" role="37wK5m">
<node concept="3clFbS" id="1PN9XOHuyuL" role="1bW5cS">
<node concept="3clFbH" id="1PN9XOHuCkE" role="3cqZAp" />
@ -7047,9 +6694,9 @@
</node>
<node concept="liA8E" id="5iJsa3_ds5d" role="2OqNvi">
<ref role="37wK5l" to="1yqb:5iJsa3_8EKs" resolve="doWithValue" />
<node concept="10M0yZ" id="5iJsa3_dvnx" role="37wK5m">
<ref role="1PxDUh" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
<ref role="3cqZAo" to="1yqb:5iJsa3_dp$f" resolve="REPORT_ITEMS" />
<node concept="10M0yZ" id="7Vnjo8LWj0V" role="37wK5m">
<ref role="3cqZAo" to="tj24:5iJsa3_dp$f" resolve="REPORT_ITEMS" />
<ref role="1PxDUh" to="tj24:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
</node>
<node concept="1bVj0M" id="5iJsa3_ds5f" role="37wK5m">
<node concept="37vLTG" id="5iJsa3_ds5g" role="1bW2Oz">
@ -7146,9 +6793,9 @@
<ref role="1PxDUh" to="tj24:NKt6yn81z$" resolve="TypecheckingStep" />
<ref role="3cqZAo" to="tj24:1G9Y_Qv7rZx" resolve="TRACE_EVENTS" />
</node>
<node concept="10M0yZ" id="4tC1JBnbNzA" role="37wK5m">
<ref role="1PxDUh" to="1yqb:RZQG98UNsT" resolve="ConfigureEvalStep" />
<ref role="3cqZAo" to="1yqb:39eNUjlXwas" resolve="TRACE_TMPL" />
<node concept="10M0yZ" id="7Vnjo8LWj14" role="37wK5m">
<ref role="3cqZAo" to="tj24:39eNUjlXwas" resolve="TRACE_TMPL" />
<ref role="1PxDUh" to="tj24:RZQG98UNsT" resolve="ConfigureEvalStep" />
</node>
<node concept="1bVj0M" id="5iJsa3_j6h6" role="37wK5m">
<node concept="3clFbS" id="5iJsa3_j6h7" role="1bW5cS">

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff