Skip to content

Commit 4db7779

Browse files
mps-ci-buildbotmps-ci-buildbot
authored
Merge pull request #1686 from JetBrains/merge/master
Merge maintenance/mps20251 into master
2 parents f159c28 + 15517c3 commit 4db7779

File tree

4 files changed

+58
-6
lines changed

4 files changed

+58
-6
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +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+
- *de.itemis.mps.editor.celllayout* Reloading all classes do not lead to ClassCastExceptions anymore.
1920

2021
### Added
2122

‎code/celllayout/solutions/de.slisson.mps.editor.celllayout.runtime/models/de/itemis/mps/editor/celllayout/runtime/plugin.mps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@
501501
<node concept="3clFbF" id="2hEgJWExc8_" role="3cqZAp">
502502
<node concept="2OqwBi" id="2hEgJWExchV" role="3clFbG">
503503
<node concept="liA8E" id="2hEgJWExe5w" role="2OqNvi">
504-
<ref role="37wK5l" to="exr9:~EditorComponent.relayout()" resolve="relayout" />
504+
<ref role="37wK5l" to="exr9:~EditorComponent.update()" resolve="update" />
505505
</node>
506506
<node concept="37vLTw" id="2hEgJWExc8z" role="2Oq$k0">
507507
<ref role="3cqZAo" node="DrREDhpexS" resolve="editorComponent" />

‎code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime.mps‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2681,6 +2681,14 @@
26812681
<ref role="37wK5l" to="bd8o:~Application.invokeAndWait(java.lang.Runnable)" resolve="invokeAndWait" />
26822682
<node concept="1bVj0M" id="4hHbxs9xH_k" role="37wK5m">
26832683
<node concept="3clFbS" id="4hHbxs9xH_l" role="1bW5cS">
2684+
<node concept="3clFbJ" id="2silbc$qQ_q" role="3cqZAp">
2685+
<node concept="3clFbS" id="2silbc$qQ_s" role="3clFbx">
2686+
<node concept="3cpWs6" id="2silbc$qUUV" role="3cqZAp" />
2687+
</node>
2688+
<node concept="37vLTw" id="2silbc$qS5R" role="3clFbw">
2689+
<ref role="3cqZAo" node="4hHbxs9xqXW" resolve="myStopRequested" />
2690+
</node>
2691+
</node>
26842692
<node concept="3clFbF" id="4hHbxs9xH_m" role="3cqZAp">
26852693
<node concept="2OqwBi" id="4hHbxs9z7KJ" role="3clFbG">
26862694
<node concept="2OqwBi" id="4hHbxs9z6Q9" role="2Oq$k0">
@@ -2736,12 +2744,17 @@
27362744
</node>
27372745
</node>
27382746
<node concept="3clFbJ" id="4hHbxs9xqYO" role="3cqZAp">
2739-
<node concept="AH0OO" id="4hHbxs9xqYP" role="3clFbw">
2740-
<node concept="37vLTw" id="4hHbxs9xqYQ" role="AHHXb">
2741-
<ref role="3cqZAo" node="4hHbxs9xqYq" resolve="forceReturn" />
2747+
<node concept="22lmx$" id="2silbc$qWE9" role="3clFbw">
2748+
<node concept="37vLTw" id="2silbc$qY9V" role="3uHU7w">
2749+
<ref role="3cqZAo" node="4hHbxs9xqXW" resolve="myStopRequested" />
27422750
</node>
2743-
<node concept="3cmrfG" id="4hHbxs9xqYR" role="AHEQo">
2744-
<property role="3cmrfH" value="0" />
2751+
<node concept="AH0OO" id="4hHbxs9xqYP" role="3uHU7B">
2752+
<node concept="37vLTw" id="4hHbxs9xqYQ" role="AHHXb">
2753+
<ref role="3cqZAo" node="4hHbxs9xqYq" resolve="forceReturn" />
2754+
</node>
2755+
<node concept="3cmrfG" id="4hHbxs9xqYR" role="AHEQo">
2756+
<property role="3cmrfH" value="0" />
2757+
</node>
27452758
</node>
27462759
</node>
27472760
<node concept="3clFbS" id="4hHbxs9xqYT" role="3clFbx">

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -536,6 +536,44 @@
536536
<property role="3oM_SC" value="user." />
537537
</node>
538538
</node>
539+
<node concept="2DRihI" id="4EvAOIwpQ_U" role="15bAlk">
540+
<property role="2RT3bR" value="0" />
541+
<node concept="15Ami3" id="4EvAOIwpQCD" role="1PaTwD">
542+
<node concept="37shsh" id="4EvAOIwpQCF" role="15Aodc">
543+
<node concept="1dCxOk" id="4EvAOIwpQE5" role="37shsm">
544+
<property role="1XweGW" value="1919c723-b60b-4592-9318-9ce96d91da44" />
545+
<property role="1XxBO9" value="de.itemis.mps.editor.celllayout" />
546+
</node>
547+
</node>
548+
</node>
549+
<node concept="3oM_SD" id="4EvAOIwpQEZ" role="1PaTwD">
550+
<property role="3oM_SC" value="Reloading" />
551+
</node>
552+
<node concept="3oM_SD" id="4EvAOIwpQFn" role="1PaTwD">
553+
<property role="3oM_SC" value="all" />
554+
</node>
555+
<node concept="3oM_SD" id="4EvAOIwpQFo" role="1PaTwD">
556+
<property role="3oM_SC" value="classes" />
557+
</node>
558+
<node concept="3oM_SD" id="4EvAOIwpQFZ" role="1PaTwD">
559+
<property role="3oM_SC" value="do" />
560+
</node>
561+
<node concept="3oM_SD" id="4EvAOIwpQLR" role="1PaTwD">
562+
<property role="3oM_SC" value="not" />
563+
</node>
564+
<node concept="3oM_SD" id="4EvAOIwpQMf" role="1PaTwD">
565+
<property role="3oM_SC" value="lead" />
566+
</node>
567+
<node concept="3oM_SD" id="4EvAOIwpQMv" role="1PaTwD">
568+
<property role="3oM_SC" value="to" />
569+
</node>
570+
<node concept="3oM_SD" id="4EvAOIwpQN6" role="1PaTwD">
571+
<property role="3oM_SC" value="ClassCastExceptions" />
572+
</node>
573+
<node concept="3oM_SD" id="4EvAOIwpQNP" role="1PaTwD">
574+
<property role="3oM_SC" value="anymore." />
575+
</node>
576+
</node>
539577
</node>
540578
<node concept="15bAme" id="7sG71xKEOFT" role="15bAlL">
541579
<property role="15bAli" value="Po4Z58tnOE/added" />

0 commit comments

Comments
 (0)