Skip to content

Commit 57c8227

Browse files
sergej-koscejevsergej-koscejev
authored
Merge pull request #246 from mbeddr/merge/MPS-2024.1-manual
Merge 2023.2 → 2024.1
2 parents b0ec3b7 + 9d20301 commit 57c8227

File tree

7 files changed

+1874
-892
lines changed

7 files changed

+1874
-892
lines changed

‎.github/workflows/PR-into-next-version.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ jobs:
1515
branch_prefix: maintenance/MPS-
1616
merge_prefix: merge/MPS-
1717
default_merge_prefix: merge/
18+
automerge_new_prs: true
1819
token: ${{ secrets.MPS_CI_BUILD_BOT_ACCESS_TOKEN }}

‎code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.intentions.mps‎

Lines changed: 141 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@
1515
<import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
1616
<import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
1717
<import index="u41u" ref="r:88cf32d8-7e39-47c5-b37a-24d1801279ce(org.mpsqa.arch.util)" />
18-
<import index="ryx8" ref="r:d0c25d1d-f21e-42b4-b319-5eef0584d5ca(org.mpsqa.arch.structure)" implicit="true" />
18+
<import index="ryx8" ref="r:d0c25d1d-f21e-42b4-b319-5eef0584d5ca(org.mpsqa.arch.structure)" />
1919
<import index="xlb7" ref="r:cf42fd0a-68d2-493b-8b77-961658617704(jetbrains.mps.lang.modelapi.behavior)" implicit="true" />
2020
<import index="zqge" ref="r:59e90602-6655-4552-86eb-441a42a9a0e4(jetbrains.mps.lang.text.structure)" implicit="true" />
21+
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
22+
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
2123
</imports>
2224
<registry>
2325
<language id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts">
@@ -92,6 +94,7 @@
9294
<child id="1081773367579" name="rightExpression" index="3uHU7w" />
9395
<child id="1081773367580" name="leftExpression" index="3uHU7B" />
9496
</concept>
97+
<concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
9598
<concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
9699
<child id="1163668914799" name="condition" index="3K4Cdx" />
97100
<child id="1163668922816" name="ifTrue" index="3K4E3e" />
@@ -115,6 +118,13 @@
115118
<child id="2522969319638198291" name="executeFunction" index="2ZfgGD" />
116119
<child id="2522969319638093993" name="descriptionFunction" index="2ZfVej" />
117120
</concept>
121+
<concept id="1240316299033" name="jetbrains.mps.lang.intentions.structure.QueryBlock" flags="in" index="38BcoT">
122+
<child id="1240393479918" name="paramType" index="3ddBve" />
123+
</concept>
124+
<concept id="1240322627579" name="jetbrains.mps.lang.intentions.structure.IntentionParameter" flags="nn" index="38Zlrr" />
125+
<concept id="1240395258925" name="jetbrains.mps.lang.intentions.structure.ParameterizedIntentionDeclaration" flags="ig" index="3dkpOd">
126+
<child id="1240395532443" name="queryFunction" index="3dlsAV" />
127+
</concept>
118128
</language>
119129
<language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
120130
<concept id="6332851714983831325" name="jetbrains.mps.baseLanguage.logging.structure.MsgStatement" flags="ng" index="2xdQw9">
@@ -131,11 +141,19 @@
131141
<concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
132142
<concept id="1138757581985" name="jetbrains.mps.lang.smodel.structure.Link_SetNewChildOperation" flags="nn" index="zfrQC" />
133143
<concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
144+
<concept id="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
134145
<concept id="1139184414036" name="jetbrains.mps.lang.smodel.structure.LinkList_AddNewChildOperation" flags="nn" index="WFELt" />
146+
<concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
135147
<concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
136148
<concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
137149
<child id="1207343664468" name="conceptArgument" index="ri$Ld" />
138150
</concept>
151+
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
152+
<reference id="1138405853777" name="concept" index="ehGHo" />
153+
</concept>
154+
<concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
155+
<reference id="1138056395725" name="property" index="3TsBF5" />
156+
</concept>
139157
<concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
140158
<reference id="1138056516764" name="link" index="3Tt5mk" />
141159
</concept>
@@ -163,6 +181,7 @@
163181
<concept id="1151689724996" name="jetbrains.mps.baseLanguage.collections.structure.SequenceType" flags="in" index="A3Dl8">
164182
<child id="1151689745422" name="elementType" index="A3Ik2" />
165183
</concept>
184+
<concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
166185
<concept id="1153943597977" name="jetbrains.mps.baseLanguage.collections.structure.ForEachStatement" flags="nn" index="2Gpval">
167186
<child id="1153944400369" name="variable" index="2Gsz3X" />
168187
<child id="1153944424730" name="inputSequence" index="2GsD0m" />
@@ -174,7 +193,9 @@
174193
<concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
175194
<child id="1237721435807" name="elementType" index="HW$YZ" />
176195
</concept>
196+
<concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
177197
<concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
198+
<concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
178199
<concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
179200
<concept id="1172254888721" name="jetbrains.mps.baseLanguage.collections.structure.ContainsOperation" flags="nn" index="3JPx81" />
180201
</language>
@@ -612,5 +633,124 @@
612633
</node>
613634
</node>
614635
</node>
636+
<node concept="3dkpOd" id="4slSdkNr7S1">
637+
<property role="TrG5h" value="moveModuleToLanguageComponent" />
638+
<ref role="2ZfgGC" to="ryx8:6MUZd5Uje4h" resolve="ModuleComponent" />
639+
<node concept="38BcoT" id="4slSdkNr7S2" role="3dlsAV">
640+
<node concept="3Tqbb2" id="4slSdkNr8xv" role="3ddBve">
641+
<ref role="ehGHo" to="ryx8:6MUZd5Uj9vB" resolve="ComponentDefinition" />
642+
</node>
643+
<node concept="3clFbS" id="4slSdkNr7S4" role="2VODD2">
644+
<node concept="3cpWs8" id="4slSdkNrrR$" role="3cqZAp">
645+
<node concept="3cpWsn" id="4slSdkNrrR_" role="3cpWs9">
646+
<property role="TrG5h" value="myComponentDefinition" />
647+
<node concept="3Tqbb2" id="4slSdkNrrPr" role="1tU5fm">
648+
<ref role="ehGHo" to="ryx8:6MUZd5Uj9vB" resolve="ComponentDefinition" />
649+
</node>
650+
<node concept="2OqwBi" id="4slSdkNrrRA" role="33vP2m">
651+
<node concept="2Sf5sV" id="4slSdkNrrRB" role="2Oq$k0" />
652+
<node concept="2Xjw5R" id="4slSdkNrrRC" role="2OqNvi">
653+
<node concept="1xMEDy" id="4slSdkNrrRD" role="1xVPHs">
654+
<node concept="chp4Y" id="4slSdkNrrRE" role="ri$Ld">
655+
<ref role="cht4Q" to="ryx8:6MUZd5Uj9vB" resolve="ComponentDefinition" />
656+
</node>
657+
</node>
658+
</node>
659+
</node>
660+
</node>
661+
</node>
662+
<node concept="3clFbF" id="4slSdkNr9qu" role="3cqZAp">
663+
<node concept="2OqwBi" id="4slSdkNrugI" role="3clFbG">
664+
<node concept="2OqwBi" id="4slSdkNrgGl" role="2Oq$k0">
665+
<node concept="2OqwBi" id="4slSdkNrcD3" role="2Oq$k0">
666+
<node concept="2OqwBi" id="4slSdkNragw" role="2Oq$k0">
667+
<node concept="2Sf5sV" id="4slSdkNr9qt" role="2Oq$k0" />
668+
<node concept="2Rxl7S" id="4slSdkNrcrW" role="2OqNvi" />
669+
</node>
670+
<node concept="2Rf3mk" id="4slSdkNrcVd" role="2OqNvi">
671+
<node concept="1xMEDy" id="4slSdkNrcVf" role="1xVPHs">
672+
<node concept="chp4Y" id="4slSdkNrcYC" role="ri$Ld">
673+
<ref role="cht4Q" to="ryx8:6MUZd5Uj9vB" resolve="ComponentDefinition" />
674+
</node>
675+
</node>
676+
</node>
677+
</node>
678+
<node concept="3zZkjj" id="4slSdkNroFf" role="2OqNvi">
679+
<node concept="1bVj0M" id="4slSdkNroFh" role="23t8la">
680+
<node concept="3clFbS" id="4slSdkNroFi" role="1bW5cS">
681+
<node concept="3clFbF" id="4slSdkNrpCg" role="3cqZAp">
682+
<node concept="3y3z36" id="4slSdkNrpXe" role="3clFbG">
683+
<node concept="37vLTw" id="4slSdkNrtsm" role="3uHU7w">
684+
<ref role="3cqZAo" node="4slSdkNrrR_" resolve="myComponentDefinition" />
685+
</node>
686+
<node concept="37vLTw" id="4slSdkNrpCf" role="3uHU7B">
687+
<ref role="3cqZAo" node="4slSdkNroFj" resolve="it" />
688+
</node>
689+
</node>
690+
</node>
691+
</node>
692+
<node concept="gl6BB" id="4slSdkNroFj" role="1bW2Oz">
693+
<property role="TrG5h" value="it" />
694+
<node concept="2jxLKc" id="4slSdkNroFk" role="1tU5fm" />
695+
</node>
696+
</node>
697+
</node>
698+
</node>
699+
<node concept="ANE8D" id="4slSdkNrvxq" role="2OqNvi" />
700+
</node>
701+
</node>
702+
</node>
703+
</node>
704+
<node concept="2S6ZIM" id="4slSdkNr7S5" role="2ZfVej">
705+
<node concept="3clFbS" id="4slSdkNr7S6" role="2VODD2">
706+
<node concept="3clFbF" id="4slSdkNrvAa" role="3cqZAp">
707+
<node concept="3cpWs3" id="4slSdkNy3tD" role="3clFbG">
708+
<node concept="Xl_RD" id="4slSdkNy3uy" role="3uHU7w">
709+
<property role="Xl_RC" value="'" />
710+
</node>
711+
<node concept="3cpWs3" id="4slSdkNrx7F" role="3uHU7B">
712+
<node concept="Xl_RD" id="4slSdkNrvA9" role="3uHU7B">
713+
<property role="Xl_RC" value="Move to '" />
714+
</node>
715+
<node concept="2OqwBi" id="4slSdkNysPC" role="3uHU7w">
716+
<node concept="2OqwBi" id="4slSdkNrxz5" role="2Oq$k0">
717+
<node concept="38Zlrr" id="4slSdkNrx8m" role="2Oq$k0" />
718+
<node concept="3TrcHB" id="4slSdkNrxO7" role="2OqNvi">
719+
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
720+
</node>
721+
</node>
722+
<node concept="liA8E" id="4slSdkNyvdW" role="2OqNvi">
723+
<ref role="37wK5l" to="wyt6:~String.replaceAll(java.lang.String,java.lang.String)" resolve="replaceAll" />
724+
<node concept="Xl_RD" id="4slSdkNyvfT" role="37wK5m">
725+
<property role="Xl_RC" value="_" />
726+
</node>
727+
<node concept="Xl_RD" id="4slSdkNyw6_" role="37wK5m">
728+
<property role="Xl_RC" value="__" />
729+
</node>
730+
</node>
731+
</node>
732+
</node>
733+
</node>
734+
</node>
735+
</node>
736+
</node>
737+
<node concept="2Sbjvc" id="4slSdkNr7S7" role="2ZfgGD">
738+
<node concept="3clFbS" id="4slSdkNr7S8" role="2VODD2">
739+
<node concept="3clFbF" id="4slSdkNrxS4" role="3cqZAp">
740+
<node concept="2OqwBi" id="4slSdkNr$$0" role="3clFbG">
741+
<node concept="2OqwBi" id="4slSdkNry55" role="2Oq$k0">
742+
<node concept="38Zlrr" id="4slSdkNrxS3" role="2Oq$k0" />
743+
<node concept="3Tsc0h" id="4slSdkNrylq" role="2OqNvi">
744+
<ref role="3TtcxE" to="ryx8:6MUZd5Uj9xT" resolve="content" />
745+
</node>
746+
</node>
747+
<node concept="TSZUe" id="4slSdkNrCIC" role="2OqNvi">
748+
<node concept="2Sf5sV" id="4slSdkNrCMm" role="25WWJ7" />
749+
</node>
750+
</node>
751+
</node>
752+
</node>
753+
</node>
754+
</node>
615755
</model>
616756

