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

Refactor AspectLookup to depend on repository, cache results

This commit is contained in:
Fedor Isakov 2021-05-14 19:14:29 +02:00
parent 0cea4073cc
commit 1bb8763816
13 changed files with 1094 additions and 304 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.xml
View File

@ -628,6 +628,7 @@
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
<module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
<module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
<module ref="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" kind="cl" />
<module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
<module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="cl" />
<module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
@ -1818,6 +1819,7 @@
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" kind="rt" />
<module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="rt" />
<module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
<module ref="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" kind="cl" />
<module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
<module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="cl" />
<module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />

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

@ -2655,6 +2655,11 @@
<ref role="3bR37D" node="5wYq9r5EBDN" resolve="jetbrains.mps.coderules.runtime" />
</node>
</node>
<node concept="1SiIV0" id="IFW4V2Rmqp" role="3bR37C">
<node concept="3bR9La" id="IFW4V2Rmqq" role="1SiIV1">
<ref role="3bR37D" to="ffeo:44LXwdzyvTi" resolve="Annotations" />
</node>
</node>
</node>
<node concept="1E1JtA" id="7BVjoXzUxee" role="2G$12L">
<property role="BnDLt" value="true" />

19
coderules/solutions/jetbrains.mps.coderules.test/models/jetbrains.mps.coderules.aspect@tests.mps
View File

@ -2228,6 +2228,25 @@
<node concept="312cEu" id="6nx4rRkXZkf">
<property role="TrG5h" value="MockAspectDiscoverable" />
<node concept="2tJIrI" id="6nx4rRkXZmo" role="jymVt" />
<node concept="3clFb_" id="IFW4V2y54C" role="jymVt">
<property role="TrG5h" value="aspectClass" />
<node concept="3uibUv" id="IFW4V2y54D" role="3clF45">
<ref role="3uigEE" to="wyt6:~Class" resolve="Class" />
<node concept="3uibUv" id="IFW4V2y54H" role="11_B2D">
<ref role="3uigEE" node="6nx4rRkXZmQ" resolve="MockLanguageAspect" />
</node>
</node>
<node concept="3Tm1VV" id="IFW4V2y54F" role="1B3o_S" />
<node concept="3clFbS" id="IFW4V2y54I" role="3clF47">
<node concept="3clFbF" id="IFW4V2y54L" role="3cqZAp">
<node concept="10Nm6u" id="IFW4V2y54K" role="3clFbG" />
</node>
</node>
<node concept="2AHcQZ" id="IFW4V2y54J" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="IFW4V2y4M_" role="jymVt" />
<node concept="3clFb_" id="6nx4rRkXZ$Y" role="jymVt">
<property role="TrG5h" value="discover" />
<node concept="37vLTG" id="6nx4rRkXZ$Z" role="3clF46">

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

@ -1268,6 +1268,9 @@
<node concept="2YIFZM" id="5SC$dmozDc5" role="2Oq$k0">
<ref role="37wK5l" to="u46i:78H58oeCAQS" resolve="aspectLookup" />
<ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
<node concept="37vLTw" id="IFW4V2stHa" role="37wK5m">
<ref role="3cqZAo" node="WJTIIoJUru" resolve="repo" />
</node>
</node>
<node concept="liA8E" id="5SC$dmozDc6" role="2OqNvi">
<ref role="37wK5l" to="fqlx:7mB3viLmii2" resolve="allForNodes" />
@ -1279,9 +1282,6 @@
</node>
</node>
</node>
<node concept="37vLTw" id="5SC$dmozDcb" role="37wK5m">
<ref role="3cqZAo" node="WJTIIoJUru" resolve="repo" />
</node>
</node>
</node>
</node>
@ -1398,14 +1398,19 @@
<node concept="37vLTw" id="5SC$dmozUZb" role="37vLTJ">
<ref role="3cqZAo" node="5SC$dmouktP" resolve="acs" />
</node>
<node concept="2YIFZM" id="3KN3A4v4YzG" role="37vLTx">
<ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
<ref role="37wK5l" to="u46i:7P_FdVPW9uU" resolve="allForModel" />
<node concept="37vLTw" id="3KN3A4v4YzH" role="37wK5m">
<ref role="3cqZAo" node="WJTIIoJU9x" resolve="model" />
<node concept="2OqwBi" id="IFW4V2EfI2" role="37vLTx">
<node concept="2YIFZM" id="IFW4V2E4Al" role="2Oq$k0">
<ref role="37wK5l" to="u46i:78H58oeCAQS" resolve="aspectLookup" />
<ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
<node concept="37vLTw" id="IFW4V2E4An" role="37wK5m">
<ref role="3cqZAo" node="WJTIIoJUru" resolve="repo" />
</node>
</node>
<node concept="37vLTw" id="3KN3A4v4YzI" role="37wK5m">
<ref role="3cqZAo" node="WJTIIoJUru" resolve="repo" />
<node concept="liA8E" id="IFW4V2EiLE" role="2OqNvi">
<ref role="37wK5l" to="fqlx:NKt6ynoYr0" resolve="allForModel" />
<node concept="37vLTw" id="IFW4V2Ek49" role="37wK5m">
<ref role="3cqZAo" node="WJTIIoJU9x" resolve="model" />
</node>
</node>
</node>
</node>

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

