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

Revert temporary workaround for MPSCR-51 from 16e39a93

This commit is contained in:
Grigorii Kirgizov 2020-03-23 14:39:54 +03:00
parent 91e4d2b582
commit b6aaec8870
8 changed files with 0 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
View File

@ -712,10 +712,6 @@
</node>
<node concept="92CTh" id="6OXbTD$fzih">
<property role="TrG5h" value="TypecheckQuery" />
<node concept="2_cOLj" id="6UxFjlrEBIY" role="2_cLD1">
<property role="TrG5h" value="checkingScope" />
<node concept="3Tqbb2" id="6UxFjlrEBJS" role="2_9F96" />
</node>
<node concept="2_cOLj" id="5fMWD6IydE6" role="2_cLD1">
<property role="TrG5h" value="typeCollector" />
<node concept="3uibUv" id="5fMWD6HQY7C" role="2_9F96">

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

@ -1523,12 +1523,6 @@
</node>
</node>
</node>
<node concept="2OqwBi" id="36PPzUCzH$R" role="37wK5m">
<node concept="37vLTw" id="36PPzUCzFD8" role="2Oq$k0">
<ref role="3cqZAo" node="tyIfzC3xp3" resolve="demo" />
</node>
<node concept="2Rxl7S" id="36PPzUCzJBK" role="2OqNvi" />
</node>
<node concept="37vLTw" id="5fMWD6IorqM" role="37wK5m">
<ref role="3cqZAo" node="5fMWD6Iop7s" resolve="typeCollector" />
</node>

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

@ -1268,12 +1268,6 @@
</node>
</node>
</node>
<node concept="2OqwBi" id="36PPzUCzQyi" role="37wK5m">
<node concept="37vLTw" id="36PPzUCzQ11" role="2Oq$k0">
<ref role="3cqZAo" node="7mB3viLf32I" resolve="demo" />
</node>
<node concept="2Rxl7S" id="36PPzUCzRe8" role="2OqNvi" />
</node>
<node concept="37vLTw" id="7gOEBI$hjpf" role="37wK5m">
<ref role="3cqZAo" node="7gOEBI$hd0J" resolve="typeCollector" />
</node>

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

@ -3177,21 +3177,6 @@
</node>
</node>
<node concept="3clFbH" id="6nFpYluod$P" role="3cqZAp" />
<node concept="3cpWs8" id="36PPzUC$GOS" role="3cqZAp">
<node concept="3cpWsn" id="36PPzUC$GOV" role="3cpWs9">
<property role="TrG5h" value="checkingScope" />
<node concept="3Tqbb2" id="36PPzUC$GOQ" role="1tU5fm" />
<node concept="2OqwBi" id="36PPzUC$KVL" role="33vP2m">
<node concept="2OqwBi" id="36PPzUC$Jl7" role="2Oq$k0">
<node concept="37vLTw" id="36PPzUC$I4R" role="2Oq$k0">
<ref role="3cqZAo" node="6hqFpWnfpcc" resolve="nodes" />
</node>
<node concept="1uHKPH" id="36PPzUC$KzA" role="2OqNvi" />
</node>
<node concept="2Rxl7S" id="36PPzUC$Lo6" role="2OqNvi" />
</node>
</node>
</node>
<node concept="3clFbF" id="7WKNeR8TcXy" role="3cqZAp">
<node concept="2OqwBi" id="7WKNeR8TcXz" role="3clFbG">
<node concept="37vLTw" id="7WKNeR8TcX$" role="2Oq$k0">
@ -3221,9 +3206,6 @@
<node concept="37vLTw" id="7WKNeR9foS9" role="37wK5m">
<ref role="3cqZAo" node="7WKNeR9fm7b" resolve="queryKind" />
</node>
<node concept="37vLTw" id="36PPzUC$LO0" role="37wK5m">
<ref role="3cqZAo" node="36PPzUC$GOV" resolve="checkingScope" />
</node>
<node concept="37vLTw" id="5fMWD6IsEOE" role="37wK5m">
<ref role="3cqZAo" node="5fMWD6IsEOz" resolve="typeCollector" />
</node>

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

