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

Refactor typechecking state/results API for readability. 

A bunch of renames:
TypesIndex -> TypecheckingResultsCache,
TypecheckingCache -> TypecheckingState.
Simplify methods that update caches.
This commit is contained in:
Fedor Isakov 2020-07-27 13:18:18 +02:00
parent 301c0993d7
commit 4f74f192b4
5 changed files with 580 additions and 678 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking.test.util.mps
View File

@ -4791,7 +4791,7 @@
<property role="TrG5h" value="TestTypesIndex" />
<node concept="3Tm6S6" id="WJTIIoVi_5" role="1B3o_S" />
<node concept="3uibUv" id="WJTIIoVe7c" role="1zkMxy">
<ref role="3uigEE" to="tj24:6QH_LDtcxgf" resolve="TypesIndex" />
<ref role="3uigEE" to="tj24:6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
</node>
<node concept="3clFbW" id="WJTIIoVepJ" role="jymVt">
<node concept="37vLTG" id="WJTIIoVepK" role="3clF46">
@ -4804,7 +4804,7 @@
<node concept="3Tmbuc" id="WJTIIoW_05" role="1B3o_S" />
<node concept="3clFbS" id="WJTIIoVepO" role="3clF47">
<node concept="XkiVB" id="WJTIIoVepX" role="3cqZAp">
<ref role="37wK5l" to="tj24:6QH_LDtcxgh" resolve="TypesIndex" />
<ref role="37wK5l" to="tj24:6QH_LDtcxgh" resolve="TypecheckingResultsCache" />
<node concept="37vLTw" id="WJTIIoVepY" role="37wK5m">
<ref role="3cqZAo" node="WJTIIoVepK" resolve="typesModule" />
</node>

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

