Skip to content

Merge maintenance/mps20243 into master #1088

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mps-ci-buildbot merged 17 commits into from
Dec 11, 2024
Merged

Merge maintenance/mps20243 into master #1088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
f6ce145
Revert "projectview: don't publish example views"
Dec 5, 2024
2c01212
mpsutil.projectview: keep publishing the helper class
Dec 5, 2024
7a0c5b6
Merge pull request #1080 from JetBrains/bugfix/projects_views_util_class
Dec 5, 2024
fc487bd
Reduce from errors to warnings when finding missing policies.
mfsoliveira Nov 6, 2024
d8a0048
Run remigrate
mfsoliveira Dec 8, 2024
04e98c0
Merge branch 'maintenance/mps20232' into feature/ModelMerge_ReduceFro…
mfsoliveira Dec 8, 2024
5be6ec6
editor.diagram: add support for custom IDs for edges
Dec 9, 2024
c303704
Merge pull request #1085 from JetBrains/feature/edge_IDs
Dec 9, 2024
06f0374
remove comment
mfsoliveira Dec 9, 2024
eb47ab0
Merge pull request #1083 from mfsoliveira/feature/ModelMerge_ReduceFr…
mfsoliveira Dec 9, 2024
e665b0c
Merge remote-tracking branch 'refs/remotes/origin/maintenance/mps2024…
Dec 11, 2024
c3fd373
fix the changelog
Dec 11, 2024
f73e689
run migrations
Dec 11, 2024
dd6cf06
Merge pull request #1081 from JetBrains/merge/mps20241
mps-ci-buildbot Dec 11, 2024
71b30ed
Merge remote-tracking branch 'origin/maintenance/mps20243' into merge…
Dec 11, 2024
7258fa3
run migrations
Dec 11, 2024
38b19d2
Merge pull request #1087 from JetBrains/merge/mps20243
mps-ci-buildbot Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ All notable changes to this project are documented in this file.

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.

## December 2024

### Changed

- 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.

### Added

- *de.itemis.mps.editor.diagram*: Edges now support custom IDs.

## November 2024

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

### Fixed

- *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)
- *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)
- *de.itemis.mps.editor.diagram*: Some issues related to ELK styles and custom IDs were fixed.

### Changed

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

## July 2024

