Skip to content

Commit c428b59

Browse files
mps-ci-buildbotmps-ci-buildbot
authored
Merge pull request #1088 from JetBrains/merge/master
Merge maintenance/mps20243 into master
2 parents cf4150b + 38b19d2 commit c428b59

File tree

51 files changed

+3745
-2576
lines changed

Some content is hidden

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

51 files changed

+3745
-2576
lines changed

‎CHANGELOG.md‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,16 @@ All notable changes to this project are documented in this file.
44

55
The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) .The project does *not* follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.
66

7+
## December 2024
8+
9+
### Changed
10+
11+
- combine multiple elements without spaces Reduced from Errors to Warning checks that force policies for all concepts in a language. In this way one can prototype with small set of merge policies. Use Partial police flag in your MergingPolicy to deactivate runtime checks as well.
12+
13+
### Added
14+
15+
- *de.itemis.mps.editor.diagram*: Edges now support custom IDs.
16+
717
## November 2024
818

919
### Changed
@@ -50,13 +60,13 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e
5060

5161
### Fixed
5262

53-
- *com.mbeddr.mpsutil.projectview.runtime*: Fixed several NPEs. See: [#903,](https://github.com/JetBrains/MPS-extensions/issues/903) [#904]((https://github.com/JetBrains/MPS-extensions/issues/904) , [#901](https://github.com/JetBrains/MPS-extensions/issues/901)
63+
- *com.mbeddr.mpsutil.projectview.runtime*: Fixed several NPEs. See: [#903,](https://github.com/JetBrains/MPS-extensions/issues/903) [#904](https://github.com/JetBrains/MPS-extensions/issues/904) , [#901](https://github.com/JetBrains/MPS-extensions/issues/901)
5464
- *de.itemis.mps.editor.diagram*: Some issues related to ELK styles and custom IDs were fixed.
5565

5666
### Changed
5767

5868
- *de.slisson.mps.reflection*: The language uses the class ReflectionUtil directly and doesn't copy ReflectionUtil_copy in the model anymore.
59-
- *com.mbeddr.mpsutil.editor.querylist.runtime*: Querylist calls model checks of target nodes less agressively.
69+
- *com.mbeddr.mpsutil.editor.querylist.runtime*: Query list calls model checks of target nodes less aggressively.
6070

6171
## July 2024
6272

‎code/.mps/modules.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
<modulePath path="$PROJECT_DIR$/languages/de.itemis.model.simple.demo.children/de.itemis.model.simple.demo.children.mpl" folder="modelmerger2.test.language" />
7878
<modulePath path="$PROJECT_DIR$/languages/de.itemis.model.simple.demo.collection.keeper/de.itemis.model.simple.demo.collection.keeper.mpl" folder="modelmerger2.test.language" />
7979
<modulePath path="$PROJECT_DIR$/languages/de.itemis.model.simple.demo.collection/de.itemis.model.simple.demo.collection.mpl" folder="modelmerger2.test.language" />
80+
<modulePath path="$PROJECT_DIR$/languages/de.itemis.model.simple.demo.enums/de.itemis.model.simple.demo.enums.mpl" folder="modelmerger2.test.language" />
8081
<modulePath path="$PROJECT_DIR$/languages/de.itemis.model.simple.demo.property/de.itemis.model.simple.demo.property.mpl" folder="modelmerger2.test.language" />
8182
<modulePath path="$PROJECT_DIR$/languages/de.itemis.model.simple.demo.reference/de.itemis.model.simple.demo.reference.mpl" folder="modelmerger2.test.language" />
8283
<modulePath path="$PROJECT_DIR$/langvis/languages/com.dslfoundry.langvis.demolang/com.dslfoundry.langvis.demolang.mpl" folder="langvis" />
@@ -126,6 +127,7 @@
126127
<modulePath path="$PROJECT_DIR$/plaintextgen/solutions/com.dslfoundry.plaintextgen.example.nestedlist.sandbox/com.dslfoundry.plaintextgen.example.nestedlist.sandbox.msd" folder="plaintextgen" />
127128
<modulePath path="$PROJECT_DIR$/plaintextgen/solutions/com.dslfoundry.plaintextgen.example.plaintextflow/com.dslfoundry.plaintextgen.example.plaintextflow.msd" folder="plaintextgen" />
128129
<modulePath path="$PROJECT_DIR$/plaintextgen/solutions/com.dslfoundry.plaintextgen.example.testlang.sandbox/com.dslfoundry.plaintextgen.example.testlang.sandbox.msd" folder="plaintextgen" />
130+
<modulePath path="$PROJECT_DIR$/projectview/com.mbeddr.mpsutil.projectview.demo/com.mbeddr.mpsutil.projectview.demo.msd" folder="projectview" />
129131
<modulePath path="$PROJECT_DIR$/projectview/com.mbeddr.mpsutil.projectview.runtime/com.mbeddr.mpsutil.projectview.runtime.msd" folder="projectview" />
130132
<modulePath path="$PROJECT_DIR$/projectview/com.mbeddr.mpsutil.projectview.vcs/com.mbeddr.mpsutil.projectview.vcs.msd" folder="projectview" />
131133
<modulePath path="$PROJECT_DIR$/projectview/com.mbeddr.mpsutil.projectview.views/com.mbeddr.mpsutil.projectview.views.msd" folder="projectview" />

‎code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps‎

Lines changed: 177 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14899,6 +14899,86 @@
1489914899
</node>
1490014900
</node>
1490114901
</node>
14902+
<node concept="1E1JtA" id="3jVbLyZDuHs" role="2G$12L">
14903+
<property role="BnDLt" value="true" />
14904+
<property role="TrG5h" value="com.mbeddr.mpsutil.projectview.views" />
14905+
<property role="3LESm3" value="5c67d0a6-96e9-4056-be57-e594d54526b0" />
14906+
<node concept="3rtmxn" id="3xFG3bj5cMH" role="3bR31x">
14907+
<node concept="3LXTmp" id="3xFG3bj5cMI" role="3rtmxm">
14908+
<node concept="3qWCbU" id="3xFG3bj5cMJ" role="3LXTna">
14909+
<property role="3qWCbO" value="icons/**, resources/**" />
14910+
</node>
14911+
<node concept="398BVA" id="3xFG3bj5cMK" role="3LXTmr">
14912+
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
14913+
<node concept="2Ry0Ak" id="3xFG3bj5cML" role="iGT6I">
14914+
<property role="2Ry0Am" value="projectview" />
14915+
<node concept="2Ry0Ak" id="3xFG3bj5cMM" role="2Ry0An">
14916+
<property role="2Ry0Am" value="com.mbeddr.mpsutil.projectview.views" />
14917+
</node>
14918+
</node>
14919+
</node>
14920+
</node>
14921+
</node>
14922+
<node concept="398BVA" id="3jVbLyZDwm6" role="3LF7KH">
14923+
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
14924+
<node concept="2Ry0Ak" id="3jVbLyZDxDY" role="iGT6I">
14925+
<property role="2Ry0Am" value="projectview" />
14926+
<node concept="2Ry0Ak" id="3jVbLyZDyXP" role="2Ry0An">
14927+
<property role="2Ry0Am" value="com.mbeddr.mpsutil.projectview.views" />
14928+
<node concept="2Ry0Ak" id="3jVbLyZD$hG" role="2Ry0An">
14929+
<property role="2Ry0Am" value="com.mbeddr.mpsutil.projectview.views.msd" />
14930+
</node>
14931+
</node>
14932+
</node>
14933+
</node>
14934+
<node concept="1SiIV0" id="3jVbLyZD$VB" role="3bR37C">
14935+
<node concept="3bR9La" id="3jVbLyZD$VC" role="1SiIV1">
14936+
<ref role="3bR37D" to="ffeo:2eDSGe9d1q1" resolve="MPS.Workbench" />
14937+
</node>
14938+
</node>
14939+
<node concept="1SiIV0" id="3jVbLyZD$VJ" role="3bR37C">
14940+
<node concept="3bR9La" id="3jVbLyZD$VK" role="1SiIV1">
14941+
<ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
14942+
</node>
14943+
</node>
14944+
<node concept="1SiIV0" id="3jVbLyZD$VL" role="3bR37C">
14945+
<node concept="3bR9La" id="3jVbLyZD$VM" role="1SiIV1">
14946+
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
14947+
</node>
14948+
</node>
14949+
<node concept="1SiIV0" id="3jVbLyZD$VP" role="3bR37C">
14950+
<node concept="3bR9La" id="3jVbLyZD$VQ" role="1SiIV1">
14951+
<ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
14952+
</node>
14953+
</node>
14954+
<node concept="1SiIV0" id="2avgMTl5svn" role="3bR37C">
14955+
<node concept="3bR9La" id="2avgMTl5svo" role="1SiIV1">
14956+
<ref role="3bR37D" node="PE3B26QCrP" resolve="org.apache.commons" />
14957+
</node>
14958+
</node>
14959+
<node concept="1BupzO" id="4PRpvcZJNMx" role="3bR31x">
14960+
<property role="3ZfqAx" value="models" />
14961+
<property role="1Hdu6h" value="true" />
14962+
<property role="1HemKv" value="true" />
14963+
<node concept="3LXTmp" id="4PRpvcZJNMy" role="1HemKq">
14964+
<node concept="398BVA" id="4PRpvcZJNMm" role="3LXTmr">
14965+
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
14966+
<node concept="2Ry0Ak" id="4PRpvcZJNMn" role="iGT6I">
14967+
<property role="2Ry0Am" value="projectview" />
14968+
<node concept="2Ry0Ak" id="4PRpvcZJNMo" role="2Ry0An">
14969+
<property role="2Ry0Am" value="com.mbeddr.mpsutil.projectview.views" />
14970+
<node concept="2Ry0Ak" id="4PRpvcZJNMp" role="2Ry0An">
14971+
<property role="2Ry0Am" value="models" />
14972+
</node>
14973+
</node>
14974+
</node>
14975+
</node>
14976+
<node concept="3qWCbU" id="4PRpvcZJNMz" role="3LXTna">
14977+
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
14978+
</node>
14979+
</node>
14980+
</node>
14981+
</node>
1490214982
</node>
1490314983
<node concept="m$_wf" id="24ObHxTzV4S" role="3989C9">
1490414984
<property role="m$_wk" value="com.mbeddr.mpsutil.projectview.vcs" />
@@ -18353,6 +18433,11 @@
1835318433
</node>
1835418434
</node>
1835518435
</node>
18436+
<node concept="1SiIV0" id="75IoIgYoAtf" role="3bR37C">
18437+
<node concept="3bR9La" id="75IoIgYoAtg" role="1SiIV1">
18438+
<ref role="3bR37D" node="75IoIgYo$Z9" resolve="de.itemis.model.simple.demo.enums" />
18439+
</node>
18440+
</node>
1835618441
</node>
1835718442
<node concept="1E1JtA" id="5Jy3PcPRnpY" role="2G$12L">
1835818443
<property role="BnDLt" value="true" />
@@ -18752,6 +18837,95 @@
1875218837
</node>
1875318838
</node>
1875418839
</node>
18840+
<node concept="1E1JtD" id="75IoIgYo$Z9" role="2G$12L">
18841+
<property role="BnDLt" value="true" />
18842+
<property role="TrG5h" value="de.itemis.model.simple.demo.enums" />
18843+
<property role="3LESm3" value="bf491fd2-a197-456a-8354-b3b225d4e871" />
18844+
<node concept="398BVA" id="75IoIgYo$Za" role="3LF7KH">
18845+
<ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
18846+
<node concept="2Ry0Ak" id="75IoIgYo$Zb" role="iGT6I">
18847+
<property role="2Ry0Am" value="languages" />
18848+
<node concept="2Ry0Ak" id="75IoIgYo$Zc" role="2Ry0An">
18849+
<property role="2Ry0Am" value="de.itemis.model.simple.demo.enums" />
18850+
<node concept="2Ry0Ak" id="75IoIgYo_s6" role="2Ry0An">
18851+
<property role="2Ry0Am" value="de.itemis.model.simple.demo.enums.mpl" />
18852+
</node>
18853+
</node>
18854+
</node>
18855+
</node>
18856+
<node concept="1BupzO" id="75IoIgYo$Ze" role="3bR31x">
18857+
<property role="3ZfqAx" value="models" />
18858+
<property role="1Hdu6h" value="true" />
18859+
<property role="1HemKv" value="true" />
18860+
<node concept="3LXTmp" id="75IoIgYo$Zf" role="1HemKq">
18861+
<node concept="398BVA" id="75IoIgYo$Zg" role="3LXTmr">
18862+
<ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
18863+
<node concept="2Ry0Ak" id="75IoIgYo$Zh" role="iGT6I">
18864+
<property role="2Ry0Am" value="languages" />
18865+
<node concept="2Ry0Ak" id="75IoIgYo$Zi" role="2Ry0An">
18866+
<property role="2Ry0Am" value="de.itemis.model.simple.demo.enums" />
18867+
<node concept="2Ry0Ak" id="75IoIgYo$Zj" role="2Ry0An">
18868+
<property role="2Ry0Am" value="models" />
18869+
</node>
18870+
</node>
18871+
</node>
18872+
</node>
18873+
<node concept="3qWCbU" id="75IoIgYo$Zk" role="3LXTna">
18874+
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
18875+
</node>
18876+
</node>
18877+
</node>
18878+
<node concept="3rtmxn" id="75IoIgYo$Zl" role="3bR31x">
18879+
<node concept="3LXTmp" id="75IoIgYo$Zm" role="3rtmxm">
18880+
<node concept="398BVA" id="75IoIgYo$Zn" role="3LXTmr">
18881+
<ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
18882+
<node concept="2Ry0Ak" id="75IoIgYo$Zo" role="iGT6I">
18883+
<property role="2Ry0Am" value="languages" />
18884+
<node concept="2Ry0Ak" id="75IoIgYo_Ja" role="2Ry0An">
18885+
<property role="2Ry0Am" value="de.itemis.model.simple.demo.enums" />
18886+
</node>
18887+
</node>
18888+
</node>
18889+
<node concept="3qWCbU" id="75IoIgYo$Zq" role="3LXTna">
18890+
<property role="3qWCbO" value="icons/**, resources/**" />
18891+
</node>
18892+
</node>
18893+
</node>
18894+
<node concept="1SiIV0" id="75IoIgYo_WM" role="3bR37C">
18895+
<node concept="3bR9La" id="75IoIgYo_WN" role="1SiIV1">
18896+
<ref role="3bR37D" node="2UnEDPCh8Ac" resolve="de.itemis.model.simple.demo.property" />
18897+
</node>
18898+
</node>
18899+
<node concept="1yeLz9" id="75IoIgYo_X2" role="1TViLv">
18900+
<property role="TrG5h" value="de.itemis.model.simple.demo.enums.generator" />
18901+
<property role="3LESm3" value="7306450b-0779-41f2-97a4-8a2ed3686b8d" />
18902+
<node concept="1BupzO" id="75IoIgYo_Xk" role="3bR31x">
18903+
<property role="3ZfqAx" value="generator/templates" />
18904+
<property role="1Hdu6h" value="true" />
18905+
<property role="1HemKv" value="true" />
18906+
<node concept="3LXTmp" id="75IoIgYo_Xl" role="1HemKq">
18907+
<node concept="398BVA" id="75IoIgYo_X3" role="3LXTmr">
18908+
<ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
18909+
<node concept="2Ry0Ak" id="75IoIgYo_X4" role="iGT6I">
18910+
<property role="2Ry0Am" value="languages" />
18911+
<node concept="2Ry0Ak" id="75IoIgYo_X5" role="2Ry0An">
18912+
<property role="2Ry0Am" value="de.itemis.model.simple.demo.enums" />
18913+
<node concept="2Ry0Ak" id="75IoIgYo_X6" role="2Ry0An">
18914+
<property role="2Ry0Am" value="generator" />
18915+
<node concept="2Ry0Ak" id="75IoIgYo_X7" role="2Ry0An">
18916+
<property role="2Ry0Am" value="templates" />
18917+
</node>
18918+
</node>
18919+
</node>
18920+
</node>
18921+
</node>
18922+
<node concept="3qWCbU" id="75IoIgYo_Xm" role="3LXTna">
18923+
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
18924+
</node>
18925+
</node>
18926+
</node>
18927+
</node>
18928+
</node>
1875518929
</node>
1875618930
<node concept="2G$12M" id="T8sXq9o52B" role="3989C9">
1875718931
<property role="TrG5h" value="plaintextgen-tests" />
@@ -22753,6 +22927,9 @@
2275322927
<node concept="L2wRC" id="2UnEDPCihk6" role="39821P">
2275422928
<ref role="L2wRA" node="2UnEDPCh8Ac" resolve="de.itemis.model.simple.demo.property" />
2275522929
</node>
22930+
<node concept="L2wRC" id="75IoIgYo$Ff" role="39821P">
22931+
<ref role="L2wRA" node="75IoIgYo$Z9" resolve="de.itemis.model.simple.demo.enums" />
22932+
</node>
2275622933
<node concept="L2wRC" id="2UnEDPClM$0" role="39821P">
2275722934
<ref role="L2wRA" node="2UnEDPClLCV" resolve="de.itemis.model.simple.demo.children" />
2275822935
</node>

0 commit comments

Comments
 (0)