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

Fix incremental update of reported feedback 

Correctly detect cache up-to-date.
Refactor feedback reporting, provide origin node as the key.
Drop invalidated feedback correctly.
Code cleanup.
This commit is contained in:
Fedor Isakov 2021-03-23 12:24:39 +01:00
parent 2977b4dd19
commit 99e248c5b3
14 changed files with 1045 additions and 1009 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1810,7 +1810,67 @@
<node concept="3clFbF" id="61G6TdBo87G" role="3cqZAp">
<node concept="2OqwBi" id="61G6TdBo87H" role="3clFbG">
<node concept="liA8E" id="61G6TdBo87I" role="2OqNvi">
<ref role="37wK5l" to="i348:61G6TdBpSf1" resolve="provideFeedback" />
<ref role="37wK5l" to="i348:3Pxu0s8x4Kl" resolve="reportFeedback" />
<node concept="2OqwBi" id="55xYlrl2U6J" role="37wK5m">
<node concept="1rXfSq" id="55xYlrl2U6K" role="2Oq$k0">
<ref role="37wK5l" node="6tnA467FI0r" resolve="token" />
<node concept="1ZhdrF" id="55xYlrl2U6L" role="lGtFl">
<property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
<property role="2qtEX8" value="baseMethodDeclaration" />
<node concept="3$xsQk" id="55xYlrl2U6M" role="3$ytzL">
<node concept="3clFbS" id="55xYlrl2U6N" role="2VODD2">
<node concept="3clFbF" id="55xYlrl2U6O" role="3cqZAp">
<node concept="2OqwBi" id="55xYlrl2U6P" role="3clFbG">
<node concept="1iwH7S" id="55xYlrl2U6Q" role="2Oq$k0" />
<node concept="1iwH70" id="55xYlrl2U6R" role="2OqNvi">
<ref role="1iwH77" node="36tQV5AugIl" resolve="template_token_this" />
<node concept="2OqwBi" id="55xYlrl2U6S" role="1iwH7V">
<node concept="30H73N" id="55xYlrl2U6T" role="2Oq$k0" />
<node concept="2Xjw5R" id="55xYlrl2U6U" role="2OqNvi">
<node concept="1xMEDy" id="55xYlrl2U6V" role="1xVPHs">
<node concept="chp4Y" id="55xYlrl2U6W" role="ri$Ld">
<ref role="cht4Q" to="wq2x:6OXbTDyHcuD" resolve="Template" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2OwXpG" id="55xYlrl2U6X" role="2OqNvi">
<ref role="2Oxat5" node="6tnA467FI0o" resolve="input" />
<node concept="1ZhdrF" id="55xYlrl2U6Y" role="lGtFl">
<property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1197029447546/1197029500499" />
<property role="2qtEX8" value="fieldDeclaration" />
<node concept="3$xsQk" id="55xYlrl2U6Z" role="3$ytzL">
<node concept="3clFbS" id="55xYlrl2U70" role="2VODD2">
<node concept="3clFbF" id="55xYlrl2U71" role="3cqZAp">
<node concept="2OqwBi" id="55xYlrl2U72" role="3clFbG">
<node concept="1iwH7S" id="55xYlrl2U73" role="2Oq$k0" />
<node concept="1iwH70" id="55xYlrl2U74" role="2OqNvi">
<ref role="1iwH77" node="36tQV5Au3A_" resolve="ruletemplate_token_input" />
<node concept="2OqwBi" id="55xYlrl2U75" role="1iwH7V">
<node concept="30H73N" id="55xYlrl2U76" role="2Oq$k0" />
<node concept="2Xjw5R" id="55xYlrl2U77" role="2OqNvi">
<node concept="1xMEDy" id="55xYlrl2U78" role="1xVPHs">
<node concept="chp4Y" id="55xYlrl2U79" role="ri$Ld">
<ref role="cht4Q" to="wq2x:36tQV5AmIsf" resolve="RuleTemplate" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="10Nm6u" id="61G6TdBusYk" role="37wK5m">
<node concept="5jKBG" id="61G6TdBut2U" role="lGtFl">
<ref role="v9R2y" node="61G6TdBuqi8" resolve="frag_ProvideFeedbackOperation" />

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

@ -3776,56 +3776,19 @@
<ref role="3cqZAo" node="6OXbTDxtJVO" resolve="name" />
</node>
<node concept="2ShNRf" id="61G6TdBoJWH" role="37wK5m">
<node concept="YeOm9" id="61G6TdBqILW" role="2ShVmc">
<node concept="1Y3b0j" id="61G6TdBqILZ" role="YeSDq">
<property role="2bfB8j" value="true" />
<ref role="37wK5l" to="ksgm:7DvO2Ma0h_M" resolve="MacroProcessing" />
<ref role="1Y3XeK" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
<node concept="3Tm1VV" id="61G6TdBqIM0" role="1B3o_S" />
<node concept="2OqwBi" id="61G6TdBoJWJ" role="37wK5m">
<node concept="37vLTw" id="61G6TdBoJWK" role="2Oq$k0">
<ref role="3cqZAo" node="7DvO2M9peEl" resolve="ruleProcessingSession" />
</node>
<node concept="liA8E" id="61G6TdBoJWL" role="2OqNvi">
<ref role="37wK5l" node="72RDgIN45VE" resolve="repository" />
</node>
</node>
<node concept="37vLTw" id="61G6TdBoJWN" role="37wK5m">
<node concept="1pGfFk" id="3Pxu0s87CHM" role="2ShVmc">
<ref role="37wK5l" to="ksgm:7DvO2Ma0h_M" resolve="MacroProcessing" />
<node concept="2OqwBi" id="61G6TdBoJWJ" role="37wK5m">
<node concept="37vLTw" id="61G6TdBoJWK" role="2Oq$k0">
<ref role="3cqZAo" node="7DvO2M9peEl" resolve="ruleProcessingSession" />
</node>
<node concept="3clFb_" id="61G6TdBqITu" role="jymVt">
<property role="TrG5h" value="provideFeedback" />
<node concept="37vLTG" id="61G6TdBsK75" role="3clF46">
<property role="TrG5h" value="feedback" />
<node concept="3uibUv" id="61G6TdBsKW2" role="1tU5fm">
<ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
</node>
</node>
<node concept="3cqZAl" id="61G6TdBqITD" role="3clF45" />
<node concept="3Tm1VV" id="61G6TdBqITE" role="1B3o_S" />
<node concept="3clFbS" id="61G6TdBqITI" role="3clF47">
<node concept="3SKdUt" id="61G6TdBqJcK" role="3cqZAp">
<node concept="1PaTwC" id="61G6TdBqJcL" role="1aUNEU">
<node concept="3oM_SD" id="61G6TdBqJcM" role="1PaTwD">
<property role="3oM_SC" value="FIXME" />
</node>
<node concept="3oM_SD" id="61G6TdBqJd7" role="1PaTwD">
<property role="3oM_SC" value="process" />
</node>
<node concept="3oM_SD" id="61G6TdBqJdq" role="1PaTwD">
<property role="3oM_SC" value="report" />
</node>
<node concept="3oM_SD" id="61G6TdBqJdu" role="1PaTwD">
<property role="3oM_SC" value="items" />
</node>
</node>
</node>
</node>
<node concept="2AHcQZ" id="61G6TdBqITJ" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
<node concept="liA8E" id="61G6TdBoJWL" role="2OqNvi">
<ref role="37wK5l" node="72RDgIN45VE" resolve="repository" />
</node>
</node>
<node concept="37vLTw" id="61G6TdBoJWN" role="37wK5m">
<ref role="3cqZAo" node="7DvO2M9peEl" resolve="ruleProcessingSession" />
</node>
</node>
</node>
<node concept="37vLTw" id="7i3KM7g75jt" role="37wK5m">

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

@ -850,8 +850,8 @@
</node>
</node>
</node>
<node concept="liA8E" id="5R9R5HilVOI" role="2OqNvi">
<ref role="37wK5l" to="i348:6tnA4677QqC" resolve="originRef" />
<node concept="liA8E" id="3Pxu0s8jTB4" role="2OqNvi">
<ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
</node>
</node>
</node>

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

