Skip to content

Commit b545afa

Browse files
author
Alexander Pann
committed
feat(conditionalEditor): make it possible to customize the alias of any concept
1 parent 141985f commit b545afa

File tree

12 files changed

+2795
-121
lines changed

12 files changed

+2795
-121
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e
1616
- *de.slisson.mps.tables* Textgen warning about duplicate unit name when an editor model contains multiple tables without an action map.
1717
- *de.itemis.mps.editor.pagination* A NullPointerException was fixed for cases where the clicked node was null.
1818
- *de.itemis.mps.spellcheck* Custom dictionaries are not saved in the .mps/dictionaries/project.xml files anymore and pollute the file that is normally used for words saved manually by the user.
19-
20-
### Added
21-
22-
- *com.mbeddr.mpsutil.grammarcells* All cells now support *show* *if* blocks (except optional cells), parent styles and style sheet items. Note that only certain styles can be applied (transitive styles and styles that make sense for wrapper cells).
19+
- *de.itemis.mps.editor.celllayout* Reloading all classes do not lead to ClassCastExceptions anymore.
2320

2421
## October 2025
2522

‎code/.mps/modules.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
<modulePath path="$PROJECT_DIR$/conditional-editor/languages/de.slisson.mps.conditionalEditor/de.slisson.mps.conditionalEditor.mpl" folder="conditional-editor" />
4242
<modulePath path="$PROJECT_DIR$/conditional-editor/solutions/de.slisson.mps.conditionalEditor.runtime/de.slisson.mps.conditionalEditor.runtime.msd" folder="conditional-editor" />
4343
<modulePath path="$PROJECT_DIR$/conditional-editor/solutions/de.slisson.mps.conditionalEditor.sandbox/de.slisson.mps.conditionalEditor.sandbox.msd" folder="conditional-editor" />
44+
<modulePath path="$PROJECT_DIR$/conditional-editor/solutions/test.de.slisson.mps.conditionalEditor/test.de.slisson.mps.conditionalEditor.msd" folder="conditional-editor" />
4445
<modulePath path="$PROJECT_DIR$/debug/languages/de.itemis.mps.debug/de.itemis.mps.debug.mpl" folder="debug" />
4546
<modulePath path="$PROJECT_DIR$/debug/solutions/de.itemis.mps.debug.runtime/de.itemis.mps.debug.runtime.msd" folder="debug" />
4647
<modulePath path="$PROJECT_DIR$/devkits/de.q60.mps.genplan.virutalinterfaces_incremental.devkit/de.q60.mps.genplan.virutalinterfaces_incremental.devkit.devkit" folder="shadowmodels.examples.interpreter" />

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

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4542,6 +4542,11 @@
45424542
</node>
45434543
</node>
45444544
</node>
4545+
<node concept="1SiIV0" id="2nIe0Om1pLq" role="3bR37C">
4546+
<node concept="3bR9La" id="2nIe0Om1pLr" role="1SiIV1">
4547+
<ref role="3bR37D" to="ffeo:7Kfy9QB6LaO" resolve="jetbrains.mps.lang.structure" />
4548+
</node>
4549+
</node>
45454550
</node>
45464551
<node concept="1E1JtD" id="7klUZA6XM5Q" role="2G$12L">
45474552
<property role="BnDLt" value="true" />
@@ -23140,6 +23145,11 @@
2314023145
</node>
2314123146
</node>
2314223147
</node>
23148+
<node concept="1SiIV0" id="2nIe0Om1p5Q" role="3bR37C">
23149+
<node concept="3bR9La" id="2nIe0Om1p5R" role="1SiIV1">
23150+
<ref role="3bR37D" node="7klUZA6XM5K" resolve="de.slisson.mps.conditionalEditor.runtime" />
23151+
</node>
23152+
</node>
2314323153
</node>
2314423154
<node concept="1E1JtA" id="7qi8mU1Ozo5" role="2G$12L">
2314523155
<property role="BnDLt" value="true" />
@@ -23201,6 +23211,51 @@
2320123211
</node>
2320223212
</node>
2320323213
</node>
23214+
<node concept="1E1JtA" id="2nIe0Om1rWQ" role="2G$12L">
23215+
<property role="BnDLt" value="true" />
23216+
<property role="TrG5h" value="test.de.slisson.mps.conditionalEditor" />
23217+
<property role="3LESm3" value="d7b432d9-5044-4b5c-a87e-d53ab073d690" />
23218+
<property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
23219+
<node concept="398BVA" id="2nIe0Om1rXj" role="3LF7KH">
23220+
<ref role="398BVh" node="7qi8mU1OzW7" resolve="conditionalEditor.home" />
23221+
<node concept="2Ry0Ak" id="2nIe0Om1rY9" role="iGT6I">
23222+
<property role="2Ry0Am" value="solutions" />
23223+
<node concept="2Ry0Ak" id="2nIe0Om1rYY" role="2Ry0An">
23224+
<property role="2Ry0Am" value="test.de.slisson.mps.conditionalEditor" />
23225+
<node concept="2Ry0Ak" id="2nIe0Om1rZN" role="2Ry0An">
23226+
<property role="2Ry0Am" value="test.de.slisson.mps.conditionalEditor.msd" />
23227+
</node>
23228+
</node>
23229+
</node>
23230+
</node>
23231+
<node concept="1SiIV0" id="2nIe0Om1sjd" role="3bR37C">
23232+
<node concept="3bR9La" id="2nIe0Om1sje" role="1SiIV1">
23233+
<ref role="3bR37D" node="7qi8mU1Ozo0" resolve="de.slisson.mps.conditionalEditor.demolang" />
23234+
</node>
23235+
</node>
23236+
<node concept="1BupzO" id="2nIe0Om1sj$" role="3bR31x">
23237+
<property role="3ZfqAx" value="models" />
23238+
<property role="1Hdu6h" value="true" />
23239+
<property role="1HemKv" value="true" />
23240+
<node concept="3LXTmp" id="2nIe0Om1sj_" role="1HemKq">
23241+
<node concept="398BVA" id="2nIe0Om1sjf" role="3LXTmr">
23242+
<ref role="398BVh" node="7qi8mU1OzW7" resolve="conditionalEditor.home" />
23243+
<node concept="2Ry0Ak" id="2nIe0Om1sjg" role="iGT6I">
23244+
<property role="2Ry0Am" value="solutions" />
23245+
<node concept="2Ry0Ak" id="2nIe0Om1sjh" role="2Ry0An">
23246+
<property role="2Ry0Am" value="test.de.slisson.mps.conditionalEditor" />
23247+
<node concept="2Ry0Ak" id="2nIe0Om1sji" role="2Ry0An">
23248+
<property role="2Ry0Am" value="models" />
23249+
</node>
23250+
</node>
23251+
</node>
23252+
</node>
23253+
<node concept="3qWCbU" id="2nIe0Om1sjA" role="3LXTna">
23254+
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
23255+
</node>
23256+
</node>
23257+
</node>
23258+
</node>
2320423259
</node>
2320523260
<node concept="2G$12M" id="34tM7SkU508" role="3989C9">
2320623261
<property role="TrG5h" value="math" />
@@ -26595,6 +26650,12 @@
2659526650
<node concept="L2wRC" id="3s41kb3BVRV" role="39821P">
2659626651
<ref role="L2wRA" node="3s41kb3BVkF" resolve="nl.f1re.mpsutil.hasher.tests" />
2659726652
</node>
26653+
<node concept="L2wRC" id="2nIe0Om3lC$" role="39821P">
26654+
<ref role="L2wRA" node="7qi8mU1Ozo0" resolve="de.slisson.mps.conditionalEditor.demolang" />
26655+
</node>
26656+
<node concept="L2wRC" id="2nIe0Om1syq" role="39821P">
26657+
<ref role="L2wRA" node="2nIe0Om1rWQ" resolve="test.de.slisson.mps.conditionalEditor" />
26658+
</node>
2659826659
</node>
2659926660
<node concept="2igEWh" id="H43MYuxQDj" role="1hWBAP">
2660026661
<property role="3UIfUI" value="2024" />
@@ -26694,6 +26755,9 @@
2669426755
<node concept="22LTRM" id="3s41kb3BVT9" role="22LTRK">
2669526756
<ref role="22LTRN" node="3s41kb3BVkF" resolve="nl.f1re.mpsutil.hasher.tests" />
2669626757
</node>
26758+
<node concept="22LTRM" id="2nIe0Om1s$q" role="22LTRK">
26759+
<ref role="22LTRN" node="2nIe0Om1rWQ" resolve="test.de.slisson.mps.conditionalEditor" />
26760+
</node>
2669726761
</node>
2669826762
<node concept="2igEWh" id="1OMGwhrtizD" role="1hWBAP">
2669926763
<property role="3UIfUI" value="1024" />

