Skip to content

Commit aac3f58

Browse files
mps-ci-buildbotmps-ci-buildbot
authored
Merge pull request #3358 from mbeddr/merge/master
Merge maintenance/mps20251 into master
2 parents e66f5b3 + c750c15 commit aac3f58

File tree

14 files changed

+6696
-4
lines changed

14 files changed

+6696
-4
lines changed

‎.github/workflows/vulnerability-scanning.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ jobs:
66
name: depecheck_test
77
steps:
88
- name: Checkout
9-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
9+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
1010
- name: Setup Java
11-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4
11+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
1212
with:
1313
distribution: temurin
1414
java-version: 17
1515
- name: Setup Gradle
16-
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4
16+
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5
1717
- name: Call setup
1818
run: ./gradlew dependencies
1919
- name: Depcheck
@@ -27,7 +27,7 @@ jobs:
2727
format: 'HTML'
2828
out: 'reports'
2929
- name: Upload Test results
30-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
30+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
3131
with:
3232
name: Depcheck report
3333
path: ${{github.workspace}}/reports

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
55
The format is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). The project does _not_ follow
66
Semantic Versioning and the changes are simply documented in reverse chronological order, grouped by calendar month.
77

8+
# Februrary 2025
9+
10+
## com.mbeddr.mpsutil.genplandiagram
11+
12+
- This new plugin was introduced to visualize generation plans. Import the language and create a new [Plan Visualizer](http://127.0.0.1:63320/node?ref=r%3A69e7f585-d1ea-4d0d-b392-5608c01d468b%28com.mbeddr.mpsutil.genplandiagram.structure%29%2F7940016190799018040) node and click 'Visualize`.
13+
814
# December 2025
915

1016
## com.mbeddr.mpsutil.filepicker

‎code/platform/com.mbeddr.mpsutil/.mps/modules.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.mpsutil.extensionclass/com.mbeddr.mpsutil.extensionclass.mpl" folder="staging.extensionclass" />
3232
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.mpsutil.filepicker/com.mbeddr.mpsutil.filepicker.mpl" folder="stable" />
3333
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.mpsutil.framecell/com.mbeddr.mpsutil.framecell.mpl" folder="rest" />
34+
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.mpsutil.genplandiagram.sandbox/com.mbeddr.mpsutil.genplandiagram.sandbox.msd" folder="rest.genplandiagram" />
35+
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.mpsutil.genplandiagram/com.mbeddr.mpsutil.genplandiagram.mpl" folder="rest.genplandiagram" />
3436
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.mpsutil.genutil/genutil.mpl" folder="staging" />
3537
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.mpsutil.graphstream.example/com.mbeddr.mpsutil.graphstream.example.mpl" folder="staging.graphstream.example" />
3638
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.mpsutil.graphstream.example/sandbox/com.mbeddr.mpsutil.graphstream.example.sandbox.msd" folder="staging.graphstream.example" />
@@ -121,6 +123,7 @@
121123
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.extensionclass.annotation/com.mbeddr.mpsutil.extensionclass.annotation.msd" folder="staging.extensionclass" />
122124
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.generatorfacade/com.mbeddr.mpsutil.generatorfacade.msd" folder="staging" />
123125
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.genericactions/com.mbeddr.mpsutil.genericactions.msd" folder="staging" />
126+
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.genplandiagram.tests/com.mbeddr.mpsutil.genplandiagram.tests.msd" folder="rest.genplandiagram" />
124127
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.genreview/com.mbeddr.mpsutil.genreview.msd" folder="rest.genreview" />
125128
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.hyperlink.sandbox.sandbox/com.mbeddr.mpsutil.hyperlink.sandbox.sandbox.msd" folder="staging.hyperlink" />
126129
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.interpreter.migration/com.mbeddr.mpsutil.interpreter.migration.msd" folder="staging.interpreter" />

‎code/platform/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.genplandiagram.sandbox/com.mbeddr.mpsutil.genplandiagram.sandbox.msd‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<solution name="com.mbeddr.mpsutil.genplandiagram.sandbox" uuid="669b5a8f-5657-4ec8-9c4f-6309658fed1e" moduleVersion="0">
3+
<models>
4+
<modelRoot contentPath="${module}" type="default">
5+
<sourceRoot path="${module}/models" />
6+
</modelRoot>
7+
</models>
8+
<facets>
9+
<facet type="java" compile="off" classes="off" ext="no">
10+
<classes generated="true" />
11+
</facet>
12+
</facets>
13+
<dependencies>
14+
<dependency reexport="false">f0aec392-47e3-40ae-a843-4519e73ec102(jetbrains.mps.lang.documentation.genplan)</dependency>
15+
</dependencies>
16+
<languageVersions>
17+
<language slang="l:ff3d5f86-c6fa-4c63-aa95-c2de600f92ac:com.mbeddr.mpsutil.genplandiagram" version="0" />
18+
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
19+
<language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
20+
<language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
21+
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
22+
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
23+
<language slang="l:7ab1a6fa-0a11-4b95-9e48-75f363d6cb00:jetbrains.mps.lang.generator.plan" version="3" />
24+
<language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="6" />
25+
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
26+
</languageVersions>
27+
<dependencyVersions>
28+
<module reference="669b5a8f-5657-4ec8-9c4f-6309658fed1e(com.mbeddr.mpsutil.genplandiagram.sandbox)" version="0" />
29+
<module reference="f0aec392-47e3-40ae-a843-4519e73ec102(jetbrains.mps.lang.documentation.genplan)" version="0" />
30+
</dependencyVersions>
31+
</solution>
32+

‎code/platform/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.genplandiagram.sandbox/models/com.mbeddr.mpsutil.genplandiagram.sandbox.mps‎

Lines changed: 196 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,196 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<model ref="r:a3e7f5f7-3a4f-44ab-a14b-470e9199c460(com.mbeddr.mpsutil.genplandiagram.sandbox)">
3+
<persistence version="9" />
4+
<languages>
5+
<use id="ff3d5f86-c6fa-4c63-aa95-c2de600f92ac" name="com.mbeddr.mpsutil.genplandiagram" version="0" />
6+
<use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
7+
<use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="4" />
8+
<use id="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan" version="3" />
9+
</languages>
10+
<imports>
11+
<import index="heug" ref="r:d1cf1bdc-d32d-481e-8ec6-73dc1f9dcb76(jetbrains.mps.lang.documentation@genplan)" />
12+
<import index="f4a4" ref="r:1d4f7f55-4fae-4dcb-9cb8-5924426f75d6(jetbrains.mps.tests@genplan)" implicit="true" />
13+
</imports>
14+
<registry>
15+
<language id="7ab1a6fa-0a11-4b95-9e48-75f363d6cb00" name="jetbrains.mps.lang.generator.plan">
16+
<concept id="869728027904920839" name="jetbrains.mps.lang.generator.plan.structure.CheckpointSynchronization" flags="ng" index="26qawf">
17+
<child id="3750601816087335480" name="checkpoint" index="3pRG92" />
18+
</concept>
19+
<concept id="2332321114124261810" name="jetbrains.mps.lang.generator.plan.structure.GeneratorModulePointer" flags="ng" index="lQKw0">
20+
<child id="2332321114124261812" name="module" index="lQKw6" />
21+
</concept>
22+
<concept id="3705377275350227759" name="jetbrains.mps.lang.generator.plan.structure.IncludePlan" flags="ng" index="NozSJ">
23+
<reference id="3705377275350227762" name="plan" index="NozSM" />
24+
</concept>
25+
<concept id="1152961914448136207" name="jetbrains.mps.lang.generator.plan.structure.LanguageEntry" flags="ng" index="2Qf6Nf">
26+
<property id="1152961914448142318" name="kind" index="2Qf7GI" />
27+
<child id="1152961914448136208" name="language" index="2Qf6Ng" />
28+
</concept>
29+
<concept id="1820634577908471803" name="jetbrains.mps.lang.generator.plan.structure.Plan" flags="ng" index="2VgMpV">
30+
<child id="1820634577908471815" name="steps" index="2VgMA7" />
31+
</concept>
32+
<concept id="1820634577908471809" name="jetbrains.mps.lang.generator.plan.structure.Checkpoint" flags="ng" index="2VgMA1">
33+
<child id="3750601816081740498" name="cpSpec" index="3ps6aC" />
34+
</concept>
35+
<concept id="1820634577908471810" name="jetbrains.mps.lang.generator.plan.structure.Transform" flags="ng" index="2VgMA2">
36+
<property id="2209292798354050154" name="individualStepPerGenerator" index="1s431M" />
37+
<child id="1152961914448142326" name="entries" index="2Qf7GQ" />
38+
</concept>
39+
<concept id="3167863533095527371" name="jetbrains.mps.lang.generator.plan.structure.Fork" flags="ng" index="10T23i">
40+
<reference id="3167863533095527372" name="plan" index="10T23l" />
41+
</concept>
42+
<concept id="2959971211779300533" name="jetbrains.mps.lang.generator.plan.structure.TextDocLine" flags="ng" index="16rNan">
43+
<property id="2959971211779300563" name="text" index="16rNbL" />
44+
</concept>
45+
<concept id="6257322641293267918" name="jetbrains.mps.lang.generator.plan.structure.CheckpointDeclaration" flags="ng" index="19BiC4" />
46+
<concept id="3750601816081740541" name="jetbrains.mps.lang.generator.plan.structure.DeclaredCheckpointSpec" flags="ng" index="3ps6a7">
47+
<reference id="3750601816081740544" name="cpDecl" index="3ps6dU" />
48+
</concept>
49+
<concept id="8296877263936070001" name="jetbrains.mps.lang.generator.plan.structure.ApplyGenerators" flags="ng" index="3uMcMo">
50+
<child id="8296877263936660572" name="generator" index="3uOsAP" />
51+
</concept>
52+
<concept id="894680215637491805" name="jetbrains.mps.lang.generator.plan.structure.DocumentationStep" flags="ng" index="1ONwER">
53+
<child id="894680215637528532" name="comments" index="1ONSkY" />
54+
</concept>
55+
</language>
56+
<language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
57+
<concept id="361130699826193249" name="jetbrains.mps.lang.modelapi.structure.ModulePointer" flags="ng" index="1dCxOk">
58+
<property id="1863527487546097500" name="moduleId" index="1XweGW" />
59+
<property id="1863527487545993577" name="moduleName" index="1XxBO9" />
60+
</concept>
61+
</language>
62+
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
63+
<concept id="3542851458883438784" name="jetbrains.mps.lang.smodel.structure.LanguageId" flags="nn" index="2V$Bhx">
64+
<property id="3542851458883439831" name="namespace" index="2V$B1Q" />
65+
<property id="3542851458883439832" name="languageId" index="2V$B1T" />
66+
</concept>
67+
</language>
68+
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
69+
<concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
70+
<property id="1193676396447" name="virtualPackage" index="3GE5qa" />
71+
</concept>
72+
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
73+
<property id="1169194664001" name="name" index="TrG5h" />
74+
</concept>
75+
</language>
76+
<language id="ff3d5f86-c6fa-4c63-aa95-c2de600f92ac" name="com.mbeddr.mpsutil.genplandiagram">
77+
<concept id="7940016190799018040" name="com.mbeddr.mpsutil.genplandiagram.structure.PlanVisualizer" flags="ng" index="Xn6ag">
78+
<reference id="7940016190799018441" name="plan" index="Xn6dx" />
79+
</concept>
80+
</language>
81+
</registry>
82+
<node concept="Xn6ag" id="6SKAExjwe2b">
83+
<property role="3GE5qa" value="visualizers" />
84+
<ref role="Xn6dx" to="f4a4:6Hh8ipmr2hK" resolve="MPSTestsPlan" />
85+
</node>
86+
<node concept="2VgMpV" id="5lyXtvArK0c">
87+
<property role="TrG5h" value="DemoPlan" />
88+
<property role="3GE5qa" value="plans" />
89+
<node concept="1ONwER" id="5lyXtvArKmp" role="2VgMA7">
90+
<node concept="16rNan" id="5lyXtvArKn$" role="1ONSkY">
91+
<property role="16rNbL" value="My comment" />
92+
</node>
93+
<node concept="16rNan" id="7KBw$lnWe4D" role="1ONSkY">
94+
<property role="16rNbL" value="My comment 2" />
95+
</node>
96+
</node>
97+
<node concept="2VgMA2" id="5lyXtvArK5l" role="2VgMA7">
98+
<property role="1s431M" value="true" />
99+
<node concept="2Qf6Nf" id="5lyXtvArK5U" role="2Qf7GQ">
100+
<property role="2Qf7GI" value="1009c2Af4wn/Extend" />
101+
<node concept="2V$Bhx" id="5lyXtvArK74" role="2Qf6Ng">
102+
<property role="2V$B1T" value="63e0e566-5131-447e-90e3-12ea330e1a00" />
103+
<property role="2V$B1Q" value="com.mbeddr.mpsutil.blutil" />
104+
</node>
105+
</node>
106+
</node>
107+
<node concept="2VgMA2" id="5lyXtvArKg7" role="2VgMA7">
108+
<property role="1s431M" value="true" />
109+
<node concept="2Qf6Nf" id="5lyXtvArKg9" role="2Qf7GQ">
110+
<node concept="2V$Bhx" id="5lyXtvArKgJ" role="2Qf6Ng">
111+
<property role="2V$B1T" value="189537ea-2a28-44c9-91aa-a8e68b3e1e1b" />
112+
<property role="2V$B1Q" value="com.mbeddr.mpsutil.blutil.genutil" />
113+
</node>
114+
</node>
115+
</node>
116+
<node concept="3uMcMo" id="7KBw$lnWhZ6" role="2VgMA7">
117+
<node concept="lQKw0" id="6vwc0gQc7Ce" role="3uOsAP">
118+
<node concept="1dCxOk" id="6vwc0gQc7Cf" role="lQKw6">
119+
<property role="1XweGW" value="3a6b9f2f-4402-4ed6-a7cd-12b272b244d5" />
120+
<property role="1XxBO9" value="com.mbeddr.mpsutil.blutil#4354378109086982937" />
121+
</node>
122+
</node>
123+
</node>
124+
<node concept="19BiC4" id="7KBw$lo12kj" role="2VgMA7">
125+
<property role="TrG5h" value="checkpoint" />
126+
</node>
127+
<node concept="2VgMA1" id="7KBw$lo3Kll" role="2VgMA7">
128+
<node concept="3ps6a7" id="7KBw$lo3KlW" role="3ps6aC">
129+
<ref role="3ps6dU" node="7KBw$lo12kj" resolve="checkpoint" />
130+
</node>
131+
</node>
132+
<node concept="26qawf" id="7KBw$lo4cNs" role="2VgMA7">
133+
<node concept="3ps6a7" id="7KBw$lo4cO3" role="3pRG92">
134+
<ref role="3ps6dU" node="7KBw$lo12kj" resolve="checkpoint" />
135+
</node>
136+
</node>
137+
<node concept="1ONwER" id="308cpCq5FAd" role="2VgMA7">
138+
<node concept="16rNan" id="308cpCq5FAO" role="1ONSkY">
139+
<property role="16rNbL" value="include plan comment" />
140+
</node>
141+
</node>
142+
<node concept="NozSJ" id="7KBw$lo5o6S" role="2VgMA7">
143+
<ref role="NozSM" node="308cpCpXjqH" resolve="MyPlan" />
144+
</node>
145+
<node concept="1ONwER" id="308cpCq5FIb" role="2VgMA7">
146+
<node concept="16rNan" id="308cpCq5FIe" role="1ONSkY">
147+
<property role="16rNbL" value="fork comment" />
148+
</node>
149+
</node>
150+
<node concept="10T23i" id="7KBw$lo7CGb" role="2VgMA7">
151+
<ref role="10T23l" node="308cpCpXjqH" resolve="MyPlan" />
152+
</node>
153+
</node>
154+
<node concept="Xn6ag" id="5lyXtvArK8L">
155+
<property role="3GE5qa" value="visualizers" />
156+
<ref role="Xn6dx" node="5lyXtvArK0c" resolve="DemoPlan" />
157+
</node>
158+
<node concept="2VgMpV" id="308cpCpXjqH">
159+
<property role="3GE5qa" value="plans" />
160+
<property role="TrG5h" value="MyPlan" />
161+
<node concept="2VgMA2" id="308cpCpXjt2" role="2VgMA7">
162+
<property role="1s431M" value="true" />
163+
<node concept="2Qf6Nf" id="308cpCpXjt4" role="2Qf7GQ">
164+
<node concept="2V$Bhx" id="308cpCpXjue" role="2Qf6Ng">
165+
<property role="2V$B1T" value="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" />
166+
<property role="2V$B1Q" value="com.mbeddr.core.base" />
167+
</node>
168+
</node>
169+
</node>
170+
<node concept="10T23i" id="308cpCpXjrR" role="2VgMA7">
171+
<ref role="10T23l" node="308cpCq4Pb2" resolve="SimplePlan" />
172+
</node>
173+
<node concept="1ONwER" id="308cpCq5FSX" role="2VgMA7">
174+
<node concept="16rNan" id="308cpCq5FU8" role="1ONSkY">
175+
<property role="16rNbL" value="comment before documentation plan in my plan" />
176+
</node>
177+
</node>
178+
<node concept="10T23i" id="308cpCpXjrS" role="2VgMA7">
179+
<ref role="10T23l" to="heug:2iKjvgosNNj" resolve="DocumentationPlan" />
180+
</node>
181+
</node>
182+
<node concept="2VgMpV" id="308cpCq4Pb2">
183+
<property role="3GE5qa" value="plans" />
184+
<property role="TrG5h" value="SimplePlan" />
185+
<node concept="2VgMA2" id="308cpCq4Pcc" role="2VgMA7">
186+
<property role="1s431M" value="true" />
187+
<node concept="2Qf6Nf" id="308cpCq4Pcd" role="2Qf7GQ">
188+
<node concept="2V$Bhx" id="308cpCq4Pdn" role="2Qf6Ng">
189+
<property role="2V$B1T" value="e89e1550-b8fe-4f0d-a7fd-487968b42405" />
190+
<property role="2V$B1Q" value="com.mbeddr.mpsutil.collections" />
191+
</node>
192+
</node>
193+
</node>
194+
</node>
195+
</model>
196+

0 commit comments

Comments
 (0)