Skip to content

Commit 791882b

Browse files
Merge pull request #1702 from JetBrains/merge/master
2 parents d498ba2 + 1c14904 commit 791882b

File tree

13 files changed

+708
-445
lines changed

13 files changed

+708
-445
lines changed

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +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.
14+
15+
### Fixed
16+
17+
- *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'.
1324

1425
## November 2025
1526

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@
145145
<dependency reexport="false" scope="generate-into">a247e09e-2435-45ba-b8d2-07e93feba96a(jetbrains.mps.baseLanguage.tuples)</dependency>
146146
</dependencies>
147147
<languageVersions>
148+
<language slang="l:f89904fb-9486-43a1-865e-5ad0375a8a88:de.itemis.mps.editor.bool" version="0" />
148149
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
149150
<language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
150151
<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: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,9 @@
464464
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
465465
<reference id="1138405853777" name="concept" index="ehGHo" />
466466
</concept>
467+
<concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
468+
<reference id="1138056395725" name="property" index="3TsBF5" />
469+
</concept>
467470
<concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
468471
<reference id="1138056516764" name="link" index="3Tt5mk" />
469472
</concept>
@@ -742,6 +745,24 @@
742745
<node concept="37vLTI" id="iyWIxsf$Xd" role="3clFbG">
743746
<node concept="3clFbT" id="iyWIxsf_2N" role="37vLTx">
744747
<property role="3clFbU" value="true" />
748+
<node concept="17Uvod" id="6Vb09dgsqja" role="lGtFl">
749+
<property role="2qtEX9" value="value" />
750+
<property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123137/1068580123138" />
751+
<node concept="3zFVjK" id="6Vb09dgsqjb" role="3zH0cK">
752+
<node concept="3clFbS" id="6Vb09dgsqjc" role="2VODD2">
753+
<node concept="3clFbF" id="6Vb09dgsryX" role="3cqZAp">
754+
<node concept="3fqX7Q" id="6Vb09dgsto3" role="3clFbG">
755+
<node concept="2OqwBi" id="6Vb09dgsto5" role="3fr31v">
756+
<node concept="30H73N" id="6Vb09dgsto6" role="2Oq$k0" />
757+
<node concept="3TrcHB" id="6Vb09dgsto7" role="2OqNvi">
758+
<ref role="3TsBF5" to="8do3:6Vb09dgp30e" resolve="ignoreAnnotations" />
759+
</node>
760+
</node>
761+
</node>
762+
</node>
763+
</node>
764+
</node>
765+
</node>
745766
</node>
746767
<node concept="2OqwBi" id="iyWIxsf$$H" role="37vLTJ">
747768
<node concept="37vLTw" id="iyWIxsf$nY" role="2Oq$k0">
@@ -1327,8 +1348,26 @@
13271348
</node>
13281349
<node concept="3clFbF" id="iyWIxsfmkN" role="3cqZAp">
13291350
<node concept="37vLTI" id="iyWIxsfmLp" role="3clFbG">
1330-
<node concept="3clFbT" id="iyWIxsfmVG" role="37vLTx">
1351+
<node concept="3clFbT" id="2C1H_zkhl8M" role="37vLTx">
13311352
<property role="3clFbU" value="true" />
1353+
<node concept="17Uvod" id="2C1H_zkhlEc" role="lGtFl">
1354+
<property role="2qtEX9" value="value" />
1355+
<property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123137/1068580123138" />
1356+
<node concept="3zFVjK" id="2C1H_zkhlEd" role="3zH0cK">
1357+
<node concept="3clFbS" id="2C1H_zkhlEe" role="2VODD2">
1358+
<node concept="3clFbF" id="2C1H_zkhlP7" role="3cqZAp">
1359+
<node concept="3fqX7Q" id="2C1H_zkhlP5" role="3clFbG">
1360+
<node concept="2OqwBi" id="2C1H_zkhmz6" role="3fr31v">
1361+
<node concept="30H73N" id="2C1H_zkhlPa" role="2Oq$k0" />
1362+
<node concept="3TrcHB" id="2C1H_zkhn3u" role="2OqNvi">
1363+
<ref role="3TsBF5" to="8do3:2C1H_zkhhtk" resolve="ignoreAnnotations" />
1364+
</node>
1365+
</node>
1366+
</node>
1367+
</node>
1368+
</node>
1369+
</node>
1370+
</node>
13321371
</node>
13331372
<node concept="2OqwBi" id="iyWIxsfmpi" role="37vLTJ">
13341373
<node concept="37vLTw" id="iyWIxsfmkL" role="2Oq$k0">

0 commit comments

Comments
 (0)