@ -7417,15 +7417,6 @@
</node>
</node>
</node>
<node concept="3cpWs8" id="36PPzUCyVNz" role="3cqZAp">
<node concept="3cpWsn" id="36PPzUCyVNA" role="3cpWs9">
<property role="TrG5h" value="checkingScope" />
<node concept="3Tqbb2" id="36PPzUCyVNx" role="1tU5fm" />
<node concept="37vLTw" id="36PPzUCz7VH" role="33vP2m">
<ref role="3cqZAo" node="1FOQehxnAn0" resolve="node" />
</node>
</node>
</node>
<node concept="3cpWs8" id="1FOQehxoMr3" role="3cqZAp">
<node concept="3cpWsn" id="1FOQehxoMr4" role="3cpWs9">
<property role="TrG5h" value="helpers" />
@ -7448,9 +7439,6 @@
<ref role="3cqZAo" node="4t7Xo7inNvw" resolve="TYPECHECK" />
<ref role="1PxDUh" node="4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
</node>
<node concept="37vLTw" id="36PPzUCzaI7" role="37wK5m">
<ref role="3cqZAo" node="36PPzUCyVNA" resolve="checkingScope" />
</node>
<node concept="37vLTw" id="5fMWD6HQ2Ui" role="37wK5m">
<ref role="3cqZAo" node="5fMWD6HPS5d" resolve="typeCollector" />
</node>
@ -8071,15 +8059,6 @@
</node>
</node>
<node concept="3clFbH" id="357z3MClL7c" role="3cqZAp" />
<node concept="3cpWs8" id="36PPzUCzjHm" role="3cqZAp">
<node concept="3cpWsn" id="36PPzUCzjHp" role="3cpWs9">
<property role="TrG5h" value="checkingScope" />
<node concept="3Tqbb2" id="36PPzUCzjHk" role="1tU5fm" />
<node concept="37vLTw" id="36PPzUCzsIV" role="33vP2m">
<ref role="3cqZAo" node="7eK3DxvmvIz" resolve="unit" />
</node>
</node>
</node>
<node concept="3cpWs8" id="3IIf9O_qVtZ" role="3cqZAp">
<node concept="3cpWsn" id="3IIf9O_qVu0" role="3cpWs9">
<property role="TrG5h" value="helpers" />
@ -8100,9 +8079,6 @@
<ref role="3cqZAo" node="4t7Xo7inNvw" resolve="TYPECHECK" />
<ref role="1PxDUh" node="4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
</node>
<node concept="37vLTw" id="36PPzUCzwY_" role="37wK5m">
<ref role="3cqZAo" node="36PPzUCzjHp" resolve="checkingScope" />
</node>
<node concept="37vLTw" id="5MNibENixnz" role="37wK5m">
<ref role="3cqZAo" node="5MNibENhUYB" resolve="typeCollector" />
</node>

4
samples/fitch/languages/samples.fitch/models/types.mps
View File

@ -540,10 +540,6 @@
</node>
<node concept="92CTh" id="2rdxkKxrUlk">
<property role="TrG5h" value="Typecheck" />
<node concept="2_cOLj" id="6UxFjlrFxJL" role="2_cLD1">
<property role="TrG5h" value="checkingScope" />
<node concept="3Tqbb2" id="6UxFjlrFxK1" role="2_9F96" />
</node>
<node concept="2_cOLj" id="5fMWD6Iy9vK" role="2_cLD1">
<property role="TrG5h" value="typeCollector" />
<node concept="3uibUv" id="5fMWD6HQY7C" role="2_9F96">

4
samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
View File

@ -8571,10 +8571,6 @@
</node>
<node concept="92CTh" id="5Eb7bDWO4vA">
<property role="TrG5h" value="Typecheck" />
<node concept="2_cOLj" id="6UxFjlrFxIn" role="2_cLD1">
<property role="TrG5h" value="checkingScope" />
<node concept="3Tqbb2" id="6UxFjlrFxJh" role="2_9F96" />
</node>
<node concept="2_cOLj" id="5fMWD6HFjux" role="2_cLD1">
<property role="TrG5h" value="typesUpdateFun" />
<node concept="3uibUv" id="5fMWD6HQY7C" role="2_9F96">

93
samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
View File