‎code/conditional-editor/languages/de.slisson.mps.conditionalEditor.demolang/de.slisson.mps.conditionalEditor.demolang.mpl‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<accessoryModels />
1414
<dependencies>
1515
<dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
16+
<dependency reexport="false">9d368018-badb-4569-9884-4b463e4f6696(de.slisson.mps.conditionalEditor.runtime)</dependency>
1617
</dependencies>
1718
<languageVersions>
1819
<language slang="l:b8bb702e-43ed-4090-a902-d180d3e5f292:de.slisson.mps.conditionalEditor" version="0" />
@@ -25,6 +26,7 @@
2526
<language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
2627
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
2728
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
29+
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
2830
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
2931
<language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="6" />
3032
<language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
@@ -36,9 +38,11 @@
3638
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
3739
<language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
3840
<language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="15" />
41+
<language slang="l:c0080a47-7e37-4558-bee9-9ae18e690549:jetbrains.mps.lang.extension" version="2" />
3942
<language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="1" />
4043
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
4144
<language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
45+
<language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
4246
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
4347
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
4448
<language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
@@ -49,6 +53,8 @@
4953
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
5054
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
5155
<language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
56+
<language slang="l:c9d137c4-3259-44f8-80ff-33ab2b506ee4:jetbrains.mps.lang.util.order" version="0" />
57+
<language slang="l:696c1165-4a59-463b-bc5d-902caab85dd0:jetbrains.mps.make.facet" version="0" />
5258
</languageVersions>
5359
<dependencyVersions>
5460
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
@@ -59,6 +65,7 @@
5965
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
6066
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
6167
<module reference="1831633c-aea1-4345-beff-4a6e7fb4f813(de.slisson.mps.conditionalEditor.demolang)" version="0" />
68+
<module reference="9d368018-badb-4569-9884-4b463e4f6696(de.slisson.mps.conditionalEditor.runtime)" version="0" />
6269
<module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
6370
<module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
6471
<module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />

0 commit comments

Comments
 (0)