@ -3083,17 +3083,22 @@
</node>
</node>
</node>
<node concept="2YIFZM" id="3KN3A4v4Q8U" role="33vP2m">
<ref role="37wK5l" to="u46i:7P_FdVPW9uU" resolve="allForModel" />
<ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
<node concept="2OqwBi" id="3KN3A4v4Q8V" role="37wK5m">
<node concept="37vLTw" id="3KN3A4v4Q8W" role="2Oq$k0">
<ref role="3cqZAo" node="7mB3viLf32I" resolve="demo" />
<node concept="2OqwBi" id="IFW4V2EoXu" role="33vP2m">
<node concept="2YIFZM" id="IFW4V2Eovi" role="2Oq$k0">
<ref role="37wK5l" to="u46i:78H58oeCAQS" resolve="aspectLookup" />
<ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
<node concept="37vLTw" id="IFW4V2Eovj" role="37wK5m">
<ref role="3cqZAo" node="6OXbTD_oHcp" resolve="repo" />
</node>
<node concept="I4A8Y" id="3KN3A4v4Q8X" role="2OqNvi" />
</node>
<node concept="37vLTw" id="3KN3A4v4Q8Y" role="37wK5m">
<ref role="3cqZAo" node="6OXbTD_oHcp" resolve="repo" />
<node concept="liA8E" id="IFW4V2EpHM" role="2OqNvi">
<ref role="37wK5l" to="fqlx:NKt6ynoYr0" resolve="allForModel" />
<node concept="2OqwBi" id="3KN3A4v4Q8V" role="37wK5m">
<node concept="37vLTw" id="3KN3A4v4Q8W" role="2Oq$k0">
<ref role="3cqZAo" node="7mB3viLf32I" resolve="demo" />
</node>
<node concept="I4A8Y" id="3KN3A4v4Q8X" role="2OqNvi" />
</node>
</node>
</node>
</node>

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

