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

Drop usages of OriginIndex; minor fixes in tests

This commit is contained in:
Fedor Isakov 2024-09-20 18:18:37 +02:00
parent 0f5389b689
commit c401e686cb
4 changed files with 82 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1002,8 +1002,13 @@
</node>
<node concept="liA8E" id="2LxIQemUJYl" role="2OqNvi">
<ref role="37wK5l" to="ugy2:4VNF0fT26a5" resolve="withDependencyUpdatable" />
<node concept="37vLTw" id="2LxIQemUK79" role="37wK5m">
<ref role="3cqZAo" node="1XKnVQwJTH" resolve="updatesRecorder" />
<node concept="2OqwBi" id="KkWtiNKZCH" role="37wK5m">
<node concept="37vLTw" id="2LxIQemUK79" role="2Oq$k0">
<ref role="3cqZAo" node="1XKnVQwJTH" resolve="updatesRecorder" />
</node>
<node concept="liA8E" id="KkWtiNLTR4" role="2OqNvi">
<ref role="37wK5l" to="hano:KkWtiNLqRM" resolve="dependencies" />
</node>
</node>
</node>
</node>
@ -1048,21 +1053,6 @@
</node>
</node>
</node>
<node concept="3clFbF" id="6nFpYlv0TZv" role="3cqZAp">
<node concept="2OqwBi" id="6nFpYlv0UjV" role="3clFbG">
<node concept="37vLTw" id="6nFpYlv0TZt" role="2Oq$k0">
<ref role="3cqZAo" node="tyIfzC1aUL" resolve="tplApp" />
</node>
<node concept="liA8E" id="6nFpYlv0Ux7" role="2OqNvi">
<ref role="37wK5l" to="hano:6nFpYluWwIS" resolve="setOriginIndex" />
<node concept="2ShNRf" id="6nFpYlv0UyZ" role="37wK5m">
<node concept="HV5vD" id="6nFpYlv0UK1" role="2ShVmc">
<ref role="HV5vE" to="hano:70Wv0dJhQb2" resolve="OriginIndex" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="4hQVL4fdQZO" role="3cqZAp">
<node concept="2OqwBi" id="4hQVL4fdSHQ" role="3clFbG">
<node concept="37vLTw" id="4hQVL4fdQZM" role="2Oq$k0">
@ -5545,6 +5535,43 @@
<node concept="10P_77" id="5SC$dmot02O" role="3clF45" />
<node concept="3Tm1VV" id="5SC$dmot02P" role="1B3o_S" />
<node concept="3clFbS" id="5SC$dmot02Y" role="3clF47">
<node concept="3SKdUt" id="6YXFD4u9kxA" role="3cqZAp">
<node concept="1PaTwC" id="6YXFD4u9kxB" role="1aUNEU">
<node concept="3oM_SD" id="6YXFD4u9kxC" role="1PaTwD">
<property role="3oM_SC" value="FIXME" />
</node>
<node concept="3oM_SD" id="6YXFD4u9pNs" role="1PaTwD">
<property role="3oM_SC" value="presentation" />
</node>
<node concept="3oM_SD" id="6YXFD4u9pWp" role="1PaTwD">
<property role="3oM_SC" value="here" />
</node>
<node concept="3oM_SD" id="6YXFD4u9pWE" role="1PaTwD">
<property role="3oM_SC" value="is" />
</node>
<node concept="3oM_SD" id="6YXFD4u9pWF" role="1PaTwD">
<property role="3oM_SC" value="a" />
</node>
<node concept="3oM_SD" id="6YXFD4u9pWG" role="1PaTwD">
<property role="3oM_SC" value="poor" />
</node>
<node concept="3oM_SD" id="6YXFD4u9pWX" role="1PaTwD">
<property role="3oM_SC" value="choice" />
</node>
<node concept="3oM_SD" id="6YXFD4u9pXY" role="1PaTwD">
<property role="3oM_SC" value="to" />
</node>
<node concept="3oM_SD" id="6YXFD4u9pXZ" role="1PaTwD">
<property role="3oM_SC" value="compare" />
</node>
<node concept="3oM_SD" id="6YXFD4u9pYw" role="1PaTwD">
<property role="3oM_SC" value="nodes" />
</node>
<node concept="3oM_SD" id="6YXFD4u9pYL" role="1PaTwD">
<property role="3oM_SC" value="by" />
</node>
</node>
</node>
<node concept="3clFbF" id="5SC$dmot74h" role="3cqZAp">
<node concept="2OqwBi" id="5SC$dmot8ha" role="3clFbG">
<node concept="2OqwBi" id="5SC$dmot7K6" role="2Oq$k0">
@ -6697,6 +6724,7 @@
<node concept="37vLTw" id="3j46jeGYngU" role="37wK5m">
<ref role="3cqZAo" node="3j46jeGYiQm" resolve="res" />
</node>
<node concept="10Nm6u" id="1bodCZ$EAU8" role="37wK5m" />
</node>
</node>
</node>
@ -7060,6 +7088,7 @@
<node concept="37vLTw" id="WJTIIomFFw" role="37wK5m">
<ref role="3cqZAo" node="WJTIIomxzX" resolve="computedType" />
</node>
<node concept="10Nm6u" id="1bodCZ$ErwG" role="37wK5m" />
</node>
</node>
<node concept="3cpWs6" id="WJTIIomjrt" role="3cqZAp">
@ -7992,6 +8021,12 @@
<ref role="3cqZAo" node="WJTIIokCYO" resolve="types" />
</node>
</node>
<node concept="2OqwBi" id="1bodCZ$DLSH" role="37wK5m">
<node concept="2GrUjf" id="1bodCZ$DLSI" role="2Oq$k0">
<ref role="2Gs0qQ" node="WJTIIpaCjO" resolve="expectedTyped" />
</node>
<node concept="3AY5_j" id="1bodCZ$DLSJ" role="2OqNvi" />
</node>
</node>
</node>
</node>
@ -8232,6 +8267,10 @@
<property role="TrG5h" value="type" />
<node concept="3Tqbb2" id="WJTIIokCZw" role="1tU5fm" />
</node>
<node concept="37vLTG" id="1bodCZ$CTj0" role="3clF46">
<property role="TrG5h" value="loc" />
<node concept="2sp9CU" id="1bodCZ$D13o" role="1tU5fm" />
</node>
<node concept="3cqZAl" id="WJTIIokCZx" role="3clF45" />
<node concept="3clFbS" id="WJTIIokCZy" role="3clF47">
<node concept="1X3_iC" id="WJTIIomJFC" role="lGtFl">
@ -8278,13 +8317,26 @@
<ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...)" resolve="format" />
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
<node concept="Xl_RD" id="4ZGicUZ5ZbC" role="37wK5m">
<property role="Xl_RC" value="types differ: expected [%s], got [%s]!" />
<property role="Xl_RC" value="types differ @%s: expected [%s], got [%s]!" />
</node>
<node concept="37vLTw" id="5SC$dmoE7GW" role="37wK5m">
<ref role="3cqZAo" node="WJTIIokCZt" resolve="expected" />
<node concept="37vLTw" id="1bodCZ$D$_F" role="37wK5m">
<ref role="3cqZAo" node="1bodCZ$CTj0" resolve="loc" />
</node>
<node concept="37vLTw" id="5SC$dmoE9Ee" role="37wK5m">
<ref role="3cqZAo" node="WJTIIokCZv" resolve="type" />
<node concept="2OqwBi" id="1bodCZ$BYSf" role="37wK5m">
<node concept="37vLTw" id="5SC$dmoE7GW" role="2Oq$k0">
<ref role="3cqZAo" node="WJTIIokCZt" resolve="expected" />
</node>
<node concept="2qgKlT" id="1bodCZ$C4qY" role="2OqNvi">
<ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
</node>
</node>
<node concept="2OqwBi" id="1bodCZ$C9UF" role="37wK5m">
<node concept="37vLTw" id="5SC$dmoE9Ee" role="2Oq$k0">
<ref role="3cqZAo" node="WJTIIokCZv" resolve="type" />
</node>
<node concept="2qgKlT" id="1bodCZ$Cgay" role="2OqNvi">
<ref role="37wK5l" to="tpcu:hEwIMiw" resolve="getPresentation" />
</node>
</node>
</node>
</node>

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

