Skip to content

Commit 45f62f9

Browse files
wsafonovwsafonov
committed
adjusted code to API changes
base: fixed overidden method visibility lint: fixed broken method ref testing: fixed MacrosHelper access due to changed visibility
1 parent 5bbbbb3 commit 45f62f9

File tree

3 files changed

+35
-128
lines changed

3 files changed

+35
-128
lines changed

‎code/languages/org.mpsqa.base/solutions/org.mpsqa.base.errors_suppressor.pluginSolution/models/org.mpsqa.base.errors_suppressor.pluginSolution.plugin.mps‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@
224224
</concept>
225225
<concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
226226
<concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
227-
<concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
228227
<concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
229228
<reference id="1116615189566" name="classifier" index="3VsUkX" />
230229
</concept>
@@ -576,7 +575,7 @@
576575
<node concept="3clFb_" id="4c7y4qc4X0x" role="jymVt">
577576
<property role="TrG5h" value="checkNodeInEditor" />
578577
<node concept="3cqZAl" id="4c7y4qc4X0y" role="3clF45" />
579-
<node concept="3Tmbuc" id="4c7y4qc4X0z" role="1B3o_S" />
578+
<node concept="3Tm1VV" id="4UYQrPl7ru4" role="1B3o_S" />
580579
<node concept="37vLTG" id="4c7y4qc4X0_" role="3clF46">
581580
<property role="TrG5h" value="node" />
582581
<node concept="3Tqbb2" id="4c7y4qc4X0A" role="1tU5fm" />

‎code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.typesystem.mps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3201,7 +3201,7 @@
32013201
</node>
32023202
</node>
32033203
<node concept="liA8E" id="1Cs6QcZxTdc" role="2OqNvi">
3204-
<ref role="37wK5l" to="j8aq:~ReloadableModuleBase.getClass(java.lang.String)" resolve="getClass" />
3204+
<ref role="37wK5l" to="j8aq:~ReloadableModule.getClass(java.lang.String)" resolve="getClass" />
32053205
<node concept="37vLTw" id="1Cs6QcZxWLU" role="37wK5m">
32063206
<ref role="3cqZAo" node="y1G8y67DG8" resolve="clazzName" />
32073207
</node>

‎code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.generator.templates@generator.mps‎

