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

Merge report classes; simplify cache API

This commit is contained in:
Fedor Isakov 2024-09-03 10:39:10 +02:00
parent 746dfdf24b
commit 0c5b6c12f3
4 changed files with 571 additions and 761 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5021,23 +5021,7 @@
</node>
<node concept="2ShNRf" id="7Aoa2yVNQiS" role="37vLTx">
<node concept="HV5vD" id="7Aoa2yVNQiT" role="2ShVmc">
<ref role="HV5vE" to="tj24:7Aoa2yVdSP8" resolve="ReportedTypes" />
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="7Aoa2yVQt6v" role="3cqZAp">
<node concept="37vLTI" id="7Aoa2yVQvx1" role="3clFbG">
<node concept="2ShNRf" id="7Aoa2yVQwgd" role="37vLTx">
<node concept="HV5vD" id="7Aoa2yVQxQa" role="2ShVmc">
<property role="373rjd" value="true" />
<ref role="HV5vE" to="tj24:7Aoa2yVfU_u" resolve="ReportedItems" />
</node>
</node>
<node concept="2OqwBi" id="7Aoa2yVQtkN" role="37vLTJ">
<node concept="Xjq3P" id="7Aoa2yVQt6t" role="2Oq$k0" />
<node concept="2OwXpG" id="7Aoa2yVQu_Q" role="2OqNvi">
<ref role="2Oxat5" node="7Aoa2yVNxRN" resolve="reportedItems" />
<ref role="HV5vE" to="tj24:7Aoa2yVdSP8" resolve="TypecheckingReport" />
</node>
</node>
</node>
@ -5051,27 +5035,13 @@
<node concept="3clFbH" id="WJTIIoZMsv" role="3cqZAp" />
<node concept="3cpWs8" id="WJTIIoWrMe" role="3cqZAp">
<node concept="3cpWsn" id="WJTIIoWrMf" role="3cpWs9">
<property role="TrG5h" value="newReportedTypes" />
<property role="TrG5h" value="newReport" />
<node concept="3uibUv" id="WJTIIp0B55" role="1tU5fm">
<ref role="3uigEE" to="tj24:7Aoa2yVdSP8" resolve="ReportedTypes" />
<ref role="3uigEE" to="tj24:7Aoa2yVdSP8" resolve="TypecheckingReport" />
</node>
<node concept="2ShNRf" id="7Aoa2yVNR2a" role="33vP2m">
<node concept="HV5vD" id="7Aoa2yVNR2b" role="2ShVmc">
<ref role="HV5vE" to="tj24:7Aoa2yVdSP8" resolve="ReportedTypes" />
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="7Aoa2yVNXMP" role="3cqZAp">
<node concept="3cpWsn" id="7Aoa2yVNXMQ" role="3cpWs9">
<property role="TrG5h" value="newReportedItems" />
<node concept="3uibUv" id="7Aoa2yVNXMR" role="1tU5fm">
<ref role="3uigEE" to="tj24:7Aoa2yVfU_u" resolve="ReportedItems" />
</node>
<node concept="2ShNRf" id="7Aoa2yVO5l3" role="33vP2m">
<node concept="HV5vD" id="7Aoa2yVO7Nm" role="2ShVmc">
<property role="373rjd" value="true" />
<ref role="HV5vE" to="tj24:7Aoa2yVfU_u" resolve="ReportedItems" />
<ref role="HV5vE" to="tj24:7Aoa2yVdSP8" resolve="TypecheckingReport" />
</node>
</node>
</node>
@ -5218,7 +5188,7 @@
</node>
</node>
<node concept="37vLTw" id="1z4$59jeiRG" role="2Oq$k0">
<ref role="3cqZAo" node="7Aoa2yVNXMQ" resolve="newReportedItems" />
<ref role="3cqZAo" node="WJTIIoWrMf" resolve="newReportedTypes" />
</node>
</node>
</node>
@ -5232,7 +5202,7 @@
<node concept="2OqwBi" id="362mGRZLGZ1" role="1DdaDG">
<node concept="2OqwBi" id="1z4$59jegXH" role="2Oq$k0">
<node concept="37vLTw" id="1z4$59jegYb" role="2Oq$k0">
<ref role="3cqZAo" node="7Aoa2yVNxRN" resolve="reportedItems" />
<ref role="3cqZAo" node="5Qx6_65wuyf" resolve="reportedTypes" />
</node>
<node concept="liA8E" id="1z4$59jej9y" role="2OqNvi">
<ref role="37wK5l" to="tj24:7Aoa2yVl_uk" resolve="allReportItems" />
@ -5284,27 +5254,6 @@
</node>
</node>
</node>
<node concept="3clFbH" id="qsErMwqiyZ" role="3cqZAp" />
<node concept="3clFbF" id="qsErMwqkr0" role="3cqZAp">
<node concept="2OqwBi" id="qsErMwqmeu" role="3clFbG">
<node concept="37vLTw" id="qsErMwqkqY" role="2Oq$k0">
<ref role="3cqZAo" node="7Aoa2yVNxRN" resolve="reportedItems" />
</node>
<node concept="liA8E" id="qsErMwqnZ3" role="2OqNvi">
<ref role="37wK5l" to="tj24:7Aoa2yVQVr5" resolve="clear" />
</node>
</node>
</node>
<node concept="3clFbF" id="qsErMwqrrE" role="3cqZAp">
<node concept="37vLTI" id="qsErMwqtcQ" role="3clFbG">
<node concept="37vLTw" id="qsErMwqv2N" role="37vLTx">
<ref role="3cqZAo" node="7Aoa2yVNXMQ" resolve="newReportedItems" />
</node>
<node concept="37vLTw" id="qsErMwqrrC" role="37vLTJ">
<ref role="3cqZAo" node="7Aoa2yVNxRN" resolve="reportedItems" />
</node>
</node>
</node>
<node concept="1DcWWT" id="362mGRZM0tb" role="3cqZAp">
<node concept="3clFbS" id="362mGRZM0tc" role="2LFqv$">
<node concept="3clFbF" id="362mGRZM0tf" role="3cqZAp">
@ -5316,7 +5265,7 @@
</node>
</node>
<node concept="37vLTw" id="362mGRZM1HB" role="2Oq$k0">
<ref role="3cqZAo" node="7Aoa2yVNxRN" resolve="reportedItems" />
<ref role="3cqZAo" node="5Qx6_65wuyf" resolve="reportedTypes" />
</node>
</node>
</node>
@ -5414,43 +5363,7 @@
</node>
<node concept="2ShNRf" id="7Aoa2yVQA4Q" role="37vLTx">
<node concept="HV5vD" id="7Aoa2yVQA4R" role="2ShVmc">
<ref role="HV5vE" to="tj24:7Aoa2yVdSP8" resolve="ReportedTypes" />
</node>
</node>
</node>
</node>
<node concept="3clFbJ" id="7Aoa2yVQ$vN" role="3cqZAp">
<node concept="3clFbS" id="7Aoa2yVQ$vP" role="3clFbx">
<node concept="3clFbF" id="7Aoa2yVQNqi" role="3cqZAp">
<node concept="2OqwBi" id="7Aoa2yVQOWu" role="3clFbG">
<node concept="37vLTw" id="7Aoa2yVQNqg" role="2Oq$k0">
<ref role="3cqZAo" node="7Aoa2yVNxRN" resolve="reportedItems" />
</node>
<node concept="liA8E" id="7Aoa2yVRbjF" role="2OqNvi">
<ref role="37wK5l" to="tj24:7Aoa2yVQVr5" resolve="clear" />
</node>
</node>
</node>
</node>
<node concept="3y3z36" id="7Aoa2yVQKuW" role="3clFbw">
<node concept="10Nm6u" id="7Aoa2yVQLGJ" role="3uHU7w" />
<node concept="37vLTw" id="7Aoa2yVQELB" role="3uHU7B">
<ref role="3cqZAo" node="7Aoa2yVNxRN" resolve="reportedItems" />
</node>
</node>
</node>
<node concept="3clFbF" id="7Aoa2yVReOr" role="3cqZAp">
<node concept="37vLTI" id="7Aoa2yVRlv6" role="3clFbG">
<node concept="2ShNRf" id="7Aoa2yVRn92" role="37vLTx">
<node concept="HV5vD" id="7Aoa2yVRpQi" role="2ShVmc">
<property role="373rjd" value="true" />
<ref role="HV5vE" to="tj24:7Aoa2yVfU_u" resolve="ReportedItems" />
</node>
</node>
<node concept="2OqwBi" id="7Aoa2yVRg2G" role="37vLTJ">
<node concept="Xjq3P" id="7Aoa2yVReOp" role="2Oq$k0" />
<node concept="2OwXpG" id="7Aoa2yVRidB" role="2OqNvi">
<ref role="2Oxat5" node="7Aoa2yVNxRN" resolve="reportedItems" />
<ref role="HV5vE" to="tj24:7Aoa2yVdSP8" resolve="TypecheckingReport" />
</node>
</node>
</node>
@ -5496,7 +5409,7 @@
<node concept="2OqwBi" id="WJTIIoVjFv" role="2Oq$k0">
<node concept="2OqwBi" id="WJTIIoV2MM" role="2Oq$k0">
<node concept="37vLTw" id="WJTIIoV2EE" role="2Oq$k0">
<ref role="3cqZAo" node="7Aoa2yVNxRN" resolve="reportedItems" />
<ref role="3cqZAo" node="5Qx6_65wuyf" resolve="reportedTypes" />
</node>
<node concept="liA8E" id="WJTIIoVjdV" role="2OqNvi">
<ref role="37wK5l" to="tj24:7Aoa2yVl_uk" resolve="allReportItems" />
@ -5526,17 +5439,10 @@
</node>
<node concept="2tJIrI" id="WJTIIoVbDF" role="jymVt" />
<node concept="312cEg" id="5Qx6_65wuyf" role="jymVt">
<property role="TrG5h" value="reportedTypes" />
<property role="TrG5h" value="report" />
<node concept="3Tm6S6" id="WJTIIoViiv" role="1B3o_S" />
<node concept="3uibUv" id="WJTIIoVhQN" role="1tU5fm">
<ref role="3uigEE" to="tj24:7Aoa2yVdSP8" resolve="ReportedTypes" />
</node>
</node>
<node concept="312cEg" id="7Aoa2yVNxRN" role="jymVt">
<property role="TrG5h" value="reportedItems" />
<node concept="3Tm6S6" id="7Aoa2yVNxRO" role="1B3o_S" />
<node concept="3uibUv" id="7Aoa2yVNxRP" role="1tU5fm">
<ref role="3uigEE" to="tj24:7Aoa2yVfU_u" resolve="ReportedItems" />
<ref role="3uigEE" to="tj24:7Aoa2yVdSP8" resolve="TypecheckingReport" />
</node>
</node>
<node concept="312cEg" id="WJTIIoUV8P" role="jymVt">

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