@ -1104,24 +1104,29 @@
</node>
</node>
</node>
<node concept="2YIFZM" id="3KN3A4v4yZV" role="33vP2m">
<ref role="37wK5l" to="u46i:7P_FdVPW9uU" resolve="allForModel" />
<ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
<node concept="2OqwBi" id="3KN3A4v4yZW" role="37wK5m">
<node concept="37vLTw" id="3KN3A4v4yZX" role="2Oq$k0">
<ref role="3cqZAo" node="3YJ7yg2LDWz" resolve="containingRoot" />
</node>
<node concept="I4A8Y" id="3KN3A4v4yZY" role="2OqNvi" />
</node>
<node concept="2OqwBi" id="3KN3A4v4yZZ" role="37wK5m">
<node concept="2OqwBi" id="3KN3A4v4z00" role="2Oq$k0">
<node concept="2WthIp" id="3KN3A4v4z01" role="2Oq$k0" />
<node concept="1DTwFV" id="3KN3A4v4z02" role="2OqNvi">
<ref role="2WH_rO" node="3YJ7yg2LgUn" resolve="mpsProject" />
<node concept="2OqwBi" id="IFW4V2ErZ7" role="33vP2m">
<node concept="2YIFZM" id="IFW4V2ErB$" role="2Oq$k0">
<ref role="37wK5l" to="u46i:78H58oeCAQS" resolve="aspectLookup" />
<ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
<node concept="2OqwBi" id="IFW4V2ErB_" role="37wK5m">
<node concept="2OqwBi" id="IFW4V2ErBA" role="2Oq$k0">
<node concept="2WthIp" id="IFW4V2ErBB" role="2Oq$k0" />
<node concept="1DTwFV" id="IFW4V2ErBC" role="2OqNvi">
<ref role="2WH_rO" node="3YJ7yg2LgUn" resolve="mpsProject" />
</node>
</node>
<node concept="liA8E" id="IFW4V2ErBD" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
<node concept="liA8E" id="3KN3A4v4z03" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
<node concept="liA8E" id="IFW4V2EsEi" role="2OqNvi">
<ref role="37wK5l" to="fqlx:NKt6ynoYr0" resolve="allForModel" />
<node concept="2OqwBi" id="3KN3A4v4yZW" role="37wK5m">
<node concept="37vLTw" id="3KN3A4v4yZX" role="2Oq$k0">
<ref role="3cqZAo" node="3YJ7yg2LDWz" resolve="containingRoot" />
</node>
<node concept="I4A8Y" id="3KN3A4v4yZY" role="2OqNvi" />
</node>
</node>
</node>
@ -1899,21 +1904,26 @@
</node>
</node>
</node>
<node concept="2YIFZM" id="NKt6yomRVQ" role="33vP2m">
<ref role="37wK5l" to="u46i:7P_FdVPW9uU" resolve="allForModel" />
<ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
<node concept="2OqwBi" id="7WKNeR8ULi3" role="37wK5m">
<node concept="37vLTw" id="7WKNeR8ULi4" role="2Oq$k0">
<ref role="3cqZAo" node="6hqFpWnfbDy" resolve="containingRoot" />
<node concept="2OqwBi" id="IFW4V2Exws" role="33vP2m">
<node concept="2YIFZM" id="IFW4V2Ewyh" role="2Oq$k0">
<ref role="37wK5l" to="u46i:78H58oeCAQS" resolve="aspectLookup" />
<ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
<node concept="2OqwBi" id="IFW4V2Ewyi" role="37wK5m">
<node concept="37vLTw" id="IFW4V2Ewyj" role="2Oq$k0">
<ref role="3cqZAo" node="6hqFpWnfhk_" resolve="mpsProject" />
</node>
<node concept="liA8E" id="IFW4V2Ewyk" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
<node concept="I4A8Y" id="7WKNeR8ULi5" role="2OqNvi" />
</node>
<node concept="2OqwBi" id="7WKNeR8ULi6" role="37wK5m">
<node concept="37vLTw" id="7WKNeR8ULi7" role="2Oq$k0">
<ref role="3cqZAo" node="6hqFpWnfhk_" resolve="mpsProject" />
</node>
<node concept="liA8E" id="7WKNeR8ULi8" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
<node concept="liA8E" id="IFW4V2ExUQ" role="2OqNvi">
<ref role="37wK5l" to="fqlx:NKt6ynoYr0" resolve="allForModel" />
<node concept="2OqwBi" id="7WKNeR8ULi3" role="37wK5m">
<node concept="37vLTw" id="7WKNeR8ULi4" role="2Oq$k0">
<ref role="3cqZAo" node="6hqFpWnfbDy" resolve="containingRoot" />
</node>
<node concept="I4A8Y" id="7WKNeR8ULi5" role="2OqNvi" />
</node>
</node>
</node>
@ -3062,6 +3072,9 @@
<node concept="2YIFZM" id="3KN3A4vDf1H" role="33vP2m">
<ref role="37wK5l" to="u46i:78H58oeCAQS" resolve="aspectLookup" />
<ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
<node concept="37vLTw" id="IFW4V2ttEc" role="37wK5m">
<ref role="3cqZAo" node="7WKNeR8SQxI" resolve="repository" />
</node>
</node>
</node>
</node>
@ -3077,14 +3090,6 @@
<node concept="37vLTw" id="3KN3A4vDlEm" role="37wK5m">
<ref role="3cqZAo" node="6hqFpWnfpcc" resolve="nodes" />
</node>
<node concept="2OqwBi" id="3KN3A4vDlEo" role="37wK5m">
<node concept="37vLTw" id="3KN3A4vDlEp" role="2Oq$k0">
<ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
</node>
<node concept="liA8E" id="3KN3A4vDlEq" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
</node>
<node concept="3uibUv" id="3KN3A4vDl$Q" role="1tU5fm">

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