‎code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._080_lint_build.mps‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -234,14 +234,14 @@
234234
<node concept="m$_yC" id="30a3800NyCh" role="m$_yJ">
235235
<ref role="m$_y1" to="ffeo:5lGJ4Taqfsl" resolve="jetbrains.mps.ide.modelchecker" />
236236
</node>
237-
<node concept="m$_yC" id="72L9LYdx1cL" role="m$_yJ">
238-
<ref role="m$_y1" to="ffeo:ymnOULATpW" resolve="jetbrains.mps.testing" />
239-
</node>
240237
<node concept="3_J27D" id="3dqUbgQmcyK" role="m_cZH">
241238
<node concept="3Mxwew" id="3dqUbgQmcyU" role="3MwsjC">
242239
<property role="3MwjfP" value="org.mpsqa.lint" />
243240
</node>
244241
</node>
242+
<node concept="m$_yC" id="72L9LYdx1cL" role="m$_yJ">
243+
<ref role="m$_y1" to="ffeo:ymnOULATpW" resolve="jetbrains.mps.testing" />
244+
</node>
245245
</node>
246246
<node concept="2G$12M" id="3dqUbgQmcyz" role="3989C9">
247247
<property role="TrG5h" value="org.mpsqa.lint" />
@@ -408,6 +408,9 @@
408408
<ref role="1Busuk" to="ffeo:3HV74$ebibC" resolve="jetbrains.mps.lang.text" />
409409
</node>
410410
</node>
411+
<node concept="1E0d5M" id="3mJ3k6P96iq" role="1E1XAP">
412+
<ref role="1E0d5P" node="3mJ3k6P7dwI" resolve="org.mpsqa.lint.generic.runtime" />
413+
</node>
411414
<node concept="1SiIV0" id="3mJ3k6P96id" role="3bR37C">
412415
<node concept="3bR9La" id="3mJ3k6P96ie" role="1SiIV1">
413416
<ref role="3bR37D" node="3mJ3k6P7dwI" resolve="org.mpsqa.lint.generic.runtime" />
@@ -428,9 +431,6 @@
428431
<ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
429432
</node>
430433
</node>
431-
<node concept="1E0d5M" id="3mJ3k6P96iq" role="1E1XAP">
432-
<ref role="1E0d5P" node="3mJ3k6P7dwI" resolve="org.mpsqa.lint.generic.runtime" />
433-
</node>
434434
</node>
435435
<node concept="1E1JtD" id="3ghOW5HWiKq" role="2G$12L">
436436
<property role="BnDLt" value="true" />
@@ -856,6 +856,16 @@
856856
<ref role="3bR37D" to="ffeo:ymnOULAU0H" resolve="jetbrains.mps.lang.test" />
857857
</node>
858858
</node>
859+
<node concept="1SiIV0" id="5PFth5Wc5FU" role="3bR37C">
860+
<node concept="3bR9La" id="5PFth5Wc5FV" role="1SiIV1">
861+
<ref role="3bR37D" to="ffeo:1CtrbKI2fIc" resolve="jetbrains.mps.baseLanguage.lightweightdsl" />
862+
</node>
863+
</node>
864+
<node concept="1SiIV0" id="5PFth5Wc5FW" role="3bR37C">
865+
<node concept="3bR9La" id="5PFth5Wc5FX" role="1SiIV1">
866+
<ref role="3bR37D" to="ffeo:1CtrbKI23Wm" resolve="jetbrains.mps.lang.migration" />
867+
</node>
868+
</node>
859869
</node>
860870
</node>
861871
<node concept="55IIr" id="3dqUbgQmcy$" role="auvoZ" />

0 commit comments

Comments
 (0)