Skip to content

Commit 71add6c

Browse files
mps-ci-buildbotmps-ci-buildbot
authored
Merge pull request #1652 from JetBrains/merge/mps20241
Merge maintenance/mps20232 into maintenance/mps20241
2 parents c0f5f82 + e8390e4 commit 71add6c

File tree

5 files changed

+227
-122
lines changed

5 files changed

+227
-122
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ All notable changes to this project are documented in this file.
44

55
The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) .The project does *not* follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.
66

7+
## November 2025
8+
9+
### Fixed
10+
11+
- *de.slisson.mps.tables* IllegalArgumentException thrown when copy-paste support is not defined for a table node (#1650).
12+
- *de.slisson.mps.tables* Textgen warning about duplicate unit name when an editor model contains multiple tables without an action map.
13+
714
## October 2025
815

916
### Fixed

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

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,128 @@
234234
</node>
235235
</node>
236236
</node>
237+
<node concept="15bmVD" id="6Qwtr1aMjHs" role="15bmVC">
238+
<node concept="15ShDW" id="6Qwtr1aMjHp" role="15bq2Y">
239+
<property role="15ShDY" value="Po4Z58IgBl/November" />
240+
<property role="15ShDw" value="2025" />
241+
</node>
242+
<node concept="15bAme" id="6Qwtr1aMjHq" role="15bAlL">
243+
<node concept="2DRihI" id="6Qwtr1aMjHr" role="15bAlk">
244+
<node concept="15Ami3" id="6Qwtr1aMjHt" role="1PaTwD">
245+
<node concept="37shsh" id="6Qwtr1aMjHu" role="15Aodc">
246+
<node concept="1dCxOk" id="6Qwtr1aMjMB" role="37shsm">
247+
<property role="1XweGW" value="7e450f4e-1ac3-41ef-a851-4598161bdb94" />
248+
<property role="1XxBO9" value="de.slisson.mps.tables" />
249+
</node>
250+
</node>
251+
</node>
252+
<node concept="3oM_SD" id="6Qwtr1aMjS4" role="1PaTwD">
253+
<property role="3oM_SC" value="IllegalArgumentException" />
254+
</node>
255+
<node concept="3oM_SD" id="6Qwtr1aMjRP" role="1PaTwD">
256+
<property role="3oM_SC" value="thrown" />
257+
</node>
258+
<node concept="3oM_SD" id="6Qwtr1aMjS5" role="1PaTwD">
259+
<property role="3oM_SC" value="when" />
260+
</node>
261+
<node concept="3oM_SD" id="6Qwtr1aMjRQ" role="1PaTwD">
262+
<property role="3oM_SC" value="copy-paste" />
263+
</node>
264+
<node concept="3oM_SD" id="6Qwtr1aMjRR" role="1PaTwD">
265+
<property role="3oM_SC" value="support" />
266+
</node>
267+
<node concept="3oM_SD" id="6Qwtr1aMjRS" role="1PaTwD">
268+
<property role="3oM_SC" value="is" />
269+
</node>
270+
<node concept="3oM_SD" id="6Qwtr1aMjRW" role="1PaTwD">
271+
<property role="3oM_SC" value="not" />
272+
</node>
273+
<node concept="3oM_SD" id="6Qwtr1aMjRT" role="1PaTwD">
274+
<property role="3oM_SC" value="defined" />
275+
</node>
276+
<node concept="3oM_SD" id="6Qwtr1aMjRU" role="1PaTwD">
277+
<property role="3oM_SC" value="for" />
278+
</node>
279+
<node concept="3oM_SD" id="6Qwtr1aMjRV" role="1PaTwD">
280+
<property role="3oM_SC" value="a" />
281+
</node>
282+
<node concept="3oM_SD" id="6Qwtr1aMjRX" role="1PaTwD">
283+
<property role="3oM_SC" value="table" />
284+
</node>
285+
<node concept="3oM_SD" id="6Qwtr1aMjRY" role="1PaTwD">
286+
<property role="3oM_SC" value="node" />
287+
</node>
288+
<node concept="3oM_SD" id="6Qwtr1aMjS3" role="1PaTwD">
289+
<property role="3oM_SC" value="(#1650)." />
290+
</node>
291+
</node>
292+
<node concept="2DRihI" id="6Qwtr1b9aRL" role="15bAlk">
293+
<property role="2RT3bR" value="0" />
294+
<node concept="15Ami3" id="6Qwtr1b9aSk" role="1PaTwD">
295+
<node concept="37shsh" id="6Qwtr1b9aSm" role="15Aodc">
296+
<node concept="1dCxOk" id="6Qwtr1b9aXA" role="37shsm">
297+
<property role="1XweGW" value="7e450f4e-1ac3-41ef-a851-4598161bdb94" />
298+
<property role="1XxBO9" value="de.slisson.mps.tables" />
299+
</node>
300+
</node>
301+
</node>
302+
<node concept="3oM_SD" id="6Qwtr1beyyb" role="1PaTwD">
303+
<property role="3oM_SC" value="Textgen" />
304+
</node>
305+
<node concept="3oM_SD" id="6Qwtr1beyyc" role="1PaTwD">
306+
<property role="3oM_SC" value="warning" />
307+
</node>
308+
<node concept="3oM_SD" id="6Qwtr1b9b8H" role="1PaTwD">
309+
<property role="3oM_SC" value="about" />
310+
</node>
311+
<node concept="3oM_SD" id="6Qwtr1b9b8I" role="1PaTwD">
312+
<property role="3oM_SC" value="duplicate" />
313+
</node>
314+
<node concept="3oM_SD" id="6Qwtr1b9b8J" role="1PaTwD">
315+
<property role="3oM_SC" value="unit" />
316+
</node>
317+
<node concept="3oM_SD" id="6Qwtr1beyyd" role="1PaTwD">
318+
<property role="3oM_SC" value="name" />
319+
</node>
320+
<node concept="3oM_SD" id="6Qwtr1b9b8L" role="1PaTwD">
321+
<property role="3oM_SC" value="when" />
322+
</node>
323+
<node concept="3oM_SD" id="6Qwtr1b9be6" role="1PaTwD">
324+
<property role="3oM_SC" value="an" />
325+
</node>
326+
<node concept="3oM_SD" id="6Qwtr1b9be7" role="1PaTwD">
327+
<property role="3oM_SC" value="editor" />
328+
</node>
329+
<node concept="3oM_SD" id="6Qwtr1b9be8" role="1PaTwD">
330+
<property role="3oM_SC" value="model" />
331+
</node>
332+
<node concept="3oM_SD" id="6Qwtr1b9be9" role="1PaTwD">
333+
<property role="3oM_SC" value="contains" />
334+
</node>
335+
<node concept="3oM_SD" id="6Qwtr1b9bea" role="1PaTwD">
336+
<property role="3oM_SC" value="multiple" />
337+
</node>
338+
<node concept="3oM_SD" id="6Qwtr1b9beb" role="1PaTwD">
339+
<property role="3oM_SC" value="tables" />
340+
</node>
341+
<node concept="3oM_SD" id="6Qwtr1b9bec" role="1PaTwD">
342+
<property role="3oM_SC" value="without" />
343+
</node>
344+
<node concept="3oM_SD" id="6Qwtr1b9bed" role="1PaTwD">
345+
<property role="3oM_SC" value="an" />
346+
</node>
347+
<node concept="3oM_SD" id="6Qwtr1b9beg" role="1PaTwD">
348+
<property role="3oM_SC" value="action" />
349+
</node>
350+
<node concept="3oM_SD" id="6Qwtr1b9bee" role="1PaTwD">
351+
<property role="3oM_SC" value="map." />
352+
</node>
353+
<node concept="3oM_SD" id="6Qwtr1b9aXJ" role="1PaTwD">
354+
<property role="3oM_SC" value="" />
355+
</node>
356+
</node>
357+
</node>
358+
</node>
237359
<node concept="15bmVD" id="7Ub7KQvMivS" role="15bmVC">
238360
<node concept="15ShDW" id="7Ub7KQvMivP" role="15bq2Y">
239361
<property role="15ShDY" value="Po4Z58IgBa/October" />

‎code/tables/languages/de.slisson.mps.tables/generator/template/[email protected]‎

Lines changed: 72 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -13665,45 +13665,68 @@
1366513665
<property role="1v3jST" value="true" />
1366613666
<node concept="1pplIY" id="7NamNJWFqGU" role="1pqMTA">
1366713667
<node concept="3clFbS" id="7NamNJWFqGV" role="2VODD2">
13668+
<node concept="3cpWs8" id="6Qwtr1aYbyA" role="3cqZAp">
13669+
<node concept="3cpWsn" id="6Qwtr1aYbyD" role="3cpWs9">
13670+
<property role="TrG5h" value="tableSelectionActionMap" />
13671+
<node concept="3Tqbb2" id="6Qwtr1aYby$" role="1tU5fm">
13672+
<ref role="ehGHo" to="tpc2:g_h_SNY" resolve="CellActionMapDeclaration" />
13673+
</node>
13674+
<node concept="10Nm6u" id="6Qwtr1aYbFt" role="33vP2m" />
13675+
</node>
13676+
</node>
13677+
<node concept="3clFbH" id="6Qwtr1aYh4E" role="3cqZAp" />
1366813678
<node concept="3clFbF" id="7NamNJWFu6j" role="3cqZAp">
1366913679
<node concept="2OqwBi" id="7NamNJWFy94" role="3clFbG">
13670-
<node concept="2OqwBi" id="7NamNJWFufd" role="2Oq$k0">
13671-
<node concept="1Q6Npb" id="7NamNJWFu6i" role="2Oq$k0" />
13672-
<node concept="2SmgA7" id="7NamNJWFuuO" role="2OqNvi">
13673-
<node concept="chp4Y" id="7NamNJWFuvd" role="1dBWTz">
13674-
<ref role="cht4Q" to="bnk3:1dAqnm8m1Em" resolve="Table" />
13680+
<node concept="2OqwBi" id="6Qwtr1aYkdp" role="2Oq$k0">
13681+
<node concept="2OqwBi" id="7NamNJWFufd" role="2Oq$k0">
13682+
<node concept="1Q6Npb" id="7NamNJWFu6i" role="2Oq$k0" />
13683+
<node concept="2SmgA7" id="7NamNJWFuuO" role="2OqNvi">
13684+
<node concept="chp4Y" id="7NamNJWFuvd" role="1dBWTz">
13685+
<ref role="cht4Q" to="bnk3:1dAqnm8m1Em" resolve="Table" />
13686+
</node>
13687+
</node>
13688+
</node>
13689+
<node concept="3zZkjj" id="6Qwtr1aYpem" role="2OqNvi">
13690+
<node concept="1bVj0M" id="6Qwtr1aYpeo" role="23t8la">
13691+
<node concept="3clFbS" id="6Qwtr1aYpep" role="1bW5cS">
13692+
<node concept="3clFbF" id="6Qwtr1aYpoN" role="3cqZAp">
13693+
<node concept="3clFbC" id="6Qwtr1b3PSh" role="3clFbG">
13694+
<node concept="2OqwBi" id="6Qwtr1aYpLT" role="3uHU7B">
13695+
<node concept="37vLTw" id="6Qwtr1aYpoM" role="2Oq$k0">
13696+
<ref role="3cqZAo" node="6Qwtr1aYpeq" resolve="it" />
13697+
</node>
13698+
<node concept="3TrEf2" id="6Qwtr1aYswE" role="2OqNvi">
13699+
<ref role="3Tt5mk" to="tpc2:g_ERwze" resolve="actionMap" />
13700+
</node>
13701+
</node>
13702+
<node concept="10Nm6u" id="6Qwtr1aYtw4" role="3uHU7w" />
13703+
</node>
13704+
</node>
13705+
</node>
13706+
<node concept="gl6BB" id="6Qwtr1aYpeq" role="1bW2Oz">
13707+
<property role="TrG5h" value="it" />
13708+
<node concept="2jxLKc" id="6Qwtr1aYper" role="1tU5fm" />
13709+
</node>
1367513710
</node>
1367613711
</node>
1367713712
</node>
1367813713
<node concept="2es0OD" id="7NamNJWF_97" role="2OqNvi">
1367913714
<node concept="1bVj0M" id="7NamNJWF_99" role="23t8la">
1368013715
<node concept="3clFbS" id="7NamNJWF_9a" role="1bW5cS">
13681-
<node concept="3clFbJ" id="7NamNJWF_cS" role="3cqZAp">
13682-
<node concept="2OqwBi" id="7NamNJWFAzQ" role="3clFbw">
13683-
<node concept="2OqwBi" id="7NamNJWF_zx" role="2Oq$k0">
13684-
<node concept="37vLTw" id="7NamNJWF_hM" role="2Oq$k0">
13685-
<ref role="3cqZAo" node="7NamNJWF_9b" resolve="it" />
13686-
</node>
13687-
<node concept="3TrEf2" id="7NamNJWFA4O" role="2OqNvi">
13688-
<ref role="3Tt5mk" to="tpc2:g_ERwze" resolve="actionMap" />
13689-
</node>
13690-
</node>
13691-
<node concept="3w_OXm" id="7NamNJWFB0H" role="2OqNvi" />
13692-
</node>
13693-
<node concept="3clFbS" id="7NamNJWF_cU" role="3clFbx">
13694-
<node concept="3cpWs8" id="2CQc9DPhiHO" role="3cqZAp">
13695-
<node concept="3cpWsn" id="2CQc9DPhiHR" role="3cpWs9">
13696-
<property role="TrG5h" value="newCellActionMap" />
13697-
<node concept="3Tqbb2" id="2CQc9DPhiHM" role="1tU5fm">
13698-
<ref role="ehGHo" to="tpc2:g_h_SNY" resolve="CellActionMapDeclaration" />
13699-
</node>
13700-
<node concept="2pJPEk" id="2CQc9DPhkwL" role="33vP2m">
13716+
<node concept="3clFbJ" id="6Qwtr1aYbNq" role="3cqZAp">
13717+
<node concept="3clFbS" id="6Qwtr1aYbNs" role="3clFbx">
13718+
<node concept="3clFbF" id="6Qwtr1aYdq2" role="3cqZAp">
13719+
<node concept="37vLTI" id="6Qwtr1aYe6s" role="3clFbG">
13720+
<node concept="37vLTw" id="6Qwtr1aYdq0" role="37vLTJ">
13721+
<ref role="3cqZAo" node="6Qwtr1aYbyD" resolve="tableSelectionActionMap" />
13722+
</node>
13723+
<node concept="2pJPEk" id="2CQc9DPhkwL" role="37vLTx">
1370113724
<node concept="2pJPED" id="2CQc9DPhkwN" role="2pJPEn">
1370213725
<ref role="2pJxaS" to="tpc2:g_h_SNY" resolve="CellActionMapDeclaration" />
1370313726
<node concept="2pJxcG" id="2CQc9DPhkJ5" role="2pJxcM">
1370413727
<ref role="2pJxcJ" to="tpck:h0TrG11" resolve="name" />
13705-
<node concept="WxPPo" id="2CQc9DPhkOC" role="28ntcv">
13706-
<node concept="Xl_RD" id="2CQc9DPhkOB" role="WxPPp">
13728+
<node concept="WxPPo" id="6Qwtr1aYeIq" role="28ntcv">
13729+
<node concept="Xl_RD" id="6Qwtr1aYeIp" role="WxPPp">
1370713730
<property role="Xl_RC" value="TableSelectionActionMap" />
1370813731
</node>
1370913732
</node>
@@ -13744,7 +13767,7 @@
1374413767
<node concept="2OqwBi" id="2CQc9DPhqdU" role="3clFbG">
1374513768
<node concept="2OqwBi" id="2CQc9DPhm$6" role="2Oq$k0">
1374613769
<node concept="37vLTw" id="2CQc9DPhmhh" role="2Oq$k0">
13747-
<ref role="3cqZAo" node="2CQc9DPhiHR" resolve="newCellActionMap" />
13770+
<ref role="3cqZAo" node="6Qwtr1aYbyD" resolve="tableSelectionActionMap" />
1374813771
</node>
1374913772
<node concept="3Tsc0h" id="2CQc9DPhn4o" role="2OqNvi">
1375013773
<ref role="3TtcxE" to="tpc2:g_h_SO1" resolve="item" />
@@ -13787,31 +13810,37 @@
1378713810
<node concept="1Q6Npb" id="2CQc9DPhxnL" role="2Oq$k0" />
1378813811
<node concept="3BYIHo" id="2CQc9DPhxTE" role="2OqNvi">
1378913812
<node concept="37vLTw" id="2CQc9DPhy2F" role="3BYIHq">
13790-
<ref role="3cqZAo" node="2CQc9DPhiHR" resolve="newCellActionMap" />
13813+
<ref role="3cqZAo" node="6Qwtr1aYbyD" resolve="tableSelectionActionMap" />
1379113814
</node>
1379213815
</node>
1379313816
</node>
1379413817
</node>
13795-
<node concept="3clFbF" id="7NamNJWFBdY" role="3cqZAp">
13796-
<node concept="37vLTI" id="7NamNJWFDRq" role="3clFbG">
13797-
<node concept="2OqwBi" id="7NamNJWFBuQ" role="37vLTJ">
13798-
<node concept="37vLTw" id="7NamNJWFBdX" role="2Oq$k0">
13799-
<ref role="3cqZAo" node="7NamNJWF_9b" resolve="it" />
13800-
</node>
13801-
<node concept="3TrEf2" id="7NamNJWFC1S" role="2OqNvi">
13802-
<ref role="3Tt5mk" to="tpc2:g_ERwze" resolve="actionMap" />
13803-
</node>
13804-
</node>
13805-
<node concept="37vLTw" id="2CQc9DPhyAd" role="37vLTx">
13806-
<ref role="3cqZAo" node="2CQc9DPhiHR" resolve="newCellActionMap" />
13807-
</node>
13818+
</node>
13819+
<node concept="3clFbC" id="6Qwtr1aYcix" role="3clFbw">
13820+
<node concept="10Nm6u" id="6Qwtr1aYci$" role="3uHU7w" />
13821+
<node concept="37vLTw" id="6Qwtr1aYbUZ" role="3uHU7B">
13822+
<ref role="3cqZAo" node="6Qwtr1aYbyD" resolve="tableSelectionActionMap" />
13823+
</node>
13824+
</node>
13825+
</node>
13826+
<node concept="3clFbF" id="7NamNJWFBdY" role="3cqZAp">
13827+
<node concept="37vLTI" id="7NamNJWFDRq" role="3clFbG">
13828+
<node concept="2OqwBi" id="7NamNJWFBuQ" role="37vLTJ">
13829+
<node concept="37vLTw" id="7NamNJWFBdX" role="2Oq$k0">
13830+
<ref role="3cqZAo" node="7NamNJWF_9b" resolve="table" />
1380813831
</node>
13832+
<node concept="3TrEf2" id="7NamNJWFC1S" role="2OqNvi">
13833+
<ref role="3Tt5mk" to="tpc2:g_ERwze" resolve="actionMap" />
13834+
</node>
13835+
</node>
13836+
<node concept="37vLTw" id="2CQc9DPhyAd" role="37vLTx">
13837+
<ref role="3cqZAo" node="6Qwtr1aYbyD" resolve="tableSelectionActionMap" />
1380913838
</node>
1381013839
</node>
1381113840
</node>
1381213841
</node>
1381313842
<node concept="gl6BB" id="7NamNJWF_9b" role="1bW2Oz">
13814-
<property role="TrG5h" value="it" />
13843+
<property role="TrG5h" value="table" />
1381513844
<node concept="2jxLKc" id="7NamNJWF_9c" role="1tU5fm" />
1381613845
</node>
1381713846
</node>

0 commit comments

Comments
 (0)