Lines changed: 33 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -908,44 +908,21 @@
908908
</node>
909909
</node>
910910
</node>
911-
<node concept="3cpWs8" id="4JpXQ$UYAK8" role="3cqZAp">
912-
<node concept="3cpWsn" id="4JpXQ$UYAK9" role="3cpWs9">
913-
<property role="TrG5h" value="project" />
914-
<node concept="3Tqbb2" id="4JpXQ$UYAKa" role="1tU5fm">
915-
<ref role="ehGHo" to="3ior:4RPz6WoY4Cj" resolve="BuildProject" />
916-
</node>
917-
<node concept="1PxgMI" id="4JpXQ$UYAKb" role="33vP2m">
918-
<node concept="2OqwBi" id="4JpXQ$UYAKc" role="1m5AlR">
919-
<node concept="2Rxl7S" id="4JpXQ$UYAKd" role="2OqNvi" />
920-
<node concept="30H73N" id="4JpXQ$UYAKe" role="2Oq$k0" />
921-
</node>
922-
<node concept="chp4Y" id="4JpXQ$UYAKf" role="3oSUPX">
923-
<ref role="cht4Q" to="3ior:4RPz6WoY4Cj" resolve="BuildProject" />
924-
</node>
925-
</node>
926-
</node>
927-
</node>
928911
<node concept="3cpWs8" id="4JpXQ$UYAKg" role="3cqZAp">
929912
<node concept="3cpWsn" id="4JpXQ$UYAKh" role="3cpWs9">
930913
<property role="TrG5h" value="macroHelper" />
931914
<node concept="3uibUv" id="4JpXQ$UYAKi" role="1tU5fm">
932915
<ref role="3uigEE" to="o3n2:5FtnUVJR86u" resolve="MacroHelper" />
933916
</node>
934-
<node concept="2OqwBi" id="4JpXQ$UYAKj" role="33vP2m">
935-
<node concept="2ShNRf" id="4JpXQ$UYAKk" role="2Oq$k0">
936-
<node concept="1pGfFk" id="4JpXQ$UYAKl" role="2ShVmc">
937-
<ref role="37wK5l" to="o3n2:5DY7s5F2Pa1" resolve="MacroHelper.MacroContext" />
938-
<node concept="37vLTw" id="4JpXQ$UYAKm" role="37wK5m">
939-
<ref role="3cqZAo" node="4JpXQ$UYAK9" resolve="project" />
940-
</node>
941-
<node concept="1iwH7S" id="4JpXQ$UYAKn" role="37wK5m" />
942-
</node>
917+
<node concept="2OqwBi" id="3uAfcsN3j9F" role="33vP2m">
918+
<node concept="2YIFZM" id="5V$ev8kKIwf" role="2Oq$k0">
919+
<ref role="1Pybhc" to="o3n2:4jjtc7WZOAv" resolve="Context" />
920+
<ref role="37wK5l" to="o3n2:19KdqCVerNJ" resolve="defaultContext" />
921+
<node concept="1iwH7S" id="5V$ev8kKIwg" role="37wK5m" />
943922
</node>
944-
<node concept="liA8E" id="4JpXQ$UYAKo" role="2OqNvi">
945-
<ref role="37wK5l" to="o3n2:5DY7s5F2PaT" resolve="getMacros" />
946-
<node concept="37vLTw" id="4JpXQ$UYAKp" role="37wK5m">
947-
<ref role="3cqZAo" node="4JpXQ$UYAK9" resolve="project" />
948-
</node>
923+
<node concept="liA8E" id="3uAfcsN3jnX" role="2OqNvi">
924+
<ref role="37wK5l" to="o3n2:5DY7s5F3vd2" resolve="getMacros" />
925+
<node concept="30H73N" id="3uAfcsN3rhl" role="37wK5m" />
949926
</node>
950927
</node>
951928
</node>
@@ -1725,44 +1702,21 @@
17251702
</node>
17261703
</node>
17271704
</node>
1728-
<node concept="3cpWs8" id="HwplGM7Em4" role="3cqZAp">
1729-
<node concept="3cpWsn" id="HwplGM7Em5" role="3cpWs9">
1730-
<property role="TrG5h" value="project" />
1731-
<node concept="3Tqbb2" id="HwplGM7Em6" role="1tU5fm">
1732-
<ref role="ehGHo" to="3ior:4RPz6WoY4Cj" resolve="BuildProject" />
1733-
</node>
1734-
<node concept="1PxgMI" id="HwplGM7Em7" role="33vP2m">
1735-
<node concept="2OqwBi" id="HwplGM7Em8" role="1m5AlR">
1736-
<node concept="2Rxl7S" id="HwplGM7Em9" role="2OqNvi" />
1737-
<node concept="30H73N" id="HwplGM7Ema" role="2Oq$k0" />
1738-
</node>
1739-
<node concept="chp4Y" id="HwplGM7Emb" role="3oSUPX">
1740-
<ref role="cht4Q" to="3ior:4RPz6WoY4Cj" resolve="BuildProject" />
1741-
</node>
1742-
</node>
1743-
</node>
1744-
</node>
17451705
<node concept="3cpWs8" id="HwplGM7Emc" role="3cqZAp">
17461706
<node concept="3cpWsn" id="HwplGM7Emd" role="3cpWs9">
17471707
<property role="TrG5h" value="macroHelper" />
17481708
<node concept="3uibUv" id="HwplGM7Eme" role="1tU5fm">
17491709
<ref role="3uigEE" to="o3n2:5FtnUVJR86u" resolve="MacroHelper" />
17501710
</node>
1751-
<node concept="2OqwBi" id="HwplGM7Emf" role="33vP2m">
1752-
<node concept="2ShNRf" id="HwplGM7Emg" role="2Oq$k0">
1753-
<node concept="1pGfFk" id="HwplGM7Emh" role="2ShVmc">
1754-
<ref role="37wK5l" to="o3n2:5DY7s5F2Pa1" resolve="MacroHelper.MacroContext" />
1755-
<node concept="37vLTw" id="HwplGM7Emi" role="37wK5m">
1756-
<ref role="3cqZAo" node="HwplGM7Em5" resolve="project" />
1757-
</node>
1758-
<node concept="1iwH7S" id="HwplGM7Emj" role="37wK5m" />
1759-
</node>
1711+
<node concept="2OqwBi" id="3uAfcsN3tZO" role="33vP2m">
1712+
<node concept="2YIFZM" id="3uAfcsN3tZP" role="2Oq$k0">
1713+
<ref role="1Pybhc" to="o3n2:4jjtc7WZOAv" resolve="Context" />
1714+
<ref role="37wK5l" to="o3n2:19KdqCVerNJ" resolve="defaultContext" />
1715+
<node concept="1iwH7S" id="3uAfcsN3tZQ" role="37wK5m" />
17601716
</node>
1761-
<node concept="liA8E" id="HwplGM7Emk" role="2OqNvi">
1762-
<ref role="37wK5l" to="o3n2:5DY7s5F2PaT" resolve="getMacros" />
1763-
<node concept="37vLTw" id="HwplGM7Eml" role="37wK5m">
1764-
<ref role="3cqZAo" node="HwplGM7Em5" resolve="project" />
1765-
</node>
1717+
<node concept="liA8E" id="3uAfcsN3tZR" role="2OqNvi">
1718+
<ref role="37wK5l" to="o3n2:5DY7s5F3vd2" resolve="getMacros" />
1719+
<node concept="30H73N" id="3uAfcsN3tZS" role="37wK5m" />
17661720
</node>
17671721
</node>
17681722
</node>
@@ -2245,44 +2199,21 @@
22452199
</node>
22462200
</node>
22472201
</node>
2248-
<node concept="3cpWs8" id="4JpXQ$UYZH8" role="3cqZAp">
2249-
<node concept="3cpWsn" id="4JpXQ$UYZH9" role="3cpWs9">
2250-
<property role="TrG5h" value="project" />
2251-
<node concept="3Tqbb2" id="4JpXQ$UYZHa" role="1tU5fm">
2252-
<ref role="ehGHo" to="3ior:4RPz6WoY4Cj" resolve="BuildProject" />
2253-
</node>
2254-
<node concept="1PxgMI" id="4JpXQ$UYZHb" role="33vP2m">
2255-
<node concept="2OqwBi" id="4JpXQ$UYZHc" role="1m5AlR">
2256-
<node concept="2Rxl7S" id="4JpXQ$UYZHd" role="2OqNvi" />
2257-
<node concept="30H73N" id="4JpXQ$UYZHe" role="2Oq$k0" />
2258-
</node>
2259-
<node concept="chp4Y" id="4JpXQ$UYZHf" role="3oSUPX">
2260-
<ref role="cht4Q" to="3ior:4RPz6WoY4Cj" resolve="BuildProject" />
2261-
</node>
2262-
</node>
2263-
</node>
2264-
</node>
22652202
<node concept="3cpWs8" id="4JpXQ$UYZHg" role="3cqZAp">
22662203
<node concept="3cpWsn" id="4JpXQ$UYZHh" role="3cpWs9">
22672204
<property role="TrG5h" value="macroHelper" />
22682205
<node concept="3uibUv" id="4JpXQ$UYZHi" role="1tU5fm">
22692206
<ref role="3uigEE" to="o3n2:5FtnUVJR86u" resolve="MacroHelper" />
22702207
</node>
2271-
<node concept="2OqwBi" id="4JpXQ$UYZHj" role="33vP2m">
2272-
<node concept="2ShNRf" id="4JpXQ$UYZHk" role="2Oq$k0">
2273-
<node concept="1pGfFk" id="4JpXQ$UYZHl" role="2ShVmc">
2274-
<ref role="37wK5l" to="o3n2:5DY7s5F2Pa1" resolve="MacroHelper.MacroContext" />
2275-
<node concept="37vLTw" id="4JpXQ$UYZHm" role="37wK5m">
2276-
<ref role="3cqZAo" node="4JpXQ$UYZH9" resolve="project" />
2277-
</node>
2278-
<node concept="1iwH7S" id="4JpXQ$UYZHn" role="37wK5m" />
2279-
</node>
2208+
<node concept="2OqwBi" id="3uAfcsN3sHH" role="33vP2m">
2209+
<node concept="2YIFZM" id="3uAfcsN3sHI" role="2Oq$k0">
2210+
<ref role="1Pybhc" to="o3n2:4jjtc7WZOAv" resolve="Context" />
2211+
<ref role="37wK5l" to="o3n2:19KdqCVerNJ" resolve="defaultContext" />
2212+
<node concept="1iwH7S" id="3uAfcsN3sHJ" role="37wK5m" />
22802213
</node>
2281-
<node concept="liA8E" id="4JpXQ$UYZHo" role="2OqNvi">
2282-
<ref role="37wK5l" to="o3n2:5DY7s5F2PaT" resolve="getMacros" />
2283-
<node concept="37vLTw" id="4JpXQ$UYZHp" role="37wK5m">
2284-
<ref role="3cqZAo" node="4JpXQ$UYZH9" resolve="project" />
2285-
</node>
2214+
<node concept="liA8E" id="3uAfcsN3sHK" role="2OqNvi">
2215+
<ref role="37wK5l" to="o3n2:5DY7s5F3vd2" resolve="getMacros" />
2216+
<node concept="30H73N" id="3uAfcsN3sHL" role="37wK5m" />
22862217
</node>
22872218
</node>
22882219
</node>
@@ -3428,44 +3359,21 @@
34283359
</node>
34293360
</node>
34303361
</node>
3431-
<node concept="3cpWs8" id="51DD0tdMhSa" role="3cqZAp">
3432-
<node concept="3cpWsn" id="51DD0tdMhSb" role="3cpWs9">
3433-
<property role="TrG5h" value="project" />
3434-
<node concept="3Tqbb2" id="51DD0tdMhSc" role="1tU5fm">
3435-
<ref role="ehGHo" to="3ior:4RPz6WoY4Cj" resolve="BuildProject" />
3436-
</node>
3437-
<node concept="1PxgMI" id="51DD0tdMhSd" role="33vP2m">
3438-
<node concept="2OqwBi" id="51DD0tdMhSe" role="1m5AlR">
3439-
<node concept="2Rxl7S" id="51DD0tdMhSf" role="2OqNvi" />
3440-
<node concept="30H73N" id="51DD0tdMhSg" role="2Oq$k0" />
3441-
</node>
3442-
<node concept="chp4Y" id="51DD0tdMhSh" role="3oSUPX">
3443-
<ref role="cht4Q" to="3ior:4RPz6WoY4Cj" resolve="BuildProject" />
3444-
</node>
3445-
</node>
3446-
</node>
3447-
</node>
34483362
<node concept="3cpWs8" id="51DD0tdMhSi" role="3cqZAp">
34493363
<node concept="3cpWsn" id="51DD0tdMhSj" role="3cpWs9">
34503364
<property role="TrG5h" value="macroHelper" />
34513365
<node concept="3uibUv" id="51DD0tdMhSk" role="1tU5fm">
34523366
<ref role="3uigEE" to="o3n2:5FtnUVJR86u" resolve="MacroHelper" />
34533367
</node>
3454-
<node concept="2OqwBi" id="51DD0tdMhSl" role="33vP2m">
3455-
<node concept="2ShNRf" id="51DD0tdMhSm" role="2Oq$k0">
3456-
<node concept="1pGfFk" id="51DD0tdMhSn" role="2ShVmc">
3457-
<ref role="37wK5l" to="o3n2:5DY7s5F2Pa1" resolve="MacroHelper.MacroContext" />
3458-
<node concept="37vLTw" id="51DD0tdMhSo" role="37wK5m">
3459-
<ref role="3cqZAo" node="51DD0tdMhSb" resolve="project" />
3460-
</node>
3461-
<node concept="1iwH7S" id="51DD0tdMhSp" role="37wK5m" />
3462-
</node>
3463-
</node>
3464-
<node concept="liA8E" id="51DD0tdMhSq" role="2OqNvi">
3465-
<ref role="37wK5l" to="o3n2:5DY7s5F2PaT" resolve="getMacros" />
3466-
<node concept="37vLTw" id="51DD0tdMhSr" role="37wK5m">
3467-
<ref role="3cqZAo" node="51DD0tdMhSb" resolve="project" />
3468-
</node>
3368+
<node concept="2OqwBi" id="3uAfcsN3uih" role="33vP2m">
3369+
<node concept="2YIFZM" id="3uAfcsN3uii" role="2Oq$k0">
3370+
<ref role="1Pybhc" to="o3n2:4jjtc7WZOAv" resolve="Context" />
3371+
<ref role="37wK5l" to="o3n2:19KdqCVerNJ" resolve="defaultContext" />
3372+
<node concept="1iwH7S" id="3uAfcsN3uij" role="37wK5m" />
3373+
</node>
3374+
<node concept="liA8E" id="3uAfcsN3uik" role="2OqNvi">
3375+
<ref role="37wK5l" to="o3n2:5DY7s5F3vd2" resolve="getMacros" />
3376+
<node concept="30H73N" id="3uAfcsN3uil" role="37wK5m" />
34693377
</node>
34703378
</node>
34713379
</node>

0 commit comments

Comments
 (0)