@ -11991,7 +11991,6 @@
<node concept="312cEu" id="7DvO2M9IiKB">
<property role="TrG5h" value="MacroProcessing" />
<property role="2bfB8j" value="false" />
<property role="1sVAO0" value="true" />
<node concept="2tJIrI" id="7DvO2M9IiKC" role="jymVt" />
<node concept="3clFbW" id="7DvO2Ma0h_M" role="jymVt">
<node concept="3cqZAl" id="7DvO2Ma0h_O" role="3clF45" />
@ -12912,7 +12911,6 @@
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="4VNF0fT41VU" role="jymVt" />
<node concept="2tJIrI" id="6nFpYlucPih" role="jymVt" />
<node concept="3clFb_" id="6nFpYlucRT5" role="jymVt">
<property role="TrG5h" value="recordUpdate" />
@ -12989,6 +12987,22 @@
</node>
</node>
<node concept="2tJIrI" id="6nFpYlufd2K" role="jymVt" />
<node concept="3clFb_" id="At0yqMNzB3" role="jymVt">
<property role="TrG5h" value="hasChanges" />
<node concept="10P_77" id="At0yqMNH$M" role="3clF45" />
<node concept="3Tm1VV" id="At0yqMNzB6" role="1B3o_S" />
<node concept="3clFbS" id="At0yqMNzB7" role="3clF47">
<node concept="3clFbF" id="At0yqMO6VW" role="3cqZAp">
<node concept="2OqwBi" id="At0yqMOc9M" role="3clFbG">
<node concept="37vLTw" id="At0yqMO6VV" role="2Oq$k0">
<ref role="3cqZAo" node="6nFpYlu6n2t" resolve="changedSet" />
</node>
<node concept="3GX2aA" id="At0yqMOgR1" role="2OqNvi" />
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="At0yqMNuiC" role="jymVt" />
<node concept="3clFb_" id="1XKnVQioNo" role="jymVt">
<property role="TrG5h" value="invalidateChanged" />
<node concept="37vLTG" id="1XKnVQiz0H" role="3clF46">
@ -15427,11 +15441,11 @@
<property role="TrG5h" value="originRefs" />
<node concept="3Tm6S6" id="5HxDM7DcE86" role="1B3o_S" />
<node concept="2hMVRd" id="5HxDM7DcE9K" role="1tU5fm">
<node concept="2sp9CU" id="5HxDM7DcEb2" role="2hN53Y" />
<node concept="3Tqbb2" id="3Pxu0s8jYW5" role="2hN53Y" />
</node>
<node concept="2ShNRf" id="5HxDM7DcEsN" role="33vP2m">
<node concept="2i4dXS" id="5HxDM7DcEGR" role="2ShVmc">
<node concept="2sp9CU" id="5HxDM7DcEYC" role="HW$YZ" />
<node concept="3Tqbb2" id="3Pxu0s8jZtz" role="HW$YZ" />
<node concept="10Nm6u" id="5HxDM7DcFhv" role="HW$Y0" />
</node>
</node>
@ -15454,28 +15468,8 @@
<ref role="3cqZAo" node="5HxDM7DcEb5" resolve="originRefs" />
</node>
<node concept="X8dFx" id="5HxDM7DcMJB" role="2OqNvi">
<node concept="2OqwBi" id="5HxDM7DcNVd" role="25WWJ7">
<node concept="37vLTw" id="5HxDM7DcMWV" role="2Oq$k0">
<ref role="3cqZAo" node="5HxDM7DcDPq" resolve="preambleRuleOrigins" />
</node>
<node concept="3$u5V9" id="5HxDM7DcOwm" role="2OqNvi">
<node concept="1bVj0M" id="5HxDM7DcOwo" role="23t8la">
<node concept="3clFbS" id="5HxDM7DcOwp" role="1bW5cS">
<node concept="3clFbF" id="5HxDM7DcP9x" role="3cqZAp">
<node concept="2OqwBi" id="5HxDM7DcPqn" role="3clFbG">
<node concept="37vLTw" id="5HxDM7DcP9w" role="2Oq$k0">
<ref role="3cqZAo" node="5HxDM7DcOwq" resolve="it" />
</node>
<node concept="iZEcu" id="5HxDM7DcQG$" role="2OqNvi" />
</node>
</node>
</node>
<node concept="Rh6nW" id="5HxDM7DcOwq" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="5HxDM7DcOwr" role="1tU5fm" />
</node>
</node>
</node>
<node concept="37vLTw" id="5HxDM7DcMWV" role="25WWJ7">
<ref role="3cqZAo" node="5HxDM7DcDPq" resolve="preambleRuleOrigins" />
</node>
</node>
</node>
@ -15614,8 +15608,8 @@
</node>
<node concept="3JPx81" id="5HxDM7DcL6E" role="2OqNvi">
<node concept="2OqwBi" id="5HxDM7DcIwH" role="25WWJ7">
<node concept="liA8E" id="5HxDM7DcII1" role="2OqNvi">
<ref role="37wK5l" to="i348:6tnA4677QqC" resolve="originRef" />
<node concept="liA8E" id="3Pxu0s8jZZE" role="2OqNvi">
<ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
</node>
<node concept="37vLTw" id="7L9cSENHQFa" role="2Oq$k0">
<ref role="3cqZAo" node="7L9cSENH$qV" resolve="rex" />

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

