Skip to content

Commit 0ca1fb6

Browse files
sergej-koscejevsergej-koscejev
authored
Merge pull request #2825 from mbeddr/merge/mps20232
Merge maintenance/mps20223 into maintenance/mps20232
2 parents 598b47e + ac87e9b commit 0ca1fb6

File tree

260 files changed

+1221
-9250
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

260 files changed

+1221
-9250
lines changed

‎CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@ Semantic Versioning and the changes are simply documented in reverse chronologic
77

88
# April 2025
99

10+
## com.mbeddr.doc
11+
12+
- 🚨 Stubs for POI and other libraries were moved from language `com.mbeddr.spreadsheat`
13+
to solution `com.mbeddr.spreadsheet.libs`.
14+
- During generation non-root Document nodes will be kept even if they are not referenced by any other document. This
15+
enables using Document nodes in tests, for example.
16+
1017
## com.mbeddr.mpsutil.conceptdiagram
1118

1219
### Added

‎code/languages/com.mbeddr.build/solutions/com.mbeddr.build/models/com/mbeddr/build/build.mps

Lines changed: 44 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -4740,7 +4740,7 @@
47404740
<property role="3qWCbO" value="icons/**, resources/**" />
47414741
</node>
47424742
<node concept="398BVA" id="3xFG3bj5clT" role="3LXTmr">
4743-
<ref role="398BVh" node="3tiuL$x4rIQ" resolve="mbeddr.doc" />
4743+
<ref role="398BVh" node="7uZw0yZ43N8" resolve="mbeddr.core" />
47444744
<node concept="2Ry0Ak" id="3xFG3bj5clU" role="iGT6I">
47454745
<property role="2Ry0Am" value="languages" />
47464746
<node concept="2Ry0Ak" id="3xFG3bj5clV" role="2Ry0An">
@@ -4751,7 +4751,7 @@
47514751
</node>
47524752
</node>
47534753
<node concept="398BVA" id="3tiuL$x4gIa" role="3LF7KH">
4754-
<ref role="398BVh" node="3tiuL$x4rIQ" resolve="mbeddr.doc" />
4754+
<ref role="398BVh" node="7uZw0yZ43N8" resolve="mbeddr.core" />
47554755
<node concept="2Ry0Ak" id="3tiuL$x4gIb" role="iGT6I">
47564756
<property role="2Ry0Am" value="languages" />
47574757
<node concept="2Ry0Ak" id="3tiuL$x4gIc" role="2Ry0An">
@@ -4794,23 +4794,23 @@
47944794
<property role="3ZfqAx" value="generator/template" />
47954795
<property role="1Hdu6h" value="true" />
47964796
<property role="1HemKv" value="true" />
4797-
<node concept="3LXTmp" id="7ZN_vIiSh$J" role="1HemKq">
4798-
<node concept="398BVA" id="7ZN_vIiSh$x" role="3LXTmr">
4799-
<ref role="398BVh" node="3tiuL$x4rIQ" resolve="mbeddr.doc" />
4800-
<node concept="2Ry0Ak" id="7ZN_vIiSh$y" role="iGT6I">
4797+
<node concept="3LXTmp" id="5FkZWZm6sHK" role="1HemKq">
4798+
<node concept="398BVA" id="5FkZWZm6sHz" role="3LXTmr">
4799+
<ref role="398BVh" node="7uZw0yZ43N8" resolve="mbeddr.core" />
4800+
<node concept="2Ry0Ak" id="5FkZWZm6sH$" role="iGT6I">
48014801
<property role="2Ry0Am" value="languages" />
4802-
<node concept="2Ry0Ak" id="7ZN_vIiSh$z" role="2Ry0An">
4802+
<node concept="2Ry0Ak" id="5FkZWZm6sH_" role="2Ry0An">
48034803
<property role="2Ry0Am" value="com.mbeddr.doc.qa" />
4804-
<node concept="2Ry0Ak" id="7ZN_vIiSh$$" role="2Ry0An">
4804+
<node concept="2Ry0Ak" id="5FkZWZm6sHA" role="2Ry0An">
48054805
<property role="2Ry0Am" value="generator" />
4806-
<node concept="2Ry0Ak" id="7ZN_vIiSh$_" role="2Ry0An">
4806+
<node concept="2Ry0Ak" id="5FkZWZm6sHB" role="2Ry0An">
48074807
<property role="2Ry0Am" value="template" />
48084808
</node>
48094809
</node>
48104810
</node>
48114811
</node>
48124812
</node>
4813-
<node concept="3qWCbU" id="7ZN_vIiSh$K" role="3LXTna">
4813+
<node concept="3qWCbU" id="5FkZWZm6sHL" role="3LXTna">
48144814
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
48154815
</node>
48164816
</node>
@@ -4820,20 +4820,20 @@
48204820
<property role="3ZfqAx" value="languageModels" />
48214821
<property role="1Hdu6h" value="true" />
48224822
<property role="1HemKv" value="true" />
4823-
<node concept="3LXTmp" id="7ZN_vIiSh$v" role="1HemKq">
4824-
<node concept="398BVA" id="7ZN_vIiSh$j" role="3LXTmr">
4825-
<ref role="398BVh" node="3tiuL$x4rIQ" resolve="mbeddr.doc" />
4826-
<node concept="2Ry0Ak" id="7ZN_vIiSh$k" role="iGT6I">
4823+
<node concept="3LXTmp" id="5FkZWZm6sHx" role="1HemKq">
4824+
<node concept="398BVA" id="5FkZWZm6sHm" role="3LXTmr">
4825+
<ref role="398BVh" node="7uZw0yZ43N8" resolve="mbeddr.core" />
4826+
<node concept="2Ry0Ak" id="5FkZWZm6sHn" role="iGT6I">
48274827
<property role="2Ry0Am" value="languages" />
4828-
<node concept="2Ry0Ak" id="7ZN_vIiSh$l" role="2Ry0An">
4828+
<node concept="2Ry0Ak" id="5FkZWZm6sHo" role="2Ry0An">
48294829
<property role="2Ry0Am" value="com.mbeddr.doc.qa" />
4830-
<node concept="2Ry0Ak" id="7ZN_vIiSh$m" role="2Ry0An">
4830+
<node concept="2Ry0Ak" id="5FkZWZm6sHp" role="2Ry0An">
48314831
<property role="2Ry0Am" value="languageModels" />
48324832
</node>
48334833
</node>
48344834
</node>
48354835
</node>
4836-
<node concept="3qWCbU" id="7ZN_vIiSh$w" role="3LXTna">
4836+
<node concept="3qWCbU" id="5FkZWZm6sHy" role="3LXTna">
48374837
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
48384838
</node>
48394839
</node>
@@ -9912,42 +9912,24 @@
99129912
<property role="3qWCbO" value="icons/**, resources/**" />
99139913
</node>
99149914
<node concept="398BVA" id="3xFG3bj5chc" role="3LXTmr">
9915-
<ref role="398BVh" node="7uZw0yZ2_Jf" resolve="mbeddr.github.core.home" />
9916-
<node concept="2Ry0Ak" id="3xFG3bj5chd" role="iGT6I">
9917-
<property role="2Ry0Am" value="code" />
9918-
<node concept="2Ry0Ak" id="3xFG3bj5che" role="2Ry0An">
9919-
<property role="2Ry0Am" value="languages" />
9920-
<node concept="2Ry0Ak" id="3xFG3bj5chf" role="2Ry0An">
9921-
<property role="2Ry0Am" value="com.mbeddr.doc" />
9922-
<node concept="2Ry0Ak" id="3xFG3bj5chg" role="2Ry0An">
9923-
<property role="2Ry0Am" value="languages" />
9924-
<node concept="2Ry0Ak" id="3xFG3bj5chh" role="2Ry0An">
9925-
<property role="2Ry0Am" value="com.mbeddr.doc.expressions" />
9926-
</node>
9927-
</node>
9928-
</node>
9915+
<ref role="398BVh" node="7eF9rfAnuhS" resolve="mbeddr.cc" />
9916+
<node concept="2Ry0Ak" id="3xFG3bj5chg" role="iGT6I">
9917+
<property role="2Ry0Am" value="languages" />
9918+
<node concept="2Ry0Ak" id="3xFG3bj5chh" role="2Ry0An">
9919+
<property role="2Ry0Am" value="com.mbeddr.doc.expressions" />
99299920
</node>
99309921
</node>
99319922
</node>
99329923
</node>
99339924
</node>
99349925
<node concept="398BVA" id="7tNo_gxoK91" role="3LF7KH">
9935-
<ref role="398BVh" node="7uZw0yZ2_Jf" resolve="mbeddr.github.core.home" />
9936-
<node concept="2Ry0Ak" id="7tNo_gxoK92" role="iGT6I">
9937-
<property role="2Ry0Am" value="code" />
9938-
<node concept="2Ry0Ak" id="7tNo_gxoK93" role="2Ry0An">
9939-
<property role="2Ry0Am" value="languages" />
9940-
<node concept="2Ry0Ak" id="7tNo_gxoK94" role="2Ry0An">
9941-
<property role="2Ry0Am" value="com.mbeddr.doc" />
9942-
<node concept="2Ry0Ak" id="7tNo_gxoK95" role="2Ry0An">
9943-
<property role="2Ry0Am" value="languages" />
9944-
<node concept="2Ry0Ak" id="7tNo_gxoK96" role="2Ry0An">
9945-
<property role="2Ry0Am" value="com.mbeddr.doc.expressions" />
9946-
<node concept="2Ry0Ak" id="7e0YBDNi0dn" role="2Ry0An">
9947-
<property role="2Ry0Am" value="com.mbeddr.doc.expressions.mpl" />
9948-
</node>
9949-
</node>
9950-
</node>
9926+
<ref role="398BVh" node="7eF9rfAnuhS" resolve="mbeddr.cc" />
9927+
<node concept="2Ry0Ak" id="7tNo_gxoK95" role="iGT6I">
9928+
<property role="2Ry0Am" value="languages" />
9929+
<node concept="2Ry0Ak" id="7tNo_gxoK96" role="2Ry0An">
9930+
<property role="2Ry0Am" value="com.mbeddr.doc.expressions" />
9931+
<node concept="2Ry0Ak" id="7e0YBDNi0dn" role="2Ry0An">
9932+
<property role="2Ry0Am" value="com.mbeddr.doc.expressions.mpl" />
99519933
</node>
99529934
</node>
99539935
</node>
@@ -9979,23 +9961,23 @@
99799961
<property role="3ZfqAx" value="generator/template" />
99809962
<property role="1Hdu6h" value="true" />
99819963
<property role="1HemKv" value="true" />
9982-
<node concept="3LXTmp" id="7ZN_vIiShOM" role="1HemKq">
9983-
<node concept="398BVA" id="7ZN_vIiShO$" role="3LXTmr">
9984-
<ref role="398BVh" node="3tiuL$x4rIQ" resolve="mbeddr.doc" />
9985-
<node concept="2Ry0Ak" id="7ZN_vIiShO_" role="iGT6I">
9964+
<node concept="3LXTmp" id="5FkZWZm6sUy" role="1HemKq">
9965+
<node concept="398BVA" id="5FkZWZm6sUl" role="3LXTmr">
9966+
<ref role="398BVh" node="7eF9rfAnuhS" resolve="mbeddr.cc" />
9967+
<node concept="2Ry0Ak" id="5FkZWZm6sUm" role="iGT6I">
99869968
<property role="2Ry0Am" value="languages" />
9987-
<node concept="2Ry0Ak" id="7ZN_vIiShOA" role="2Ry0An">
9969+
<node concept="2Ry0Ak" id="5FkZWZm6sUn" role="2Ry0An">
99889970
<property role="2Ry0Am" value="com.mbeddr.doc.expressions" />
9989-
<node concept="2Ry0Ak" id="7ZN_vIiShOB" role="2Ry0An">
9971+
<node concept="2Ry0Ak" id="5FkZWZm6sUo" role="2Ry0An">
99909972
<property role="2Ry0Am" value="generator" />
9991-
<node concept="2Ry0Ak" id="7ZN_vIiShOC" role="2Ry0An">
9973+
<node concept="2Ry0Ak" id="5FkZWZm6sUp" role="2Ry0An">
99929974
<property role="2Ry0Am" value="template" />
99939975
</node>
99949976
</node>
99959977
</node>
99969978
</node>
99979979
</node>
9998-
<node concept="3qWCbU" id="7ZN_vIiShON" role="3LXTna">
9980+
<node concept="3qWCbU" id="5FkZWZm6sUz" role="3LXTna">
99999981
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
100009982
</node>
100019983
</node>
@@ -10020,20 +10002,20 @@
1002010002
<property role="3ZfqAx" value="languageModels" />
1002110003
<property role="1Hdu6h" value="true" />
1002210004
<property role="1HemKv" value="true" />
10023-
<node concept="3LXTmp" id="7ZN_vIiShOy" role="1HemKq">
10024-
<node concept="398BVA" id="7ZN_vIiShOm" role="3LXTmr">
10025-
<ref role="398BVh" node="3tiuL$x4rIQ" resolve="mbeddr.doc" />
10026-
<node concept="2Ry0Ak" id="7ZN_vIiShOn" role="iGT6I">
10005+
<node concept="3LXTmp" id="5FkZWZm6sUj" role="1HemKq">
10006+
<node concept="398BVA" id="5FkZWZm6sU8" role="3LXTmr">
10007+
<ref role="398BVh" node="7eF9rfAnuhS" resolve="mbeddr.cc" />
10008+
<node concept="2Ry0Ak" id="5FkZWZm6sU9" role="iGT6I">
1002710009
<property role="2Ry0Am" value="languages" />
10028-
<node concept="2Ry0Ak" id="7ZN_vIiShOo" role="2Ry0An">
10010+
<node concept="2Ry0Ak" id="5FkZWZm6sUa" role="2Ry0An">
1002910011
<property role="2Ry0Am" value="com.mbeddr.doc.expressions" />
10030-
<node concept="2Ry0Ak" id="7ZN_vIiShOp" role="2Ry0An">
10012+
<node concept="2Ry0Ak" id="5FkZWZm6sUb" role="2Ry0An">
1003110013
<property role="2Ry0Am" value="languageModels" />
1003210014
</node>
1003310015
</node>
1003410016
</node>
1003510017
</node>
10036-
<node concept="3qWCbU" id="7ZN_vIiShOz" role="3LXTna">
10018+
<node concept="3qWCbU" id="5FkZWZm6sUk" role="3LXTna">
1003710019
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
1003810020
</node>
1003910021
</node>
@@ -11284,21 +11266,6 @@
1128411266
</node>
1128511267
</node>
1128611268
</node>
11287-
<node concept="398rNT" id="3tiuL$x4rIQ" role="1l3spd">
11288-
<property role="TrG5h" value="mbeddr.doc" />
11289-
<node concept="398BVA" id="3tiuL$x4rIR" role="398pKh">
11290-
<ref role="398BVh" node="7uZw0yZ2_Jf" resolve="mbeddr.github.core.home" />
11291-
<node concept="2Ry0Ak" id="3tiuL$x4rIS" role="iGT6I">
11292-
<property role="2Ry0Am" value="code" />
11293-
<node concept="2Ry0Ak" id="3tiuL$x4rIT" role="2Ry0An">
11294-
<property role="2Ry0Am" value="languages" />
11295-
<node concept="2Ry0Ak" id="3tiuL$x4rIU" role="2Ry0An">
11296-
<property role="2Ry0Am" value="com.mbeddr.doc" />
11297-
</node>
11298-
</node>
11299-
</node>
11300-
</node>
11301-
</node>
1130211269
<node concept="398rNT" id="7eF9rfAuAMr" role="1l3spd">
1130311270
<property role="TrG5h" value="mbeddr.ext" />
1130411271
<node concept="398BVA" id="7eF9rfAuAMs" role="398pKh">