@ -11035,6 +11035,9 @@
<node concept="2YIFZM" id="7i3KM7gwh3a" role="2Oq$k0">
<ref role="37wK5l" to="u46i:78H58oeCAQS" resolve="aspectLookup" />
<ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
<node concept="37vLTw" id="IFW4V2s$Li" role="37wK5m">
<ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
</node>
</node>
<node concept="liA8E" id="3KN3A4vFhfh" role="2OqNvi">
<ref role="37wK5l" to="fqlx:NKt6ynoYr0" resolve="allForModel" />
@ -11044,9 +11047,6 @@
</node>
<node concept="I4A8Y" id="3KN3A4vFhfk" role="2OqNvi" />
</node>
<node concept="37vLTw" id="3KN3A4vFhfl" role="37wK5m">
<ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
</node>
</node>
</node>
</node>
@ -11134,6 +11134,9 @@
<node concept="2YIFZM" id="2hQbw6I7Ego" role="2Oq$k0">
<ref role="37wK5l" to="u46i:78H58oeCAQS" resolve="aspectLookup" />
<ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
<node concept="37vLTw" id="IFW4V2sJsw" role="37wK5m">
<ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
</node>
</node>
<node concept="liA8E" id="2hQbw6I7Egp" role="2OqNvi">
<ref role="37wK5l" to="fqlx:7mB3viLmii2" resolve="allForNodes" />
@ -11145,9 +11148,6 @@
</node>
</node>
</node>
<node concept="37vLTw" id="2hQbw6I7Egt" role="37wK5m">
<ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
</node>
</node>
</node>
</node>
@ -11231,15 +11231,15 @@
<node concept="2YIFZM" id="156bt08TbiK" role="2Oq$k0">
<ref role="37wK5l" to="u46i:78H58oeCAQS" resolve="aspectLookup" />
<ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
<node concept="37vLTw" id="IFW4V2sSWI" role="37wK5m">
<ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
</node>
</node>
<node concept="liA8E" id="156bt08TbiL" role="2OqNvi">
<ref role="37wK5l" to="fqlx:7mB3viLmii2" resolve="allForNodes" />
<node concept="37vLTw" id="156bt08Qxmc" role="37wK5m">
<ref role="3cqZAo" node="156bt08QxlR" resolve="nodes" />
</node>
<node concept="37vLTw" id="156bt08TbiN" role="37wK5m">
<ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
</node>
</node>
</node>
</node>
@ -11318,15 +11318,15 @@
<node concept="2YIFZM" id="7i3KM7gwmJg" role="2Oq$k0">
<ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
<ref role="37wK5l" to="u46i:78H58oeCAQS" resolve="aspectLookup" />
<node concept="37vLTw" id="IFW4V2tcXr" role="37wK5m">
<ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
</node>
</node>
<node concept="liA8E" id="7i3KM7gvgs5" role="2OqNvi">
<ref role="37wK5l" to="fqlx:7mB3viLmii2" resolve="allForNodes" />
<node concept="37vLTw" id="7i3KM7gvgs6" role="37wK5m">
<ref role="3cqZAo" node="3KN3A4vEXnm" resolve="nodes" />
</node>
<node concept="37vLTw" id="7i3KM7gvgs7" role="37wK5m">
<ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
</node>
</node>
</node>
</node>
@ -11399,6 +11399,9 @@
<node concept="2YIFZM" id="4XsNDZY9Lqt" role="2Oq$k0">
<ref role="37wK5l" to="u46i:78H58oeCAQS" resolve="aspectLookup" />
<ref role="1Pybhc" to="u46i:7km57Pkjxf4" resolve="TypecheckingAspect" />
<node concept="37vLTw" id="IFW4V2tnJT" role="37wK5m">
<ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
</node>
</node>
<node concept="liA8E" id="4XsNDZY9Lqu" role="2OqNvi">
<ref role="37wK5l" to="fqlx:7mB3viLmii2" resolve="allForNodes" />
@ -11410,9 +11413,6 @@
</node>
</node>
</node>
<node concept="37vLTw" id="4XsNDZY9Lqz" role="37wK5m">
<ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
</node>
</node>
</node>
</node>

25
coderules/solutions/jetbrains.mps.coderules/models/plugin.mps
View File