@ -965,56 +965,19 @@
<ref role="3uigEE" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
</node>
<node concept="2ShNRf" id="61G6TdBqAxu" role="33vP2m">
<node concept="YeOm9" id="61G6TdBqAxv" role="2ShVmc">
<node concept="1Y3b0j" id="61G6TdBqAxw" role="YeSDq">
<property role="2bfB8j" value="true" />
<ref role="37wK5l" to="ksgm:7DvO2Ma0h_M" resolve="MacroProcessing" />
<ref role="1Y3XeK" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
<node concept="3Tm1VV" id="61G6TdBqAxx" role="1B3o_S" />
<node concept="2OqwBi" id="61G6TdBqAxy" role="37wK5m">
<node concept="37vLTw" id="61G6TdBqAxz" role="2Oq$k0">
<ref role="3cqZAo" node="6OXbTD_o6iv" resolve="session" />
</node>
<node concept="liA8E" id="61G6TdBqAx$" role="2OqNvi">
<ref role="37wK5l" to="hano:72RDgIN45VE" resolve="repository" />
</node>
</node>
<node concept="37vLTw" id="61G6TdBqAxA" role="37wK5m">
<node concept="1pGfFk" id="3Pxu0s87$zF" role="2ShVmc">
<ref role="37wK5l" to="ksgm:7DvO2Ma0h_M" resolve="MacroProcessing" />
<node concept="2OqwBi" id="61G6TdBqAxy" role="37wK5m">
<node concept="37vLTw" id="61G6TdBqAxz" role="2Oq$k0">
<ref role="3cqZAo" node="6OXbTD_o6iv" resolve="session" />
</node>
<node concept="3clFb_" id="61G6TdBqAxC" role="jymVt">
<property role="TrG5h" value="provideFeedback" />
<node concept="37vLTG" id="61G6TdBsK75" role="3clF46">
<property role="TrG5h" value="feedback" />
<node concept="3uibUv" id="61G6TdBsKW2" role="1tU5fm">
<ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
</node>
</node>
<node concept="3cqZAl" id="61G6TdBqAxN" role="3clF45" />
<node concept="3Tm1VV" id="61G6TdBqAxO" role="1B3o_S" />
<node concept="3clFbS" id="61G6TdBqAxP" role="3clF47">
<node concept="3SKdUt" id="61G6TdBqAxQ" role="3cqZAp">
<node concept="1PaTwC" id="61G6TdBqAxR" role="1aUNEU">
<node concept="3oM_SD" id="61G6TdBqAxS" role="1PaTwD">
<property role="3oM_SC" value="FIXME" />
</node>
<node concept="3oM_SD" id="61G6TdBqGQI" role="1PaTwD">
<property role="3oM_SC" value="process" />
</node>
<node concept="3oM_SD" id="61G6TdBqGR1" role="1PaTwD">
<property role="3oM_SC" value="report" />
</node>
<node concept="3oM_SD" id="61G6TdBqGR_" role="1PaTwD">
<property role="3oM_SC" value="items" />
</node>
</node>
</node>
</node>
<node concept="2AHcQZ" id="61G6TdBqAxV" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
<node concept="liA8E" id="61G6TdBqAx$" role="2OqNvi">
<ref role="37wK5l" to="hano:72RDgIN45VE" resolve="repository" />
</node>
</node>
<node concept="37vLTw" id="61G6TdBqAxA" role="37wK5m">
<ref role="3cqZAo" node="6OXbTD_o6iv" resolve="session" />
</node>
</node>
</node>
</node>
@ -1049,7 +1012,7 @@
<ref role="3cqZAo" node="61G6TdBqAxt" resolve="macroProcessing" />
</node>
<node concept="liA8E" id="2LxIQemUJYl" role="2OqNvi">
<ref role="37wK5l" to="ksgm:4VNF0fT816Y" resolve="withRequirementsRecorder" />
<ref role="37wK5l" to="ksgm:4VNF0fT816Y" resolve="withDependencyUpdatable" />
<node concept="37vLTw" id="2LxIQemUK79" role="37wK5m">
<ref role="3cqZAo" node="1XKnVQwJTH" resolve="updatesRecorder" />
</node>
@ -4668,48 +4631,29 @@
</node>
<node concept="3clFbJ" id="MSv3oweCrZ" role="3cqZAp">
<node concept="3clFbS" id="MSv3oweCs1" role="3clFbx">
<node concept="3cpWs8" id="MSv3owhGhA" role="3cqZAp">
<node concept="3cpWsn" id="MSv3owhGhD" role="3cpWs9">
<property role="TrG5h" value="originRef" />
<node concept="3uibUv" id="MSv3owhNcg" role="1tU5fm">
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
</node>
<node concept="2OqwBi" id="MSv3oweDqw" role="33vP2m">
<node concept="1eOMI4" id="MSv3oweDhS" role="2Oq$k0">
<node concept="10QFUN" id="MSv3oweCQP" role="1eOMHV">
<node concept="3uibUv" id="MSv3oweCUI" role="10QFUM">
<node concept="3cpWs8" id="3Pxu0s8fTYN" role="3cqZAp">
<node concept="3cpWsn" id="3Pxu0s8fTYO" role="3cpWs9">
<property role="TrG5h" value="origin" />
<node concept="3Tqbb2" id="3Pxu0s8fTeZ" role="1tU5fm" />
<node concept="2OqwBi" id="3Pxu0s8fTYP" role="33vP2m">
<node concept="1eOMI4" id="3Pxu0s8fTYQ" role="2Oq$k0">
<node concept="10QFUN" id="3Pxu0s8fTYR" role="1eOMHV">
<node concept="3uibUv" id="3Pxu0s8fTYS" role="10QFUM">
<ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
</node>
<node concept="37vLTw" id="MSv3oweCHv" role="10QFUP">
<node concept="37vLTw" id="3Pxu0s8fTYT" role="10QFUP">
<ref role="3cqZAo" node="MSv3owey_W" resolve="rule" />
</node>
</node>
</node>
<node concept="liA8E" id="MSv3oweD_g" role="2OqNvi">
<ref role="37wK5l" to="i348:6tnA4677QqC" resolve="originRef" />
<node concept="liA8E" id="3Pxu0s8fTYU" role="2OqNvi">
<ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
</node>
</node>
</node>
</node>
<node concept="3clFbJ" id="MSv3owhKk3" role="3cqZAp">
<node concept="3clFbS" id="MSv3owhKk5" role="3clFbx">
<node concept="3cpWs8" id="MSv3oweEf9" role="3cqZAp">
<node concept="3cpWsn" id="MSv3oweEfc" role="3cpWs9">
<property role="TrG5h" value="origin" />
<node concept="3Tqbb2" id="MSv3oweEf7" role="1tU5fm" />
<node concept="2OqwBi" id="MSv3oweDEK" role="33vP2m">
<node concept="liA8E" id="MSv3oweDSY" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
<node concept="37vLTw" id="MSv3oweDWj" role="37wK5m">
<ref role="3cqZAo" node="MSv3oweiHc" resolve="repo" />
</node>
</node>
<node concept="37vLTw" id="MSv3owhLyn" role="2Oq$k0">
<ref role="3cqZAo" node="MSv3owhGhD" resolve="originRef" />
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="MSv3oweFpQ" role="3cqZAp">
<node concept="2OqwBi" id="MSv3owePK$" role="3clFbG">
<node concept="2OqwBi" id="MSv3oweLTg" role="2Oq$k0">
@ -4728,8 +4672,8 @@
<node concept="2YIFZM" id="MSv3owg1zI" role="37wK5m">
<ref role="37wK5l" node="6uUkLpHm8V7" resolve="nodeToString" />
<ref role="1Pybhc" node="3evPR3EeeoU" resolve="TestDebugInfoPrinter" />
<node concept="37vLTw" id="MSv3owg2on" role="37wK5m">
<ref role="3cqZAo" node="MSv3oweEfc" resolve="origin" />
<node concept="37vLTw" id="3Pxu0s8g0tr" role="37wK5m">
<ref role="3cqZAo" node="3Pxu0s8fTYO" resolve="origin" />
</node>
</node>
</node>
@ -4738,8 +4682,8 @@
</node>
<node concept="3y3z36" id="MSv3owhLp4" role="3clFbw">
<node concept="10Nm6u" id="MSv3owhLuV" role="3uHU7w" />
<node concept="37vLTw" id="MSv3owhLe7" role="3uHU7B">
<ref role="3cqZAo" node="MSv3owhGhD" resolve="originRef" />
<node concept="37vLTw" id="3Pxu0s8fV3C" role="3uHU7B">
<ref role="3cqZAo" node="3Pxu0s8fTYO" resolve="origin" />
</node>
</node>
</node>
@ -5293,7 +5237,7 @@
<ref role="3cqZAo" node="1z4$59jegXF" resolve="it" />
</node>
<node concept="liA8E" id="362mGRZLKCR" role="2OqNvi">
<ref role="37wK5l" to="tj24:5b5WPl4QD9T" resolve="getFeedbackIdentity" />
<ref role="37wK5l" to="tj24:5b5WPl4QD9T" resolve="getFeedbackKey" />
</node>
</node>
</node>
@ -5391,7 +5335,7 @@
<ref role="3cqZAo" node="362mGRZM0tr" resolve="it" />
</node>
<node concept="liA8E" id="362mGRZM0tq" role="2OqNvi">
<ref role="37wK5l" to="tj24:5b5WPl4QD9T" resolve="getFeedbackIdentity" />
<ref role="37wK5l" to="tj24:5b5WPl4QD9T" resolve="getFeedbackKey" />
</node>
</node>
</node>
@ -9930,27 +9874,14 @@
<node concept="3clFbS" id="6jc_YgcRhfw" role="3clFbx">
<node concept="3cpWs8" id="6jc_YgcRjyO" role="3cqZAp">
<node concept="3cpWsn" id="6jc_YgcRjyR" role="3cpWs9">
<property role="TrG5h" value="resolved" />
<property role="TrG5h" value="org" />
<node concept="3Tqbb2" id="6jc_YgcRjyM" role="1tU5fm" />
<node concept="2OqwBi" id="6jc_YgcRk9O" role="33vP2m">
<node concept="2OqwBi" id="6jc_YgcRjZb" role="2Oq$k0">
<node concept="37vLTw" id="6jc_YgcRjZc" role="2Oq$k0">
<ref role="3cqZAo" node="6jc_YgcRhD5" resolve="ruleEx" />
</node>
<node concept="liA8E" id="6jc_YgcRjZd" role="2OqNvi">
<ref role="37wK5l" to="i348:6tnA4677QqC" resolve="originRef" />
</node>
<node concept="2OqwBi" id="6jc_YgcRjZb" role="33vP2m">
<node concept="37vLTw" id="6jc_YgcRjZc" role="2Oq$k0">
<ref role="3cqZAo" node="6jc_YgcRhD5" resolve="ruleEx" />
</node>
<node concept="liA8E" id="6jc_YgcRknM" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
<node concept="2OqwBi" id="6jc_YgcRkOa" role="37wK5m">
<node concept="37vLTw" id="6jc_YgcRkxi" role="2Oq$k0">
<ref role="3cqZAo" node="6jc_YgcOZ2n" resolve="launcher" />
</node>
<node concept="liA8E" id="6jc_YgcRl43" role="2OqNvi">
<ref role="37wK5l" node="3o9wrC3CZg_" resolve="getRepo" />
</node>
</node>
<node concept="liA8E" id="3Pxu0s8f_uo" role="2OqNvi">
<ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
</node>
</node>
</node>
@ -9966,7 +9897,7 @@
<node concept="liA8E" id="6jc_YgcRfca" role="2OqNvi">
<ref role="37wK5l" node="6jc_YgcQJPK" resolve="addedRulesFor" />
<node concept="37vLTw" id="6jc_YgcRmJv" role="37wK5m">
<ref role="3cqZAo" node="6jc_YgcRjyR" resolve="resolved" />
<ref role="3cqZAo" node="6jc_YgcRjyR" resolve="org" />
</node>
</node>
</node>
@ -9981,7 +9912,7 @@
<node concept="3y3z36" id="6jc_YgcRlPT" role="3clFbw">
<node concept="10Nm6u" id="6jc_YgcRlZy" role="3uHU7w" />
<node concept="37vLTw" id="6jc_YgcRlDe" role="3uHU7B">
<ref role="3cqZAo" node="6jc_YgcRjyR" resolve="resolved" />
<ref role="3cqZAo" node="6jc_YgcRjyR" resolve="org" />
</node>
</node>
</node>
@ -9992,8 +9923,8 @@
<node concept="37vLTw" id="6jc_YgcRiv2" role="2Oq$k0">
<ref role="3cqZAo" node="6jc_YgcRhD5" resolve="ruleEx" />
</node>
<node concept="liA8E" id="6jc_YgcRiNb" role="2OqNvi">
<ref role="37wK5l" to="i348:6tnA4677QqC" resolve="originRef" />
<node concept="liA8E" id="3Pxu0s8f$ya" role="2OqNvi">
<ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
</node>
</node>
</node>
@ -10086,27 +10017,14 @@
<node concept="3clFbS" id="6jc_YgcRpx_" role="3clFbx">
<node concept="3cpWs8" id="6jc_YgcRpxA" role="3cqZAp">
<node concept="3cpWsn" id="6jc_YgcRpxB" role="3cpWs9">
<property role="TrG5h" value="resolved" />
<property role="TrG5h" value="org" />
<node concept="3Tqbb2" id="6jc_YgcRpxC" role="1tU5fm" />
<node concept="2OqwBi" id="6jc_YgcRpxD" role="33vP2m">
<node concept="2OqwBi" id="6jc_YgcRpxE" role="2Oq$k0">
<node concept="liA8E" id="6jc_YgcRpxG" role="2OqNvi">
<ref role="37wK5l" to="i348:6tnA4677QqC" resolve="originRef" />
</node>
<node concept="37vLTw" id="6jc_YgcRqAa" role="2Oq$k0">
<ref role="3cqZAo" node="6jc_YgcQ$4I" resolve="removedRule" />
</node>
<node concept="2OqwBi" id="6jc_YgcRpxE" role="33vP2m">
<node concept="liA8E" id="3Pxu0s8fC_6" role="2OqNvi">
<ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
</node>
<node concept="liA8E" id="6jc_YgcRpxH" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
<node concept="2OqwBi" id="6jc_YgcRpxI" role="37wK5m">
<node concept="37vLTw" id="6jc_YgcRpxJ" role="2Oq$k0">
<ref role="3cqZAo" node="6jc_YgcOZ2n" resolve="launcher" />
</node>
<node concept="liA8E" id="6jc_YgcRpxK" role="2OqNvi">
<ref role="37wK5l" node="3o9wrC3CZg_" resolve="getRepo" />
</node>
</node>
<node concept="37vLTw" id="6jc_YgcRqAa" role="2Oq$k0">
<ref role="3cqZAo" node="6jc_YgcQ$4I" resolve="removedRule" />
</node>
</node>
</node>
@ -10122,7 +10040,7 @@
<node concept="liA8E" id="6jc_YgcRpxR" role="2OqNvi">
<ref role="37wK5l" node="6jc_YgcR0mn" resolve="removedRulesFor" />
<node concept="37vLTw" id="6jc_YgcRpxS" role="37wK5m">
<ref role="3cqZAo" node="6jc_YgcRpxB" resolve="resolved" />
<ref role="3cqZAo" node="6jc_YgcRpxB" resolve="org" />
</node>
</node>
</node>
@ -10137,7 +10055,7 @@
<node concept="3y3z36" id="6jc_YgcRpxV" role="3clFbw">
<node concept="10Nm6u" id="6jc_YgcRpxW" role="3uHU7w" />
<node concept="37vLTw" id="6jc_YgcRpxX" role="3uHU7B">
<ref role="3cqZAo" node="6jc_YgcRpxB" resolve="resolved" />
<ref role="3cqZAo" node="6jc_YgcRpxB" resolve="org" />
</node>
</node>
</node>
@ -10148,8 +10066,8 @@
<node concept="37vLTw" id="6jc_YgcRqu3" role="2Oq$k0">
<ref role="3cqZAo" node="6jc_YgcQ$4I" resolve="removedRule" />
</node>
<node concept="liA8E" id="6jc_YgcRpy2" role="2OqNvi">
<ref role="37wK5l" to="i348:6tnA4677QqC" resolve="originRef" />
<node concept="liA8E" id="3Pxu0s8fBDQ" role="2OqNvi">
<ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
</node>
</node>
</node>

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

