Skip to content

Commit 69f57be

Browse files
sergej-koscejevsergej-koscejev
committed
Merge remote-tracking branch 'origin/maintenance/mps20241' into maintenance/mps20251
2 parents 1fa4dbe + 13ab777 commit 69f57be

File tree

13 files changed

+659
-448
lines changed

13 files changed

+659
-448
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,17 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e
1010

1111
- *nl.f1re.mps.aliascustomization* The alias of all concepts globally can now be customized through the extension point [AliasCustomization.](http://127.0.0.1:63320/node?ref=r%3Af0a80b34-9760-42b8-9ee6-d5b0d1582551%28de.slisson.mps.conditionalEditor.runtime.plugin%29%2F1679635547169731239) Please be aware that this feature is experimental. Use it with care!
1212
- *com.mbeddr.mpsutil.intentions* All intentions can now be customized through the extension point [IntentionCustomization](http://127.0.0.1:63320/node?ref=r%3A028362d1-b964-410a-a3d5-6096bcd4a2b6%28com.mbeddr.mpsutil.intentions.runtime.plugin%29%2F4784371196443178355) (child filter, description, is applicable block, execute method). Note that you can't customize intentions that are not enabled in the current context (node + editor context).
13+
- *de.itemis.mps.compare* 'assert node equals' and ':isEqualTo:' expression can now ignore attributes (annotations) when comparing nodes.
1314

1415
### Fixed
1516

1617
- *com.dslfoundry.langvis.plugin* The action *Visualize* *Language* *Structure* doesn't throw an IllegalModelAccessError anymore.
18+
- Migrate all usages of deprecated getInstance() from [NavigationSupport](http://127.0.0.1:63320/node?ref=1ed103c3-3aa6-49b7-9c21-6765ee11f224%2Fjava%3Ajetbrains.mps.openapi.navigation%28MPS.Editor%2F%29%2F~NavigationSupport) to its replacement getInstance(Project mpsProject)
19+
20+
### Changed
21+
22+
- *de.itemis.mps.compare* 'show diff' in assertions is now implemented using a transient property. Changing it will mark the node as changed but the property value is not written to disk and so will never be checked into version control.
23+
- *de.itemis.mps.compare* minor improvements to the editors of 'assert node equals' and 'show diff'.
1724

1825
## November 2025
1926

‎code/compare/languages/de.itemis.mps.compare/compare.mpl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@
147147
<dependency reexport="false" scope="generate-into">a247e09e-2435-45ba-b8d2-07e93feba96a(jetbrains.mps.baseLanguage.tuples)</dependency>
148148
</dependencies>
149149
<languageVersions>
150+
<language slang="l:f89904fb-9486-43a1-865e-5ad0375a8a88:de.itemis.mps.editor.bool" version="0" />
150151
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
151152
<language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
152153
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />

‎code/compare/languages/de.itemis.mps.compare/generator/template/[email protected]‎

Lines changed: 42 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,9 @@
466466
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
467467
<reference id="1138405853777" name="concept" index="ehGHo" />
468468
</concept>
469+
<concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
470+
<reference id="1138056395725" name="property" index="3TsBF5" />
471+
</concept>
469472
<concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
470473
<reference id="1138056516764" name="link" index="3Tt5mk" />
471474
</concept>
@@ -744,6 +747,24 @@
744747
<node concept="37vLTI" id="iyWIxsf$Xd" role="3clFbG">
745748
<node concept="3clFbT" id="iyWIxsf_2N" role="37vLTx">
746749
<property role="3clFbU" value="true" />
750+
<node concept="17Uvod" id="6Vb09dgsqja" role="lGtFl">
751+
<property role="2qtEX9" value="value" />
752+
<property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123137/1068580123138" />
753+
<node concept="3zFVjK" id="6Vb09dgsqjb" role="3zH0cK">
754+
<node concept="3clFbS" id="6Vb09dgsqjc" role="2VODD2">
755+
<node concept="3clFbF" id="6Vb09dgsryX" role="3cqZAp">
756+
<node concept="3fqX7Q" id="6Vb09dgsto3" role="3clFbG">
757+
<node concept="2OqwBi" id="6Vb09dgsto5" role="3fr31v">
758+
<node concept="30H73N" id="6Vb09dgsto6" role="2Oq$k0" />
759+
<node concept="3TrcHB" id="6Vb09dgsto7" role="2OqNvi">
760+
<ref role="3TsBF5" to="8do3:6Vb09dgp30e" resolve="ignoreAnnotations" />
761+
</node>
762+
</node>
763+
</node>
764+
</node>
765+
</node>
766+
</node>
767+
</node>
747768
</node>
748769
<node concept="2OqwBi" id="iyWIxsf$$H" role="37vLTJ">
749770
<node concept="37vLTw" id="iyWIxsf$nY" role="2Oq$k0">
@@ -1329,9 +1350,6 @@
13291350
</node>
13301351
<node concept="3clFbF" id="iyWIxsfmkN" role="3cqZAp">
13311352
<node concept="37vLTI" id="iyWIxsfmLp" role="3clFbG">
1332-
<node concept="3clFbT" id="iyWIxsfmVG" role="37vLTx">
1333-
<property role="3clFbU" value="true" />
1334-
</node>
13351353
<node concept="2OqwBi" id="iyWIxsfmpi" role="37vLTJ">
13361354
<node concept="37vLTw" id="iyWIxsfmkL" role="2Oq$k0">
13371355
<ref role="3cqZAo" node="iyWIxsfidM" resolve="options" />
@@ -1340,6 +1358,27 @@
13401358
<ref role="2Oxat5" to="mqum:E9Bg752xHS" resolve="compareAnnotations" />
13411359
</node>
13421360
</node>
1361+
<node concept="3clFbT" id="2C1H_zkhl8M" role="37vLTx">
1362+
<property role="3clFbU" value="true" />
1363+
<node concept="17Uvod" id="2C1H_zkhlEc" role="lGtFl">
1364+
<property role="2qtEX9" value="value" />
1365+
<property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123137/1068580123138" />
1366+
<node concept="3zFVjK" id="2C1H_zkhlEd" role="3zH0cK">
1367+
<node concept="3clFbS" id="2C1H_zkhlEe" role="2VODD2">
1368+
<node concept="3clFbF" id="2C1H_zkhlP7" role="3cqZAp">
1369+
<node concept="3fqX7Q" id="2C1H_zkhlP5" role="3clFbG">
1370+
<node concept="2OqwBi" id="2C1H_zkhmz6" role="3fr31v">
1371+
<node concept="30H73N" id="2C1H_zkhlPa" role="2Oq$k0" />
1372+
<node concept="3TrcHB" id="2C1H_zkhn3u" role="2OqNvi">
1373+
<ref role="3TsBF5" to="8do3:2C1H_zkhhtk" resolve="ignoreAnnotations" />
1374+
</node>
1375+
</node>
1376+
</node>
1377+
</node>
1378+
</node>
1379+
</node>
1380+
</node>
1381+
</node>
13431382
</node>
13441383
</node>
13451384
<node concept="3clFbF" id="iyWIxsfnhc" role="3cqZAp">

0 commit comments

Comments
 (0)