@ -34,6 +34,7 @@
<import index="1yqb" ref="r:bd76f794-cfad-45dd-9c1c-e3203d1c5c7a(jetbrains.mps.coderules.service)" />
<import index="d6hs" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors.item(MPS.Core/)" />
<import index="i5cy" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent.atomic(JDK/)" />
<import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.coderules.aspect)" />
<import index="unkn" ref="f97d84b2-8bad-4fdd-8ede-da17b3eacf4c/java:io.reactivex(jetbrains.mps.coderules/)" implicit="true" />
</imports>
<registry>
@ -8342,5 +8343,29 @@
</node>
<node concept="3Tm1VV" id="39eNUjm3TK_" role="1B3o_S" />
</node>
<node concept="2uRRBC" id="IFW4V2uR81">
<property role="3GE5qa" value="lifecycle" />
<property role="TrG5h" value="AspectLookupLifecycle" />
<node concept="2uRRBj" id="IFW4V2uR82" role="2uRRBE">
<node concept="3clFbS" id="IFW4V2uR83" role="2VODD2">
<node concept="3clFbF" id="IFW4V2uR84" role="3cqZAp">
<node concept="2YIFZM" id="IFW4V2uR85" role="3clFbG">
<ref role="1Pybhc" to="fqlx:IFW4V2uswu" resolve="AspectLookup.AspectLookupCoordinator" />
<ref role="37wK5l" to="fqlx:IFW4V2uAhM" resolve="init" />
</node>
</node>
</node>
</node>
<node concept="2uRRBI" id="IFW4V2uR86" role="2uRRBF">
<node concept="3clFbS" id="IFW4V2uR87" role="2VODD2">
<node concept="3clFbF" id="IFW4V2uRwY" role="3cqZAp">
<node concept="2YIFZM" id="IFW4V2uRy4" role="3clFbG">
<ref role="37wK5l" to="fqlx:IFW4V2uCEF" resolve="dispose" />
<ref role="1Pybhc" to="fqlx:IFW4V2uswu" resolve="AspectLookup.AspectLookupCoordinator" />
</node>
</node>
</node>
</node>
</node>
</model>

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

@ -452,21 +452,26 @@
</node>
</node>
</node>
<node concept="2YIFZM" id="78H58oetzW2" role="33vP2m">
<ref role="37wK5l" to="vrzs:7P_FdVPW9uU" resolve="allForModel" />
<ref role="1Pybhc" to="vrzs:7km57Pkjxf4" resolve="ControlflowAspect" />
<node concept="2OqwBi" id="78H58oetzW3" role="37wK5m">
<node concept="37vLTw" id="78H58oetzW4" role="2Oq$k0">
<ref role="3cqZAo" node="6hqFpWnfbDy" resolve="containingRoot" />
<node concept="2OqwBi" id="IFW4V2DCrd" role="33vP2m">
<node concept="2YIFZM" id="IFW4V2DBO6" role="2Oq$k0">
<ref role="37wK5l" to="vrzs:78H58oeCBNZ" resolve="aspectLookup" />
<ref role="1Pybhc" to="vrzs:7km57Pkjxf4" resolve="ControlflowAspect" />
<node concept="2OqwBi" id="IFW4V2DBOa" role="37wK5m">
<node concept="37vLTw" id="IFW4V2DBOb" role="2Oq$k0">
<ref role="3cqZAo" node="6hqFpWnfhk_" resolve="mpsProject" />
</node>
<node concept="liA8E" id="IFW4V2DBOc" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
<node concept="I4A8Y" id="78H58oetzW5" role="2OqNvi" />
</node>
<node concept="2OqwBi" id="78H58oetzW6" role="37wK5m">
<node concept="37vLTw" id="78H58oetzW7" role="2Oq$k0">
<ref role="3cqZAo" node="6hqFpWnfhk_" resolve="mpsProject" />
</node>
<node concept="liA8E" id="78H58oetzW8" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
<node concept="liA8E" id="IFW4V2DCTu" role="2OqNvi">
<ref role="37wK5l" to="fqlx:NKt6ynoYr0" resolve="allForModel" />
<node concept="2OqwBi" id="IFW4V2DBO7" role="37wK5m">
<node concept="37vLTw" id="IFW4V2DBO8" role="2Oq$k0">
<ref role="3cqZAo" node="6hqFpWnfbDy" resolve="containingRoot" />
</node>
<node concept="I4A8Y" id="IFW4V2DBO9" role="2OqNvi" />
</node>
</node>
</node>
@ -885,6 +890,9 @@
<node concept="2YIFZM" id="3KN3A4vD2Js" role="33vP2m">
<ref role="37wK5l" to="vrzs:78H58oeCBNZ" resolve="aspectLookup" />
<ref role="1Pybhc" to="vrzs:7km57Pkjxf4" resolve="ControlflowAspect" />
<node concept="37vLTw" id="IFW4V2tyj5" role="37wK5m">
<ref role="3cqZAo" node="7WKNeR8SQxI" resolve="repository" />
</node>
</node>
</node>
</node>
@ -908,14 +916,6 @@
<node concept="37vLTw" id="3KN3A4vD8om" role="37wK5m">
<ref role="3cqZAo" node="6hqFpWnfpcc" resolve="nodes" />
</node>
<node concept="2OqwBi" id="3KN3A4vDcVU" role="37wK5m">
<node concept="37vLTw" id="3KN3A4vDc5s" role="2Oq$k0">
<ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
</node>
<node concept="liA8E" id="3KN3A4vDe3E" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
</node>
</node>