@ -3405,56 +3405,19 @@
<ref role="3uigEE" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
</node>
<node concept="2ShNRf" id="61G6TdBqDRl" role="33vP2m">
<node concept="YeOm9" id="61G6TdBqDRm" role="2ShVmc">
<node concept="1Y3b0j" id="61G6TdBqDRn" role="YeSDq">
<property role="2bfB8j" value="true" />
<ref role="37wK5l" to="ksgm:7DvO2Ma0h_M" resolve="MacroProcessing" />
<ref role="1Y3XeK" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
<node concept="3Tm1VV" id="61G6TdBqDRo" role="1B3o_S" />
<node concept="2OqwBi" id="61G6TdBqDRp" role="37wK5m">
<node concept="37vLTw" id="61G6TdBqDRq" 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>
</node>
<node concept="37vLTw" id="61G6TdBqDRt" role="37wK5m">
<node concept="1pGfFk" id="3Pxu0s87EMf" role="2ShVmc">
<ref role="37wK5l" to="ksgm:7DvO2Ma0h_M" resolve="MacroProcessing" />
<node concept="2OqwBi" id="61G6TdBqDRp" role="37wK5m">
<node concept="37vLTw" id="61G6TdBqDRq" role="2Oq$k0">
<ref role="3cqZAo" node="6OXbTD_o6iv" resolve="session" />
</node>
<node concept="3clFb_" id="61G6TdBqDRv" role="jymVt">
<property role="TrG5h" value="provideFeedback" />
<node concept="37vLTG" id="61G6TdBsK75" role="3clF46">
<property role="TrG5h" value="feedback" />
<node concept="3uibUv" id="61G6TdBsKW2" role="1tU5fm">
<ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
</node>
</node>
<node concept="3cqZAl" id="61G6TdBqDRE" role="3clF45" />
<node concept="3Tm1VV" id="61G6TdBqDRF" role="1B3o_S" />
<node concept="3clFbS" id="61G6TdBqDRG" role="3clF47">
<node concept="3SKdUt" id="61G6TdBqG4h" role="3cqZAp">
<node concept="1PaTwC" id="61G6TdBqG4i" role="1aUNEU">
<node concept="3oM_SD" id="61G6TdBqG4j" role="1PaTwD">
<property role="3oM_SC" value="FIXME" />
</node>
<node concept="3oM_SD" id="61G6TdBqG93" role="1PaTwD">
<property role="3oM_SC" value="process" />
</node>
<node concept="3oM_SD" id="61G6TdBqGah" role="1PaTwD">
<property role="3oM_SC" value="report" />
</node>
<node concept="3oM_SD" id="61G6TdBqGaI" role="1PaTwD">
<property role="3oM_SC" value="items" />
</node>
</node>
</node>
</node>
<node concept="2AHcQZ" id="61G6TdBqDRH" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
<node concept="liA8E" id="61G6TdBqDRr" role="2OqNvi">
<ref role="37wK5l" to="hano:72RDgIN45VE" resolve="repository" />
</node>
</node>
<node concept="37vLTw" id="61G6TdBqDRt" role="37wK5m">
<ref role="3cqZAo" node="6OXbTD_o6iv" resolve="session" />
</node>
</node>
</node>
</node>

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

@ -3000,59 +3000,13 @@
<ref role="3uigEE" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
</node>
<node concept="2ShNRf" id="61G6TdBDyzM" role="33vP2m">
<node concept="YeOm9" id="61G6TdBDyzN" role="2ShVmc">
<node concept="1Y3b0j" id="61G6TdBDyzO" role="YeSDq">
<property role="2bfB8j" value="true" />
<ref role="37wK5l" to="ksgm:7DvO2Ma0h_M" resolve="MacroProcessing" />
<ref role="1Y3XeK" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
<node concept="3Tm1VV" id="61G6TdBDyzP" role="1B3o_S" />
<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>
<node concept="3clFb_" id="61G6TdBDyzU" role="jymVt">
<property role="TrG5h" value="provideFeedback" />
<node concept="37vLTG" id="61G6TdBDyzV" role="3clF46">
<property role="TrG5h" value="feedback" />
<node concept="3uibUv" id="61G6TdBDyzW" role="1tU5fm">
<ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
</node>
</node>
<node concept="3cqZAl" id="61G6TdBDyzX" role="3clF45" />
<node concept="3Tm1VV" id="61G6TdBDyzY" role="1B3o_S" />
<node concept="3clFbS" id="61G6TdBDyzZ" role="3clF47">
<node concept="3SKdUt" id="61G6TdBDy$0" role="3cqZAp">
<node concept="1PaTwC" id="61G6TdBDy$1" role="1aUNEU">
<node concept="3oM_SD" id="61G6TdBDy$2" role="1PaTwD">
<property role="3oM_SC" value="FIXME" />
</node>
<node concept="3oM_SD" id="61G6TdBDy$3" role="1PaTwD">
<property role="3oM_SC" value="provide" />
</node>
<node concept="3oM_SD" id="61G6TdBDy$4" role="1PaTwD">
<property role="3oM_SC" value="appropriate" />
</node>
<node concept="3oM_SD" id="61G6TdBDy$5" role="1PaTwD">
<property role="3oM_SC" value="reporting" />
</node>
<node concept="3oM_SD" id="61G6TdBDy$6" role="1PaTwD">
<property role="3oM_SC" value="for" />
</node>
<node concept="3oM_SD" id="61G6TdBDy$7" role="1PaTwD">
<property role="3oM_SC" value="typechecking" />
</node>
<node concept="3oM_SD" id="61G6TdBDy$8" role="1PaTwD">
<property role="3oM_SC" value="errors" />
</node>
</node>
</node>
</node>
<node concept="2AHcQZ" id="61G6TdBDy$9" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="1pGfFk" id="3Pxu0s87Llu" role="2ShVmc">
<ref role="37wK5l" to="ksgm:7DvO2Ma0h_M" resolve="MacroProcessing" />
<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>
</node>
</node>

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