‎code/languages/com.mbeddr.build/solutions/com.mbeddr.cc.tests.dev.build/models/com/mbeddr/cc/tests/dev/build/build.mps

Lines changed: 69 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
</imports>
1515
<registry>
1616
<language id="3600cb0a-44dd-4a5b-9968-22924406419e" name="jetbrains.mps.build.mps.tests">
17+
<concept id="4560297596904469355" name="jetbrains.mps.build.mps.tests.structure.BuildMps_TestModuleGroup" flags="ng" index="22LTRF">
18+
<reference id="4560297596904469356" name="group" index="22LTRG" />
19+
</concept>
1720
<concept id="4560297596904469357" name="jetbrains.mps.build.mps.tests.structure.BuildAspect_MpsTestModules" flags="nn" index="22LTRH">
1821
<child id="4560297596904469360" name="modules" index="22LTRK" />
1922
<child id="6593674873639474544" name="options" index="24cAkG" />
2023
</concept>
21-
<concept id="4560297596904469362" name="jetbrains.mps.build.mps.tests.structure.BuildMps_TestModule" flags="nn" index="22LTRM">
22-
<reference id="4560297596904469363" name="module" index="22LTRN" />
23-
</concept>
2424
<concept id="6593674873639474400" name="jetbrains.mps.build.mps.tests.structure.BuildMps_TestModules_Options" flags="ng" index="24cAiW" />
2525
<concept id="4005526075820600484" name="jetbrains.mps.build.mps.tests.structure.BuildModuleTestsPlugin" flags="ng" index="1gjT0q" />
2626
</language>
@@ -250,26 +250,8 @@
250250
<node concept="L2wRC" id="352CMsvKMMs" role="39821P">
251251
<ref role="L2wRA" node="352CMsvKMzF" resolve="test.ts.cc.var.composition" />
252252
</node>
253-
</node>
254-
<node concept="m$_wf" id="7eF9rfAnzV5" role="3989C9">
255-
<property role="m$_wk" value="dummy" />
256-
<node concept="3_J27D" id="7eF9rfAnzV6" role="m$_yQ">
257-
<node concept="3Mxwew" id="7eF9rfAnzV7" role="3MwsjC">
258-
<property role="3MwjfP" value="dummy" />
259-
</node>
260-
</node>
261-
<node concept="3_J27D" id="7eF9rfAnzV8" role="m_cZH">
262-
<node concept="3Mxwew" id="7eF9rfAnzV9" role="3MwsjC">
263-
<property role="3MwjfP" value="dummy" />
264-
</node>
265-
</node>
266-
<node concept="3_J27D" id="7eF9rfAnzVa" role="m$_w8">
267-
<node concept="3Mxwew" id="7eF9rfAnzVb" role="3MwsjC">
268-
<property role="3MwjfP" value="1.0" />
269-
</node>
270-
</node>
271-
<node concept="m$_yC" id="7eF9rfAnzVc" role="m$_yJ">
272-
<ref role="m$_y1" to="ffeo:5CFKsRWRuFN" resolve="jetbrains.mps.debugger.api" />
253+
<node concept="L2wRC" id="WD9jaanOij" role="39821P">
254+
<ref role="L2wRA" node="WD9jaanOgz" resolve="tests.ts.doc" />
273255
</node>
274256
</node>
275257
<node concept="2G$12M" id="7eF9rfAnzVd" role="3989C9">
@@ -502,19 +484,74 @@
502484
</node>
503485
</node>
504486
</node>
487+
<node concept="1E1JtA" id="WD9jaanOgz" role="2G$12L">
488+
<property role="BnDLt" value="true" />
489+
<property role="TrG5h" value="tests.ts.doc" />
490+
<property role="3LESm3" value="fdf8949f-50fd-4f1a-ba07-726db58b6214" />
491+
<property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
492+
<node concept="398BVA" id="WD9jaanOgB" role="3LF7KH">
493+
<ref role="398BVh" node="7eF9rfAnzUi" resolve="mbeddr.cc" />
494+
<node concept="2Ry0Ak" id="WD9jaanOgF" role="iGT6I">
495+
<property role="2Ry0Am" value="tests" />
496+
<node concept="2Ry0Ak" id="WD9jaanOgI" role="2Ry0An">
497+
<property role="2Ry0Am" value="tests.ts.doc" />
498+
<node concept="2Ry0Ak" id="WD9jaanOgL" role="2Ry0An">
499+
<property role="2Ry0Am" value="tests.ts.doc.msd" />
500+
</node>
501+
</node>
502+
</node>
503+
</node>
504+
<node concept="1SiIV0" id="WD9jaanOhU" role="3bR37C">
505+
<node concept="3bR9La" id="WD9jaanOhV" role="1SiIV1">
506+
<ref role="3bR37D" to="al5i:1YMM4SJ2m0" resolve="com.mbeddr.doc" />
507+
</node>
508+
</node>
509+
<node concept="1BupzO" id="WD9jaanOie" role="3bR31x">
510+
<property role="3ZfqAx" value="models" />
511+
<property role="1Hdu6h" value="true" />
512+
<property role="1HemKv" value="true" />
513+
<node concept="3LXTmp" id="WD9jaanOif" role="1HemKq">
514+
<node concept="398BVA" id="WD9jaanOhW" role="3LXTmr">
515+
<ref role="398BVh" node="7eF9rfAnzUi" resolve="mbeddr.cc" />
516+
<node concept="2Ry0Ak" id="WD9jaanOhX" role="iGT6I">
517+
<property role="2Ry0Am" value="tests" />
518+
<node concept="2Ry0Ak" id="WD9jaanOhY" role="2Ry0An">
519+
<property role="2Ry0Am" value="tests.ts.doc" />
520+
<node concept="2Ry0Ak" id="WD9jaanOhZ" role="2Ry0An">
521+
<property role="2Ry0Am" value="models" />
522+
</node>
523+
</node>
524+
</node>
525+
</node>
526+
<node concept="3qWCbU" id="WD9jaanOig" role="3LXTna">
527+
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
528+
</node>
529+
</node>
530+
</node>
531+
<node concept="3rtmxn" id="D2wbO5CO$k" role="3bR31x">
532+
<node concept="3LXTmp" id="D2wbO5CO$l" role="3rtmxm">
533+
<node concept="3qWCbU" id="D2wbO5CO$m" role="3LXTna">
534+
<property role="3qWCbO" value="icons/**, resources/**" />
535+
</node>
536+
<node concept="398BVA" id="D2wbO5CO$n" role="3LXTmr">
537+
<ref role="398BVh" node="7eF9rfAnzUi" resolve="mbeddr.cc" />
538+
<node concept="2Ry0Ak" id="D2wbO5CO$o" role="iGT6I">
539+
<property role="2Ry0Am" value="tests" />
540+
<node concept="2Ry0Ak" id="D2wbO5CO$p" role="2Ry0An">
541+
<property role="2Ry0Am" value="tests.ts.doc" />
542+
</node>
543+
</node>
544+
</node>
545+
</node>
546+
</node>
547+
</node>
505548
</node>
506549
<node concept="22LTRH" id="7eF9rfAnzVt" role="1hWBAP">
507550
<property role="TrG5h" value="com.mbeddr.cc.tests" />
508-
<node concept="22LTRM" id="7eF9rfAnzVu" role="22LTRK">
509-
<ref role="22LTRN" node="7eF9rfAnzVo" resolve="test.ts.cc.var.c" />
510-
</node>
511-
<node concept="22LTRM" id="7eF9rfAnzVw" role="22LTRK">
512-
<ref role="22LTRN" node="7eF9rfAnzVe" resolve="test.ts.requirements" />
513-
</node>
514-
<node concept="22LTRM" id="352CMsvKMSn" role="22LTRK">
515-
<ref role="22LTRN" node="352CMsvKMzF" resolve="test.ts.cc.var.composition" />
516-
</node>
517551
<node concept="24cAiW" id="76N1O$Kj6vp" role="24cAkG" />
552+
<node concept="22LTRF" id="WD9jaanOih" role="22LTRK">
553+
<ref role="22LTRG" node="7eF9rfAnzVd" resolve="com.mbeddr.cc.test" />
554+
</node>
518555
</node>
519556
</node>
520557
<node concept="1l3spW" id="7eF9rfAnzVx">

0 commit comments

Comments
 (0)