Skip to content

Merge maintenance/mps20251 into master #1722

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 8 commits into from
Jan 29, 2026
+217 −6
Merged

Merge maintenance/mps20251 into master #1722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8f83feb
bugfix(editor.multiline): prevent placeholder insertion for words
Jan 15, 2026
0f4bb61
Merge pull request #1714 from JetBrains/bugfix/richtext_prevent_gener…
alexanderpann Jan 22, 2026
48adf45
fix(tables): prevent inserting before/after a singular child
wsafonov Jan 23, 2026
ad99335
Merge pull request #1720 from JetBrains/bugfix/tables_prevent_insert_…
wsafonov Jan 26, 2026
080fcbc
Merge remote-tracking branch 'refs/remotes/origin/maintenance/mps2024…
wsafonov Jan 26, 2026
bca5eaa
Merge pull request #1721 from JetBrains/merge/mps20241
mps-ci-buildbot Jan 26, 2026
50410ef
Merge remote-tracking branch 'refs/remotes/origin/maintenance/mps2025…
wsafonov Jan 26, 2026
69c8e5f
Merge pull request #1719 from JetBrains/merge/mps20251
mps-ci-buildbot Jan 26, 2026
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 @@ -4,6 +4,13 @@ All notable changes to this project are documented in this file.

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.

## January 2026

### Fixed

- *de.slisson.mps.editor.multiline* Generic placeholders like generic comments can't be inserted into words anymore (an exception was thrown).
- *de.slisson.mps.tables.runtime* Prevent inserting a new row node before/after a singular cardinality child node

## December 2025