@ -3090,17 +3090,6 @@
</node>
</node>
</node>
<node concept="3clFbH" id="5Qx6_660tQu" role="3cqZAp" />
<node concept="3clFbF" id="syqlb1TGDb" role="3cqZAp">
<node concept="2OqwBi" id="syqlb1THkU" role="3clFbG">
<node concept="37vLTw" id="syqlb1TGD9" role="2Oq$k0">
<ref role="3cqZAo" node="9dktABR$KQ" resolve="typesIndex" />
</node>
<node concept="liA8E" id="syqlb1Uwyj" role="2OqNvi">
<ref role="37wK5l" to="tj24:syqlb1TNjY" resolve="markUsed" />
</node>
</node>
</node>
</node>
<node concept="2AHcQZ" id="2Hyoxv0bBN" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
@ -3206,43 +3195,16 @@
</node>
</node>
</node>
<node concept="3clFbH" id="1z4$59j71i9" role="3cqZAp" />
<node concept="3cpWs8" id="9dktABQBqG" role="3cqZAp">
<node concept="3cpWsn" id="9dktABQBqH" role="3cpWs9">
<property role="TrG5h" value="typesIndex" />
<node concept="3uibUv" id="9dktABQKwh" role="1tU5fm">
<ref role="3uigEE" to="tj24:6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
<node concept="3clFbF" id="At0yqMXSkh" role="3cqZAp">
<node concept="2OqwBi" id="At0yqMXZs2" role="3clFbG">
<node concept="37vLTw" id="At0yqMXSkf" role="2Oq$k0">
<ref role="3cqZAo" node="1z4$59j5F_5" resolve="typecheckingService" />
</node>
<node concept="2OqwBi" id="9dktABQBqI" role="33vP2m">
<node concept="liA8E" id="9dktABQBqJ" role="2OqNvi">
<ref role="37wK5l" to="tj24:19OC90lY7P" resolve="cachedTypes" />
<node concept="37vLTw" id="9dktABQBqK" role="37wK5m">
<ref role="3cqZAo" node="19OC90nb5K" resolve="containingRoot" />
</node>
<node concept="liA8E" id="At0yqMY6Qp" role="2OqNvi">
<ref role="37wK5l" to="tj24:At0yqMUA4l" resolve="isCacheUpToDate" />
<node concept="37vLTw" id="At0yqMYnat" role="37wK5m">
<ref role="3cqZAo" node="19OC90nb5K" resolve="containingRoot" />
</node>
<node concept="37vLTw" id="1z4$59j6War" role="2Oq$k0">
<ref role="3cqZAo" node="1z4$59j5F_5" resolve="typecheckingService" />
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="1z4$59iLDzF" role="3cqZAp" />
<node concept="3cpWs6" id="syqlb1U_qh" role="3cqZAp">
<node concept="3K4zz7" id="5Qx6_669ATc" role="3cqZAk">
<node concept="2OqwBi" id="5Qx6_669ATd" role="3K4E3e">
<node concept="37vLTw" id="5Qx6_669ATe" role="2Oq$k0">
<ref role="3cqZAo" node="9dktABQBqH" resolve="typesIndex" />
</node>
<node concept="liA8E" id="5Qx6_669ATf" role="2OqNvi">
<ref role="37wK5l" to="tj24:syqlb1UmCh" resolve="isUsed" />
</node>
</node>
<node concept="3clFbT" id="5Qx6_669ATg" role="3K4GZi" />
<node concept="3y3z36" id="5Qx6_669ATh" role="3K4Cdx">
<node concept="37vLTw" id="5Qx6_669ATi" role="3uHU7B">
<ref role="3cqZAo" node="9dktABQBqH" resolve="typesIndex" />
</node>
<node concept="10Nm6u" id="5Qx6_669ATj" role="3uHU7w" />
</node>
</node>
</node>

1151
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

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

@ -19627,52 +19627,23 @@
<node concept="1QHqEK" id="6QkkSolKHzY" role="3cqZAp">
<node concept="1QHqEC" id="6QkkSolKHzZ" role="1QHqEI">
<node concept="3clFbS" id="6QkkSolKH$0" role="1bW5cS">
<node concept="3cpWs8" id="6QkkSolKH$1" role="3cqZAp">
<node concept="3cpWsn" id="6QkkSolKH$2" role="3cpWs9">
<property role="TrG5h" value="ref" />
<property role="3TUv4t" value="true" />
<node concept="3uibUv" id="6QkkSolKH$3" role="1tU5fm">
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
<node concept="3cpWs8" id="3Pxu0s8gDPC" role="3cqZAp">
<node concept="3cpWsn" id="3Pxu0s8gDPD" role="3cpWs9">
<property role="TrG5h" value="origin" />
<node concept="3uibUv" id="3Pxu0s8gOTy" role="1tU5fm">
<ref role="3uigEE" to="w1kc:~SNode" resolve="SNode" />
</node>
<node concept="2OqwBi" id="6QkkSolKH$5" role="33vP2m">
<node concept="37vLTw" id="6QkkSolKH$6" role="2Oq$k0">
<ref role="3cqZAo" node="6QkkSolKGTF" resolve="ruleEx" />
</node>
<node concept="liA8E" id="6tnA4678ZwI" role="2OqNvi">
<ref role="37wK5l" to="i348:6tnA4677QqC" resolve="originRef" />
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="6QkkSolKH$8" role="3cqZAp">
<node concept="3cpWsn" id="6QkkSolKH$9" role="3cpWs9">
<property role="TrG5h" value="snode" />
<node concept="3uibUv" id="6QkkSolKH$a" role="1tU5fm">
<ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
</node>
<node concept="3K4zz7" id="6i42QSs9SBB" role="33vP2m">
<node concept="10Nm6u" id="6i42QSs9Tqt" role="3K4GZi" />
<node concept="3y3z36" id="6i42QSs9RSr" role="3K4Cdx">
<node concept="10Nm6u" id="6i42QSs9S7U" role="3uHU7w" />
<node concept="37vLTw" id="6i42QSs9Rqf" role="3uHU7B">
<ref role="3cqZAo" node="6QkkSolKH$2" resolve="ref" />
<node concept="10QFUN" id="3Pxu0s8gQKY" role="33vP2m">
<node concept="2OqwBi" id="3Pxu0s8gDPE" role="10QFUP">
<node concept="37vLTw" id="3Pxu0s8gDPF" role="2Oq$k0">
<ref role="3cqZAo" node="6QkkSolKGTF" resolve="ruleEx" />
</node>
<node concept="liA8E" id="3Pxu0s8gDPG" role="2OqNvi">
<ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
</node>
</node>
<node concept="2OqwBi" id="6QkkSolKH$b" role="3K4E3e">
<node concept="37vLTw" id="6QkkSolKH$c" role="2Oq$k0">
<ref role="3cqZAo" node="6QkkSolKH$2" resolve="ref" />
</node>
<node concept="liA8E" id="6QkkSolKH$d" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
<node concept="2OqwBi" id="6QkkSolKH$e" role="37wK5m">
<node concept="37vLTw" id="6QkkSolKH$f" role="2Oq$k0">
<ref role="3cqZAo" node="6QkkSolKz4F" resolve="mpsProject" />
</node>
<node concept="liA8E" id="6QkkSolKH$g" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
<node concept="3uibUv" id="3Pxu0s8gQKZ" role="10QFUM">
<ref role="3uigEE" to="w1kc:~SNode" resolve="SNode" />
</node>
</node>
</node>
@ -19687,8 +19658,8 @@
</node>
<node concept="liA8E" id="428_4iYzSiW" role="2OqNvi">
<ref role="37wK5l" node="19fWAfxfBp1" resolve="extractPresentation" />
<node concept="37vLTw" id="4_RQpN_djSO" role="37wK5m">
<ref role="3cqZAo" node="6QkkSolKH$9" resolve="snode" />
<node concept="37vLTw" id="3Pxu0s8gKZR" role="37wK5m">
<ref role="3cqZAo" node="3Pxu0s8gDPD" resolve="origin" />
</node>
</node>
</node>
@ -19705,11 +19676,11 @@
</node>
<node concept="2EnYce" id="6QkkSolKH$o" role="37wK5m">
<node concept="2EnYce" id="6QkkSolKH$p" role="2Oq$k0">
<node concept="37vLTw" id="6QkkSolKH$q" role="2Oq$k0">
<ref role="3cqZAo" node="6QkkSolKH$9" resolve="snode" />
<node concept="37vLTw" id="3Pxu0s8gM$y" role="2Oq$k0">
<ref role="3cqZAo" node="3Pxu0s8gDPD" resolve="origin" />
</node>
<node concept="liA8E" id="6QkkSolKH$r" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getConcept()" resolve="getConcept" />
<ref role="37wK5l" to="w1kc:~SNode.getConcept()" resolve="getConcept" />
</node>
</node>
<node concept="liA8E" id="6QkkSolKH$s" role="2OqNvi">
@ -19731,37 +19702,52 @@
<node concept="3Tm1VV" id="6QkkSolKH$y" role="1B3o_S" />
<node concept="3cqZAl" id="6QkkSolKH$z" role="3clF45" />
<node concept="3clFbS" id="6QkkSolKH$$" role="3clF47">
<node concept="3clFbF" id="6QkkSolKH$_" role="3cqZAp">
<node concept="2OqwBi" id="6QkkSolKH$A" role="3clFbG">
<node concept="2OqwBi" id="6QkkSolKH$B" role="2Oq$k0">
<node concept="2OqwBi" id="6QkkSolKH$C" role="2Oq$k0">
<node concept="2ShNRf" id="6QkkSolKH$D" role="2Oq$k0">
<node concept="1pGfFk" id="6QkkSolKH$E" role="2ShVmc">
<ref role="37wK5l" to="kz9k:~EditorNavigator.&lt;init&gt;(jetbrains.mps.project.Project)" resolve="EditorNavigator" />
<node concept="37vLTw" id="6QkkSolKH$F" role="37wK5m">
<ref role="3cqZAo" node="6QkkSolKz4F" resolve="mpsProject" />
<node concept="3clFbJ" id="3Pxu0s8h9CJ" role="3cqZAp">
<node concept="3clFbS" id="3Pxu0s8h9CL" role="3clFbx">
<node concept="3clFbF" id="6QkkSolKH$_" role="3cqZAp">
<node concept="2OqwBi" id="6QkkSolKH$A" role="3clFbG">
<node concept="2OqwBi" id="6QkkSolKH$B" role="2Oq$k0">
<node concept="2OqwBi" id="6QkkSolKH$C" role="2Oq$k0">
<node concept="2ShNRf" id="6QkkSolKH$D" role="2Oq$k0">
<node concept="1pGfFk" id="6QkkSolKH$E" role="2ShVmc">
<ref role="37wK5l" to="kz9k:~EditorNavigator.&lt;init&gt;(jetbrains.mps.project.Project)" resolve="EditorNavigator" />
<node concept="37vLTw" id="6QkkSolKH$F" role="37wK5m">
<ref role="3cqZAo" node="6QkkSolKz4F" resolve="mpsProject" />
</node>
</node>
</node>
<node concept="liA8E" id="6QkkSolKH$G" role="2OqNvi">
<ref role="37wK5l" to="kz9k:~EditorNavigator.shallFocus(boolean)" resolve="shallFocus" />
<node concept="3clFbT" id="6QkkSolKH$H" role="37wK5m">
<property role="3clFbU" value="false" />
</node>
</node>
</node>
<node concept="liA8E" id="6QkkSolKH$I" role="2OqNvi">
<ref role="37wK5l" to="kz9k:~EditorNavigator.shallSelect(boolean)" resolve="shallSelect" />
<node concept="3clFbT" id="6QkkSolKH$J" role="37wK5m">
<property role="3clFbU" value="true" />
</node>
</node>
</node>
<node concept="liA8E" id="6QkkSolKH$G" role="2OqNvi">
<ref role="37wK5l" to="kz9k:~EditorNavigator.shallFocus(boolean)" resolve="shallFocus" />
<node concept="3clFbT" id="6QkkSolKH$H" role="37wK5m">
<property role="3clFbU" value="false" />
<node concept="liA8E" id="6QkkSolKH$K" role="2OqNvi">
<ref role="37wK5l" to="kz9k:~EditorNavigator.open(org.jetbrains.mps.openapi.model.SNodeReference)" resolve="open" />
<node concept="2OqwBi" id="3Pxu0s8hi6U" role="37wK5m">
<node concept="37vLTw" id="3Pxu0s8gS6P" role="2Oq$k0">
<ref role="3cqZAo" node="3Pxu0s8gDPD" resolve="origin" />
</node>
<node concept="liA8E" id="3Pxu0s8h6ij" role="2OqNvi">
<ref role="37wK5l" to="w1kc:~SNode.getReference()" resolve="getReference" />
</node>
</node>
</node>
</node>
<node concept="liA8E" id="6QkkSolKH$I" role="2OqNvi">
<ref role="37wK5l" to="kz9k:~EditorNavigator.shallSelect(boolean)" resolve="shallSelect" />
<node concept="3clFbT" id="6QkkSolKH$J" role="37wK5m">
<property role="3clFbU" value="true" />
</node>
</node>
</node>
<node concept="liA8E" id="6QkkSolKH$K" role="2OqNvi">
<ref role="37wK5l" to="kz9k:~EditorNavigator.open(org.jetbrains.mps.openapi.model.SNodeReference)" resolve="open" />
<node concept="37vLTw" id="6QkkSolKH$L" role="37wK5m">
<ref role="3cqZAo" node="6QkkSolKH$2" resolve="ref" />
</node>
</node>
<node concept="3y3z36" id="3Pxu0s8hd$s" role="3clFbw">
<node concept="10Nm6u" id="3Pxu0s8heWG" role="3uHU7w" />
<node concept="37vLTw" id="3Pxu0s8hbJS" role="3uHU7B">
<ref role="3cqZAo" node="3Pxu0s8gDPD" resolve="origin" />
</node>
</node>
</node>
@ -21973,8 +21959,8 @@
<node concept="37vLTw" id="6bBjpI8anRH" role="2Oq$k0">
<ref role="3cqZAo" node="6RFuZEC715N" resolve="ruleEx" />
</node>
<node concept="liA8E" id="6tnA4678XaQ" role="2OqNvi">
<ref role="37wK5l" to="i348:6tnA4677QqC" resolve="originRef" />
<node concept="liA8E" id="3Pxu0s8g7uE" role="2OqNvi">
<ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
</node>
</node>
</node>

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

