Skip to content

Commit 8ed4abf

Browse files
mps-ci-buildbotmps-ci-buildbot
authored
Merge pull request #1512 from JetBrains/merge/mps20251
Merge maintenance/mps20241 into maintenance/mps20251
2 parents 2b7faa7 + e38caee commit 8ed4abf

File tree

9 files changed

+1743
-689
lines changed

9 files changed

+1743
-689
lines changed

‎build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ dependencies {
189189
"batik"("org.apache.xmlgraphics:batik-all:1.19")
190190

191191
"commons"("org.apache.commons:commons-csv:1.14.0")
192-
"commons"("commons-io:commons-io:2.19.0")
192+
"commons"("commons-io:commons-io:2.20.0")
193193
"commons"("org.apache.commons:commons-lang3:3.18.0")
194194
"commons"("org.apache.commons:commons-math3:3.6.1")
195195
"commons"("org.apache.commons:commons-csv:1.14.0")
@@ -200,7 +200,7 @@ dependencies {
200200
"collections"("org.apache.commons:commons-collections4:4.5.0")
201201
"collections"("com.google.guava:guava:33.4.8-jre")
202202
"collections"("net.sf.trove4j:trove4j:3.0.3")
203-
"collections"("io.vavr:vavr:0.10.6")
203+
"collections"("io.vavr:vavr:0.10.7")
204204
}
205205

206206
val buildScriptClasspath by extra(project.configurations["ant_lib"])

‎code/compare/languages/de.itemis.mps.compare/languageModels/de.itemis.mps.compare.typesystem.mps‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -302,25 +302,25 @@
302302
<node concept="1YbPZF" id="3C6_kMLO7YY">
303303
<property role="TrG5h" value="typeof_AssertHasElements" />
304304
<node concept="3clFbS" id="3C6_kMLO7YZ" role="18ibNy">
305-
<node concept="1Z5TYs" id="3C6_kMLO80s" role="3cqZAp">
306-
<node concept="mw_s8" id="3C6_kMLO80t" role="1ZfhKB">
307-
<node concept="2c44tf" id="3C6_kMLO80u" role="mwGJk">
308-
<node concept="2I9FWS" id="3C6_kMLOCSk" role="2c44tc" />
309-
</node>
310-
</node>
311-
<node concept="mw_s8" id="3C6_kMLO80x" role="1ZfhK$">
312-
<node concept="1Z2H0r" id="3C6_kMLO80y" role="mwGJk">
313-
<node concept="2OqwBi" id="3C6_kMLO80z" role="1Z2MuG">
314-
<node concept="1YBJjd" id="3C6_kMLO8eH" role="2Oq$k0">
305+
<node concept="1ZobV4" id="3hhKUUEQBKY" role="3cqZAp">
306+
<node concept="mw_s8" id="3hhKUUEQBL0" role="1ZfhK$">
307+
<node concept="1Z2H0r" id="3hhKUUEQBL1" role="mwGJk">
308+
<node concept="2OqwBi" id="3hhKUUEQBL2" role="1Z2MuG">
309+
<node concept="1YBJjd" id="3hhKUUEQBL3" role="2Oq$k0">
315310
<ref role="1YBMHb" node="3C6_kMLO7Z1" resolve="assertHasElements" />
316311
</node>
317-
<node concept="3TrEf2" id="3C6_kMLZpAY" role="2OqNvi">
312+
<node concept="3TrEf2" id="3hhKUUEQBL4" role="2OqNvi">
318313
<ref role="3Tt5mk" to="8do3:3C6_kMLP2FL" resolve="list" />
319314
</node>
320315
</node>
321316
</node>
322317
</node>
323-
<node concept="1YBJjd" id="77BxNvs6uX2" role="1ZmcU8">
318+
<node concept="mw_s8" id="3hhKUUEQBL5" role="1ZfhKB">
319+
<node concept="2c44tf" id="3hhKUUEQBL6" role="mwGJk">
320+
<node concept="2I9FWS" id="3hhKUUEQBL7" role="2c44tc" />
321+
</node>
322+
</node>
323+
<node concept="1YBJjd" id="3hhKUUEQBL8" role="1ZmcU8">
324324
<ref role="1YBMHb" node="3C6_kMLO7Z1" resolve="assertHasElements" />
325325
</node>
326326
</node>

‎code/languages/de.itemis.model.merge/generator/templates/[email protected]‎

Lines changed: 54 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,10 @@
104104
<concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
105105
<child id="1079359253376" name="expression" index="1eOMHV" />
106106
</concept>
107+
<concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
108+
<child id="1160998896846" name="condition" index="1gVkn0" />
109+
<child id="1160998916832" name="message" index="1gVpfI" />
110+
</concept>
107111
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
108112
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
109113
<child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -117,6 +121,7 @@
117121
<concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
118122
<concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
119123
<reference id="1107535924139" name="classifier" index="3uigEE" />
124+
<child id="1109201940907" name="parameter" index="11_B2D" />
120125
</concept>
121126
<concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
122127
<child id="1081773367579" name="rightExpression" index="3uHU7w" />
@@ -305,6 +310,7 @@
305310
<child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
306311
<child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
307312
</concept>
313+
<concept id="8329979535468945057" name="jetbrains.mps.lang.smodel.structure.Node_PresentationOperation" flags="ng" index="2Iv5rx" />
308314
<concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
309315
<child id="1145404616321" name="leftExpression" index="2JrQYb" />
310316
</concept>
@@ -2024,18 +2030,61 @@
20242030
<node concept="29HgVG" id="1yAYHyQ77jn" role="lGtFl">
20252031
<node concept="3NFfHV" id="1yAYHyQ77$B" role="3NFExx">
20262032
<node concept="3clFbS" id="1yAYHyQ77$C" role="2VODD2">
2033+
<node concept="3cpWs8" id="35K6dbyVUI2" role="3cqZAp">
2034+
<node concept="3cpWsn" id="35K6dbyVUI3" role="3cpWs9">
2035+
<property role="TrG5h" value="childIdFunctionMaybe" />
2036+
<node concept="3uibUv" id="35K6dbyVQSv" role="1tU5fm">
2037+
<ref role="3uigEE" to="33ny:~Optional" resolve="Optional" />
2038+
<node concept="3Tqbb2" id="35K6dbyVQSy" role="11_B2D">
2039+
<ref role="ehGHo" to="mopj:6celbXx0_R7" resolve="IdFunction" />
2040+
</node>
2041+
</node>
2042+
<node concept="2OqwBi" id="35K6dbyVUI4" role="33vP2m">
2043+
<node concept="30H73N" id="35K6dbyVUI5" role="2Oq$k0" />
2044+
<node concept="2qgKlT" id="35K6dbyVUI6" role="2OqNvi">
2045+
<ref role="37wK5l" to="rnx3:6CwG2k87nXX" resolve="childIdFunction" />
2046+
</node>
2047+
</node>
2048+
</node>
2049+
</node>
2050+
<node concept="1gVbGN" id="35K6dbyVV5Y" role="3cqZAp">
2051+
<node concept="2OqwBi" id="35K6dbyZSHX" role="1gVkn0">
2052+
<node concept="37vLTw" id="35K6dbyVVab" role="2Oq$k0">
2053+
<ref role="3cqZAo" node="35K6dbyVUI3" resolve="childIdFunctionMaybe" />
2054+
</node>
2055+
<node concept="liA8E" id="35K6dbyZThs" role="2OqNvi">
2056+
<ref role="37wK5l" to="33ny:~Optional.isPresent()" resolve="isPresent" />
2057+
</node>
2058+
</node>
2059+
<node concept="3cpWs3" id="35K6dbyVX9C" role="1gVpfI">
2060+
<node concept="2OqwBi" id="35K6dbz1mOl" role="3uHU7w">
2061+
<node concept="2OqwBi" id="35K6dbz0B5T" role="2Oq$k0">
2062+
<node concept="2OqwBi" id="35K6dbyVXEH" role="2Oq$k0">
2063+
<node concept="30H73N" id="35K6dbyVXcj" role="2Oq$k0" />
2064+
<node concept="3TrEf2" id="35K6dbyVYqS" role="2OqNvi">
2065+
<ref role="3Tt5mk" to="mopj:1VmHfRxVF4J" resolve="child" />
2066+
</node>
2067+
</node>
2068+
<node concept="3TrEf2" id="35K6dbz0BJj" role="2OqNvi">
2069+
<ref role="3Tt5mk" to="tpce:fA0lvVK" resolve="target" />
2070+
</node>
2071+
</node>
2072+
<node concept="2Iv5rx" id="35K6dbz1o0a" role="2OqNvi" />
2073+
</node>
2074+
<node concept="Xl_RD" id="35K6dbyVVIY" role="3uHU7B">
2075+
<property role="Xl_RC" value="NO ID-Function for concept " />
2076+
</node>
2077+
</node>
2078+
</node>
20272079
<node concept="3cpWs8" id="1PFYlaN0k3G" role="3cqZAp">
20282080
<node concept="3cpWsn" id="1PFYlaN0k3H" role="3cpWs9">
20292081
<property role="TrG5h" value="idFunction" />
20302082
<node concept="3Tqbb2" id="1PFYlaN0jlZ" role="1tU5fm">
20312083
<ref role="ehGHo" to="mopj:6celbXx0_R7" resolve="IdFunction" />
20322084
</node>
20332085
<node concept="2OqwBi" id="6CwG2k87$zz" role="33vP2m">
2034-
<node concept="2OqwBi" id="6CwG2k87zUy" role="2Oq$k0">
2035-
<node concept="30H73N" id="6CwG2k87zz9" role="2Oq$k0" />
2036-
<node concept="2qgKlT" id="6CwG2k87$hf" role="2OqNvi">
2037-
<ref role="37wK5l" to="rnx3:6CwG2k87nXX" resolve="childIdFunction" />
2038-
</node>
2086+
<node concept="37vLTw" id="35K6dbyVUI7" role="2Oq$k0">
2087+
<ref role="3cqZAo" node="35K6dbyVUI3" resolve="childIdFunctionMaybe" />
20392088
</node>
20402089
<node concept="liA8E" id="6CwG2k87_mJ" role="2OqNvi">
20412090
<ref role="37wK5l" to="33ny:~Optional.get()" resolve="get" />

‎code/languages/de.itemis.model.merge/models/de.itemis.model.merge.editor.mps‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,16 @@
372372
</node>
373373
<node concept="2iRfu4" id="5HyGTP182ki" role="2iSdaV" />
374374
</node>
375+
<node concept="3EZMnI" id="4VFforygbZp" role="3EZMnx">
376+
<node concept="VPM3Z" id="4VFforygbZq" role="3F10Kt" />
377+
<node concept="3F0ifn" id="4VFforygbZr" role="3EZMnx">
378+
<property role="3F0ifm" value="Partial ID-Functions : " />
379+
</node>
380+
<node concept="3F0A7n" id="4VFforygbZs" role="3EZMnx">
381+
<ref role="1NtTu8" to="mopj:4VFforygbyx" resolve="partialIDFunctions" />
382+
</node>
383+
<node concept="2iRfu4" id="4VFforygbZt" role="2iSdaV" />
384+
</node>
375385
<node concept="3EZMnI" id="7cz6vHaHuiC" role="3EZMnx">
376386
<node concept="VPM3Z" id="7cz6vHaHuiE" role="3F10Kt" />
377387
<node concept="3EZMnI" id="7cz6vHaHwCU" role="3EZMnx">

‎code/languages/de.itemis.model.merge/models/de.itemis.model.merge.structure.mps‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,11 @@
101101
<property role="TrG5h" value="partialPolicy" />
102102
<ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
103103
</node>
104+
<node concept="1TJgyi" id="4VFforygbyx" role="1TKVEl">
105+
<property role="IQ2nx" value="5686706604016187553" />
106+
<property role="TrG5h" value="partialIDFunctions" />
107+
<ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
108+
</node>
104109
</node>
105110
<node concept="1TIwiD" id="1EbzjT2R$JP">
106111
<property role="EcuMT" value="1912777765298260981" />

0 commit comments

Comments
 (0)