1
coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd
View File

@ -19,6 +19,7 @@
<dependency reexport="true">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
<dependency reexport="false">9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)</dependency>
<dependency reexport="false">f113d56b-63e3-4120-a89c-2f5dcb8c6290(jetbrains.mps.coderules.runtime)</dependency>
<dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />

1009
coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
View File

File diff suppressed because it is too large Load Diff

68
coderules/solutions/jetbrains.mps.lang.controlflow.runtime/models/jetbrains.mps.lang.controlflow.aspect.mps
View File

@ -18,12 +18,7 @@
</imports>
<registry>
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
<concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
<concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
<concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
<child id="1197027771414" name="operand" index="2Oq$k0" />
<child id="1197027833540" name="operation" index="2OqNvi" />
</concept>
<concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
<concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
<reference id="1144433194310" name="classConcept" index="1Pybhc" />
@ -45,9 +40,6 @@
<child id="1068580123134" name="parameter" index="3clF46" />
<child id="1068580123135" name="body" index="3clF47" />
</concept>
<concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
<child id="1068580123156" name="expression" index="3clFbG" />
</concept>
<concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
<child id="1068581517665" name="statement" index="3cqZAp" />
</concept>
@ -85,9 +77,6 @@
</concept>
<concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
</language>
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
<concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
</language>
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
<concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
<child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
@ -96,12 +85,6 @@
<property id="1169194664001" name="name" index="TrG5h" />
</concept>
</language>
<language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
<concept id="7125221305512719026" name="jetbrains.mps.baseLanguage.collections.structure.CollectionType" flags="in" index="3vKaQO" />
<concept id="5686963296372573083" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerType" flags="in" index="3O5elB">
<child id="5686963296372573084" name="elementType" index="3O5elw" />
</concept>
</language>
</registry>
<node concept="312cEu" id="7km57Pkjxf4">
<property role="TrG5h" value="ControlflowAspect" />
@ -109,6 +92,12 @@
<node concept="2tJIrI" id="78H58oefMK4" role="jymVt" />
<node concept="2YIFZL" id="78H58oeCBNZ" role="jymVt">
<property role="TrG5h" value="aspectLookup" />
<node concept="37vLTG" id="IFW4V2twrI" role="3clF46">
<property role="TrG5h" value="repository" />
<node concept="3uibUv" id="IFW4V2tw$f" role="1tU5fm">
<ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
</node>
</node>
<node concept="3Tm1VV" id="78H58oeCCgW" role="1B3o_S" />
<node concept="3uibUv" id="78H58oeCBO1" role="3clF45">
<ref role="3uigEE" to="fqlx:NKt6ynorWQ" resolve="AspectLookup" />
@ -121,6 +110,9 @@
<node concept="2YIFZM" id="3KN3A4v3zEA" role="3cqZAk">
<ref role="1Pybhc" to="fqlx:NKt6ynorWQ" resolve="AspectLookup" />
<ref role="37wK5l" to="fqlx:78H58oefSjC" resolve="lookup" />
<node concept="37vLTw" id="IFW4V2tCja" role="37wK5m">
<ref role="3cqZAo" node="IFW4V2twrI" resolve="repository" />
</node>
<node concept="2YIFZM" id="3KN3A4v3zEB" role="37wK5m">
<ref role="1Pybhc" to="fqlx:NKt6yp1COZ" resolve="AbstractCoderulesAspect" />
<ref role="37wK5l" to="fqlx:78H58oefoaA" resolve="discoverable" />
@ -133,48 +125,6 @@
</node>
</node>
<node concept="2tJIrI" id="6UWSvq5bjXg" role="jymVt" />
<node concept="2YIFZL" id="7P_FdVPW9uU" role="jymVt">
<property role="TrG5h" value="allForModel" />
<node concept="37vLTG" id="7P_FdVPWb2y" role="3clF46">
<property role="TrG5h" value="model" />
<node concept="H_c77" id="7P_FdVPWp2I" role="1tU5fm" />
</node>
<node concept="37vLTG" id="7P_FdVPWb2$" role="3clF46">
<property role="TrG5h" value="repository" />
<node concept="3uibUv" id="7P_FdVPWb2_" role="1tU5fm">
<ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
</node>
</node>
<node concept="3vKaQO" id="7P_FdVPWaUF" role="3clF45">
<node concept="3uibUv" id="3KN3A4v3$yu" role="3O5elw">
<ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
<node concept="3uibUv" id="3KN3A4v4FNQ" role="11_B2D">
<ref role="3uigEE" node="7km57Pkjxf4" resolve="ControlflowAspect" />
</node>
</node>
</node>
<node concept="3Tm1VV" id="7P_FdVPW9uX" role="1B3o_S" />
<node concept="3clFbS" id="7P_FdVPW9uY" role="3clF47">
<node concept="3clFbF" id="NKt6ynqt5n" role="3cqZAp">
<node concept="2OqwBi" id="NKt6ynqt5o" role="3clFbG">
<node concept="liA8E" id="NKt6ynqt5u" role="2OqNvi">
<ref role="37wK5l" to="fqlx:NKt6ynoYr0" resolve="allForModel" />
<node concept="37vLTw" id="NKt6ynqtVi" role="37wK5m">
<ref role="3cqZAo" node="7P_FdVPWb2y" resolve="model" />
</node>
<node concept="37vLTw" id="NKt6ynqt5w" role="37wK5m">
<ref role="3cqZAo" node="7P_FdVPWb2$" resolve="repository" />
</node>
</node>
<node concept="2YIFZM" id="78H58oeCC1f" role="2Oq$k0">
<ref role="1Pybhc" node="7km57Pkjxf4" resolve="ControlflowAspect" />
<ref role="37wK5l" node="78H58oeCBNZ" resolve="aspectLookup" />
</node>
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="78H58oefMKa" role="jymVt" />
<node concept="3Tm1VV" id="7km57Pkjxf5" role="1B3o_S" />
<node concept="3uibUv" id="NKt6yomOJv" role="EKbjA">
<ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />

