Skip to content

Commit d4ea6b8

Browse files
mps-ci-buildbotmps-ci-buildbot
authored
Merge pull request #1656 from JetBrains/merge/master
Merge maintenance/mps20251 into master
2 parents 1b2d1bc + 45c3c7c commit d4ea6b8

File tree

3 files changed

+74
-6
lines changed

3 files changed

+74
-6
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e
1010

1111
- *de.slisson.mps.tables* IllegalArgumentException thrown when copy-paste support is not defined for a table node (#1650).
1212
- *de.slisson.mps.tables* Textgen warning about duplicate unit name when an editor model contains multiple tables without an action map.
13+
- *de.itemis.mps.editor.pagination* A NullPointerException was fixed for cases where the clicked node was null.
1314

1415
## October 2025
1516

1617
### Fixed
1718

18-
- *de.itemis.mps.extensions.build* Version number is now set correctly in the `build.properties` file inside the published artifact.
19+
- *de.itemis.mps.comparator* The freeze was fixed when opening the diff viewer and indexing was going on in the background.
1920
- *de.itemis.mps.editor.bool.runtime* Improve loading of checkbox images to work in scenarios where the node being edited is not part of a model (even if only temporarily).
21+
- *de.itemis.mps.extensions.build* Version number is now set correctly in the `build.properties` file inside the published artifact.
2022

2123
### Changed
2224

‎code/pagination/solutions/de.itemis.mps.editor.pagination.runtime/models/de.itemis.mps.editor.pagination.runtime.plugin.utils.mps‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
1818
<import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
1919
<import index="kz9k" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.navigation(MPS.Editor/)" />
20+
<import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
2021
</imports>
2122
<registry>
2223
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -27,6 +28,12 @@
2728
<concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
2829
<concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
2930
<concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
31+
<concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
32+
<reference id="1188208074048" name="annotation" index="2AI5Lk" />
33+
</concept>
34+
<concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
35+
<child id="1188208488637" name="annotation" index="2AJF6D" />
36+
</concept>
3037
<concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
3138
<child id="1154032183016" name="body" index="2LFqv$" />
3239
</concept>
@@ -119,6 +126,7 @@
119126
<child id="1163668934364" name="ifFalse" index="3K4GZi" />
120127
</concept>
121128
<concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
129+
<concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
122130
</language>
123131
<language id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots">
124132
<concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
@@ -756,13 +764,21 @@
756764
</node>
757765
</node>
758766
</node>
759-
<node concept="3y3z36" id="5$hufwY7heW" role="3clFbw">
760-
<node concept="10Nm6u" id="5$hufwY7hom" role="3uHU7w" />
761-
<node concept="2OqwBi" id="5$hufwY7gS6" role="3uHU7B">
762-
<node concept="37vLTw" id="5$hufwY7gHc" role="2Oq$k0">
767+
<node concept="1Wc70l" id="54UganN9XfB" role="3clFbw">
768+
<node concept="3y3z36" id="54UganNaaHQ" role="3uHU7B">
769+
<node concept="10Nm6u" id="54UganNaaUG" role="3uHU7w" />
770+
<node concept="37vLTw" id="54UganN9XnT" role="3uHU7B">
763771
<ref role="3cqZAo" node="47Pq93I1YDh" resolve="node" />
764772
</node>
765-
<node concept="I4A8Y" id="5$hufwY7h2v" role="2OqNvi" />
773+
</node>
774+
<node concept="3y3z36" id="5$hufwY7heW" role="3uHU7w">
775+
<node concept="10Nm6u" id="5$hufwY7hom" role="3uHU7w" />
776+
<node concept="2OqwBi" id="5$hufwY7gS6" role="3uHU7B">
777+
<node concept="37vLTw" id="5$hufwY7gHc" role="2Oq$k0">
778+
<ref role="3cqZAo" node="47Pq93I1YDh" resolve="node" />
779+
</node>
780+
<node concept="I4A8Y" id="5$hufwY7h2v" role="2OqNvi" />
781+
</node>
766782
</node>
767783
</node>
768784
</node>
@@ -773,6 +789,9 @@
773789
<node concept="37vLTG" id="47Pq93I1YDh" role="3clF46">
774790
<property role="TrG5h" value="node" />
775791
<node concept="3Tqbb2" id="47Pq93I1YDg" role="1tU5fm" />
792+
<node concept="2AHcQZ" id="54UganN9YeM" role="2AJF6D">
793+
<ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
794+
</node>
776795
</node>
777796
<node concept="37vLTG" id="47Pq93I22AF" role="3clF46">
778797
<property role="TrG5h" value="project" />

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

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,53 @@
354354
<property role="3oM_SC" value="" />
355355
</node>
356356
</node>
357+
<node concept="2DRihI" id="54UganNamps" role="15bAlk">
358+
<property role="2RT3bR" value="0" />
359+
<node concept="15Ami3" id="54UganNamqb" role="1PaTwD">
360+
<node concept="37shsh" id="54UganNamqd" role="15Aodc">
361+
<node concept="1dCxOk" id="54UganNamqj" role="37shsm">
362+
<property role="1XweGW" value="232ef711-abb3-4b52-a3f2-e7987a748232" />
363+
<property role="1XxBO9" value="de.itemis.mps.editor.pagination" />
364+
</node>
365+
</node>
366+
</node>
367+
<node concept="3oM_SD" id="54UganNamqo" role="1PaTwD">
368+
<property role="3oM_SC" value="A" />
369+
</node>
370+
<node concept="3oM_SD" id="54UganNamqp" role="1PaTwD">
371+
<property role="3oM_SC" value="NullPointerException" />
372+
</node>
373+
<node concept="3oM_SD" id="54UganNamqq" role="1PaTwD">
374+
<property role="3oM_SC" value="was" />
375+
</node>
376+
<node concept="3oM_SD" id="54UganNamqr" role="1PaTwD">
377+
<property role="3oM_SC" value="fixed" />
378+
</node>
379+
<node concept="3oM_SD" id="54UganNamqs" role="1PaTwD">
380+
<property role="3oM_SC" value="for" />
381+
</node>
382+
<node concept="3oM_SD" id="54UganNamqt" role="1PaTwD">
383+
<property role="3oM_SC" value="cases" />
384+
</node>
385+
<node concept="3oM_SD" id="54UganNamqu" role="1PaTwD">
386+
<property role="3oM_SC" value="where" />
387+
</node>
388+
<node concept="3oM_SD" id="54UganNamqv" role="1PaTwD">
389+
<property role="3oM_SC" value="the" />
390+
</node>
391+
<node concept="3oM_SD" id="54UganNamqw" role="1PaTwD">
392+
<property role="3oM_SC" value="clicked" />
393+
</node>
394+
<node concept="3oM_SD" id="54UganNamqx" role="1PaTwD">
395+
<property role="3oM_SC" value="node" />
396+
</node>
397+
<node concept="3oM_SD" id="54UganNamqy" role="1PaTwD">
398+
<property role="3oM_SC" value="was" />
399+
</node>
400+
<node concept="3oM_SD" id="54UganNamqz" role="1PaTwD">
401+
<property role="3oM_SC" value="null." />
402+
</node>
403+
</node>
357404
</node>
358405
</node>
359406
<node concept="15bmVD" id="7Ub7KQvMivS" role="15bmVC">

0 commit comments

Comments
 (0)