@ -531,11 +531,11 @@
<node concept="3cpWsn" id="6QH_LDtdTgs" role="3cpWs9">
<property role="TrG5h" value="tc" />
<node concept="3uibUv" id="6QH_LDtdTgp" role="1tU5fm">
<ref role="3uigEE" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingCache" />
<ref role="3uigEE" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingState" />
</node>
<node concept="2YIFZM" id="6$gg4k_t5t5" role="33vP2m">
<ref role="37wK5l" to="tj24:4Z$O9mrQIG1" resolve="get" />
<ref role="1Pybhc" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingCache" />
<ref role="1Pybhc" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingState" />
<node concept="37vLTw" id="14$_tTxzVwH" role="37wK5m">
<ref role="3cqZAo" node="14$_tTxzTDw" resolve="modelRepo" />
</node>
@ -546,14 +546,14 @@
<node concept="3cpWsn" id="6QH_LDtdVHk" role="3cpWs9">
<property role="TrG5h" value="typesCache" />
<node concept="3uibUv" id="1FOQehxeuXN" role="1tU5fm">
<ref role="3uigEE" to="tj24:6QH_LDtcxgf" resolve="TypesIndex" />
<ref role="3uigEE" to="tj24:6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
</node>
<node concept="2OqwBi" id="6QH_LDtdVHl" role="33vP2m">
<node concept="37vLTw" id="6QH_LDtdVHm" role="2Oq$k0">
<ref role="3cqZAo" node="6QH_LDtdTgs" resolve="tc" />
</node>
<node concept="liA8E" id="6QH_LDtdVHn" role="2OqNvi">
<ref role="37wK5l" to="tj24:4Z$O9mrQJgp" resolve="cachedTypesIndex" />
<ref role="37wK5l" to="tj24:4Z$O9mrQJgp" resolve="cachedTypecheckingResults" />
<node concept="2OqwBi" id="443LGHB5OH6" role="37wK5m">
<node concept="2JrnkZ" id="443LGHB5Olz" role="2Oq$k0">
<node concept="37vLTw" id="7mB3viLe3ou" role="2JrQYb">
@ -580,14 +580,14 @@
<node concept="3cpWsn" id="6QH_LDtdXLK" role="3cpWs9">
<property role="TrG5h" value="typesIndex2" />
<node concept="3uibUv" id="1FOQehxevl5" role="1tU5fm">
<ref role="3uigEE" to="tj24:6QH_LDtcxgf" resolve="TypesIndex" />
<ref role="3uigEE" to="tj24:6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
</node>
<node concept="2OqwBi" id="6QH_LDtdXLL" role="33vP2m">
<node concept="37vLTw" id="6QH_LDtdXLM" role="2Oq$k0">
<ref role="3cqZAo" node="6QH_LDtdTgs" resolve="tc" />
</node>
<node concept="liA8E" id="6QH_LDtdXLN" role="2OqNvi">
<ref role="37wK5l" to="tj24:44XN1Jd1wRa" resolve="updateCachedTypesIndex" />
<ref role="37wK5l" to="tj24:44XN1Jd1wRa" resolve="updateTypecheckingResults" />
<node concept="2OqwBi" id="4vBwiiVtLmA" role="37wK5m">
<node concept="2JrnkZ" id="4vBwiiVtKYf" role="2Oq$k0">
<node concept="37vLTw" id="7mB3viLe3zX" role="2JrQYb">
@ -701,7 +701,7 @@
<node concept="37vLTG" id="6$gg4kB7Byp" role="1bW2Oz">
<property role="TrG5h" value="index" />
<node concept="3uibUv" id="6$gg4kB7D7T" role="1tU5fm">
<ref role="3uigEE" to="tj24:6QH_LDtcxgf" resolve="TypesIndex" />
<ref role="3uigEE" to="tj24:6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
</node>
</node>
</node>
@ -713,7 +713,7 @@
<node concept="37vLTG" id="44XN1Jd6FWm" role="1bW2Oz">
<property role="TrG5h" value="updatable" />
<node concept="3uibUv" id="44XN1Jd6G8I" role="1tU5fm">
<ref role="3uigEE" to="tj24:4Dkptq1Qcxp" resolve="TypecheckingCache.TypeIndexUpdatable" />
<ref role="3uigEE" to="tj24:4Dkptq1Qcxp" resolve="TypecheckingState.TypecheckingResultsUpdatable" />
</node>
</node>
</node>
@ -732,14 +732,14 @@
<node concept="3cpWsn" id="6QH_LDtdZNu" role="3cpWs9">
<property role="TrG5h" value="typesIndex3" />
<node concept="3uibUv" id="1FOQehxesGr" role="1tU5fm">
<ref role="3uigEE" to="tj24:6QH_LDtcxgf" resolve="TypesIndex" />
<ref role="3uigEE" to="tj24:6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
</node>
<node concept="2OqwBi" id="6QH_LDtdZNv" role="33vP2m">
<node concept="37vLTw" id="6QH_LDtdZNw" role="2Oq$k0">
<ref role="3cqZAo" node="6QH_LDtdTgs" resolve="tc" />
</node>
<node concept="liA8E" id="6QH_LDtdZNx" role="2OqNvi">
<ref role="37wK5l" to="tj24:4Z$O9mrQJgp" resolve="cachedTypesIndex" />
<ref role="37wK5l" to="tj24:4Z$O9mrQJgp" resolve="cachedTypecheckingResults" />
<node concept="2OqwBi" id="4vBwiiVuDf_" role="37wK5m">
<node concept="2JrnkZ" id="4vBwiiVuDfA" role="2Oq$k0">
<node concept="37vLTw" id="7mB3viLezeb" role="2JrQYb">
@ -771,7 +771,7 @@
<node concept="1eOMI4" id="443LGHByrov" role="2Oq$k0">
<node concept="10QFUN" id="443LGHByros" role="1eOMHV">
<node concept="3uibUv" id="443LGHByrB9" role="10QFUM">
<ref role="3uigEE" to="tj24:6QH_LDtcxgf" resolve="TypesIndex" />
<ref role="3uigEE" to="tj24:6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
</node>
<node concept="37vLTw" id="443LGHByrox" role="10QFUP">
<ref role="3cqZAo" node="6QH_LDtdZNu" resolve="typesIndex3" />
@ -814,7 +814,7 @@
<node concept="3clFbF" id="14$_tTxAMey" role="3cqZAp">
<node concept="2YIFZM" id="6$gg4k_t5t7" role="3clFbG">
<ref role="37wK5l" to="tj24:14$_tTxAmT8" resolve="clearAll" />
<ref role="1Pybhc" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingCache" />
<ref role="1Pybhc" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingState" />
</node>
</node>
</node>
@ -1703,7 +1703,7 @@
<node concept="3clFbF" id="14$_tTxAR_w" role="3cqZAp">
<node concept="2YIFZM" id="6$gg4k_t5t8" role="3clFbG">
<ref role="37wK5l" to="tj24:14$_tTxAmT8" resolve="clearAll" />
<ref role="1Pybhc" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingCache" />
<ref role="1Pybhc" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingState" />
</node>
</node>
</node>
@ -1910,7 +1910,7 @@
<node concept="3clFbF" id="14$_tTxAQ_B" role="3cqZAp">
<node concept="2YIFZM" id="6$gg4k_t5t9" role="3clFbG">
<ref role="37wK5l" to="tj24:14$_tTxAmT8" resolve="clearAll" />
<ref role="1Pybhc" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingCache" />
<ref role="1Pybhc" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingState" />
</node>
</node>
</node>
@ -2166,7 +2166,7 @@
<node concept="3clFbF" id="3IIf9OA4zNv" role="3cqZAp">
<node concept="2YIFZM" id="6$gg4k_t5ta" role="3clFbG">
<ref role="37wK5l" to="tj24:14$_tTxAmT8" resolve="clearAll" />
<ref role="1Pybhc" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingCache" />
<ref role="1Pybhc" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingState" />
</node>
</node>
</node>
@ -2275,7 +2275,7 @@
<node concept="3cpWsn" id="27bTNFfbxlN" role="3cpWs9">
<property role="TrG5h" value="checkTypes" />
<node concept="3uibUv" id="27bTNFfbxlO" role="1tU5fm">
<ref role="3uigEE" to="tj24:6QH_LDtcxgf" resolve="TypesIndex" />
<ref role="3uigEE" to="tj24:6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
</node>
<node concept="2OqwBi" id="27bTNFfbxlP" role="33vP2m">
<node concept="2YIFZM" id="27bTNFfbxlQ" role="2Oq$k0">
@ -2654,7 +2654,7 @@
<node concept="3clFbF" id="3KwBCAABxsP" role="3cqZAp">
<node concept="2YIFZM" id="6$gg4k_t5tb" role="3clFbG">
<ref role="37wK5l" to="tj24:14$_tTxAmT8" resolve="clearAll" />
<ref role="1Pybhc" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingCache" />
<ref role="1Pybhc" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingState" />
</node>
</node>
</node>

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

