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

Cascading merge from 2021.2 to 2021.3 + update MPS version to 2021.3.5 #714

Merged
merged 45 commits into from
Dec 11, 2023
Merged

Cascading merge from 2021.2 to 2021.3 + update MPS version to 2021.3.5 #714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
0859f60
Fix wrong version number for local build (#630)
HeikoBecker Jun 1, 2023
4932980
Merge pull request #631 from JetBrains/bugfix/fix_version_number_630
HeikoBecker Jun 1, 2023
8ba22c8
Add a Changelog to document user-facing changes
HeikoBecker Jun 29, 2023
be16227
Minor:passive->active wording
HeikoBecker Jun 29, 2023
7642ac0
Merge pull request #636 from JetBrains/feature/changelog
HeikoBecker Jun 30, 2023
3bde22b
Remove build script block dependency to old nexus.
alexanderpann Jul 28, 2023
9a14128
Fix build for windows
AlexeiQ Jul 31, 2023
15cd0e7
remove old nexus repository and update usage according to https://git…
KemalSoysal Jul 31, 2023
68211a8
adopt changes encouraged by @sergej-koscejev in comments
KemalSoysal Aug 1, 2023
e3cea99
adopt changes encouraged by @sergej-koscejev in comment
KemalSoysal Aug 1, 2023
4d74855
Merge pull request #652 from JetBrains/bugfix/fixing-build
AlexeiQ Aug 1, 2023
801b5b6
Executed rerunnable migrations
AlexeiQ Aug 1, 2023
aa22a20
Merge pull request #653 from JetBrains/bugfix/mps20211-execute-rerunn…
KemalSoysal Aug 4, 2023
3f77603
Merge branch 'maintenance/mps20211' into cascading-merge/2021.1-into-…
AlexeiQ Aug 4, 2023
4d7b610
Execute needed migrations via migration-manager
AlexeiQ Aug 4, 2023
6026a63
Executed rerunnable migrations (2021.2)
AlexeiQ Aug 4, 2023
1360a64
Merge pull request #656 from JetBrains/cascading-merge/2021.1-into-20…
KemalSoysal Aug 4, 2023
9f5f431
Adds testcases for checking order of lists (#659)
dbinkele Sep 7, 2023
87db59d
Adds further testcases for checking order of lists (#659)
dbinkele Sep 7, 2023
6415373
Code cosmetics (#659)
dbinkele Sep 19, 2023
9dd88c0
Fixing some usability glichtes (#659)
dbinkele Sep 27, 2023
8bb8004
Change the behavior of list merge in Modelmerger (#659)
dbinkele Sep 28, 2023
6907bab
Change the behavior of list merge in Modelmerger cntd + test (#659)
dbinkele Oct 5, 2023
c678458
Adds 'Dataflow'-Aspect to 'ModelMergerExpression' (#659)
dbinkele Oct 6, 2023
6ac7d88
Adds ModelMergerTest for checking prefix (#659)
dbinkele Oct 6, 2023
a941a04
Altering ModelMergerTest for checking prefix (#659)
dbinkele Oct 6, 2023
d0a26cc
Comment MetaCollectionManager for readability (#659)
HeikoBecker Oct 17, 2023
880960f
Updating comment (#659)
dbinkele Oct 17, 2023
df330c7
Remove bogus comment (#659)
HeikoBecker Oct 17, 2023
1a3185e
Merge pull request #660 from JetBrains/feature/Add_Testcases_for_Mode…
dbinkele Oct 17, 2023
8d42420
diagram: handle Ctrl+A when editing a cell inside the diagram
slisson Oct 25, 2023
5c645e7
Fix build and extend functionality of select all plugin function
HeikoBecker Nov 10, 2023
8cb631e
Fix catch-all case to properly run select all action
HeikoBecker Nov 10, 2023
b09332f
Fix selectAll-Logic
dbinkele Nov 15, 2023
2c08c3f
fix model import
dbinkele Nov 15, 2023
1cbad8d
Merge pull request #688 from JetBrains/diagram-select-all
dbinkele Nov 15, 2023
8c5277a
fix(celllayout): additional horizontal cell was generated around opti…
slisson Nov 21, 2023
b20916e
Merge pull request #697 from JetBrains/bugfix/unexpected-collection-a…
slisson Nov 22, 2023
070fe71
Merge remote-tracking branch 'origin/maintenance/mps20211' into featu…
alexanderpann Dec 11, 2023
166e5d6
Run migrations
alexanderpann Dec 11, 2023
a6090d8
Merge pull request #713 from JetBrains/feature/cascade_20211_20212_1211
alexanderpann Dec 11, 2023
68c4b2a
Merge remote-tracking branch 'origin/maintenance/mps20212' into featu…
alexanderpann Dec 11, 2023
f59b242
Update to MPS 2021.3.5
alexanderpann Dec 11, 2023
780a241
Update the build script
alexanderpann Dec 11, 2023
718d261
Update the readme
alexanderpann Dec 11, 2023
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# MPS Extensions

<a href="https://build.mbeddr.com/project.html?projectId=Mbeddr2_Mbeddr_Gradle_MpsExtensions&tab=projectOverview"><img src="https://build.mbeddr.com/app/rest/builds/buildType:(id:Mbeddr2_Mbeddr_Gradle_MpsExtenstions)/statusIcon"/></a>
![≤ JetBrains MPS 2021.3.3](https://img.shields.io/badge/JetBrains%20MPS-%E2%89%A42021.3.3-orange)
![≤ JetBrains MPS 2021.3.5](https://img.shields.io/badge/JetBrains%20MPS-%E2%89%A42021.3.5-orange)

The MPS extensions aim to ease language development within MPS. They are maintained by itemis, JetBrains, and the open source community, and its development is closely aligned with the development of MPS.

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ ext.dependencyRepositories = [
// major version, e.g. '2021.1', '2021.2'
ext.mpsMajor = '2021.3'
// optional minor/bugfix number (not added to the final build version)
ext.mpsMinor = '3'
ext.mpsMinor = '5'
// e.g. Beta, EAP, RC
ext.mpsReleaseType = ''

Expand Down
56 changes: 33 additions & 23 deletions .../build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12126,9 +12126,6 @@
<node concept="m$_yC" id="3ofF9dt4eDr" role="m$_yJ">
<ref role="m$_y1" node="2OJNL7ElZsF" resolve="de.q60.mps.collections.libs" />
</node>
<node concept="m$_yC" id="5lBBNpx5PcJ" role="m$_yJ">
<ref role="m$_y1" node="4p3FRivDLPy" resolve="org.apache.commons" />
</node>
<node concept="2iUeEo" id="3vhhDKcvNeO" role="2iVFfd">
<property role="2iUeEt" value="Modelix" />
<property role="2iUeEu" value="http://modelix.org" />
Expand All @@ -12138,6 +12135,9 @@
<property role="3MwjfP" value="Alternative model API with better support for persistent data structures." />
</node>
</node>
<node concept="m$_yC" id="5lBBNpx5PcJ" role="m$_yJ">
<ref role="m$_y1" node="4p3FRivDLPy" resolve="org.apache.commons" />
</node>
</node>
<node concept="2G$12M" id="5U8hsWC6WQb" role="3989C9">
<property role="TrG5h" value="group.model-api" />
Expand Down Expand Up @@ -14735,6 +14735,11 @@
<ref role="3bR37D" node="F1NWDqweoc" resolve="com.mbeddr.mpsutil.grammarcells.sandboxlang" />
</node>
</node>
<node concept="1SiIV0" id="2ii6N8k6GSa" role="3bR37C">
<node concept="3bR9La" id="2ii6N8k6GSb" role="1SiIV1">
<ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
</node>
</node>
</node>
<node concept="1E1JtA" id="6$6tsX_CURF" role="2G$12L">
<property role="BnDLt" value="true" />
Expand Down Expand Up @@ -16068,6 +16073,26 @@
<ref role="3bR37D" node="2UnEDPCh8Ac" resolve="de.itemis.model.simple.demo.property" />
</node>
</node>
<node concept="1SiIV0" id="2ii6N8k6GXx" role="3bR37C">
<node concept="3bR9La" id="2ii6N8k6GXy" role="1SiIV1">
<ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
</node>
</node>
<node concept="1SiIV0" id="2ii6N8k6GXz" role="3bR37C">
<node concept="3bR9La" id="2ii6N8k6GX$" role="1SiIV1">
<ref role="3bR37D" node="GuygFg7AfB" resolve="test.de.itemis.mps.modelmerger.testlanguage" />
</node>
</node>
<node concept="1SiIV0" id="2ii6N8k6GX_" role="3bR37C">
<node concept="3bR9La" id="2ii6N8k6GXA" role="1SiIV1">
<ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
</node>
</node>
<node concept="1SiIV0" id="2ii6N8k6GXB" role="3bR37C">
<node concept="3bR9La" id="2ii6N8k6GXC" role="1SiIV1">
<ref role="3bR37D" node="5Jy3PcPRnpY" resolve="de.itemis.model.merge.baselang.sandbox" />
</node>
</node>
</node>
<node concept="1E1JtA" id="2UnEDPCpnjG" role="2G$12L">
<property role="BnDLt" value="true" />
Expand Down Expand Up @@ -16437,6 +16462,11 @@
<ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
</node>
</node>
<node concept="1SiIV0" id="2ii6N8k6GYE" role="3bR37C">
<node concept="3bR9La" id="2ii6N8k6GYF" role="1SiIV1">
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
</node>
</node>
</node>
<node concept="1E1JtA" id="3oyo9Wzq1vN" role="2G$12L">
<property role="BnDLt" value="true" />
Expand Down Expand Up @@ -17022,31 +17052,11 @@
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
</node>
</node>
<node concept="1SiIV0" id="7g5FWGK3ZSY" role="3bR37C">
<node concept="3bR9La" id="7g5FWGK3ZSZ" role="1SiIV1">
<ref role="3bR37D" node="5U8hsWC73Be" resolve="org.modelix.model.repositoryconcepts" />
</node>
</node>
<node concept="1SiIV0" id="7g5FWGK3ZT0" role="3bR37C">
<node concept="3bR9La" id="7g5FWGK3ZT1" role="1SiIV1">
<ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
</node>
</node>
<node concept="1SiIV0" id="7g5FWGK3ZT2" role="3bR37C">
<node concept="3bR9La" id="7g5FWGK3ZT3" role="1SiIV1">
<ref role="3bR37D" node="5U8hsWC70jw" resolve="org.modelix.model.api" />
</node>
</node>
<node concept="1SiIV0" id="7g5FWGK3ZT4" role="3bR37C">
<node concept="3bR9La" id="7g5FWGK3ZT5" role="1SiIV1">
<ref role="3bR37D" node="4iIKqJTZ5Hm" resolve="de.q60.mps.shadowmodels.runtime" />
</node>
</node>
<node concept="1SiIV0" id="7g5FWGK3ZT6" role="3bR37C">
<node concept="3bR9La" id="7g5FWGK3ZT7" role="1SiIV1">
<ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
</node>
</node>
<node concept="1SiIV0" id="7g5FWGK3ZT8" role="3bR37C">
<node concept="3bR9La" id="7g5FWGK3ZT9" role="1SiIV1">
<ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
Expand Down
5 changes: 1 addition & 4 deletions code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1388,10 +1388,7 @@
<node concept="Xl_RD" id="6rPpQ1NH_wj" role="3uHU7B">
<property role="Xl_RC" value="returning Extends.to: " />
</node>
<node concept="2OqwBi" id="7LJ_vJOlkvY" role="3uHU7w">
<node concept="1Pxb5l" id="6rPpQ1NH_wu" role="2Oq$k0" />
<node concept="2Iv5rx" id="7LJ_vJOlkvZ" role="2OqNvi" />
</node>
<node concept="1Pxb5l" id="6rPpQ1NH_wu" role="3uHU7w" />
</node>
</node>
</node>
Expand Down
16 changes: 8 additions & 8 deletions ...diagram.demoentities.sandbox/models/de/itemis/mps/editor/diagram/demoentities/sandbox.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@
<node concept="gqqVs" id="56Tfdun38iY" role="37mO4d">
<property role="gqqTZ" value="237.0" />
<property role="gqqTW" value="334.0004967285156" />
<property role="gqqTX" value="116.0" />
<property role="gqqTy" value="46.0" />
<property role="gqqTX" value="155.0" />
<property role="gqqTy" value="64.0" />
<property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
</node>
</node>
Expand All @@ -149,8 +149,8 @@
<node concept="gqqVs" id="56Tfdun38iA" role="37mO4d">
<property role="gqqTZ" value="245.0" />
<property role="gqqTW" value="455.0007103515625" />
<property role="gqqTX" value="100.0" />
<property role="gqqTy" value="46.0" />
<property role="gqqTX" value="133.0" />
<property role="gqqTy" value="64.0" />
<property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
</node>
</node>
Expand All @@ -159,8 +159,8 @@
<node concept="gqqVs" id="56Tfdun38hW" role="37mO4d">
<property role="gqqTZ" value="130.0" />
<property role="gqqTW" value="193.00029836425782" />
<property role="gqqTX" value="92.0" />
<property role="gqqTy" value="46.0" />
<property role="gqqTX" value="122.0" />
<property role="gqqTy" value="64.0" />
<property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
</node>
</node>
Expand All @@ -169,8 +169,8 @@
<node concept="gqqVs" id="56Tfdun38iw" role="37mO4d">
<property role="gqqTZ" value="146.0" />
<property role="gqqTW" value="52.0001" />
<property role="gqqTX" value="60.0" />
<property role="gqqTy" value="46.0" />
<property role="gqqTX" value="78.0" />
<property role="gqqTy" value="64.0" />
<property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
</node>
</node>
Expand Down
24 changes: 21 additions & 3 deletions ....itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59147,6 +59147,24 @@
</node>
</node>
</node>
<node concept="2tJIrI" id="itssr789xH" role="jymVt" />
<node concept="3clFb_" id="itssr78hM5" role="jymVt">
<property role="TrG5h" value="getMPSCell" />
<node concept="3clFbS" id="itssr78hM8" role="3clF47">
<node concept="3cpWs6" id="itssr78jZ_" role="3cqZAp">
<node concept="2OqwBi" id="itssr78l_4" role="3cqZAk">
<node concept="Xjq3P" id="itssr78kdS" role="2Oq$k0" />
<node concept="2OwXpG" id="itssr78nJe" role="2OqNvi">
<ref role="2Oxat6" node="1uCOQFMkh1i" resolve="myEditingCell" />
</node>
</node>
</node>
</node>
<node concept="3Tm1VV" id="itssr78dG3" role="1B3o_S" />
<node concept="3uibUv" id="itssr78haf" role="3clF45">
<ref role="3uigEE" node="3YJYJT3M3W" resolve="MPSCell" />
</node>
</node>
</node>
<node concept="312cEu" id="1uCOQFNaAxI">
<property role="TrG5h" value="MPSCellEditor" />
Expand Down Expand Up @@ -107043,6 +107061,9 @@
<ref role="3cqZAo" node="2BjZSlQD2RX" resolve="ports" />
</node>
<node concept="2DpFxk" id="6KIoYkeusZH" role="2OqNvi">
<node concept="1nlBCl" id="6KIoYkeusZP" role="2Dq5b$">
<property role="3clFbU" value="true" />
</node>
<node concept="1bVj0M" id="6L_GEhdDfhS" role="23t8la">
<node concept="3clFbS" id="6L_GEhdDfhT" role="1bW5cS">
<node concept="3clFbF" id="6L_GEhdDi6L" role="3cqZAp">
Expand Down Expand Up @@ -107070,9 +107091,6 @@
<node concept="2jxLKc" id="6L_GEhdDfhX" role="1tU5fm" />
</node>
</node>
<node concept="1nlBCl" id="6KIoYkeusZP" role="2Dq5b$">
<property role="3clFbU" value="true" />
</node>
</node>
</node>
<node concept="ANE8D" id="6Fu8whC8Cv6" role="2OqNvi" />
Expand Down
Loading
Loading