Skip to content

Commit e4dab91

Browse files
mps-ci-buildbotmps-ci-buildbot
authored
Merge pull request #1516 from JetBrains/merge/mps20251
Merge maintenance/mps20241 into maintenance/mps20251
2 parents 8ed4abf + 3ad196b commit e4dab91

File tree

11 files changed

+2959
-894
lines changed

11 files changed

+2959
-894
lines changed

‎CHANGELOG.md‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,13 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e
99
### Fixed
1010

1111
- *jetbrains.mps.lang.smodel.query* A NullPointerException was fixed in the query list typesystem checker.
12-
- Table Actions Toolbar items now appear in the new UI toolbar.
12+
- *com.mbeddr.mpsutil.comparator* Custom generation plans of generation options builders are not overwritten anymore.
13+
- *de.itemis.mps.compare* Assert node equals statements don't ignore node annotations anymore any the diff viewer now works with nodes that do not belong to a model.
14+
- *de.slisson.mps.tables.runtime* Table Actions Toolbar items now appear in the new UI toolbar.
15+
16+
### Added
17+
18+
- *de.itemis.mps.compare* A new option was added to *assert* *generated* *text* *model* and *assert* *generated* *model* to select the output model to compare. The post-process and filter function now also have a generation status parameter.
1319

1420
## June 2025
1521

@@ -20,7 +26,8 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e
2026

2127
### Fixed
2228