### Added
Expand Down
33 changes: 33 additions & 0 deletions .../de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/cells.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,9 @@
<property id="1176718929932" name="isFinal" index="3TUv4t" />
<child id="1068431790190" name="initializer" index="33vP2m" />
</concept>
<concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
<property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
</concept>
<concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
<reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
</concept>
Expand Down Expand Up @@ -7247,6 +7250,36 @@
</node>
</node>
</node>
<node concept="3clFbF" id="1Mwb2kIqhVM" role="3cqZAp">
<node concept="1rXfSq" id="1Mwb2kIqhVK" role="3clFbG">
<ref role="37wK5l" to="g51k:~EditorCell_Basic.setAction(jetbrains.mps.openapi.editor.cells.CellActionType,jetbrains.mps.openapi.editor.cells.CellAction)" resolve="setAction" />
<node concept="Rm8GO" id="1Mwb2kIqCDl" role="37wK5m">
<ref role="Rm8GQ" to="f4zo:~CellActionType.INSERT_PLACEHOLDER" resolve="INSERT_PLACEHOLDER" />
<ref role="1Px2BO" to="f4zo:~CellActionType" resolve="CellActionType" />
</node>
<node concept="2ShNRf" id="1Mwb2kIsn32" role="37wK5m">
<node concept="1pGfFk" id="1Mwb2kItG2w" role="2ShVmc">
<property role="373rjd" value="true" />
<ref role="37wK5l" to="3ahc:~EmptyCellAction.&lt;init&gt;()" resolve="EmptyCellAction" />
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="1Mwb2kItSMk" role="3cqZAp">
<node concept="1rXfSq" id="1Mwb2kItSMl" role="3clFbG">
<ref role="37wK5l" to="g51k:~EditorCell_Basic.setAction(jetbrains.mps.openapi.editor.cells.CellActionType,jetbrains.mps.openapi.editor.cells.CellAction)" resolve="setAction" />
<node concept="Rm8GO" id="1Mwb2kIu4_e" role="37wK5m">
<ref role="Rm8GQ" to="f4zo:~CellActionType.INSERT_PLACEHOLDER_BEFORE" resolve="INSERT_PLACEHOLDER_BEFORE" />
<ref role="1Px2BO" to="f4zo:~CellActionType" resolve="CellActionType" />
</node>
<node concept="2ShNRf" id="1Mwb2kItSMn" role="37wK5m">
<node concept="1pGfFk" id="1Mwb2kItSMo" role="2ShVmc">
<property role="373rjd" value="true" />
<ref role="37wK5l" to="3ahc:~EmptyCellAction.&lt;init&gt;()" resolve="EmptyCellAction" />
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="6tLsdkfI1c$" role="3cqZAp">
<node concept="3cpWsn" id="6tLsdkfI1c_" role="3cpWs9">
<property role="TrG5h" value="km" />
Expand Down
109 changes: 109 additions & 0 deletions ...olutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,115 @@
</node>
</node>
</node>
<node concept="15bmVD" id="1Mwb2kI$RVD" role="15bmVC">
<node concept="15ShDW" id="1Mwb2kI$RVA" role="15bq2Y">
<property role="15ShDY" value="Po4Z58IgAl/January" />
<property role="15ShDw" value="2026" />
</node>
<node concept="15bAme" id="1Mwb2kI$RVB" role="15bAlL">
<node concept="2DRihI" id="1Mwb2kI$RVC" role="15bAlk">
<node concept="15Ami3" id="1Mwb2kI$RVK" role="1PaTwD">
<node concept="37shsh" id="1Mwb2kI$RVL" role="15Aodc">
<node concept="1dCxOk" id="1Mwb2kI$RVQ" role="37shsm">
<property role="1XweGW" value="31c91def-a131-41a1-9018-102874f49a12" />
<property role="1XxBO9" value="de.slisson.mps.editor.multiline" />
</node>
</node>
</node>
<node concept="3oM_SD" id="1Mwb2kI$RVV" role="1PaTwD">
<property role="3oM_SC" value="Generic" />
</node>
<node concept="3oM_SD" id="1Mwb2kI$RVW" role="1PaTwD">
<property role="3oM_SC" value="placeholders" />
</node>
<node concept="3oM_SD" id="1Mwb2kI$RVX" role="1PaTwD">
<property role="3oM_SC" value="like" />
</node>
<node concept="3oM_SD" id="1Mwb2kI$RVY" role="1PaTwD">
<property role="3oM_SC" value="generic" />
</node>
<node concept="3oM_SD" id="1Mwb2kI$RVZ" role="1PaTwD">
<property role="3oM_SC" value="comments" />
</node>
<node concept="3oM_SD" id="1Mwb2kI$RW0" role="1PaTwD">
<property role="3oM_SC" value="can't" />
</node>
<node concept="3oM_SD" id="1Mwb2kI$RW1" role="1PaTwD">
<property role="3oM_SC" value="be" />
</node>
<node concept="3oM_SD" id="1Mwb2kI$RW2" role="1PaTwD">
<property role="3oM_SC" value="inserted" />
</node>
<node concept="3oM_SD" id="1Mwb2kI$RW3" role="1PaTwD">
<property role="3oM_SC" value="into" />
</node>
<node concept="3oM_SD" id="1Mwb2kI$RW4" role="1PaTwD">
<property role="3oM_SC" value="words" />
</node>
<node concept="3oM_SD" id="1Mwb2kI$RW7" role="1PaTwD">
<property role="3oM_SC" value="anymore" />
</node>
<node concept="3oM_SD" id="1Mwb2kI$RW8" role="1PaTwD">
<property role="3oM_SC" value="(an" />
</node>
<node concept="3oM_SD" id="1Mwb2kI$RW9" role="1PaTwD">
<property role="3oM_SC" value="exception" />
</node>
<node concept="3oM_SD" id="1Mwb2kI$RWa" role="1PaTwD">
<property role="3oM_SC" value="was" />
</node>
<node concept="3oM_SD" id="1Mwb2kI$RWb" role="1PaTwD">
<property role="3oM_SC" value="thrown)." />
</node>
</node>
<node concept="2DRihI" id="54TnD34INwR" role="15bAlk">
<node concept="15Ami3" id="54TnD34INwT" role="1PaTwD">
<node concept="37shsh" id="54TnD34INwU" role="15Aodc">
<node concept="1dCxOk" id="54TnD34INA9" role="37shsm">
<property role="1XweGW" value="da21218f-a674-474d-8b4e-d59e33007003" />
<property role="1XxBO9" value="de.slisson.mps.tables.runtime" />
</node>
</node>
</node>
<node concept="3oM_SD" id="54TnD34INFr" role="1PaTwD">
<property role="3oM_SC" value="Prevent" />
</node>
<node concept="3oM_SD" id="54TnD34INFs" role="1PaTwD">
<property role="3oM_SC" value="inserting" />
</node>
<node concept="3oM_SD" id="54TnD34INKJ" role="1PaTwD">
<property role="3oM_SC" value="a" />
</node>
<node concept="3oM_SD" id="54TnD34INPZ" role="1PaTwD">
<property role="3oM_SC" value="new" />
</node>
<node concept="3oM_SD" id="54TnD34INQ0" role="1PaTwD">
<property role="3oM_SC" value="row" />
</node>
<node concept="3oM_SD" id="54TnD34INPX" role="1PaTwD">
<property role="3oM_SC" value="node" />
</node>
<node concept="3oM_SD" id="54TnD34INFt" role="1PaTwD">
<property role="3oM_SC" value="before/after" />
</node>
<node concept="3oM_SD" id="54TnD34INFu" role="1PaTwD">
<property role="3oM_SC" value="a" />
</node>
<node concept="3oM_SD" id="54TnD34INKG" role="1PaTwD">
<property role="3oM_SC" value="singular" />
</node>
<node concept="3oM_SD" id="54TnD34INKH" role="1PaTwD">
<property role="3oM_SC" value="cardinality" />
</node>
<node concept="3oM_SD" id="54TnD34INKI" role="1PaTwD">
<property role="3oM_SC" value="child" />
</node>
<node concept="3oM_SD" id="54TnD34INPY" role="1PaTwD">
<property role="3oM_SC" value="node" />
</node>
</node>
</node>
</node>
<node concept="15bmVD" id="1tfgU6ddLDI" role="15bmVC">
<node concept="15ShDW" id="1tfgU6ddLDF" role="15bq2Y">
<property role="15ShDY" value="Po4Z58IgBx/December" />
Expand Down
74 changes: 68 additions & 6 deletions ...es/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35514,15 +35514,15 @@
</node>
<node concept="3clFbF" id="7HQUZCSJL$o" role="3cqZAp">
<node concept="2OqwBi" id="7HQUZCSJMIL" role="3clFbG">
<node concept="37vLTw" id="1S_MuZtFd5Y" role="2Oq$k0">
<ref role="3cqZAo" node="1S_MuZtFd5S" resolve="layoutable" />
</node>
<node concept="liA8E" id="7HQUZCSJMPT" role="2OqNvi">
<ref role="37wK5l" to="xggr:ZjQ6tpoIjT" resolve="getMinSize" />
<node concept="37vLTw" id="7HQUZCSJMYy" role="37wK5m">
<ref role="3cqZAo" node="7HQUZCSIOZQ" resolve="sizeConstraint" />
</node>
</node>
<node concept="37vLTw" id="1S_MuZtFd5Y" role="2Oq$k0">
<ref role="3cqZAo" node="1S_MuZtFd5S" resolve="layoutable" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -35590,15 +35590,15 @@
</node>
<node concept="3clFbF" id="7HQUZCSJNg2" role="3cqZAp">
<node concept="2OqwBi" id="7HQUZCSJNg3" role="3clFbG">
<node concept="37vLTw" id="1S_MuZtFn_E" role="2Oq$k0">
<ref role="3cqZAo" node="1S_MuZtFn_$" resolve="layoutable" />
</node>
<node concept="liA8E" id="7HQUZCSJNg9" role="2OqNvi">
<ref role="37wK5l" to="xggr:ZjQ6tpoId6" resolve="getPreferredSize" />
<node concept="37vLTw" id="7HQUZCSJNga" role="37wK5m">
<ref role="3cqZAo" node="7HQUZCSIP03" resolve="sizeConstraint" />
</node>
</node>
<node concept="37vLTw" id="1S_MuZtFn_E" role="2Oq$k0">
<ref role="3cqZAo" node="1S_MuZtFn_$" resolve="layoutable" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -37194,6 +37194,65 @@
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="2tJIrI" id="6FKKvoE4Myw" role="jymVt" />
<node concept="3clFb_" id="6FKKvoE4Mzv" role="jymVt">
<property role="TrG5h" value="canExecute" />
<node concept="3Tm1VV" id="6FKKvoE4Mzw" role="1B3o_S" />
<node concept="10P_77" id="6FKKvoE4Mzx" role="3clF45" />
<node concept="37vLTG" id="6FKKvoE4Mzy" role="3clF46">
<property role="TrG5h" value="context" />
<node concept="3uibUv" id="6FKKvoE4Mzz" role="1tU5fm">
<ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
</node>
</node>
<node concept="2AHcQZ" id="6FKKvoE4M$j" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
<node concept="3clFbS" id="6FKKvoE4M$k" role="3clF47">
<node concept="3clFbJ" id="4gOm2JeHyMx" role="3cqZAp">
<node concept="3clFbS" id="4gOm2JeHyMz" role="3clFbx">
<node concept="3cpWs6" id="4gOm2JeHEan" role="3cqZAp">
<node concept="3clFbT" id="4gOm2JeHFU$" role="3cqZAk" />
</node>
</node>
<node concept="3fqX7Q" id="4gOm2JeHBPN" role="3clFbw">
<node concept="3nyPlj" id="4gOm2JeHBPP" role="3fr31v">
<ref role="37wK5l" node="7IUya7cjexf" resolve="canExecute" />
<node concept="37vLTw" id="4gOm2JeHHUx" role="37wK5m">
<ref role="3cqZAo" node="6FKKvoE4Mzy" resolve="context" />
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="4gOm2JeHJ3z" role="3cqZAp" />
<node concept="3cpWs8" id="6FKKvoE4M$o" role="3cqZAp">
<node concept="3cpWsn" id="6FKKvoE4M$p" role="3cpWs9">
<property role="TrG5h" value="nodeOfRow" />
<node concept="3Tqbb2" id="6FKKvoE4M$q" role="1tU5fm" />
<node concept="2YIFZM" id="6FKKvoE4M$r" role="33vP2m">
<ref role="1Pybhc" node="6tOcB$JKlIC" resolve="TableUtils" />
<ref role="37wK5l" node="7IUya7c4DQS" resolve="getNodeOfRowNode" />
<node concept="1rXfSq" id="6FKKvoE4M$s" role="37wK5m">
<ref role="37wK5l" node="7IUya7cczGL" resolve="getGridCell" />
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="6FKKvoE5B9C" role="3cqZAp">
<node concept="2OqwBi" id="6FKKvoE4M$x" role="3clFbG">
<node concept="2OqwBi" id="6FKKvoE4M$y" role="2Oq$k0">
<node concept="37vLTw" id="6FKKvoE4M$z" role="2Oq$k0">
<ref role="3cqZAo" node="6FKKvoE4M$p" resolve="nodeOfRow" />
</node>
<node concept="2NL2c5" id="6FKKvoE4M$$" role="2OqNvi" />
</node>
<node concept="liA8E" id="6FKKvoE4M$_" role="2OqNvi">
<ref role="37wK5l" to="c17a:~SAbstractLink.isMultiple()" resolve="isMultiple" />
</node>
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="56WqtlUiF76" role="jymVt" />
<node concept="3clFb_" id="4db20qfqkmQ" role="jymVt">
<property role="1EzhhJ" value="false" />
Expand Down Expand Up @@ -37269,6 +37328,9 @@
</node>
</node>
</node>
<node concept="2AHcQZ" id="6FKKvoE4MAb" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
</node>
</node>
<node concept="3Tm1VV" id="7IUya7cfFCG" role="1B3o_S" />
<node concept="3uibUv" id="7IUya7chVZy" role="1zkMxy">
Expand Down