@ -491,7 +491,6 @@
<child id="1145404616321" name="leftExpression" index="2JrQYb" />
</concept>
<concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
<concept id="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
<concept id="1145567426890" name="jetbrains.mps.lang.smodel.structure.SNodeListCreator" flags="nn" index="2T8Vx0">
<child id="1145567471833" name="createdType" index="2T96Bj" />
</concept>
@ -2754,10 +2753,6 @@
</node>
<node concept="3AqmO8" id="4btN1w5Ki4T" role="8PkJo">
<property role="TrG5h" value="checkDecls" />
<node concept="1zAUYm" id="dabFeLVK6j" role="1zAUyy">
<property role="TrG5h" value="scopeNode" />
<node concept="3Tqbb2" id="dabFeLVKf3" role="3gTf24" />
</node>
</node>
<node concept="3AqmO8" id="36PPzUCxZA0" role="8PkJo">
<property role="TrG5h" value="importDecls" />
@ -31921,10 +31916,6 @@
<node concept="92CTh" id="6OXbTD$fto2">
<property role="TrG5h" value="Typecheck" />
<property role="3GE5qa" value="query" />
<node concept="2_cOLj" id="dabFeLVQpI" role="2_cLD1">
<property role="TrG5h" value="checkingScope" />
<node concept="3Tqbb2" id="dabFeLVQrL" role="2_9F96" />
</node>
<node concept="2_cOLj" id="5fMWD6HFjux" role="2_cLD1">
<property role="TrG5h" value="typeCollector" />
<node concept="3uibUv" id="5fMWD6HQY7C" role="2_9F96">
@ -31949,11 +31940,6 @@
<node concept="3I6s7M" id="5Oz70LKdkQP" role="3I6sU7">
<node concept="3Aqt3T" id="5Oz70LKdkQN" role="3I6s78">
<ref role="3AqCNq" node="4btN1w5Ki4T" resolve="checkDecls" />
<node concept="37jhX" id="36PPzUCxS4R" role="3AunhB">
<node concept="2_cIyK" id="36PPzUCxS4P" role="37jj2">
<ref role="2_cIwb" node="dabFeLVQpI" resolve="checkingScope" />
</node>
</node>
</node>
</node>
<node concept="3I6s7M" id="6OXbTD_c30h" role="3I6sU7">
@ -43324,18 +43310,6 @@
</node>
</node>
<node concept="3clFbS" id="3c$Di5ODE7D" role="1nLNMH">
<node concept="3cpWs8" id="36PPzUCy0Yk" role="3cqZAp">
<node concept="3cpWsn" id="36PPzUCy0Yn" role="3cpWs9">
<property role="TrG5h" value="scope" />
<node concept="3Tqbb2" id="36PPzUCy0Yi" role="1tU5fm" />
<node concept="2OqwBi" id="36PPzUCy1UM" role="33vP2m">
<node concept="3A2sRY" id="36PPzUCy1JF" role="2Oq$k0">
<ref role="3A2yKK" node="4btN1w5KirY" resolve="clsTy" />
</node>
<node concept="2Rxl7S" id="36PPzUCy2Qj" role="2OqNvi" />
</node>
</node>
</node>
<node concept="3clFbJ" id="3c$Di5ODE7E" role="3cqZAp">
<node concept="3clFbS" id="4btN1w5KhF0" role="3clFbx">
<node concept="3SKdUt" id="4btN1w5Kpzj" role="3cqZAp">
@ -43509,11 +43483,6 @@
<node concept="3I6s7M" id="4btN1w5KlNI" role="3I6sU7">
<node concept="3Aqt3T" id="5Oz70LKdlWp" role="3I6s78">
<ref role="3AqCNq" node="4btN1w5Ki4T" resolve="checkDecls" />
<node concept="37jhX" id="36PPzUCy2QA" role="3AunhB">
<node concept="37vLTw" id="36PPzUCy2Q$" role="37jj2">
<ref role="3cqZAo" node="36PPzUCy0Yn" resolve="scope" />
</node>
</node>
</node>
</node>
<node concept="3I6s7M" id="4btN1w5KjRV" role="3I6sU7">
@ -43943,18 +43912,6 @@
<property role="TrG5h" value="check_TypeVariableDeclBounds" />
<property role="1nmhW7" value="true" />
<node concept="3clFbS" id="5mvKPwwqDjV" role="1nLNMH">
<node concept="3cpWs8" id="36PPzUCy2Sp" role="3cqZAp">
<node concept="3cpWsn" id="36PPzUCy2Sq" role="3cpWs9">
<property role="TrG5h" value="scope" />
<node concept="3Tqbb2" id="36PPzUCy2Sr" role="1tU5fm" />
<node concept="2OqwBi" id="36PPzUCy2Ss" role="33vP2m">
<node concept="3A2sRY" id="36PPzUCy2VW" role="2Oq$k0">
<ref role="3A2yKK" node="5mvKPwwqDYA" resolve="tvd" />
</node>
<node concept="2Rxl7S" id="36PPzUCy2Su" role="2OqNvi" />
</node>
</node>
</node>
<node concept="3clFbJ" id="5mvKPwwqNK9" role="3cqZAp">
<node concept="3clFbS" id="5mvKPwwqNKb" role="3clFbx">
<node concept="1DcWWT" id="6tnA4688W4q" role="3cqZAp">
@ -44027,11 +43984,6 @@
<node concept="3I6s7M" id="6tnA46891zj" role="3I6sU7">
<node concept="3Aqt3T" id="6tnA46891zi" role="3I6s78">
<ref role="3AqCNq" node="4btN1w5Ki4T" resolve="checkDecls" />
<node concept="37jhX" id="36PPzUCy2U9" role="3AunhB">
<node concept="37vLTw" id="36PPzUCy2U7" role="37jj2">
<ref role="3cqZAo" node="36PPzUCy2Sq" resolve="scope" />
</node>
</node>
</node>
</node>
</node>
@ -44122,19 +44074,6 @@
<property role="TrG5h" value="check_ClassifierOverridingMethods" />
<property role="1nmhW7" value="true" />
<node concept="3clFbS" id="29sKO70xbTC" role="1nLNMH">
<node concept="3cpWs8" id="36PPzUCy4jY" role="3cqZAp">
<node concept="3cpWsn" id="36PPzUCy4k1" role="3cpWs9">
<property role="TrG5h" value="scope" />
<node concept="3Tqbb2" id="36PPzUCy4jW" role="1tU5fm" />
<node concept="2OqwBi" id="36PPzUCy5p6" role="33vP2m">
<node concept="3A2sRY" id="36PPzUCy53i" role="2Oq$k0">
<ref role="3A2yKK" node="29sKO70xfxm" resolve="cls" />
</node>
<node concept="2Rxl7S" id="36PPzUCy6xl" role="2OqNvi" />
</node>
</node>
</node>
<node concept="3clFbH" id="dabFeLIjhw" role="3cqZAp" />
<node concept="3cpWs8" id="dabFeLIjhZ" role="3cqZAp">
<node concept="3cpWsn" id="dabFeLIji0" role="3cpWs9">
<property role="TrG5h" value="clsTypesResolver" />
@ -44316,11 +44255,6 @@
<node concept="3I6s7M" id="dabFeLJrtS" role="3I6sU7">
<node concept="3Aqt3T" id="dabFeLVJPK" role="3I6s78">
<ref role="3AqCNq" node="4btN1w5Ki4T" resolve="checkDecls" />
<node concept="37jhX" id="36PPzUCy6xA" role="3AunhB">
<node concept="37vLTw" id="36PPzUCy6x$" role="37jj2">
<ref role="3cqZAo" node="36PPzUCy4k1" resolve="scope" />
</node>
</node>
</node>
</node>
</node>
@ -44601,11 +44535,6 @@
<node concept="3I6s7M" id="dabFeLJnAi" role="3I6sU7">
<node concept="3Aqt3T" id="dabFeLVJPN" role="3I6s78">
<ref role="3AqCNq" node="4btN1w5Ki4T" resolve="checkDecls" />
<node concept="37jhX" id="36PPzUCy6zt" role="3AunhB">
<node concept="37vLTw" id="36PPzUCy6zr" role="37jj2">
<ref role="3cqZAo" node="36PPzUCy4k1" resolve="scope" />
</node>
</node>
</node>
</node>
</node>
@ -44823,11 +44752,6 @@
<node concept="3I6s7M" id="1GAclsBNgSZ" role="3I6sU7">
<node concept="3Aqt3T" id="1GAclsBNgT0" role="3I6s78">
<ref role="3AqCNq" node="4btN1w5Ki4T" resolve="checkDecls" />
<node concept="37jhX" id="1GAclsBNgT1" role="3AunhB">
<node concept="37vLTw" id="1GAclsBNgT2" role="37jj2">
<ref role="3cqZAo" node="36PPzUCy4k1" resolve="scope" />
</node>
</node>
</node>
</node>
</node>
@ -45975,18 +45899,6 @@
<property role="TrG5h" value="check_EnumConstantDecl" />
<property role="1nmhW7" value="true" />
<node concept="3clFbS" id="6EK6UBPp82u" role="1nLNMH">
<node concept="3cpWs8" id="dabFeLVKkM" role="3cqZAp">
<node concept="3cpWsn" id="dabFeLVKkP" role="3cpWs9">
<property role="TrG5h" value="scope" />
<node concept="3Tqbb2" id="dabFeLVKkK" role="1tU5fm" />
<node concept="2OqwBi" id="dabFeLVKHr" role="33vP2m">
<node concept="3A2sRY" id="dabFeLVKqW" role="2Oq$k0">
<ref role="3A2yKK" node="6EK6UBPp82y" resolve="econst" />
</node>
<node concept="2Rxl7S" id="dabFeLVQhF" role="2OqNvi" />
</node>
</node>
</node>
<node concept="3clFbH" id="dabFeLVQhS" role="3cqZAp" />
<node concept="3cpWs8" id="6EK6UBPpO1B" role="3cqZAp">
<node concept="3cpWsn" id="6EK6UBPpO1C" role="3cpWs9">
@ -46095,11 +46007,6 @@
<node concept="3I6s7M" id="6EK6UBPpKq9" role="3I6sU7">
<node concept="3Aqt3T" id="dabFeLVJHT" role="3I6s78">
<ref role="3AqCNq" node="4btN1w5Ki4T" resolve="checkDecls" />
<node concept="37jhX" id="dabFeLVQnB" role="3AunhB">
<node concept="37vLTw" id="dabFeLVQn_" role="37jj2">
<ref role="3cqZAo" node="dabFeLVKkP" resolve="scope" />
</node>
</node>
</node>
</node>
</node>