@ -2877,7 +2877,7 @@
<node concept="2ShNRf" id="7Aoa2yV_XUs" role="3clFbG">
<node concept="HV5vD" id="7Aoa2yV_Zrk" role="2ShVmc">
<property role="373rjd" value="true" />
<ref role="HV5vE" to="tj24:7Aoa2yVdSP8" resolve="ReportedTypes" />
<ref role="HV5vE" to="tj24:7Aoa2yVdSP8" resolve="TypecheckingReport" />
</node>
</node>
</node>

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

@ -3467,83 +3467,95 @@
</node>
</node>
<node concept="3clFbF" id="7Aoa2yVoJK1" role="3cqZAp">
<node concept="2OqwBi" id="7Aoa2yVoJK3" role="3clFbG">
<node concept="liA8E" id="7Aoa2yVoJK4" role="2OqNvi">
<ref role="37wK5l" to="tj24:7Aoa2yVmEth" resolve="check" />
<node concept="37vLTw" id="7Aoa2yVoJK5" role="37wK5m">
<ref role="3cqZAo" node="1oUwjADo$Xr" resolve="containingRoot" />
</node>
<node concept="1bVj0M" id="7Aoa2yVoJK6" role="37wK5m">
<node concept="gl6BB" id="7Aoa2yVoJK7" role="1bW2Oz">
<property role="TrG5h" value="repIt" />
<node concept="2jxLKc" id="7Aoa2yVoJK8" role="1tU5fm" />
<node concept="2OqwBi" id="KkWtiM7AGX" role="3clFbG">
<node concept="2OqwBi" id="7Aoa2yVoJK3" role="2Oq$k0">
<node concept="liA8E" id="7Aoa2yVoJK4" role="2OqNvi">
<ref role="37wK5l" to="tj24:7Aoa2yVmEth" resolve="check" />
<node concept="37vLTw" id="7Aoa2yVoJK5" role="37wK5m">
<ref role="3cqZAo" node="1oUwjADo$Xr" resolve="containingRoot" />
</node>
<node concept="3clFbS" id="7Aoa2yVoJK9" role="1bW5cS">
<node concept="3SKdUt" id="7Aoa2yVoJKa" role="3cqZAp">
<node concept="1PaTwC" id="7Aoa2yVoJKb" role="1aUNEU">
<node concept="3oM_SD" id="7Aoa2yVoJKc" role="1PaTwD">
<property role="3oM_SC" value="FIXME" />
</node>
<node concept="3oM_SD" id="7Aoa2yVoJKd" role="1PaTwD">
<property role="3oM_SC" value="better" />
</node>
<node concept="3oM_SD" id="7Aoa2yVoJKe" role="1PaTwD">
<property role="3oM_SC" value="forwarding" />
</node>
<node concept="3oM_SD" id="7Aoa2yVoJKf" role="1PaTwD">
<property role="3oM_SC" value="of" />
</node>
<node concept="3oM_SD" id="7Aoa2yVoJKg" role="1PaTwD">
<property role="3oM_SC" value="report" />
</node>
<node concept="3oM_SD" id="7Aoa2yVoJKh" role="1PaTwD">
<property role="3oM_SC" value="items" />
</node>
</node>
</node>
<node concept="3SKdUt" id="7Aoa2yVoJKi" role="3cqZAp">
<node concept="1PaTwC" id="7Aoa2yVoJKj" role="1aUNEU">
<node concept="3oM_SD" id="7Aoa2yVoJKk" role="1PaTwD">
<property role="3oM_SC" value="forward" />
</node>
<node concept="3oM_SD" id="7Aoa2yVoJKl" role="1PaTwD">
<property role="3oM_SC" value="all" />
</node>
<node concept="3oM_SD" id="7Aoa2yVoJKm" role="1PaTwD">
<property role="3oM_SC" value="reported" />
</node>
<node concept="3oM_SD" id="7Aoa2yVoJKn" role="1PaTwD">
<property role="3oM_SC" value="items" />
</node>
<node concept="3oM_SD" id="7Aoa2yVoJKo" role="1PaTwD">
<property role="3oM_SC" value="always" />
</node>
</node>
</node>
<node concept="3clFbJ" id="7Aoa2yVoJKp" role="3cqZAp">
<node concept="2ZW3vV" id="7Aoa2yVoJKq" role="3clFbw">
<node concept="3uibUv" id="7Aoa2yVoJKr" role="2ZW6by">
<ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
</node>
<node concept="37vLTw" id="7Aoa2yVoJKs" role="2ZW6bz">
<ref role="3cqZAo" node="7Aoa2yVoJK7" resolve="repIt" />
</node>
</node>
<node concept="3clFbS" id="7Aoa2yVoJKt" role="3clFbx">
<node concept="3clFbF" id="7Aoa2yVoJKu" role="3cqZAp">
<node concept="2OqwBi" id="7Aoa2yVoJKv" role="3clFbG">
<node concept="37vLTw" id="7Aoa2yVoJKw" role="2Oq$k0">
<ref role="3cqZAo" node="2Hyoxv0bBI" resolve="consumer" />
</node>
<node concept="37vLTw" id="7Aoa2yVoJKA" role="2Oq$k0">
<ref role="3cqZAo" node="1z4$59j5F_5" resolve="typecheckingService" />
</node>
</node>
<node concept="liA8E" id="KkWtiM7FjC" role="2OqNvi">
<ref role="37wK5l" to="tj24:KkWtiM163B" resolve="ifSuccessful" />
<node concept="1bVj0M" id="KkWtiM7NPj" role="37wK5m">
<node concept="gl6BB" id="KkWtiM7NPu" role="1bW2Oz">
<property role="TrG5h" value="report" />
<node concept="2jxLKc" id="KkWtiM7NPv" role="1tU5fm" />
</node>
<node concept="3clFbS" id="KkWtiM7NPT" role="1bW5cS">
<node concept="1DcWWT" id="KkWtiM8b1h" role="3cqZAp">
<node concept="3clFbS" id="KkWtiM8b1k" role="2LFqv$">
<node concept="3SKdUt" id="7Aoa2yVoJKa" role="3cqZAp">
<node concept="1PaTwC" id="7Aoa2yVoJKb" role="1aUNEU">
<node concept="3oM_SD" id="7Aoa2yVoJKc" role="1PaTwD">
<property role="3oM_SC" value="FIXME" />
</node>
<node concept="liA8E" id="7Aoa2yVoJKx" role="2OqNvi">
<ref role="37wK5l" to="82uw:~Consumer.accept(java.lang.Object)" resolve="accept" />
<node concept="1eOMI4" id="7Aoa2yVoJKy" role="37wK5m">
<node concept="10QFUN" id="7Aoa2yVoJKz" role="1eOMHV">
<node concept="3uibUv" id="7Aoa2yVoJK$" role="10QFUM">
<ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
</node>
<node concept="37vLTw" id="7Aoa2yVoJK_" role="10QFUP">
<ref role="3cqZAo" node="7Aoa2yVoJK7" resolve="repIt" />
<node concept="3oM_SD" id="7Aoa2yVoJKd" role="1PaTwD">
<property role="3oM_SC" value="better" />
</node>
<node concept="3oM_SD" id="7Aoa2yVoJKe" role="1PaTwD">
<property role="3oM_SC" value="forwarding" />
</node>
<node concept="3oM_SD" id="7Aoa2yVoJKf" role="1PaTwD">
<property role="3oM_SC" value="of" />
</node>
<node concept="3oM_SD" id="7Aoa2yVoJKg" role="1PaTwD">
<property role="3oM_SC" value="report" />
</node>
<node concept="3oM_SD" id="7Aoa2yVoJKh" role="1PaTwD">
<property role="3oM_SC" value="items" />
</node>
</node>
</node>
<node concept="3SKdUt" id="7Aoa2yVoJKi" role="3cqZAp">
<node concept="1PaTwC" id="7Aoa2yVoJKj" role="1aUNEU">
<node concept="3oM_SD" id="7Aoa2yVoJKk" role="1PaTwD">
<property role="3oM_SC" value="forward" />
</node>
<node concept="3oM_SD" id="7Aoa2yVoJKl" role="1PaTwD">
<property role="3oM_SC" value="all" />
</node>
<node concept="3oM_SD" id="7Aoa2yVoJKm" role="1PaTwD">
<property role="3oM_SC" value="reported" />
</node>
<node concept="3oM_SD" id="7Aoa2yVoJKn" role="1PaTwD">
<property role="3oM_SC" value="items" />
</node>
<node concept="3oM_SD" id="7Aoa2yVoJKo" role="1PaTwD">
<property role="3oM_SC" value="always" />
</node>
</node>
</node>
<node concept="3clFbJ" id="7Aoa2yVoJKp" role="3cqZAp">
<node concept="2ZW3vV" id="7Aoa2yVoJKq" role="3clFbw">
<node concept="3uibUv" id="7Aoa2yVoJKr" role="2ZW6by">
<ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
</node>
<node concept="37vLTw" id="7Aoa2yVoJKs" role="2ZW6bz">
<ref role="3cqZAo" node="KkWtiM8b1l" resolve="repIt" />
</node>
</node>
<node concept="3clFbS" id="7Aoa2yVoJKt" role="3clFbx">
<node concept="3clFbF" id="7Aoa2yVoJKu" role="3cqZAp">
<node concept="2OqwBi" id="7Aoa2yVoJKv" role="3clFbG">
<node concept="37vLTw" id="7Aoa2yVoJKw" role="2Oq$k0">
<ref role="3cqZAo" node="2Hyoxv0bBI" resolve="consumer" />
</node>
<node concept="liA8E" id="7Aoa2yVoJKx" role="2OqNvi">
<ref role="37wK5l" to="82uw:~Consumer.accept(java.lang.Object)" resolve="accept" />
<node concept="1eOMI4" id="7Aoa2yVoJKy" role="37wK5m">
<node concept="10QFUN" id="7Aoa2yVoJKz" role="1eOMHV">
<node concept="3uibUv" id="7Aoa2yVoJK$" role="10QFUM">
<ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
</node>
<node concept="37vLTw" id="7Aoa2yVoJK_" role="10QFUP">
<ref role="3cqZAo" node="KkWtiM8b1l" resolve="repIt" />
</node>
</node>
</node>
</node>
</node>
@ -3551,13 +3563,24 @@
</node>
</node>
</node>
<node concept="3cpWsn" id="KkWtiM8b1l" role="1Duv9x">
<property role="TrG5h" value="repIt" />
<node concept="3uibUv" id="KkWtiM8b1p" role="1tU5fm">
<ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
</node>
</node>
<node concept="2OqwBi" id="KkWtiM8b1q" role="1DdaDG">
<node concept="37vLTw" id="KkWtiM8b1r" role="2Oq$k0">
<ref role="3cqZAo" node="KkWtiM7NPu" resolve="report" />
</node>
<node concept="liA8E" id="KkWtiM8b1s" role="2OqNvi">
<ref role="37wK5l" to="tj24:7Aoa2yVl_uk" resolve="allReportItems" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="37vLTw" id="7Aoa2yVoJKA" role="2Oq$k0">
<ref role="3cqZAo" node="1z4$59j5F_5" resolve="typecheckingService" />
</node>
</node>
</node>
<node concept="3clFbH" id="3yEb0I3SBsd" role="3cqZAp" />

1035
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