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

Fix RuleBuilder not processing macro's input concept. 

A query may be invoked without the input node, thus dispatching
macros by the specified concept. The concept must be taken into
account when calculating the "diff", so that the old (stale)
rules don't override the updated ones.
This commit is contained in:
Fedor Isakov 2020-11-29 00:20:15 +01:00
parent 60f59a7a80
commit c6152abdc2
2 changed files with 47 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14530,14 +14530,38 @@
</node>
</node>
<node concept="3clFbH" id="7WFMSEvhd5r" role="3cqZAp" />
<node concept="3clFbF" id="6VRLMeOezub" role="3cqZAp">
<node concept="2OqwBi" id="6VRLMeOezKr" role="3clFbG">
<node concept="37vLTw" id="6VRLMeOezu9" role="2Oq$k0">
<node concept="3clFbF" id="5NUR$Nyqhj" role="3cqZAp">
<node concept="2OqwBi" id="5NUR$Nyqhk" role="3clFbG">
<node concept="37vLTw" id="5NUR$Nyqhl" role="2Oq$k0">
<ref role="3cqZAo" node="5itBwM6VIn8" resolve="builder" />
</node>
<node concept="liA8E" id="6VRLMeOfp9t" role="2OqNvi">
<node concept="liA8E" id="5NUR$Nyqhm" role="2OqNvi">
<ref role="37wK5l" to="i348:6VRLMeOeOlh" resolve="processMacroInput" />
<node concept="37vLTw" id="6VRLMeOfpcV" role="37wK5m">
<node concept="35c_gC" id="5NUR$NyqRu" role="37wK5m">
<ref role="35c_gD" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="1ZhdrF" id="5NUR$NyqXa" role="lGtFl">
<property role="2qtEX8" value="conceptDeclaration" />
<property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/2644386474300074836/2644386474300074837" />
<node concept="3$xsQk" id="5NUR$NyqXb" role="3$ytzL">
<node concept="3clFbS" id="5NUR$NyqXc" role="2VODD2">
<node concept="3clFbF" id="5NUR$Nyr0I" role="3cqZAp">
<node concept="2OqwBi" id="5NUR$Nysst" role="3clFbG">
<node concept="2OqwBi" id="5NUR$NyrgS" role="2Oq$k0">
<node concept="30H73N" id="5NUR$Nyrw8" role="2Oq$k0" />
<node concept="3TrEf2" id="5NUR$Nysb6" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:5itBwM67n1U" resolve="inputSpec" />
</node>
</node>
<node concept="3TrEf2" id="5NUR$NysA8" role="2OqNvi">
<ref role="3Tt5mk" to="wq2x:5itBwM66ULm" resolve="applicableConcept" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="37vLTw" id="5NUR$Nyqhn" role="37wK5m">
<ref role="3cqZAo" node="5itBwM6XBIn" resolve="input" />
</node>
</node>

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

@ -3608,6 +3608,10 @@
<node concept="2tJIrI" id="6VRLMeOe$0O" role="jymVt" />
<node concept="3clFb_" id="6VRLMeOeOlh" role="jymVt">
<property role="TrG5h" value="processMacroInput" />
<node concept="37vLTG" id="5NUR$Ny6Eo" role="3clF46">
<property role="TrG5h" value="concept" />
<node concept="3bZ5Sz" id="5NUR$NynFl" role="1tU5fm" />
</node>
<node concept="37vLTG" id="6VRLMeOf0mw" role="3clF46">
<property role="TrG5h" value="input" />
<node concept="3Tqbb2" id="6VRLMeOfpk0" role="1tU5fm" />
@ -3626,6 +3630,19 @@
</node>
</node>
</node>
<node concept="3clFbF" id="5NUR$Ny6Er" role="3cqZAp">
<node concept="2OqwBi" id="5NUR$Ny6Es" role="3clFbG">
<node concept="37vLTw" id="5NUR$Ny6Et" role="2Oq$k0">
<ref role="3cqZAo" node="16lXiqgJQmy" resolve="usedData" />
</node>
<node concept="liA8E" id="5NUR$Ny6Eu" role="2OqNvi">
<ref role="37wK5l" node="4VNF0fT39lC" resolve="doProcessUsedData" />
<node concept="37vLTw" id="5NUR$Ny6Ev" role="37wK5m">
<ref role="3cqZAo" node="5NUR$Ny6Eo" resolve="concept" />
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="6VRLMeOftjP" role="3cqZAp">
<node concept="Xjq3P" id="6VRLMeOftjN" role="3clFbG" />
</node>
@ -3635,7 +3652,7 @@
<ref role="3uigEE" node="7eGEHDlc$ap" resolve="RuleBuilder" />
</node>
</node>
<node concept="2tJIrI" id="77AxcO4ZrEu" role="jymVt" />
<node concept="2tJIrI" id="5NUR$Ny6Em" role="jymVt" />
<node concept="3clFb_" id="7nkyKX7mcq7" role="jymVt">
<property role="TrG5h" value="hasHead" />
<node concept="10P_77" id="7nkyKX7mds5" role="3clF45" />