Skip to content

Merge maintenance/mps20251 into master #1687

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 6 commits into from
Dec 3, 2025
Merged

Merge maintenance/mps20251 into master #1687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ea6e6ef
fix(reflection): broken reference in a priority rule
sergej-koscejev Dec 2, 2025
552add5
feat(conditionalEditor): make it possible to customize the alias of a…
Dec 2, 2025
e6712a9
Merge branch 'maintenance/mps20251' into feature/concept_alias_custom…
alexanderpann Dec 3, 2025
4b3f67f
Merge pull request #1684 from JetBrains/feature/concept_alias_customi…
alexanderpann Dec 3, 2025
951630c
Merge pull request #1682 from JetBrains/remove-broken-reference
sergej-koscejev Dec 3, 2025
12b754f
run migrations
Dec 3, 2025
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
1 change: 1 addition & 0 deletions code/.mps/modules.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
<modulePath path="$PROJECT_DIR$/conditional-editor/languages/de.slisson.mps.conditionalEditor/de.slisson.mps.conditionalEditor.mpl" folder="conditional-editor" />
<modulePath path="$PROJECT_DIR$/conditional-editor/solutions/de.slisson.mps.conditionalEditor.runtime/de.slisson.mps.conditionalEditor.runtime.msd" folder="conditional-editor" />
<modulePath path="$PROJECT_DIR$/conditional-editor/solutions/de.slisson.mps.conditionalEditor.sandbox/de.slisson.mps.conditionalEditor.sandbox.msd" folder="conditional-editor" />
<modulePath path="$PROJECT_DIR$/conditional-editor/solutions/test.de.slisson.mps.conditionalEditor/test.de.slisson.mps.conditionalEditor.msd" folder="conditional-editor" />
<modulePath path="$PROJECT_DIR$/debug/languages/de.itemis.mps.debug/de.itemis.mps.debug.mpl" folder="debug" />
<modulePath path="$PROJECT_DIR$/debug/solutions/de.itemis.mps.debug.runtime/de.itemis.mps.debug.runtime.msd" folder="debug" />
<modulePath path="$PROJECT_DIR$/devkits/de.q60.mps.genplan.virutalinterfaces_incremental.devkit/de.q60.mps.genplan.virutalinterfaces_incremental.devkit.devkit" folder="shadowmodels.examples.interpreter" />
Expand Down
80 changes: 80 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 @@ -4542,6 +4542,11 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="2nIe0Om1pLq" role="3bR37C">
<node concept="3bR9La" id="2nIe0Om1pLr" role="1SiIV1">
<ref role="3bR37D" to="ffeo:7Kfy9QB6LaO" resolve="jetbrains.mps.lang.structure" />
</node>
</node>
</node>
<node concept="1E1JtD" id="7klUZA6XM5Q" role="2G$12L">
<property role="BnDLt" value="true" />
Expand Down Expand Up @@ -23140,6 +23145,11 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="2nIe0Om1p5Q" role="3bR37C">
<node concept="3bR9La" id="2nIe0Om1p5R" role="1SiIV1">
<ref role="3bR37D" node="7klUZA6XM5K" resolve="de.slisson.mps.conditionalEditor.runtime" />
</node>
</node>
</node>
<node concept="1E1JtA" id="7qi8mU1Ozo5" role="2G$12L">
<property role="BnDLt" value="true" />
Expand Down Expand Up @@ -23201,6 +23211,67 @@
</node>
</node>
</node>
<node concept="1E1JtA" id="2nIe0Om1rWQ" role="2G$12L">
<property role="BnDLt" value="true" />
<property role="TrG5h" value="test.de.slisson.mps.conditionalEditor" />
<property role="3LESm3" value="d7b432d9-5044-4b5c-a87e-d53ab073d690" />
<property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
<node concept="398BVA" id="2nIe0Om1rXj" role="3LF7KH">
<ref role="398BVh" node="7qi8mU1OzW7" resolve="conditionalEditor.home" />
<node concept="2Ry0Ak" id="2nIe0Om1rY9" role="iGT6I">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="2nIe0Om1rYY" role="2Ry0An">
<property role="2Ry0Am" value="test.de.slisson.mps.conditionalEditor" />
<node concept="2Ry0Ak" id="2nIe0Om1rZN" role="2Ry0An">
<property role="2Ry0Am" value="test.de.slisson.mps.conditionalEditor.msd" />
</node>
</node>
</node>
</node>
<node concept="1SiIV0" id="2nIe0Om1sjd" role="3bR37C">
<node concept="3bR9La" id="2nIe0Om1sje" role="1SiIV1">
<ref role="3bR37D" node="7qi8mU1Ozo0" resolve="de.slisson.mps.conditionalEditor.demolang" />
</node>
</node>
<node concept="1BupzO" id="2nIe0Om1sj$" role="3bR31x">
<property role="3ZfqAx" value="models" />
<property role="1Hdu6h" value="true" />
<property role="1HemKv" value="true" />
<node concept="3LXTmp" id="2nIe0Om1sj_" role="1HemKq">
<node concept="398BVA" id="2nIe0Om1sjf" role="3LXTmr">
<ref role="398BVh" node="7qi8mU1OzW7" resolve="conditionalEditor.home" />
<node concept="2Ry0Ak" id="2nIe0Om1sjg" role="iGT6I">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="2nIe0Om1sjh" role="2Ry0An">
<property role="2Ry0Am" value="test.de.slisson.mps.conditionalEditor" />
<node concept="2Ry0Ak" id="2nIe0Om1sji" role="2Ry0An">
<property role="2Ry0Am" value="models" />
</node>
</node>
</node>
</node>
<node concept="3qWCbU" id="2nIe0Om1sjA" role="3LXTna">
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
</node>
</node>
</node>
<node concept="3rtmxn" id="7he_rmUOK56" role="3bR31x">
<node concept="3LXTmp" id="7he_rmUOK57" role="3rtmxm">
<node concept="3qWCbU" id="7he_rmUOK58" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="398BVA" id="7he_rmUOK59" role="3LXTmr">
<ref role="398BVh" node="7qi8mU1OzW7" resolve="conditionalEditor.home" />
<node concept="2Ry0Ak" id="7he_rmUOK5a" role="iGT6I">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="7he_rmUOK5b" role="2Ry0An">
<property role="2Ry0Am" value="test.de.slisson.mps.conditionalEditor" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2G$12M" id="34tM7SkU508" role="3989C9">
<property role="TrG5h" value="math" />
Expand Down Expand Up @@ -26595,6 +26666,12 @@
<node concept="L2wRC" id="3s41kb3BVRV" role="39821P">
<ref role="L2wRA" node="3s41kb3BVkF" resolve="nl.f1re.mpsutil.hasher.tests" />
</node>
<node concept="L2wRC" id="2nIe0Om3lC$" role="39821P">
<ref role="L2wRA" node="7qi8mU1Ozo0" resolve="de.slisson.mps.conditionalEditor.demolang" />
</node>
<node concept="L2wRC" id="2nIe0Om1syq" role="39821P">
<ref role="L2wRA" node="2nIe0Om1rWQ" resolve="test.de.slisson.mps.conditionalEditor" />
</node>
</node>
<node concept="2igEWh" id="H43MYuxQDj" role="1hWBAP">
<property role="3UIfUI" value="2024" />
Expand Down Expand Up @@ -26694,6 +26771,9 @@
<node concept="22LTRM" id="3s41kb3BVT9" role="22LTRK">
<ref role="22LTRN" node="3s41kb3BVkF" resolve="nl.f1re.mpsutil.hasher.tests" />
</node>
<node concept="22LTRM" id="2nIe0Om1s$q" role="22LTRK">
<ref role="22LTRN" node="2nIe0Om1rWQ" resolve="test.de.slisson.mps.conditionalEditor" />
</node>
</node>
<node concept="2igEWh" id="1OMGwhrtizD" role="1hWBAP">
<property role="3UIfUI" value="1024" />
Expand Down
7 changes: 7 additions & 0 deletions ...s/de.slisson.mps.conditionalEditor.demolang/de.slisson.mps.conditionalEditor.demolang.mpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<accessoryModels />
<dependencies>
<dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
<dependency reexport="false">9d368018-badb-4569-9884-4b463e4f6696(de.slisson.mps.conditionalEditor.runtime)</dependency>
</dependencies>
<languageVersions>
<language slang="l:b8bb702e-43ed-4090-a902-d180d3e5f292:de.slisson.mps.conditionalEditor" version="0" />
Expand All @@ -25,6 +26,7 @@
<language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
Expand All @@ -36,9 +38,11 @@
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
<language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
<language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="15" />
<language slang="l:c0080a47-7e37-4558-bee9-9ae18e690549:jetbrains.mps.lang.extension" version="2" />
<language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
<language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
<language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
Expand All @@ -49,6 +53,8 @@
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
<language slang="l:c9d137c4-3259-44f8-80ff-33ab2b506ee4:jetbrains.mps.lang.util.order" version="0" />
<language slang="l:696c1165-4a59-463b-bc5d-902caab85dd0:jetbrains.mps.make.facet" version="0" />
</languageVersions>
<dependencyVersions>
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
Expand All @@ -59,6 +65,7 @@
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
<module reference="1831633c-aea1-4345-beff-4a6e7fb4f813(de.slisson.mps.conditionalEditor.demolang)" version="0" />
<module reference="9d368018-badb-4569-9884-4b463e4f6696(de.slisson.mps.conditionalEditor.runtime)" version="0" />
<module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
<module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
<module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
Expand Down
Loading