@ -1798,7 +1798,7 @@
</node>
</node>
<node concept="Wx3nA" id="2yEnwsh8n5F" role="jymVt">
<property role="TrG5h" value="INVALID_FEEDBACK" />
<property role="TrG5h" value="INVALIDATED_FEEDBACK_KEYS" />
<node concept="3Tm1VV" id="2yEnwsh8n5G" role="1B3o_S" />
<node concept="2YIFZM" id="2yEnwsh8n5H" role="33vP2m">
<ref role="1Pybhc" node="2daneBOWXQd" resolve="Effect" />
@ -1815,7 +1815,7 @@
</node>
</node>
<node concept="Wx3nA" id="2EG5v$dFgce" role="jymVt">
<property role="TrG5h" value="INVALIDATED_NODES" />
<property role="TrG5h" value="INVALIDATED_ORIGINS" />
<node concept="3Tm1VV" id="2EG5v$dFgcf" role="1B3o_S" />
<node concept="2YIFZM" id="2EG5v$dFgcg" role="33vP2m">
<ref role="37wK5l" node="6BMBBPD1Gnj" resolve="valueKey" />
@ -2501,12 +2501,12 @@
</node>
<node concept="3cpWs8" id="2EG5v$dFmTU" role="3cqZAp">
<node concept="3cpWsn" id="2EG5v$dFmTX" role="3cpWs9">
<property role="TrG5h" value="invalidated" />
<property role="TrG5h" value="invalidatedOrigins" />
<node concept="3vKaQO" id="2EG5v$dFmTR" role="1tU5fm">
<node concept="2sp9CU" id="1RYTbd8hrEg" role="3O5elw" />
<node concept="3Tqbb2" id="3Pxu0s8k8tA" role="3O5elw" />
</node>
<node concept="1rXfSq" id="2EG5v$dG07H" role="33vP2m">
<ref role="37wK5l" node="2EG5v$dDKbh" resolve="getInvalidated" />
<ref role="37wK5l" node="2EG5v$dDKbh" resolve="collectInvalidatedOrigins" />
<node concept="2OqwBi" id="6KCGZaSxuGM" role="37wK5m">
<node concept="37vLTw" id="6KCGZaSxtQH" role="2Oq$k0">
<ref role="3cqZAo" node="4J__M6Mw24" resolve="evaluationResult" />
@ -2551,7 +2551,7 @@
</node>
<node concept="2OqwBi" id="q1hCixUYFz" role="37wK5m">
<node concept="37vLTw" id="51ek2rQHN6Z" role="2Oq$k0">
<ref role="3cqZAo" node="2yEnwsh8n5F" resolve="INVALID_FEEDBACK" />
<ref role="3cqZAo" node="2yEnwsh8n5F" resolve="INVALIDATED_FEEDBACK_KEYS" />
</node>
<node concept="liA8E" id="q1hCixUYF_" role="2OqNvi">
<ref role="37wK5l" node="6BMBBPCRIcz" resolve="is" />
@ -2562,12 +2562,12 @@
</node>
<node concept="2OqwBi" id="2EG5v$dFjOp" role="37wK5m">
<node concept="37vLTw" id="2EG5v$dFior" role="2Oq$k0">
<ref role="3cqZAo" node="2EG5v$dFgce" resolve="INVALIDATED_NODES" />
<ref role="3cqZAo" node="2EG5v$dFgce" resolve="INVALIDATED_ORIGINS" />
</node>
<node concept="liA8E" id="2EG5v$dFkOS" role="2OqNvi">
<ref role="37wK5l" node="6BMBBPCRIcz" resolve="is" />
<node concept="37vLTw" id="2EG5v$dGPCg" role="37wK5m">
<ref role="3cqZAo" node="2EG5v$dFmTX" resolve="invalidated" />
<ref role="3cqZAo" node="2EG5v$dFmTX" resolve="invalidatedOrigins" />
</node>
</node>
</node>
@ -2679,18 +2679,18 @@
</node>
<node concept="2tJIrI" id="2EG5v$dDC27" role="jymVt" />
<node concept="3clFb_" id="2EG5v$dDKbh" role="jymVt">
<property role="TrG5h" value="getInvalidated" />
<property role="TrG5h" value="collectInvalidatedOrigins" />
<node concept="3clFbS" id="2EG5v$dDKbk" role="3clF47">
<node concept="3cpWs8" id="2EG5v$dFx$H" role="3cqZAp">
<node concept="3cpWsn" id="2EG5v$dFx$K" role="3cpWs9">
<property role="TrG5h" value="invalidOrigins" />
<node concept="2ShNRf" id="2EG5v$dF$cN" role="33vP2m">
<node concept="2i4dXS" id="2EG5v$dFBP6" role="2ShVmc">
<node concept="2sp9CU" id="2EG5v$dFCiK" role="HW$YZ" />
<node concept="3Tqbb2" id="3Pxu0s8k6b7" role="HW$YZ" />
</node>
</node>
<node concept="2hMVRd" id="2EG5v$dFB68" role="1tU5fm">
<node concept="2sp9CU" id="2EG5v$dFBiS" role="2hN53Y" />
<node concept="3Tqbb2" id="3Pxu0s8k4Xz" role="2hN53Y" />
</node>
</node>
</node>
@ -2735,8 +2735,8 @@
<node concept="37vLTw" id="2EG5v$dFI3s" role="2Oq$k0">
<ref role="3cqZAo" node="2EG5v$dFHhH" resolve="ruleEx" />
</node>
<node concept="liA8E" id="2EG5v$dFIUp" role="2OqNvi">
<ref role="37wK5l" to="i348:6tnA4677QqC" resolve="originRef" />
<node concept="liA8E" id="3Pxu0s8k3w3" role="2OqNvi">
<ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
</node>
</node>
</node>
@ -2799,7 +2799,7 @@
</node>
</node>
<node concept="3vKaQO" id="2EG5v$dFtoQ" role="3clF45">
<node concept="2sp9CU" id="1RYTbd8hoku" role="3O5elw" />
<node concept="3Tqbb2" id="3Pxu0s8k16z" role="3O5elw" />
</node>
<node concept="P$JXv" id="2EG5v$dFT$I" role="lGtFl">
<node concept="TZ5HA" id="2EG5v$dFT$J" role="TZ5H$">

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

