Skip to content
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

Jump to bottom

Merge maintenance/mps20222 into maintenance/mps20223 #2520

Merged
merged 5 commits into from
Sep 18, 2024
Merged

Merge maintenance/mps20222 into maintenance/mps20223 #2520

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a5f370b
mbeddr.doc: don't stop screenshot generation in MpsEnvironment
arimer Sep 11, 2024
f59fdad
Update code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languag…
arimer Sep 16, 2024
f7f89bd
Merge branch 'maintenance/mps20222' into bugfix/revertScreenshotDeact…
arimer Sep 17, 2024
20eb099
Merge pull request #2504 from mbeddr/bugfix/revertScreenshotDeactivation
arimer Sep 17, 2024
fadb3e8
Merge maintenance/mps20223 into merge/mps20222
github-actions[bot] Sep 17, 2024
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
6 changes: 1 addition & 5 deletions code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/plugin.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,6 @@
<child id="8276990574909234106" name="finallyBody" index="1wplMD" />
</concept>
<concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
<concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
<child id="1178549979242" name="visibility" index="1B3o_S" />
</concept>
Expand Down Expand Up @@ -2318,7 +2317,7 @@
<node concept="17QB3L" id="5Ulr5FUQKky" role="1tU5fm" />
<node concept="3cpWs3" id="5Ulr5FUQLHz" role="33vP2m">
<node concept="Xl_RD" id="5Ulr5FUQLH$" role="3uHU7B">
<property role="Xl_RC" value="Screenshots cannot be taken in MpsEnvironment (Ant &lt;generate&gt; task). " />
<property role="Xl_RC" value="Screenshots might not be taken correctly in MpsEnvironment (Ant &lt;generate&gt; task). " />
</node>
<node concept="Xl_RD" id="5Ulr5FUQLH_" role="3uHU7w">
<property role="Xl_RC" value="Use mps-gradle-plugin, mps-build-backends, MPS tests, or other means to run the MPS make process in an IDEA environment." />
Expand Down Expand Up @@ -2852,7 +2851,6 @@
<ref role="3cqZAo" node="5Ulr5FUQ$ao" resolve="reportMpsEnvironment" />
</node>
</node>
<node concept="3zACq4" id="5Ulr5FUQ9rW" role="3cqZAp" />
</node>
<node concept="37vLTw" id="5Ulr5FUPY0h" role="3clFbw">
<ref role="3cqZAo" node="5Ulr5FUPOud" resolve="isMpsEnvironment" />
Expand Down Expand Up @@ -3193,13 +3191,11 @@
<ref role="3cqZAo" node="5Ulr5FUQ$ao" resolve="reportMpsEnvironment" />
</node>
</node>
<node concept="3zACq4" id="5Ulr5FUQHa8" role="3cqZAp" />
</node>
<node concept="37vLTw" id="5Ulr5FUQHa9" role="3clFbw">
<ref role="3cqZAo" node="5Ulr5FUPOud" resolve="isMpsEnvironment" />
</node>
</node>
<node concept="3clFbH" id="5Ulr5FUQgvP" role="3cqZAp" />
<node concept="3cpWs8" id="223OxQl_y91" role="3cqZAp">
<node concept="3cpWsn" id="223OxQl_y92" role="3cpWs9">
<property role="TrG5h" value="node" />
Expand Down