70
coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps
View File

@ -19,12 +19,7 @@
</imports>
<registry>
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
<concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
<concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
<concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
<child id="1197027771414" name="operand" index="2Oq$k0" />
<child id="1197027833540" name="operation" index="2OqNvi" />
</concept>
<concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
<concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
<reference id="1144433194310" name="classConcept" index="1Pybhc" />
@ -46,9 +41,6 @@
<child id="1068580123134" name="parameter" index="3clF46" />
<child id="1068580123135" name="body" index="3clF47" />
</concept>
<concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
<child id="1068580123156" name="expression" index="3clFbG" />
</concept>
<concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
<child id="1068581517665" name="statement" index="3cqZAp" />
</concept>
@ -86,9 +78,6 @@
</concept>
<concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
</language>
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
<concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
</language>
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
<concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
<child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
@ -97,12 +86,6 @@
<property id="1169194664001" name="name" index="TrG5h" />
</concept>
</language>
<language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
<concept id="7125221305512719026" name="jetbrains.mps.baseLanguage.collections.structure.CollectionType" flags="in" index="3vKaQO" />
<concept id="5686963296372573083" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerType" flags="in" index="3O5elB">
<child id="5686963296372573084" name="elementType" index="3O5elw" />
</concept>
</language>
</registry>
<node concept="312cEu" id="7km57Pkjxf4">
<property role="TrG5h" value="TypecheckingAspect" />
@ -110,6 +93,12 @@
<node concept="2tJIrI" id="2hteS6CndfK" role="jymVt" />
<node concept="2YIFZL" id="78H58oeCAQS" role="jymVt">
<property role="TrG5h" value="aspectLookup" />
<node concept="37vLTG" id="IFW4V2s0Zk" role="3clF46">
<property role="TrG5h" value="repository" />
<node concept="3uibUv" id="IFW4V2s8pA" role="1tU5fm">
<ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
</node>
</node>
<node concept="3Tm1VV" id="78H58oeCBjF" role="1B3o_S" />
<node concept="3uibUv" id="78H58oeCAQU" role="3clF45">
<ref role="3uigEE" to="fqlx:NKt6ynorWQ" resolve="AspectLookup" />
@ -122,6 +111,9 @@
<node concept="2YIFZM" id="3KN3A4v4kbD" role="3cqZAk">
<ref role="37wK5l" to="fqlx:78H58oefSjC" resolve="lookup" />
<ref role="1Pybhc" to="fqlx:NKt6ynorWQ" resolve="AspectLookup" />
<node concept="37vLTw" id="IFW4V2tCCQ" role="37wK5m">
<ref role="3cqZAo" node="IFW4V2s0Zk" resolve="repository" />
</node>
<node concept="2YIFZM" id="3KN3A4v4kbE" role="37wK5m">
<ref role="37wK5l" to="fqlx:78H58oefoaA" resolve="discoverable" />
<ref role="1Pybhc" to="fqlx:NKt6yp1COZ" resolve="AbstractCoderulesAspect" />
@ -133,49 +125,7 @@
</node>
</node>
</node>
<node concept="2tJIrI" id="6UWSvq5bjXg" role="jymVt" />
<node concept="2YIFZL" id="7P_FdVPW9uU" role="jymVt">
<property role="TrG5h" value="allForModel" />
<node concept="37vLTG" id="7P_FdVPWb2y" role="3clF46">
<property role="TrG5h" value="model" />
<node concept="H_c77" id="7P_FdVPWp2I" role="1tU5fm" />
</node>
<node concept="37vLTG" id="7P_FdVPWb2$" role="3clF46">
<property role="TrG5h" value="repository" />
<node concept="3uibUv" id="7P_FdVPWb2_" role="1tU5fm">
<ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
</node>
</node>
<node concept="3vKaQO" id="7P_FdVPWaUF" role="3clF45">
<node concept="3uibUv" id="3KN3A4v4ne1" role="3O5elw">
<ref role="3uigEE" to="fqlx:3KN3A4uUhmW" resolve="AspectClique" />
<node concept="3uibUv" id="3KN3A4v4nj3" role="11_B2D">
<ref role="3uigEE" node="7km57Pkjxf4" resolve="TypecheckingAspect" />
</node>
</node>
</node>
<node concept="3Tm1VV" id="7P_FdVPW9uX" role="1B3o_S" />
<node concept="3clFbS" id="7P_FdVPW9uY" role="3clF47">
<node concept="3clFbF" id="NKt6ynqt5n" role="3cqZAp">
<node concept="2OqwBi" id="NKt6ynqt5o" role="3clFbG">
<node concept="liA8E" id="NKt6ynqt5u" role="2OqNvi">
<ref role="37wK5l" to="fqlx:NKt6ynoYr0" resolve="allForModel" />
<node concept="37vLTw" id="NKt6ynqtVi" role="37wK5m">
<ref role="3cqZAo" node="7P_FdVPWb2y" resolve="model" />
</node>
<node concept="37vLTw" id="NKt6ynqt5w" role="37wK5m">
<ref role="3cqZAo" node="7P_FdVPWb2$" resolve="repository" />
</node>
</node>
<node concept="2YIFZM" id="78H58oeCB43" role="2Oq$k0">
<ref role="1Pybhc" node="7km57Pkjxf4" resolve="TypecheckingAspect" />
<ref role="37wK5l" node="78H58oeCAQS" resolve="aspectLookup" />
</node>
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="7P_FdVQ35vN" role="jymVt" />
<node concept="2tJIrI" id="IFW4V2EC2j" role="jymVt" />
<node concept="3Tm1VV" id="7km57Pkjxf5" role="1B3o_S" />
<node concept="3uibUv" id="NKt6yomOJv" role="EKbjA">
<ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />