Skip to content

Commit c4b4a06

Browse files
mps-ci-buildbotmps-ci-buildbot
authored
Merge pull request #1220 from JetBrains/merge/mps20243
Merge maintenance/mps20241 into maintenance/mps20243
2 parents 3a23e55 + 0bff59b commit c4b4a06

File tree

4 files changed

+118
-6
lines changed

4 files changed

+118
-6
lines changed

‎CHANGELOG.md

+1-4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e
1010

1111
- *de.itemis.mps.editor.diagram*: An issue was fixed where edges of sub-diagrams where not correctly displayed when the diagram was first opened
1212
- *de.itemis.mps.editor.diagram*: Diagram boxes not properly support borders.
13+
- *com.mbeddr.mpsutil.grammarcells*: Cells with multiple transformation texts (mainly optional cells) now match the pattern independent of the order of the elements.
1314

1415
### Added
1516

@@ -68,10 +69,6 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e
6869

6970
- *de.itemis.mps.editor.celllayout*: The maximum number of layout operations in *LayoutWatchdog#DEFAULT_MAX_LAYOUTING_OPERATIONS* can now be set e.g. by setting the constant in an application plugin.
7071

71-
### Fixed
72-
73-
- *de.slisson.mps.tables*: Various fixes to table end cells in combination with insert and deletion handlers were made.
74-
7572
## September 2024
7673

7774
### Added

‎code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.runtime/com.mbeddr.mpsutil.grammarcells.runtime.msd

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
3939
<language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
4040
<language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
41+
<language slang="l:acfc188d-d5d6-4598-b370-6f4a983f05b2:jetbrains.mps.baseLanguage.methodReferences" version="0" />
4142
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
4243
<language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
4344
<language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />

‎code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.runtime/models/com/mbeddr/mpsutil/grammarcells/runtime.mps

+42-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
1313
<use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
1414
<use id="1a8554c4-eb84-43ba-8c34-6f0d90c6e75a" name="jetbrains.mps.lang.smodel.query" version="3" />
15+
<use id="acfc188d-d5d6-4598-b370-6f4a983f05b2" name="jetbrains.mps.baseLanguage.methodReferences" version="0" />
1516
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
1617
</languages>
1718
<imports>
@@ -30107,8 +30108,47 @@
3010730108
<node concept="37vLTw" id="1YKLYyyOIG5" role="37vLTJ">
3010830109
<ref role="3cqZAo" node="1YKLYyyOIFQ" resolve="myMatchingTexts" />
3010930110
</node>
30110-
<node concept="37vLTw" id="1YKLYyyOIG6" role="37vLTx">
30111-
<ref role="3cqZAo" node="1YKLYyyOIG9" resolve="matchingTexts" />
30111+
<node concept="2OqwBi" id="5$hufwY9qbh" role="37vLTx">
30112+
<node concept="37vLTw" id="5$hufwY8Yqn" role="2Oq$k0">
30113+
<ref role="3cqZAo" node="1YKLYyyOIG9" resolve="matchingTexts" />
30114+
</node>
30115+
<node concept="2DpFxk" id="5$hufwY9r_u" role="2OqNvi">
30116+
<node concept="1nlBCl" id="5$hufwY9r_w" role="2Dq5b$">
30117+
<property role="3clFbU" value="true" />
30118+
</node>
30119+
<node concept="1bVj0M" id="5$hufwY9r_x" role="23t8la">
30120+
<node concept="3clFbS" id="5$hufwY9r_y" role="1bW5cS">
30121+
<node concept="3clFbF" id="5$hufwY9s2t" role="3cqZAp">
30122+
<node concept="3cpWsd" id="5$hufwY9C$8" role="3clFbG">
30123+
<node concept="2OqwBi" id="5$hufwY9Eqb" role="3uHU7w">
30124+
<node concept="37vLTw" id="5$hufwY9D19" role="2Oq$k0">
30125+
<ref role="3cqZAo" node="5$hufwY9r__" resolve="b" />
30126+
</node>
30127+
<node concept="liA8E" id="5$hufwY9G4B" role="2OqNvi">
30128+
<ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
30129+
</node>
30130+
</node>
30131+
<node concept="2EnYce" id="5$hufwY9vJs" role="3uHU7B">
30132+
<node concept="37vLTw" id="5$hufwY9sCS" role="2Oq$k0">
30133+
<ref role="3cqZAo" node="5$hufwY9r_z" resolve="a" />
30134+
</node>
30135+
<node concept="liA8E" id="5$hufwY9yMV" role="2OqNvi">
30136+
<ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
30137+
</node>
30138+
</node>
30139+
</node>
30140+
</node>
30141+
</node>
30142+
<node concept="gl6BB" id="5$hufwY9r_z" role="1bW2Oz">
30143+
<property role="TrG5h" value="a" />
30144+
<node concept="2jxLKc" id="5$hufwY9r_$" role="1tU5fm" />
30145+
</node>
30146+
<node concept="gl6BB" id="5$hufwY9r__" role="1bW2Oz">
30147+
<property role="TrG5h" value="b" />
30148+
<node concept="2jxLKc" id="5$hufwY9r_A" role="1tU5fm" />
30149+
</node>
30150+
</node>
30151+
</node>
3011230152
</node>
3011330153
</node>
3011430154
</node>

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

+74
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,80 @@
218218
<property role="3oM_SC" value="borders." />
219219
</node>
220220
</node>
221+
<node concept="2DRihI" id="5$hufwYdvi3" role="15bAlk">
222+
<node concept="2hgSXJ" id="5$hufwYdvig" role="1PaTwD">
223+
<node concept="1PaTwC" id="5$hufwYdvih" role="2hiFM$">
224+
<node concept="15Ami3" id="5$hufwYdvii" role="1PaTwD">
225+
<node concept="37shsh" id="5$hufwYdvij" role="15Aodc">
226+
<node concept="1dCxOk" id="5$hufwYdvik" role="37shsm">
227+
<property role="1XweGW" value="9d69e719-78c8-4286-90db-fb19c107d049" />
228+
<property role="1XxBO9" value="com.mbeddr.mpsutil.grammarcells" />
229+
</node>
230+
</node>
231+
</node>
232+
<node concept="3oM_SD" id="5$hufwYdvil" role="1PaTwD">
233+
<property role="3oM_SC" value=":" />
234+
</node>
235+
</node>
236+
</node>
237+
<node concept="3oM_SD" id="5$hufwYdvip" role="1PaTwD">
238+
<property role="3oM_SC" value="Cells" />
239+
</node>
240+
<node concept="3oM_SD" id="5$hufwYdviq" role="1PaTwD">
241+
<property role="3oM_SC" value="with" />
242+
</node>
243+
<node concept="3oM_SD" id="5$hufwYdvi_" role="1PaTwD">
244+
<property role="3oM_SC" value="multiple" />
245+
</node>
246+
<node concept="3oM_SD" id="5$hufwYdviA" role="1PaTwD">
247+
<property role="3oM_SC" value="transformation" />
248+
</node>
249+
<node concept="3oM_SD" id="5$hufwYdviB" role="1PaTwD">
250+
<property role="3oM_SC" value="texts" />
251+
</node>
252+
<node concept="3oM_SD" id="5$hufwYdviC" role="1PaTwD">
253+
<property role="3oM_SC" value="(mainly" />
254+
</node>
255+
<node concept="3oM_SD" id="5$hufwYdviD" role="1PaTwD">
256+
<property role="3oM_SC" value="optional" />
257+
</node>
258+
<node concept="3oM_SD" id="5$hufwYdviE" role="1PaTwD">
259+
<property role="3oM_SC" value="cells)" />
260+
</node>
261+
<node concept="3oM_SD" id="5$hufwYdviF" role="1PaTwD">
262+
<property role="3oM_SC" value="now" />
263+
</node>
264+
<node concept="3oM_SD" id="5$hufwYdviG" role="1PaTwD">
265+
<property role="3oM_SC" value="match" />
266+
</node>
267+
<node concept="3oM_SD" id="5$hufwYdviH" role="1PaTwD">
268+
<property role="3oM_SC" value="the" />
269+
</node>
270+
<node concept="3oM_SD" id="5$hufwYdviP" role="1PaTwD">
271+
<property role="3oM_SC" value="pattern" />
272+
</node>
273+
<node concept="3oM_SD" id="5$hufwYdviI" role="1PaTwD">
274+
<property role="3oM_SC" value="independent" />
275+
</node>
276+
<node concept="3oM_SD" id="5$hufwYdviJ" role="1PaTwD">
277+
<property role="3oM_SC" value="of" />
278+
</node>
279+
<node concept="3oM_SD" id="5$hufwYdviK" role="1PaTwD">
280+
<property role="3oM_SC" value="the" />
281+
</node>
282+
<node concept="3oM_SD" id="5$hufwYdviL" role="1PaTwD">
283+
<property role="3oM_SC" value="order" />
284+
</node>
285+
<node concept="3oM_SD" id="5$hufwYdviM" role="1PaTwD">
286+
<property role="3oM_SC" value="of" />
287+
</node>
288+
<node concept="3oM_SD" id="5$hufwYdviN" role="1PaTwD">
289+
<property role="3oM_SC" value="the" />
290+
</node>
291+
<node concept="3oM_SD" id="5$hufwYdviO" role="1PaTwD">
292+
<property role="3oM_SC" value="elements." />
293+
</node>
294+
</node>
221295
</node>
222296
<node concept="15bAme" id="6plDSSS$zdM" role="15bAlL">
223297
<property role="15bAli" value="Po4Z58tnOE/added" />

0 commit comments

Comments
 (0)