@ -3503,21 +3503,6 @@
</node>
</node>
</node>
<node concept="3clFbF" id="6nFpYlv0Vkh" role="3cqZAp">
<node concept="2OqwBi" id="6nFpYlv0VK9" role="3clFbG">
<node concept="37vLTw" id="6nFpYlv0Vkf" role="2Oq$k0">
<ref role="3cqZAo" node="6$7vuu2ugt3" resolve="tplApp" />
</node>
<node concept="liA8E" id="6nFpYlv0WkN" role="2OqNvi">
<ref role="37wK5l" to="hano:6nFpYluWwIS" resolve="setOriginIndex" />
<node concept="2ShNRf" id="6nFpYlv0WLN" role="37wK5m">
<node concept="HV5vD" id="6nFpYlv0XzE" role="2ShVmc">
<ref role="HV5vE" to="hano:70Wv0dJhQb2" resolve="OriginIndex" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="4hQVL4feBXx" role="3cqZAp">
<node concept="2OqwBi" id="4hQVL4feBXy" role="3clFbG">
<node concept="37vLTw" id="4hQVL4feBXz" role="2Oq$k0">
@ -4489,7 +4474,6 @@
</node>
<node concept="1lH9Xt" id="3KwBCAABlTI">
<property role="TrG5h" value="UpdateTypeCache" />
<property role="26Nn1l" value="true" />
<property role="3DII0k" value="2hh8MJdVwqX/command" />
<node concept="1qefOq" id="7mB3viLoF4d" role="1SKRRt">
<node concept="0U$pH" id="7lt0LtPHRY$" role="1qenE9">

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