@ -975,59 +975,13 @@
<ref role="3uigEE" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
</node>
<node concept="2ShNRf" id="61G6TdBDyzM" role="33vP2m">
<node concept="YeOm9" id="61G6TdBDyzN" role="2ShVmc">
<node concept="1Y3b0j" id="61G6TdBDyzO" role="YeSDq">
<property role="2bfB8j" value="true" />
<ref role="1Y3XeK" to="ksgm:7DvO2M9IiKB" resolve="MacroProcessing" />
<ref role="37wK5l" to="ksgm:7DvO2Ma0h_M" resolve="MacroProcessing" />
<node concept="3Tm1VV" id="61G6TdBDyzP" role="1B3o_S" />
<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="6nFpYlun4Ef" resolve="session" />
</node>
<node concept="3clFb_" id="61G6TdBDyzU" role="jymVt">
<property role="TrG5h" value="provideFeedback" />
<node concept="37vLTG" id="61G6TdBDyzV" role="3clF46">
<property role="TrG5h" value="feedback" />
<node concept="3uibUv" id="61G6TdBE_pW" role="1tU5fm">
<ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
</node>
</node>
<node concept="3cqZAl" id="61G6TdBDyzX" role="3clF45" />
<node concept="3Tm1VV" id="61G6TdBDyzY" role="1B3o_S" />
<node concept="3clFbS" id="61G6TdBDyzZ" role="3clF47">
<node concept="3SKdUt" id="61G6TdBDy$0" role="3cqZAp">
<node concept="1PaTwC" id="61G6TdBDy$1" role="1aUNEU">
<node concept="3oM_SD" id="61G6TdBDy$2" role="1PaTwD">
<property role="3oM_SC" value="FIXME" />
</node>
<node concept="3oM_SD" id="61G6TdBDy$3" role="1PaTwD">
<property role="3oM_SC" value="provide" />
</node>
<node concept="3oM_SD" id="61G6TdBDy$4" role="1PaTwD">
<property role="3oM_SC" value="appropriate" />
</node>
<node concept="3oM_SD" id="61G6TdBDy$5" role="1PaTwD">
<property role="3oM_SC" value="reporting" />
</node>
<node concept="3oM_SD" id="61G6TdBDy$6" role="1PaTwD">
<property role="3oM_SC" value="for" />
</node>
<node concept="3oM_SD" id="61G6TdBDy$7" role="1PaTwD">
<property role="3oM_SC" value="typechecking" />
</node>
<node concept="3oM_SD" id="61G6TdBDy$8" role="1PaTwD">
<property role="3oM_SC" value="errors" />
</node>
</node>
</node>
</node>
<node concept="2AHcQZ" id="61G6TdBDy$9" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="1pGfFk" id="3Pxu0s87IsV" role="2ShVmc">
<ref role="37wK5l" to="ksgm:7DvO2Ma0h_M" resolve="MacroProcessing" />
<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="6nFpYlun4Ef" resolve="session" />
</node>
</node>
</node>

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