@ -1079,6 +1079,12 @@
<ref role="3uigEE" to="mhbf:~SModel" resolve="SModel" />
</node>
</node>
<node concept="37vLTG" id="61G6TdBKQNM" role="3clF46">
<property role="TrG5h" value="repository" />
<node concept="3uibUv" id="61G6TdBKUr3" role="1tU5fm">
<ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
</node>
</node>
<node concept="3clFbS" id="2ceN1hCDzsv" role="3clF47">
<node concept="3cpWs8" id="2ceN1hCDzsO" role="3cqZAp">
<node concept="3cpWsn" id="2ceN1hCDzsP" role="3cpWs9">
@ -1143,12 +1149,6 @@
</node>
</node>
</node>
<node concept="37vLTG" id="61G6TdBKQNM" role="3clF46">
<property role="TrG5h" value="repository" />
<node concept="3uibUv" id="61G6TdBKUr3" role="1tU5fm">
<ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
</node>
</node>
</node>
<node concept="2tJIrI" id="5DUvKnrxdc4" role="jymVt" />
<node concept="3clFb_" id="14oWJ2NGjem" role="jymVt">
@ -1562,6 +1562,7 @@
<node concept="2tJIrI" id="siuT5mm_XX" role="jymVt" />
<node concept="3clFbW" id="4duYm8_rntF" role="jymVt">
<node concept="3cqZAl" id="4duYm8_rntG" role="3clF45" />
<node concept="3Tm6S6" id="61G6TdD0vqk" role="1B3o_S" />
<node concept="3clFbS" id="4duYm8_rntI" role="3clF47">
<node concept="3clFbF" id="61G6TdD0CdU" role="3cqZAp">
<node concept="37vLTI" id="61G6TdD0CdW" role="3clFbG">
@ -1632,7 +1633,6 @@
<property role="TrG5h" value="root" />
<node concept="3Tqbb2" id="4duYm8_rvDA" role="1tU5fm" />
</node>
<node concept="3Tm6S6" id="61G6TdD0vqk" role="1B3o_S" />
<node concept="37vLTG" id="61G6TdD047j" role="3clF46">
<property role="TrG5h" value="flags" />
<node concept="3uibUv" id="61G6TdD047k" role="1tU5fm">
@ -2075,6 +2075,7 @@
</node>
</node>
<node concept="2tJIrI" id="5BwsbZJE0Zx" role="jymVt" />
<node concept="3Tm1VV" id="61G6TdD0ZwH" role="1B3o_S" />
<node concept="3uibUv" id="lvX$8VFC52" role="EKbjA">
<ref role="3uigEE" to="1ka:~TypecheckingQueries" resolve="TypecheckingQueries" />
</node>
@ -2147,7 +2148,7 @@
<node concept="3cpWsn" id="9dktABR$KQ" role="3cpWs9">
<property role="TrG5h" value="typesIndex" />
<node concept="3uibUv" id="9dktABRsfo" role="1tU5fm">
<ref role="3uigEE" to="tj24:6QH_LDtcxgf" resolve="TypesIndex" />
<ref role="3uigEE" to="tj24:6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
</node>
<node concept="2OqwBi" id="9dktABR$KY" role="33vP2m">
<node concept="liA8E" id="9dktABR$KZ" role="2OqNvi">
@ -2401,7 +2402,7 @@
<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="TypesIndex" />
<ref role="3uigEE" to="tj24:6QH_LDtcxgf" resolve="TypecheckingResultsCache" />
</node>
<node concept="2OqwBi" id="9dktABQBqI" role="33vP2m">
<node concept="liA8E" id="9dktABQBqJ" role="2OqNvi">
@ -2491,7 +2492,6 @@
<ref role="3uigEE" to="1ka:~TypecheckingSession$Flags" resolve="TypecheckingSession.Flags" />
</node>
</node>
<node concept="3Tm1VV" id="61G6TdD0ZwH" role="1B3o_S" />
</node>
<node concept="2tJIrI" id="6hpwxwisYIe" role="jymVt" />
<node concept="2tJIrI" id="siuT5mmBCy" role="jymVt" />
@ -5989,7 +5989,7 @@
<node concept="3clFbF" id="6gnqipLIjE_" role="3cqZAp">
<node concept="2YIFZM" id="6gnqipLIjEA" role="3clFbG">
<ref role="37wK5l" to="tj24:14$_tTxAmT8" resolve="clearAll" />
<ref role="1Pybhc" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingCache" />
<ref role="1Pybhc" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingState" />
</node>
</node>
<node concept="3clFbF" id="6gnqipLxQat" role="3cqZAp">

1196
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

2
samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
View File

@ -895,7 +895,7 @@
<node concept="3clFbF" id="4pwDyRC1qWl" role="3cqZAp">
<node concept="2YIFZM" id="4pwDyRC1qWm" role="3clFbG">
<ref role="37wK5l" to="tj24:14$_tTxAmT8" resolve="clearAll" />
<ref role="1Pybhc" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingCache" />
<ref role="1Pybhc" to="tj24:4Z$O9mrQIzY" resolve="TypecheckingState" />
</node>
</node>
</node>