Skip to content

Merge maintenance/mps20241 into maintenance/mps20251 #1703

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 17, 2025
Merged

Merge maintenance/mps20241 into maintenance/mps20251 #1703

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
139339f
Remove deprecated `getInstance()` calls in `NavigationSupport` nad mi…
nkoester Dec 10, 2025
7fa4411
Remove deprecated `getInstance()` calls in `NavigationSupport` nad mi…
nkoester Dec 10, 2025
c7ce419
Merge pull request #1697 from JetBrains/bugfix/navigationSupportGetIn…
nkoester Dec 16, 2025
dc5cb97
feat(compare): add 'ignore annotations' property
sergej-koscejev Dec 10, 2025
13ab777
Merge pull request #1698 from JetBrains/compare-ignore-attributes
sergej-koscejev Dec 17, 2025
69f57be
Merge remote-tracking branch 'origin/maintenance/mps20241' into maint…
sergej-koscejev Dec 17, 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
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,17 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e

- *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!
- *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).
- *de.itemis.mps.compare* 'assert node equals' and ':isEqualTo:' expression can now ignore attributes (annotations) when comparing nodes.

### Fixed

- *com.dslfoundry.langvis.plugin* The action *Visualize* *Language* *Structure* doesn't throw an IllegalModelAccessError anymore.
- 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)

### Changed

- *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.
- *de.itemis.mps.compare* minor improvements to the editors of 'assert node equals' and 'show diff'.

## November 2025

Expand Down
1 change: 1 addition & 0 deletions code/compare/languages/de.itemis.mps.compare/compare.mpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@
<dependency reexport="false" scope="generate-into">a247e09e-2435-45ba-b8d2-07e93feba96a(jetbrains.mps.baseLanguage.tuples)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f89904fb-9486-43a1-865e-5ad0375a8a88:de.itemis.mps.editor.bool" version="0" />
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
<language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
Expand Down
45 changes: 42 additions & 3 deletions ...ps.compare/generator/template/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,9 @@
<concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
<reference id="1138405853777" name="concept" index="ehGHo" />
</concept>
<concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
<reference id="1138056395725" name="property" index="3TsBF5" />
</concept>
<concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
<reference id="1138056516764" name="link" index="3Tt5mk" />
</concept>
Expand Down Expand Up @@ -744,6 +747,24 @@
<node concept="37vLTI" id="iyWIxsf$Xd" role="3clFbG">
<node concept="3clFbT" id="iyWIxsf_2N" role="37vLTx">
<property role="3clFbU" value="true" />
<node concept="17Uvod" id="6Vb09dgsqja" role="lGtFl">
<property role="2qtEX9" value="value" />
<property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123137/1068580123138" />
<node concept="3zFVjK" id="6Vb09dgsqjb" role="3zH0cK">
<node concept="3clFbS" id="6Vb09dgsqjc" role="2VODD2">
<node concept="3clFbF" id="6Vb09dgsryX" role="3cqZAp">
<node concept="3fqX7Q" id="6Vb09dgsto3" role="3clFbG">
<node concept="2OqwBi" id="6Vb09dgsto5" role="3fr31v">
<node concept="30H73N" id="6Vb09dgsto6" role="2Oq$k0" />
<node concept="3TrcHB" id="6Vb09dgsto7" role="2OqNvi">
<ref role="3TsBF5" to="8do3:6Vb09dgp30e" resolve="ignoreAnnotations" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2OqwBi" id="iyWIxsf$$H" role="37vLTJ">
<node concept="37vLTw" id="iyWIxsf$nY" role="2Oq$k0">
Expand Down Expand Up @@ -1329,9 +1350,6 @@
</node>
<node concept="3clFbF" id="iyWIxsfmkN" role="3cqZAp">
<node concept="37vLTI" id="iyWIxsfmLp" role="3clFbG">
<node concept="3clFbT" id="iyWIxsfmVG" role="37vLTx">
<property role="3clFbU" value="true" />
</node>
<node concept="2OqwBi" id="iyWIxsfmpi" role="37vLTJ">
<node concept="37vLTw" id="iyWIxsfmkL" role="2Oq$k0">
<ref role="3cqZAo" node="iyWIxsfidM" resolve="options" />
Expand All @@ -1340,6 +1358,27 @@
<ref role="2Oxat5" to="mqum:E9Bg752xHS" resolve="compareAnnotations" />
</node>
</node>
<node concept="3clFbT" id="2C1H_zkhl8M" role="37vLTx">
<property role="3clFbU" value="true" />
<node concept="17Uvod" id="2C1H_zkhlEc" role="lGtFl">
<property role="2qtEX9" value="value" />
<property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123137/1068580123138" />
<node concept="3zFVjK" id="2C1H_zkhlEd" role="3zH0cK">
<node concept="3clFbS" id="2C1H_zkhlEe" role="2VODD2">
<node concept="3clFbF" id="2C1H_zkhlP7" role="3cqZAp">
<node concept="3fqX7Q" id="2C1H_zkhlP5" role="3clFbG">
<node concept="2OqwBi" id="2C1H_zkhmz6" role="3fr31v">
<node concept="30H73N" id="2C1H_zkhlPa" role="2Oq$k0" />
<node concept="3TrcHB" id="2C1H_zkhn3u" role="2OqNvi">
<ref role="3TsBF5" to="8do3:2C1H_zkhhtk" resolve="ignoreAnnotations" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="iyWIxsfnhc" role="3cqZAp">
Expand Down
Loading