@ -2517,7 +2517,6 @@
<node concept="2tJIrI" id="5itBwM7VoD8" role="jymVt" />
<node concept="3clFb_" id="61G6TdBpSf1" role="jymVt">
<property role="TrG5h" value="provideFeedback" />
<property role="1EzhhJ" value="true" />
<node concept="37vLTG" id="61G6TdBsK75" role="3clF46">
<property role="TrG5h" value="feedback" />
<node concept="3uibUv" id="61G6TdBsKW2" role="1tU5fm">
@ -2526,7 +2525,55 @@
</node>
<node concept="3cqZAl" id="61G6TdBpSf3" role="3clF45" />
<node concept="3Tm1VV" id="61G6TdBpSf4" role="1B3o_S" />
<node concept="3clFbS" id="61G6TdBpSf5" role="3clF47" />
<node concept="3clFbS" id="61G6TdBpSf5" role="3clF47">
<node concept="3SKdUt" id="3Pxu0s87mWG" role="3cqZAp">
<node concept="1PaTwC" id="3Pxu0s87mWH" role="1aUNEU">
<node concept="3oM_SD" id="3Pxu0s87nYU" role="1PaTwD">
<property role="3oM_SC" value="NOP" />
</node>
<node concept="3oM_SD" id="3Pxu0s87nYW" role="1PaTwD">
<property role="3oM_SC" value="by" />
</node>
<node concept="3oM_SD" id="3Pxu0s87nYZ" role="1PaTwD">
<property role="3oM_SC" value="default" />
</node>
</node>
</node>
</node>
<node concept="2AHcQZ" id="3Pxu0s8xlUQ" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
</node>
</node>
<node concept="2tJIrI" id="3Pxu0s8wRwl" role="jymVt" />
<node concept="3clFb_" id="3Pxu0s8x4Kl" role="jymVt">
<property role="TrG5h" value="reportFeedback" />
<node concept="37vLTG" id="3Pxu0s8xh3t" role="3clF46">
<property role="TrG5h" value="origin" />
<node concept="3Tqbb2" id="3Pxu0s8xid0" role="1tU5fm" />
</node>
<node concept="37vLTG" id="3Pxu0s8xi$y" role="3clF46">
<property role="TrG5h" value="feedback" />
<node concept="3uibUv" id="3Pxu0s8xk3l" role="1tU5fm">
<ref role="3uigEE" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
</node>
</node>
<node concept="3cqZAl" id="3Pxu0s8x4Kn" role="3clF45" />
<node concept="3Tm1VV" id="3Pxu0s8x4Ko" role="1B3o_S" />
<node concept="3clFbS" id="3Pxu0s8x4Kp" role="3clF47">
<node concept="3SKdUt" id="3Pxu0s8xkGe" role="3cqZAp">
<node concept="1PaTwC" id="3Pxu0s8xkGf" role="1aUNEU">
<node concept="3oM_SD" id="3Pxu0s8xlUC" role="1PaTwD">
<property role="3oM_SC" value="NOP" />
</node>
<node concept="3oM_SD" id="3Pxu0s8xlUE" role="1PaTwD">
<property role="3oM_SC" value="by" />
</node>
<node concept="3oM_SD" id="3Pxu0s8xlUH" role="1PaTwD">
<property role="3oM_SC" value="default" />
</node>
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="61G6TdBpQuz" role="jymVt" />
<node concept="3clFb_" id="7DvO2M9IiMh" role="jymVt">
@ -3119,18 +3166,16 @@
<property role="1sVAO0" value="true" />
<property role="3GE5qa" value="rule" />
<node concept="2tJIrI" id="7nPD14OaO2C" role="jymVt" />
<node concept="3clFb_" id="6tnA4677QqC" role="jymVt">
<node concept="3clFb_" id="3Pxu0s8egWa" role="jymVt">
<property role="TrG5h" value="origin" />
<property role="1EzhhJ" value="true" />
<property role="TrG5h" value="originRef" />
<node concept="3uibUv" id="6tnA4677Qtx" role="3clF45">
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
</node>
<node concept="3Tm1VV" id="6tnA4677QqF" role="1B3o_S" />
<node concept="3clFbS" id="6tnA4677QqG" role="3clF47" />
<node concept="P$JXv" id="6tnA4677Qt4" role="lGtFl">
<node concept="TZ5HA" id="6tnA4677Qt5" role="TZ5H$">
<node concept="1dT_AC" id="6tnA4677Qt6" role="1dT_Ay">
<property role="1dT_AB" value="A reference to the node that was used as the origin to generate this rule. " />
<node concept="3Tqbb2" id="3Pxu0s8egXz" role="3clF45" />
<node concept="3Tm1VV" id="3Pxu0s8egWd" role="1B3o_S" />
<node concept="3clFbS" id="3Pxu0s8egWe" role="3clF47" />
<node concept="P$JXv" id="3Pxu0s8eh8J" role="lGtFl">
<node concept="TZ5HA" id="3Pxu0s8eh8K" role="TZ5H$">
<node concept="1dT_AC" id="3Pxu0s8eh8L" role="1dT_Ay">
<property role="1dT_AB" value="Node that used to trigger this rule, null for constant rules. " />
</node>
</node>
</node>
@ -5844,12 +5889,8 @@
<node concept="37vLTw" id="cmlg9NUDfU" role="37wK5m">
<ref role="3cqZAo" node="7nPD14Ob4vA" resolve="templateRef" />
</node>
<node concept="2YIFZM" id="6tnA4678cYq" role="37wK5m">
<ref role="37wK5l" to="i8bi:4o40NPkYQhu" resolve="getPointer" />
<ref role="1Pybhc" to="i8bi:5IkW5anFcyt" resolve="SNodeOperations" />
<node concept="37vLTw" id="6tnA4678d3H" role="37wK5m">
<ref role="3cqZAo" node="7nPD14Ob4B1" resolve="origin" />
</node>
<node concept="37vLTw" id="3Pxu0s8eBd$" role="37wK5m">
<ref role="3cqZAo" node="7nPD14Ob4B1" resolve="origin" />
</node>
<node concept="37vLTw" id="aZPZmIbQSG" role="37wK5m">
<ref role="3cqZAo" node="aZPZmI9FOv" resolve="targetRef" />
@ -6881,16 +6922,16 @@
</node>
</node>
</node>
<node concept="3clFbF" id="6tnA46781Cl" role="3cqZAp">
<node concept="37vLTI" id="6tnA46781Cn" role="3clFbG">
<node concept="2OqwBi" id="6tnA46784tw" role="37vLTJ">
<node concept="Xjq3P" id="6tnA46784K2" role="2Oq$k0" />
<node concept="2OwXpG" id="6tnA46784tz" role="2OqNvi">
<ref role="2Oxat5" node="6tnA46781Ch" resolve="originRef" />
<node concept="3clFbF" id="3Pxu0s8enNa" role="3cqZAp">
<node concept="37vLTI" id="3Pxu0s8enNb" role="3clFbG">
<node concept="2OqwBi" id="3Pxu0s8enNc" role="37vLTJ">
<node concept="Xjq3P" id="3Pxu0s8enNd" role="2Oq$k0" />
<node concept="2OwXpG" id="3Pxu0s8etYZ" role="2OqNvi">
<ref role="2Oxat5" node="3Pxu0s8eoj5" resolve="origin" />
</node>
</node>
<node concept="37vLTw" id="6tnA46781Cr" role="37vLTx">
<ref role="3cqZAo" node="6tnA4677Yt1" resolve="originRef" />
<node concept="37vLTw" id="3Pxu0s8enNf" role="37vLTx">
<ref role="3cqZAo" node="6tnA4677Yt1" resolve="origin" />
</node>
</node>
</node>
@ -7016,10 +7057,8 @@
</node>
</node>
<node concept="37vLTG" id="6tnA4677Yt1" role="3clF46">
<property role="TrG5h" value="originRef" />
<node concept="3uibUv" id="6tnA4677YY9" role="1tU5fm">
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
</node>
<property role="TrG5h" value="origin" />
<node concept="3Tqbb2" id="3Pxu0s8el7V" role="1tU5fm" />
</node>
<node concept="37vLTG" id="cmlg9NUuZW" role="3clF46">
<property role="TrG5h" value="targetRef" />
@ -7093,21 +7132,19 @@
</node>
</node>
</node>
<node concept="2tJIrI" id="51V709l4dps" role="jymVt" />
<node concept="3clFb_" id="6tnA4677TsO" role="jymVt">
<property role="TrG5h" value="originRef" />
<node concept="3uibUv" id="6tnA4677TsP" role="3clF45">
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
</node>
<node concept="3Tm1VV" id="6tnA4677TsQ" role="1B3o_S" />
<node concept="3clFbS" id="6tnA4677TsV" role="3clF47">
<node concept="3clFbF" id="6tnA46788y5" role="3cqZAp">
<node concept="37vLTw" id="6tnA46788y4" role="3clFbG">
<ref role="3cqZAo" node="6tnA46781Ch" resolve="originRef" />
<node concept="2tJIrI" id="3Pxu0s8eH3K" role="jymVt" />
<node concept="3clFb_" id="3Pxu0s8eKz4" role="jymVt">
<property role="TrG5h" value="origin" />
<node concept="3Tqbb2" id="3Pxu0s8eKz5" role="3clF45" />
<node concept="3Tm1VV" id="3Pxu0s8eKz6" role="1B3o_S" />
<node concept="3clFbS" id="3Pxu0s8eKzb" role="3clF47">
<node concept="3clFbF" id="3Pxu0s8eUS$" role="3cqZAp">
<node concept="37vLTw" id="3Pxu0s8eUSz" role="3clFbG">
<ref role="3cqZAo" node="3Pxu0s8eoj5" resolve="origin" />
</node>
</node>
</node>
<node concept="2AHcQZ" id="6tnA4677TsW" role="2AJF6D">
<node concept="2AHcQZ" id="3Pxu0s8eKzc" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
@ -7440,12 +7477,10 @@
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
</node>
</node>
<node concept="312cEg" id="6tnA46781Ch" role="jymVt">
<property role="TrG5h" value="originRef" />
<node concept="3Tm6S6" id="6tnA46781Ci" role="1B3o_S" />
<node concept="3uibUv" id="6tnA46781Ck" role="1tU5fm">
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
</node>
<node concept="312cEg" id="3Pxu0s8eoj5" role="jymVt">
<property role="TrG5h" value="origin" />
<node concept="3Tm6S6" id="3Pxu0s8eoj6" role="1B3o_S" />
<node concept="3Tqbb2" id="3Pxu0s8eqYL" role="1tU5fm" />
</node>
<node concept="312cEg" id="cmlg9NR7Hz" role="jymVt">
<property role="TrG5h" value="targetRef" />

32
samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.incremental@tests.mps
View File

@ -157,6 +157,7 @@
<child id="1068580123135" name="body" index="3clF47" />
</concept>
<concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_" />
<concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
<concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
<child id="1068580123156" name="expression" index="3clFbG" />
</concept>
@ -311,9 +312,6 @@
<child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
<child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
</concept>
<concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
<child id="1145404616321" name="leftExpression" index="2JrQYb" />
</concept>
<concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
<reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
</concept>
@ -808,14 +806,17 @@
<ref role="3cqZAo" node="3FGJ5nvn8o2" resolve="it" />
</node>
</node>
<node concept="liA8E" id="6tnA46794bu" role="2OqNvi">
<ref role="37wK5l" to="i348:6tnA4677QqC" resolve="originRef" />
<node concept="liA8E" id="3Pxu0s8fl0p" role="2OqNvi">
<ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
</node>
</node>
</node>
</node>
<node concept="2OqwBi" id="3FGJ5nvnADg" role="3uHU7w">
<node concept="2OqwBi" id="3FGJ5nvnBh9" role="2Oq$k0">
<node concept="3clFbC" id="3Pxu0s8fths" role="3uHU7w">
<node concept="37vLTw" id="3Pxu0s8ftWw" role="3uHU7w">
<ref role="3cqZAo" node="3FGJ5nvmG0V" resolve="testNode" />
</node>
<node concept="2OqwBi" id="3FGJ5nvnBh9" role="3uHU7B">
<node concept="0kSF2" id="3FGJ5nvnAcC" role="2Oq$k0">
<node concept="3uibUv" id="3FGJ5nvnAtZ" role="0kSFW">
<ref role="3uigEE" to="i348:7nPD14OaO1O" resolve="RuleEx" />
@ -824,21 +825,8 @@
<ref role="3cqZAo" node="3FGJ5nvn8o2" resolve="it" />
</node>
</node>
<node concept="liA8E" id="6tnA46794Iy" role="2OqNvi">
<ref role="37wK5l" to="i348:6tnA4677QqC" resolve="originRef" />
</node>
</node>
<node concept="liA8E" id="3FGJ5nvn8o0" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
<node concept="2OqwBi" id="3FGJ5nvn9US" role="37wK5m">
<node concept="liA8E" id="3FGJ5nvnamB" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
</node>
<node concept="2JrnkZ" id="3FGJ5nvn9UX" role="2Oq$k0">
<node concept="37vLTw" id="3FGJ5nvn8o1" role="2JrQYb">
<ref role="3cqZAo" node="3FGJ5nvmG0V" resolve="testNode" />
</node>
</node>
<node concept="liA8E" id="3Pxu0s8foMV" role="2OqNvi">
<ref role="37wK5l" to="i348:3Pxu0s8egWa" resolve="origin" />
</node>
</node>
</node>