Skip to content

Commit 0f4bb61

Browse files
alexanderpannalexanderpann
authored
Merge pull request #1714 from JetBrains/bugfix/richtext_prevent_generic_placeholders
2 parents faab7ca + 8f83feb commit 0f4bb61

File tree

3 files changed

+102
-0
lines changed

3 files changed

+102
-0
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ 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+
## January 2026
8+
9+
### Fixed
10+
11+
- *de.slisson.mps.editor.multiline* Generic placeholders like generic comments can't be inserted into words anymore (an exception was thrown).
12+
713
## December 2025
814

915
### Added

‎code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/cells.mps‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,9 @@
162162
<property id="1176718929932" name="isFinal" index="3TUv4t" />
163163
<child id="1068431790190" name="initializer" index="33vP2m" />
164164
</concept>
165+
<concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
166+
<property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
167+
</concept>
165168
<concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
166169
<reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
167170
</concept>
@@ -7247,6 +7250,36 @@
72477250
</node>
72487251
</node>
72497252
</node>
7253+
<node concept="3clFbF" id="1Mwb2kIqhVM" role="3cqZAp">
7254+
<node concept="1rXfSq" id="1Mwb2kIqhVK" role="3clFbG">
7255+
<ref role="37wK5l" to="g51k:~EditorCell_Basic.setAction(jetbrains.mps.openapi.editor.cells.CellActionType,jetbrains.mps.openapi.editor.cells.CellAction)" resolve="setAction" />
7256+
<node concept="Rm8GO" id="1Mwb2kIqCDl" role="37wK5m">
7257+
<ref role="Rm8GQ" to="f4zo:~CellActionType.INSERT_PLACEHOLDER" resolve="INSERT_PLACEHOLDER" />
7258+
<ref role="1Px2BO" to="f4zo:~CellActionType" resolve="CellActionType" />
7259+
</node>
7260+
<node concept="2ShNRf" id="1Mwb2kIsn32" role="37wK5m">
7261+
<node concept="1pGfFk" id="1Mwb2kItG2w" role="2ShVmc">
7262+
<property role="373rjd" value="true" />
7263+
<ref role="37wK5l" to="3ahc:~EmptyCellAction.&lt;init&gt;()" resolve="EmptyCellAction" />
7264+
</node>
7265+
</node>
7266+
</node>
7267+
</node>
7268+
<node concept="3clFbF" id="1Mwb2kItSMk" role="3cqZAp">
7269+
<node concept="1rXfSq" id="1Mwb2kItSMl" role="3clFbG">
7270+
<ref role="37wK5l" to="g51k:~EditorCell_Basic.setAction(jetbrains.mps.openapi.editor.cells.CellActionType,jetbrains.mps.openapi.editor.cells.CellAction)" resolve="setAction" />
7271+
<node concept="Rm8GO" id="1Mwb2kIu4_e" role="37wK5m">
7272+
<ref role="Rm8GQ" to="f4zo:~CellActionType.INSERT_PLACEHOLDER_BEFORE" resolve="INSERT_PLACEHOLDER_BEFORE" />
7273+
<ref role="1Px2BO" to="f4zo:~CellActionType" resolve="CellActionType" />
7274+
</node>
7275+
<node concept="2ShNRf" id="1Mwb2kItSMn" role="37wK5m">
7276+
<node concept="1pGfFk" id="1Mwb2kItSMo" role="2ShVmc">
7277+
<property role="373rjd" value="true" />
7278+
<ref role="37wK5l" to="3ahc:~EmptyCellAction.&lt;init&gt;()" resolve="EmptyCellAction" />
7279+
</node>
7280+
</node>
7281+
</node>
7282+
</node>
72507283
<node concept="3cpWs8" id="6tLsdkfI1c$" role="3cqZAp">
72517284
<node concept="3cpWsn" id="6tLsdkfI1c_" role="3cpWs9">
72527285
<property role="TrG5h" value="km" />

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

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,69 @@
235235
</node>
236236
</node>
237237
</node>
238+
<node concept="15bmVD" id="1Mwb2kI$RVD" role="15bmVC">
239+
<node concept="15ShDW" id="1Mwb2kI$RVA" role="15bq2Y">
240+
<property role="15ShDY" value="Po4Z58IgAl/January" />
241+
<property role="15ShDw" value="2026" />
242+
</node>
243+
<node concept="15bAme" id="1Mwb2kI$RVB" role="15bAlL">
244+
<node concept="2DRihI" id="1Mwb2kI$RVC" role="15bAlk">
245+
<node concept="15Ami3" id="1Mwb2kI$RVK" role="1PaTwD">
246+
<node concept="37shsh" id="1Mwb2kI$RVL" role="15Aodc">
247+
<node concept="1dCxOk" id="1Mwb2kI$RVQ" role="37shsm">
248+
<property role="1XweGW" value="31c91def-a131-41a1-9018-102874f49a12" />
249+
<property role="1XxBO9" value="de.slisson.mps.editor.multiline" />
250+
</node>
251+
</node>
252+
</node>
253+
<node concept="3oM_SD" id="1Mwb2kI$RVV" role="1PaTwD">
254+
<property role="3oM_SC" value="Generic" />
255+
</node>
256+
<node concept="3oM_SD" id="1Mwb2kI$RVW" role="1PaTwD">
257+
<property role="3oM_SC" value="placeholders" />
258+
</node>
259+
<node concept="3oM_SD" id="1Mwb2kI$RVX" role="1PaTwD">
260+
<property role="3oM_SC" value="like" />
261+
</node>
262+
<node concept="3oM_SD" id="1Mwb2kI$RVY" role="1PaTwD">
263+
<property role="3oM_SC" value="generic" />
264+
</node>
265+
<node concept="3oM_SD" id="1Mwb2kI$RVZ" role="1PaTwD">
266+
<property role="3oM_SC" value="comments" />
267+
</node>
268+
<node concept="3oM_SD" id="1Mwb2kI$RW0" role="1PaTwD">
269+
<property role="3oM_SC" value="can't" />
270+
</node>
271+
<node concept="3oM_SD" id="1Mwb2kI$RW1" role="1PaTwD">
272+
<property role="3oM_SC" value="be" />
273+
</node>
274+
<node concept="3oM_SD" id="1Mwb2kI$RW2" role="1PaTwD">
275+
<property role="3oM_SC" value="inserted" />
276+
</node>
277+
<node concept="3oM_SD" id="1Mwb2kI$RW3" role="1PaTwD">
278+
<property role="3oM_SC" value="into" />
279+
</node>
280+
<node concept="3oM_SD" id="1Mwb2kI$RW4" role="1PaTwD">
281+
<property role="3oM_SC" value="words" />
282+
</node>
283+
<node concept="3oM_SD" id="1Mwb2kI$RW7" role="1PaTwD">
284+
<property role="3oM_SC" value="anymore" />
285+
</node>
286+
<node concept="3oM_SD" id="1Mwb2kI$RW8" role="1PaTwD">
287+
<property role="3oM_SC" value="(an" />
288+
</node>
289+
<node concept="3oM_SD" id="1Mwb2kI$RW9" role="1PaTwD">
290+
<property role="3oM_SC" value="exception" />
291+
</node>
292+
<node concept="3oM_SD" id="1Mwb2kI$RWa" role="1PaTwD">
293+
<property role="3oM_SC" value="was" />
294+
</node>
295+
<node concept="3oM_SD" id="1Mwb2kI$RWb" role="1PaTwD">
296+
<property role="3oM_SC" value="thrown)." />
297+
</node>
298+
</node>
299+
</node>
300+
</node>
238301
<node concept="15bmVD" id="6xbWs8QlwdI" role="15bmVC">
239302
<node concept="15bAme" id="6Vb09dgv4Sc" role="15bAlL">
240303
<property role="15bAli" value="Po4Z58tnOE/added" />

0 commit comments

Comments
 (0)