23-
- *com.mbeddr.mpsutil.compare* Fixed duplicated code generation for `assert node equals`
29+
- *de.itemis.model.merge.runtime* Fixed merging of references; allow in place merging without braking external references; fixed merging of roots.
30+
- *de.itemis.mps.compare* Fixed duplicated code generation for `assert node equals`
2431
- *com.mbeddr.mpsutil.blutil* Use `COPY_SRCL` in [IfInstanceOfElseIfClause](http://127.0.0.1:63320/node?ref=63e0e566-5131-447e-90e3-12ea330e1a00%2Fr%3Af5bd2ad9-cd54-4408-b815-07f9f306f074%28com.mbeddr.mpsutil.blutil%2Fcom.mbeddr.mpsutil.blutil.structure%29%2F8718469662507237778) to avoid build warnings
2532
- *de.itemis.mps.editor.bool.runtime* Fix image loading for check boxes.
2633
- *com.mbeddr.mpsutil.intentions* Intentions are no longer duplicated every time the intentions menu is displayed

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ plugins {
1414
id("com.github.breadmoirai.github-release") version "2.5.2"
1515
id("maven-publish")
1616
id("base")
17-
id("de.itemis.mps.gradle.launcher") version "2.6.2.+"
17+
id("de.itemis.mps.gradle.launcher") version "2.7.0.+"
1818
id("org.cyclonedx.bom") version "2.3.1"
1919
id("download-jbr") version "1.29.2.+"
2020
}

‎code/compare/languages/de.itemis.mps.compare/generator/template/[email protected]‎

Lines changed: 418 additions & 173 deletions
Large diffs are not rendered by default.

‎code/compare/languages/de.itemis.mps.compare/languageModels/de.itemis.mps.compare.behavior.mps‎

Lines changed: 158 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
<import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
1818
<import index="ap4t" ref="215c4c45-ba99-49f5-9ab7-4b6901a63cfd/java:jetbrains.mps.generator(MPS.Generator/)" />
1919
<import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
20-
<import index="mqum" ref="r:ec874b45-e888-42e6-995a-a298cefdff55(de.itemis.mps.comparator.code)" />
21-
<import index="tp4k" ref="r:00000000-0000-4000-0000-011c89590368(jetbrains.mps.lang.plugin.structure)" />
2220
<import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
21+
<import index="tp4k" ref="r:00000000-0000-4000-0000-011c89590368(jetbrains.mps.lang.plugin.structure)" />
22+
<import index="mqum" ref="r:ec874b45-e888-42e6-995a-a298cefdff55(de.itemis.mps.comparator.code)" />
2323
<import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
2424
<import index="tpc2" ref="r:00000000-0000-4000-0000-011c8959029e(jetbrains.mps.lang.editor.structure)" implicit="true" />
2525
</imports>
@@ -154,7 +154,6 @@
154154
<child id="1151688676805" name="elementType" index="_ZDj9" />
155155
</concept>
156156
<concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
157-
<child id="1237721435808" name="initValue" index="HW$Y0" />
158157
<child id="1237721435807" name="elementType" index="HW$YZ" />
159158
</concept>
160159
<concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
@@ -258,35 +257,69 @@
258257
<node concept="13h7C7" id="5Bng$8dhuRh">
259258
<property role="3GE5qa" value="queryFunction" />
260259
<ref role="13h7C2" to="8do3:1GvnUgo6Kzw" resolve="QueryFunction_PostProcess" />
261-
<node concept="13i0hz" id="1GvnUgo6K$a" role="13h7CS">
260+
<node concept="13hLZK" id="5Bng$8dhuRi" role="13h7CW">
261+
<node concept="3clFbS" id="5Bng$8dhuRj" role="2VODD2" />
262+
</node>
263+
<node concept="13i0hz" id="2sbLIdzJL$T" role="13h7CS">
264+
<property role="13i0iv" value="false" />
262265
<property role="TrG5h" value="getParameterConcepts" />
263266
<property role="13i0it" value="false" />
264-
<property role="13i0iv" value="false" />
265267
<ref role="13i0hy" to="tpek:2xELmDxyi2v" resolve="getParameterConcepts" />
266-
<node concept="3Tm1VV" id="1GvnUgo6K$F" role="1B3o_S" />
267-
<node concept="3clFbS" id="1GvnUgo6K$G" role="3clF47">
268-
<node concept="3clFbF" id="1GvnUgo6L8u" role="3cqZAp">
269-
<node concept="2ShNRf" id="1GvnUgo6L8s" role="3clFbG">
270-
<node concept="Tc6Ow" id="1GvnUgo6PXt" role="2ShVmc">
271-
<node concept="3bZ5Sz" id="1L96m4u4nK5" role="HW$YZ">
268+
<node concept="_YKpA" id="2sbLIdzJL$U" role="3clF45">
269+
<node concept="3bZ5Sz" id="2sbLIdzJL$V" role="_ZDj9">
270+
<ref role="3bZ5Sy" to="tpee:g76ryKb" resolve="ConceptFunctionParameter" />
271+
</node>
272+
</node>
273+
<node concept="3Tm1VV" id="2sbLIdzJL$W" role="1B3o_S" />
274+
<node concept="3clFbS" id="2sbLIdzJL$X" role="3clF47">
275+
<node concept="3cpWs8" id="2sbLIdzJL$Y" role="3cqZAp">
276+
<node concept="3cpWsn" id="2sbLIdzJL$Z" role="3cpWs9">
277+
<property role="TrG5h" value="result" />
278+
<node concept="2ShNRf" id="2sbLIdzJL_0" role="33vP2m">
279+
<node concept="Tc6Ow" id="2sbLIdzJL_1" role="2ShVmc">
280+
<node concept="3bZ5Sz" id="2sbLIdzJL_2" role="HW$YZ">
281+
<ref role="3bZ5Sy" to="tpee:g76ryKb" resolve="ConceptFunctionParameter" />
282+
</node>
283+
</node>
284+
</node>
285+
<node concept="_YKpA" id="2sbLIdzJL_3" role="1tU5fm">
286+
<node concept="3bZ5Sz" id="2sbLIdzJL_4" role="_ZDj9">
272287
<ref role="3bZ5Sy" to="tpee:g76ryKb" resolve="ConceptFunctionParameter" />
273288
</node>
274-
<node concept="35c_gC" id="1L96m4u4nK3" role="HW$Y0">
289+
</node>
290+
</node>
291+
</node>
292+
<node concept="3clFbF" id="2sbLIdzJL_5" role="3cqZAp">
293+
<node concept="2OqwBi" id="2sbLIdzJL_6" role="3clFbG">
294+
<node concept="TSZUe" id="2sbLIdzJL_7" role="2OqNvi">
295+
<node concept="35c_gC" id="2sbLIdzJL_8" role="25WWJ7">
296+
<ref role="35c_gD" to="8do3:2sbLIdzA56M" resolve="ConceptFunctionParameter_GenerationStatus" />
297+
</node>
298+
</node>
299+
<node concept="37vLTw" id="2sbLIdzJL_9" role="2Oq$k0">
300+
<ref role="3cqZAo" node="2sbLIdzJL$Z" resolve="result" />
301+
</node>
302+
</node>
303+
</node>
304+
<node concept="3clFbF" id="2sbLIdzJL_a" role="3cqZAp">
305+
<node concept="2OqwBi" id="2sbLIdzJL_b" role="3clFbG">
306+
<node concept="TSZUe" id="2sbLIdzJL_c" role="2OqNvi">
307+
<node concept="35c_gC" id="2sbLIdzJL_d" role="25WWJ7">
275308
<ref role="35c_gD" to="8do3:gTQ6Nt5" resolve="ConceptFunctionParameter_OutputModel" />
276309
</node>
277310
</node>
311+
<node concept="37vLTw" id="2sbLIdzJL_e" role="2Oq$k0">
312+
<ref role="3cqZAo" node="2sbLIdzJL$Z" resolve="result" />
313+
</node>
278314
</node>
279315
</node>
280-
</node>
281-
<node concept="_YKpA" id="1L96m4u4nK1" role="3clF45">
282-
<node concept="3bZ5Sz" id="1L96m4u4nK2" role="_ZDj9">
283-
<ref role="3bZ5Sy" to="tpee:g76ryKb" resolve="ConceptFunctionParameter" />
316+
<node concept="3cpWs6" id="2sbLIdzJL_f" role="3cqZAp">
317+
<node concept="37vLTw" id="2sbLIdzJL_g" role="3cqZAk">
318+
<ref role="3cqZAo" node="2sbLIdzJL$Z" resolve="result" />
319+
</node>
284320
</node>
285321
</node>
286322
</node>
287-
<node concept="13hLZK" id="5Bng$8dhuRi" role="13h7CW">
288-
<node concept="3clFbS" id="5Bng$8dhuRj" role="2VODD2" />
289-
</node>
290323
</node>
291324
<node concept="13h7C7" id="5Bng$8dhxdM">
292325
<property role="3GE5qa" value="queryFunction" />
@@ -335,6 +368,18 @@
335368
</node>
336369
</node>
337370
</node>
371+
<node concept="3clFbF" id="2sbLIdzJKpm" role="3cqZAp">
372+
<node concept="2OqwBi" id="2sbLIdzJKpn" role="3clFbG">
373+
<node concept="TSZUe" id="2sbLIdzJKpo" role="2OqNvi">
374+
<node concept="35c_gC" id="2sbLIdzJKpp" role="25WWJ7">
375+
<ref role="35c_gD" to="8do3:2sbLIdzA56M" resolve="ConceptFunctionParameter_GenerationStatus" />
376+
</node>
377+
</node>
378+
<node concept="37vLTw" id="2sbLIdzJKpq" role="2Oq$k0">
379+
<ref role="3cqZAo" node="1KBnK_bJiEQ" resolve="result" />
380+
</node>
381+
</node>
382+
</node>
338383
<node concept="3clFbF" id="1KBnK_bJsJ8" role="3cqZAp">
339384
<node concept="2OqwBi" id="1KBnK_bJsJ9" role="3clFbG">
340385
<node concept="TSZUe" id="1KBnK_bJsJa" role="2OqNvi">
@@ -692,5 +737,99 @@
692737
<node concept="3clFbS" id="6IWP88IC54n" role="2VODD2" />
693738
</node>
694739
</node>
740+
<node concept="13h7C7" id="2sbLIdzA3z4">
741+
<property role="3GE5qa" value="queryFunction" />
742+
<ref role="13h7C2" to="8do3:2sbLIdzA3tQ" resolve="QueryFunction_OutputModel" />
743+
<node concept="13i0hz" id="2sbLIdzA3zn" role="13h7CS">
744+
<property role="13i0iv" value="false" />
745+
<property role="TrG5h" value="getExpectedReturnType" />
746+
<property role="13i0it" value="false" />
747+
<ref role="13i0hy" to="tpek:hEwIGRD" resolve="getExpectedReturnType" />
748+
<node concept="3Tm1VV" id="2sbLIdzA3zo" role="1B3o_S" />
749+
<node concept="3Tqbb2" id="2sbLIdzA3zp" role="3clF45" />
750+
<node concept="3clFbS" id="2sbLIdzA3zq" role="3clF47">
751+
<node concept="3cpWs6" id="2sbLIdzA3zr" role="3cqZAp">
752+
<node concept="2c44tf" id="2sbLIdzA3zs" role="3cqZAk">
753+
<node concept="H_c77" id="2sbLIdzA569" role="2c44tc" />
754+
</node>
755+
</node>
756+
</node>
757+
</node>
758+
<node concept="13i0hz" id="2sbLIdzA3zu" role="13h7CS">
759+
<property role="13i0iv" value="false" />
760+
<property role="TrG5h" value="getParameterConcepts" />
761+
<property role="13i0it" value="false" />
762+
<ref role="13i0hy" to="tpek:2xELmDxyi2v" resolve="getParameterConcepts" />
763+
<node concept="_YKpA" id="2sbLIdzA3zv" role="3clF45">
764+
<node concept="3bZ5Sz" id="2sbLIdzA3zw" role="_ZDj9">
765+
<ref role="3bZ5Sy" to="tpee:g76ryKb" resolve="ConceptFunctionParameter" />
766+
</node>
767+
</node>
768+
<node concept="3Tm1VV" id="2sbLIdzA3zx" role="1B3o_S" />
769+
<node concept="3clFbS" id="2sbLIdzA3zy" role="3clF47">
770+
<node concept="3cpWs8" id="2sbLIdzA3zz" role="3cqZAp">
771+
<node concept="3cpWsn" id="2sbLIdzA3z$" role="3cpWs9">
772+
<property role="TrG5h" value="result" />
773+
<node concept="2ShNRf" id="2sbLIdzA3z_" role="33vP2m">
774+
<node concept="Tc6Ow" id="2sbLIdzA3zA" role="2ShVmc">
775+
<node concept="3bZ5Sz" id="2sbLIdzA3zB" role="HW$YZ">
776+
<ref role="3bZ5Sy" to="tpee:g76ryKb" resolve="ConceptFunctionParameter" />
777+
</node>
778+
</node>
779+
</node>
780+
<node concept="_YKpA" id="2sbLIdzA3zC" role="1tU5fm">
781+
<node concept="3bZ5Sz" id="2sbLIdzA3zD" role="_ZDj9">
782+
<ref role="3bZ5Sy" to="tpee:g76ryKb" resolve="ConceptFunctionParameter" />
783+
</node>
784+
</node>
785+
</node>
786+
</node>
787+
<node concept="3clFbF" id="2sbLIdzA3zE" role="3cqZAp">
788+
<node concept="2OqwBi" id="2sbLIdzA3zF" role="3clFbG">
789+
<node concept="TSZUe" id="2sbLIdzA3zG" role="2OqNvi">
790+
<node concept="35c_gC" id="2sbLIdzA3zH" role="25WWJ7">
791+
<ref role="35c_gD" to="8do3:2sbLIdzA56M" resolve="ConceptFunctionParameter_GenerationStatus" />
792+
</node>
793+
</node>
794+
<node concept="37vLTw" id="2sbLIdzA3zI" role="2Oq$k0">
795+
<ref role="3cqZAo" node="2sbLIdzA3z$" resolve="result" />
796+
</node>
797+
</node>
798+
</node>
799+
<node concept="3cpWs6" id="2sbLIdzA3zJ" role="3cqZAp">
800+
<node concept="37vLTw" id="2sbLIdzA3zK" role="3cqZAk">
801+
<ref role="3cqZAo" node="2sbLIdzA3z$" resolve="result" />
802+
</node>
803+
</node>
804+
</node>
805+
</node>
806+
<node concept="13hLZK" id="2sbLIdzA3z5" role="13h7CW">
807+
<node concept="3clFbS" id="2sbLIdzA3z6" role="2VODD2" />
808+
</node>
809+
</node>
810+
<node concept="13h7C7" id="2sbLIdzAp1Y">
811+
<property role="3GE5qa" value="queryFunction" />
812+
<ref role="13h7C2" to="8do3:2sbLIdzA56M" resolve="ConceptFunctionParameter_GenerationStatus" />
813+
<node concept="13i0hz" id="2sbLIdzAp47" role="13h7CS">
814+
<property role="TrG5h" value="getType" />
815+
<ref role="13i0hy" to="tpek:27DJnJtIQ9C" resolve="getType" />
816+
<node concept="3clFbS" id="2sbLIdzAp48" role="3clF47">
817+
<node concept="3clFbF" id="2sbLIdzAp49" role="3cqZAp">
818+
<node concept="2c44tf" id="2sbLIdzAp4a" role="3clFbG">
819+
<node concept="3uibUv" id="2sbLIdzAp4b" role="2c44tc">
820+
<ref role="3uigEE" to="ap4t:~GenerationStatus" resolve="GenerationStatus" />
821+
</node>
822+
</node>
823+
</node>
824+
</node>
825+
<node concept="3Tqbb2" id="2sbLIdzAp4c" role="3clF45">
826+
<ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
827+
</node>
828+
<node concept="3Tm1VV" id="2sbLIdzAp4d" role="1B3o_S" />
829+
</node>
830+
<node concept="13hLZK" id="2sbLIdzAp1Z" role="13h7CW">
831+
<node concept="3clFbS" id="2sbLIdzAp20" role="2VODD2" />
832+
</node>
833+
</node>
695834
</model>
696835

0 commit comments

Comments
 (0)