@ -3783,24 +3783,6 @@
</node>
<node concept="3Tmbuc" id="61G6TdCrlVr" role="1B3o_S" />
</node>
<node concept="2tJIrI" id="6KCGZaSwrLh" role="jymVt" />
<node concept="Wx3nA" id="7i3KM7gAW2Y" role="jymVt">
<property role="TrG5h" value="ORIGINS" />
<node concept="3uibUv" id="7i3KM7gAW30" role="1tU5fm">
<ref role="3uigEE" node="7i3KM7g1Lm1" resolve="CachedData.DataFlavour" />
<node concept="3uibUv" id="6nFpYlvfeOk" role="11_B2D">
<ref role="3uigEE" to="hano:70Wv0dJhQb2" resolve="OriginIndex" />
</node>
</node>
<node concept="2YIFZM" id="qsErMwtI72" role="33vP2m">
<ref role="37wK5l" node="7Aoa2yVep9e" resolve="of" />
<ref role="1Pybhc" node="7i3KM7g1Lm1" resolve="CachedData.DataFlavour" />
<node concept="3VsKOn" id="7i3KM7gAW35" role="37wK5m">
<ref role="3VsUkX" to="hano:70Wv0dJhQb2" resolve="OriginIndex" />
</node>
</node>
<node concept="3Tmbuc" id="6PWFJfG5BWT" role="1B3o_S" />
</node>
<node concept="2tJIrI" id="6PWFJfG5FIy" role="jymVt" />
<node concept="Wx3nA" id="6PWFJfG61KF" role="jymVt">
<property role="TrG5h" value="MEMO" />
@ -7313,12 +7295,6 @@
<ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
</node>
</node>
<node concept="37vLTG" id="6nFpYluWRTo" role="3clF46">
<property role="TrG5h" value="originIndex" />
<node concept="3uibUv" id="6nFpYluWSbt" role="1tU5fm">
<ref role="3uigEE" to="hano:70Wv0dJhQb2" resolve="OriginIndex" />
</node>
</node>
<node concept="37vLTG" id="6nFpYlucqnB" role="3clF46">
<property role="TrG5h" value="updatesRecorder" />
<node concept="3uibUv" id="6nFpYlucr3C" role="1tU5fm">
@ -7372,19 +7348,6 @@
</node>
</node>
</node>
<node concept="3clFbF" id="6nFpYluWSlG" role="3cqZAp">
<node concept="37vLTI" id="6nFpYluWSlI" role="3clFbG">
<node concept="2OqwBi" id="6nFpYluWTID" role="37vLTJ">
<node concept="Xjq3P" id="6nFpYluWTS0" role="2Oq$k0" />
<node concept="2OwXpG" id="6nFpYluWV3w" role="2OqNvi">
<ref role="2Oxat5" node="6nFpYluWSlC" resolve="originIndex" />
</node>
</node>
<node concept="37vLTw" id="6nFpYluWSlM" role="37vLTx">
<ref role="3cqZAo" node="6nFpYluWRTo" resolve="originIndex" />
</node>
</node>
</node>
<node concept="3clFbF" id="55xYlrlMeA3" role="3cqZAp">
<node concept="37vLTI" id="55xYlrlMeA5" role="3clFbG">
<node concept="2OqwBi" id="55xYlrlMf6J" role="37vLTJ">
@ -7618,19 +7581,6 @@
<node concept="3cqZAl" id="6nFpYluWPzR" role="3clF45" />
<node concept="3Tmbuc" id="6nFpYluWPzS" role="1B3o_S" />
<node concept="3clFbS" id="6nFpYluWP$0" role="3clF47">
<node concept="3clFbF" id="6nFpYluWRf2" role="3cqZAp">
<node concept="2OqwBi" id="6nFpYluWRtS" role="3clFbG">
<node concept="37vLTw" id="6nFpYluWRf1" role="2Oq$k0">
<ref role="3cqZAo" node="6nFpYluWPzP" resolve="programProducer" />
</node>
<node concept="liA8E" id="6nFpYluWRFt" role="2OqNvi">
<ref role="37wK5l" to="hano:6nFpYluWwIS" resolve="setOriginIndex" />
<node concept="37vLTw" id="6nFpYluWU5T" role="37wK5m">
<ref role="3cqZAo" node="6nFpYluWSlC" resolve="originIndex" />
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="6nFpYluWUfi" role="3cqZAp">
<node concept="2OqwBi" id="6nFpYluWUfj" role="3clFbG">
<node concept="37vLTw" id="6nFpYluWUfk" role="2Oq$k0">
@ -7657,13 +7607,6 @@
<ref role="3uigEE" to="hano:6nFpYlu02jD" resolve="UpdatesRecorder" />
</node>
</node>
<node concept="312cEg" id="6nFpYluWSlC" role="jymVt">
<property role="TrG5h" value="originIndex" />
<node concept="3Tm6S6" id="6nFpYluWSlD" role="1B3o_S" />
<node concept="3uibUv" id="6nFpYluWSlF" role="1tU5fm">
<ref role="3uigEE" to="hano:70Wv0dJhQb2" resolve="OriginIndex" />
</node>
</node>
<node concept="312cEg" id="55xYlrlMe_Z" role="jymVt">
<property role="TrG5h" value="producePartialProgram" />
<property role="3TUv4t" value="true" />
@ -18127,38 +18070,6 @@
</node>
</node>
<node concept="3clFbH" id="3OUB6BByEiv" role="3cqZAp" />
<node concept="3cpWs8" id="6nFpYlvfycz" role="3cqZAp">
<node concept="3cpWsn" id="6nFpYlvfyc$" role="3cpWs9">
<property role="TrG5h" value="originIndex" />
<node concept="3uibUv" id="6nFpYlvfyaJ" role="1tU5fm">
<ref role="3uigEE" to="hano:70Wv0dJhQb2" resolve="OriginIndex" />
</node>
<node concept="2OqwBi" id="6nFpYlvfyc_" role="33vP2m">
<node concept="liA8E" id="6nFpYlvfycB" role="2OqNvi">
<ref role="37wK5l" node="7z54$fPgk2E" resolve="getOrSet" />
<node concept="10M0yZ" id="61G6TdCq_qR" role="37wK5m">
<ref role="1PxDUh" node="7kaxm0sEy3e" resolve="TypecheckingService" />
<ref role="3cqZAo" node="7i3KM7gAW2Y" resolve="ORIGINS" />
</node>
<node concept="1bVj0M" id="6nFpYlvfycD" role="37wK5m">
<node concept="3clFbS" id="6nFpYlvfycE" role="1bW5cS">
<node concept="3clFbF" id="6nFpYlvfycF" role="3cqZAp">
<node concept="2ShNRf" id="6nFpYlvfycG" role="3clFbG">
<node concept="HV5vD" id="6nFpYlvfycH" role="2ShVmc">
<ref role="HV5vE" to="hano:70Wv0dJhQb2" resolve="OriginIndex" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="37vLTw" id="7Aoa2yV5c_Z" role="2Oq$k0">
<ref role="3cqZAo" node="5Qx6_65tZCJ" resolve="cachedData" />
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="3OUB6BBvJGx" role="3cqZAp" />
<node concept="3cpWs8" id="6nFpYlvfHC4" role="3cqZAp">
<node concept="3cpWsn" id="6nFpYlvfHC5" role="3cpWs9">
<property role="TrG5h" value="updatesRecorder" />
@ -18216,8 +18127,13 @@
</node>
<node concept="liA8E" id="4VNF0fT8eRS" role="2OqNvi">
<ref role="37wK5l" to="ugy2:4VNF0fT26a5" resolve="withDependencyUpdatable" />
<node concept="37vLTw" id="4VNF0fT8jj6" role="37wK5m">
<ref role="3cqZAo" node="6nFpYlvfHC5" resolve="updatesRecorder" />
<node concept="2OqwBi" id="KkWtiNM3vW" role="37wK5m">
<node concept="37vLTw" id="4VNF0fT8jj6" role="2Oq$k0">
<ref role="3cqZAo" node="6nFpYlvfHC5" resolve="updatesRecorder" />
</node>
<node concept="liA8E" id="KkWtiNM66n" role="2OqNvi">
<ref role="37wK5l" to="hano:KkWtiNLqRM" resolve="dependencies" />
</node>
</node>
</node>
</node>
@ -18240,9 +18156,6 @@
<node concept="37vLTw" id="1C_jAsqo_Hr" role="37wK5m">
<ref role="3cqZAo" node="1C_jAsqmSE4" resolve="repository" />
</node>
<node concept="37vLTw" id="6nFpYlvf$Xe" role="37wK5m">
<ref role="3cqZAo" node="6nFpYlvfyc$" resolve="originIndex" />
</node>
<node concept="37vLTw" id="6nFpYlvfOVX" role="37wK5m">
<ref role="3cqZAo" node="6nFpYlvfHC5" resolve="updatesRecorder" />
</node>
@ -19302,21 +19215,6 @@
<node concept="3cqZAl" id="6nFpYluWG8R" role="3clF45" />
<node concept="3Tmbuc" id="6nFpYluWGVX" role="1B3o_S" />
<node concept="3clFbS" id="6nFpYluWG8T" role="3clF47">
<node concept="3clFbF" id="6nFpYluWLtJ" role="3cqZAp">
<node concept="2OqwBi" id="6nFpYluWLEt" role="3clFbG">
<node concept="37vLTw" id="6nFpYluWLtI" role="2Oq$k0">
<ref role="3cqZAo" node="6nFpYluWKou" resolve="programProducer" />
</node>
<node concept="liA8E" id="6nFpYluWLNT" role="2OqNvi">
<ref role="37wK5l" to="hano:6nFpYluWwIS" resolve="setOriginIndex" />
<node concept="2ShNRf" id="6nFpYluWLSR" role="37wK5m">
<node concept="HV5vD" id="6nFpYluWMw8" role="2ShVmc">
<ref role="HV5vE" to="hano:70Wv0dJhQb2" resolve="OriginIndex" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="4hQVL4fgQu7" role="3cqZAp">
<node concept="2OqwBi" id="4hQVL4fgQu8" role="3clFbG">
<node concept="37vLTw" id="4hQVL4fgQu9" role="2Oq$k0">

2
samples/mpscore/solutions/jetbrains.mps.baseLanguage.methodReferencesExt.test/models/jetbrains.mps.baseLanguage.methodReferencesExt.test.code.mps
View File

@ -994,7 +994,7 @@
</node>
<node concept="2es0OD" id="6ZRhjsGyISy" role="2OqNvi">
<node concept="37Ijox" id="6ZRhjsGyISz" role="23t8la">
<ref role="37Ijqf" to="wyt6:~StringBuilder.append(java.lang.Object)" resolve="append" />
<ref role="37Ijqf" to="wyt6:~StringBuilder.append(int)" resolve="append" />
<node concept="37vLTw" id="6ZRhjsGyIS$" role="wWaWy">
<ref role="3cqZAo" node="6ZRhjsGyISd" resolve="builder" />
</node>