Expand Down
2 changes: 2 additions & 0 deletions code/.mps/modules.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
<modulePath path="$PROJECT_DIR$/languages/de.itemis.model.simple.demo.children/de.itemis.model.simple.demo.children.mpl" folder="modelmerger2.test.language" />
<modulePath path="$PROJECT_DIR$/languages/de.itemis.model.simple.demo.collection.keeper/de.itemis.model.simple.demo.collection.keeper.mpl" folder="modelmerger2.test.language" />
<modulePath path="$PROJECT_DIR$/languages/de.itemis.model.simple.demo.collection/de.itemis.model.simple.demo.collection.mpl" folder="modelmerger2.test.language" />
<modulePath path="$PROJECT_DIR$/languages/de.itemis.model.simple.demo.enums/de.itemis.model.simple.demo.enums.mpl" folder="modelmerger2.test.language" />
<modulePath path="$PROJECT_DIR$/languages/de.itemis.model.simple.demo.property/de.itemis.model.simple.demo.property.mpl" folder="modelmerger2.test.language" />
<modulePath path="$PROJECT_DIR$/languages/de.itemis.model.simple.demo.reference/de.itemis.model.simple.demo.reference.mpl" folder="modelmerger2.test.language" />
<modulePath path="$PROJECT_DIR$/langvis/languages/com.dslfoundry.langvis.demolang/com.dslfoundry.langvis.demolang.mpl" folder="langvis" />
Expand Down Expand Up @@ -126,6 +127,7 @@
<modulePath path="$PROJECT_DIR$/plaintextgen/solutions/com.dslfoundry.plaintextgen.example.nestedlist.sandbox/com.dslfoundry.plaintextgen.example.nestedlist.sandbox.msd" folder="plaintextgen" />
<modulePath path="$PROJECT_DIR$/plaintextgen/solutions/com.dslfoundry.plaintextgen.example.plaintextflow/com.dslfoundry.plaintextgen.example.plaintextflow.msd" folder="plaintextgen" />
<modulePath path="$PROJECT_DIR$/plaintextgen/solutions/com.dslfoundry.plaintextgen.example.testlang.sandbox/com.dslfoundry.plaintextgen.example.testlang.sandbox.msd" folder="plaintextgen" />
<modulePath path="$PROJECT_DIR$/projectview/com.mbeddr.mpsutil.projectview.demo/com.mbeddr.mpsutil.projectview.demo.msd" folder="projectview" />
<modulePath path="$PROJECT_DIR$/projectview/com.mbeddr.mpsutil.projectview.runtime/com.mbeddr.mpsutil.projectview.runtime.msd" folder="projectview" />
<modulePath path="$PROJECT_DIR$/projectview/com.mbeddr.mpsutil.projectview.vcs/com.mbeddr.mpsutil.projectview.vcs.msd" folder="projectview" />
<modulePath path="$PROJECT_DIR$/projectview/com.mbeddr.mpsutil.projectview.views/com.mbeddr.mpsutil.projectview.views.msd" folder="projectview" />
Expand Down
177 changes: 177 additions & 0 deletions .../build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14899,6 +14899,86 @@
</node>
</node>
</node>
<node concept="1E1JtA" id="3jVbLyZDuHs" role="2G$12L">
<property role="BnDLt" value="true" />
<property role="TrG5h" value="com.mbeddr.mpsutil.projectview.views" />
<property role="3LESm3" value="5c67d0a6-96e9-4056-be57-e594d54526b0" />
<node concept="3rtmxn" id="3xFG3bj5cMH" role="3bR31x">
<node concept="3LXTmp" id="3xFG3bj5cMI" role="3rtmxm">
<node concept="3qWCbU" id="3xFG3bj5cMJ" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="398BVA" id="3xFG3bj5cMK" role="3LXTmr">
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
<node concept="2Ry0Ak" id="3xFG3bj5cML" role="iGT6I">
<property role="2Ry0Am" value="projectview" />
<node concept="2Ry0Ak" id="3xFG3bj5cMM" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.mpsutil.projectview.views" />
</node>
</node>
</node>
</node>
</node>
<node concept="398BVA" id="3jVbLyZDwm6" role="3LF7KH">
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
<node concept="2Ry0Ak" id="3jVbLyZDxDY" role="iGT6I">
<property role="2Ry0Am" value="projectview" />
<node concept="2Ry0Ak" id="3jVbLyZDyXP" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.mpsutil.projectview.views" />
<node concept="2Ry0Ak" id="3jVbLyZD$hG" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.mpsutil.projectview.views.msd" />
</node>
</node>
</node>
</node>
<node concept="1SiIV0" id="3jVbLyZD$VB" role="3bR37C">
<node concept="3bR9La" id="3jVbLyZD$VC" role="1SiIV1">
<ref role="3bR37D" to="ffeo:2eDSGe9d1q1" resolve="MPS.Workbench" />
</node>
</node>
<node concept="1SiIV0" id="3jVbLyZD$VJ" role="3bR37C">
<node concept="3bR9La" id="3jVbLyZD$VK" role="1SiIV1">
<ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
</node>
</node>
<node concept="1SiIV0" id="3jVbLyZD$VL" role="3bR37C">
<node concept="3bR9La" id="3jVbLyZD$VM" role="1SiIV1">
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
</node>
</node>
<node concept="1SiIV0" id="3jVbLyZD$VP" role="3bR37C">
<node concept="3bR9La" id="3jVbLyZD$VQ" role="1SiIV1">
<ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
</node>
</node>
<node concept="1SiIV0" id="2avgMTl5svn" role="3bR37C">
<node concept="3bR9La" id="2avgMTl5svo" role="1SiIV1">
<ref role="3bR37D" node="PE3B26QCrP" resolve="org.apache.commons" />
</node>
</node>
<node concept="1BupzO" id="4PRpvcZJNMx" role="3bR31x">
<property role="3ZfqAx" value="models" />
<property role="1Hdu6h" value="true" />
<property role="1HemKv" value="true" />
<node concept="3LXTmp" id="4PRpvcZJNMy" role="1HemKq">
<node concept="398BVA" id="4PRpvcZJNMm" role="3LXTmr">
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
<node concept="2Ry0Ak" id="4PRpvcZJNMn" role="iGT6I">
<property role="2Ry0Am" value="projectview" />
<node concept="2Ry0Ak" id="4PRpvcZJNMo" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.mpsutil.projectview.views" />
<node concept="2Ry0Ak" id="4PRpvcZJNMp" role="2Ry0An">
<property role="2Ry0Am" value="models" />
</node>
</node>
</node>
</node>
<node concept="3qWCbU" id="4PRpvcZJNMz" role="3LXTna">
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
</node>
</node>
</node>
</node>
</node>
<node concept="m$_wf" id="24ObHxTzV4S" role="3989C9">
<property role="m$_wk" value="com.mbeddr.mpsutil.projectview.vcs" />
Expand Down Expand Up @@ -18353,6 +18433,11 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="75IoIgYoAtf" role="3bR37C">
<node concept="3bR9La" id="75IoIgYoAtg" role="1SiIV1">
<ref role="3bR37D" node="75IoIgYo$Z9" resolve="de.itemis.model.simple.demo.enums" />
</node>
</node>
</node>
<node concept="1E1JtA" id="5Jy3PcPRnpY" role="2G$12L">
<property role="BnDLt" value="true" />
Expand Down Expand Up @@ -18752,6 +18837,95 @@
</node>
</node>
</node>
<node concept="1E1JtD" id="75IoIgYo$Z9" role="2G$12L">
<property role="BnDLt" value="true" />
<property role="TrG5h" value="de.itemis.model.simple.demo.enums" />
<property role="3LESm3" value="bf491fd2-a197-456a-8354-b3b225d4e871" />
<node concept="398BVA" id="75IoIgYo$Za" role="3LF7KH">
<ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
<node concept="2Ry0Ak" id="75IoIgYo$Zb" role="iGT6I">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="75IoIgYo$Zc" role="2Ry0An">
<property role="2Ry0Am" value="de.itemis.model.simple.demo.enums" />
<node concept="2Ry0Ak" id="75IoIgYo_s6" role="2Ry0An">
<property role="2Ry0Am" value="de.itemis.model.simple.demo.enums.mpl" />
</node>
</node>
</node>
</node>
<node concept="1BupzO" id="75IoIgYo$Ze" role="3bR31x">
<property role="3ZfqAx" value="models" />
<property role="1Hdu6h" value="true" />
<property role="1HemKv" value="true" />
<node concept="3LXTmp" id="75IoIgYo$Zf" role="1HemKq">
<node concept="398BVA" id="75IoIgYo$Zg" role="3LXTmr">
<ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
<node concept="2Ry0Ak" id="75IoIgYo$Zh" role="iGT6I">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="75IoIgYo$Zi" role="2Ry0An">
<property role="2Ry0Am" value="de.itemis.model.simple.demo.enums" />
<node concept="2Ry0Ak" id="75IoIgYo$Zj" role="2Ry0An">
<property role="2Ry0Am" value="models" />
</node>
</node>
</node>
</node>
<node concept="3qWCbU" id="75IoIgYo$Zk" role="3LXTna">
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
</node>
</node>
</node>
<node concept="3rtmxn" id="75IoIgYo$Zl" role="3bR31x">
<node concept="3LXTmp" id="75IoIgYo$Zm" role="3rtmxm">
<node concept="398BVA" id="75IoIgYo$Zn" role="3LXTmr">
<ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
<node concept="2Ry0Ak" id="75IoIgYo$Zo" role="iGT6I">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="75IoIgYo_Ja" role="2Ry0An">
<property role="2Ry0Am" value="de.itemis.model.simple.demo.enums" />
</node>
</node>
</node>
<node concept="3qWCbU" id="75IoIgYo$Zq" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
</node>
</node>
<node concept="1SiIV0" id="75IoIgYo_WM" role="3bR37C">
<node concept="3bR9La" id="75IoIgYo_WN" role="1SiIV1">
<ref role="3bR37D" node="2UnEDPCh8Ac" resolve="de.itemis.model.simple.demo.property" />
</node>
</node>
<node concept="1yeLz9" id="75IoIgYo_X2" role="1TViLv">
<property role="TrG5h" value="de.itemis.model.simple.demo.enums.generator" />
<property role="3LESm3" value="7306450b-0779-41f2-97a4-8a2ed3686b8d" />
<node concept="1BupzO" id="75IoIgYo_Xk" role="3bR31x">
<property role="3ZfqAx" value="generator/templates" />
<property role="1Hdu6h" value="true" />
<property role="1HemKv" value="true" />
<node concept="3LXTmp" id="75IoIgYo_Xl" role="1HemKq">
<node concept="398BVA" id="75IoIgYo_X3" role="3LXTmr">
<ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
<node concept="2Ry0Ak" id="75IoIgYo_X4" role="iGT6I">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="75IoIgYo_X5" role="2Ry0An">
<property role="2Ry0Am" value="de.itemis.model.simple.demo.enums" />
<node concept="2Ry0Ak" id="75IoIgYo_X6" role="2Ry0An">
<property role="2Ry0Am" value="generator" />
<node concept="2Ry0Ak" id="75IoIgYo_X7" role="2Ry0An">
<property role="2Ry0Am" value="templates" />
</node>
</node>
</node>
</node>
</node>
<node concept="3qWCbU" id="75IoIgYo_Xm" role="3LXTna">
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2G$12M" id="T8sXq9o52B" role="3989C9">
<property role="TrG5h" value="plaintextgen-tests" />
Expand Down Expand Up @@ -22753,6 +22927,9 @@
<node concept="L2wRC" id="2UnEDPCihk6" role="39821P">
<ref role="L2wRA" node="2UnEDPCh8Ac" resolve="de.itemis.model.simple.demo.property" />
</node>
<node concept="L2wRC" id="75IoIgYo$Ff" role="39821P">
<ref role="L2wRA" node="75IoIgYo$Z9" resolve="de.itemis.model.simple.demo.enums" />
</node>
<node concept="L2wRC" id="2UnEDPClM$0" role="39821P">
<ref role="L2wRA" node="2UnEDPClLCV" resolve="de.itemis.model.simple.demo.children" />
</node>
Expand Down
Loading
Loading