Skip to content

Commit 3d1119e

Browse files
mps-ci-buildbotmps-ci-buildbot
authored
Merge pull request #1134 from JetBrains/merge/master
Merge maintenance/mps20243 into master
2 parents 7132d7b + c9c6255 commit 3d1119e

File tree

4 files changed

+273
-139
lines changed
  • code
    • diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime
    • modellisteners
      • com.mbeddr.mpsutil.modellisteners.runtime/models/com/mbeddr/mpsutil/modellisteners
      • com.mbeddr.mpsutil.modellisteners.sandboxlang/languageModels
    • solutions/de.itemis.mps.extensions.changelog/models

4 files changed

+273
-139
lines changed

‎code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13313,21 +13313,6 @@
1331313313
</node>
1331413314
</node>
1331513315
<node concept="3clFbH" id="5S8_I2GS8wk" role="3cqZAp" />
13316-
<node concept="3clFbF" id="2Q7VE3OLTDg" role="3cqZAp">
13317-
<node concept="1rXfSq" id="2Q7VE3OLTDh" role="3clFbG">
13318-
<ref role="37wK5l" node="1FlH1cKdtR4" resolve="model2graphPorts" />
13319-
<node concept="37vLTw" id="2Q7VE3OLVzX" role="37wK5m">
13320-
<ref role="3cqZAo" node="1O5GA4gqRtN" resolve="dcell" />
13321-
</node>
13322-
<node concept="37vLTw" id="2Q7VE3OLVDN" role="37wK5m">
13323-
<ref role="3cqZAo" node="4KKQOHIOelW" resolve="box" />
13324-
</node>
13325-
<node concept="37vLTw" id="2Q7VE3OLTDk" role="37wK5m">
13326-
<ref role="3cqZAo" node="1O5GA4gfk56" resolve="syncContext" />
13327-
</node>
13328-
</node>
13329-
</node>
13330-
<node concept="3clFbH" id="2Q7VE3OLSRH" role="3cqZAp" />
1333113316
<node concept="2Gpval" id="6OP6SOH_zdO" role="3cqZAp">
1333213317
<node concept="2GrKxI" id="6OP6SOH_zdQ" role="2Gsz3X">
1333313318
<property role="TrG5h" value="subdiagram" />
@@ -13571,6 +13556,21 @@
1357113556
</node>
1357213557
</node>
1357313558
</node>
13559+
<node concept="3clFbH" id="1HjGWYx6LQF" role="3cqZAp" />
13560+
<node concept="3clFbF" id="2Q7VE3OLTDg" role="3cqZAp">
13561+
<node concept="1rXfSq" id="2Q7VE3OLTDh" role="3clFbG">
13562+
<ref role="37wK5l" node="1FlH1cKdtR4" resolve="model2graphPorts" />
13563+
<node concept="37vLTw" id="2Q7VE3OLVzX" role="37wK5m">
13564+
<ref role="3cqZAo" node="1O5GA4gqRtN" resolve="dcell" />
13565+
</node>
13566+
<node concept="37vLTw" id="2Q7VE3OLVDN" role="37wK5m">
13567+
<ref role="3cqZAo" node="4KKQOHIOelW" resolve="box" />
13568+
</node>
13569+
<node concept="37vLTw" id="2Q7VE3OLTDk" role="37wK5m">
13570+
<ref role="3cqZAo" node="1O5GA4gfk56" resolve="syncContext" />
13571+
</node>
13572+
</node>
13573+
</node>
1357413574
</node>
1357513575
</node>
1357613576
<node concept="2tJIrI" id="4KKQOHIOemk" role="jymVt" />

‎code/modellisteners/com.mbeddr.mpsutil.modellisteners.runtime/models/com/mbeddr/mpsutil/modellisteners/runtime.mps‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<import index="yg2w" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util.containers(MPS.Core/)" />
2323
<import index="g3l6" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.extapi.model(MPS.Core/)" />
2424
<import index="yyf4" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.util(MPS.OpenAPI/)" />
25+
<import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
2526
</imports>
2627
<registry>
2728
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -1572,6 +1573,20 @@
15721573
</node>
15731574
</node>
15741575
</node>
1576+
<node concept="3clFbF" id="63s_Ska0rPJ" role="3cqZAp">
1577+
<node concept="2YIFZM" id="63s_Ska0HZp" role="3clFbG">
1578+
<ref role="37wK5l" to="w1kc:~FastNodeFinderManager.dispose(org.jetbrains.mps.openapi.model.SModel)" resolve="dispose" />
1579+
<ref role="1Pybhc" to="w1kc:~FastNodeFinderManager" resolve="FastNodeFinderManager" />
1580+
<node concept="2OqwBi" id="63s_Ska0NLy" role="37wK5m">
1581+
<node concept="37vLTw" id="63s_Ska0L9W" role="2Oq$k0">
1582+
<ref role="3cqZAo" node="52ZF9D37MIO" resolve="event" />
1583+
</node>
1584+
<node concept="liA8E" id="63s_Ska0R4P" role="2OqNvi">
1585+
<ref role="37wK5l" to="j9co:~SModelEvent.getModel()" resolve="getModel" />
1586+
</node>
1587+
</node>
1588+
</node>
1589+
</node>
15751590
</node>
15761591
<node concept="2AHcQZ" id="52ZF9D3cRoQ" role="2AJF6D">
15771592
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />

‎code/modellisteners/com.mbeddr.mpsutil.modellisteners.sandboxlang/languageModels/listeners.mps‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,16 @@
5757
</concept>
5858
</language>
5959
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
60+
<concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
61+
<reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
62+
</concept>
63+
<concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
6064
<concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
6165
<child id="1145404616321" name="leftExpression" index="2JrQYb" />
6266
</concept>
67+
<concept id="1171323947159" name="jetbrains.mps.lang.smodel.structure.Model_NodesOperation" flags="nn" index="2SmgA7">
68+
<child id="1758937410080001570" name="conceptArgument" index="1dBWTz" />
69+
</concept>
6370
<concept id="1144146199828" name="jetbrains.mps.lang.smodel.structure.Node_CopyOperation" flags="nn" index="1$rogu" />
6471
<concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
6572
<reference id="1138056395725" name="property" index="3TsBF5" />
@@ -77,6 +84,7 @@
7784
<concept id="5818559022137760597" name="com.mbeddr.mpsutil.modellisteners.structure.Parameter_instance" flags="ng" index="j_vvf" />
7885
<concept id="5818559022137645654" name="com.mbeddr.mpsutil.modellisteners.structure.BeforeChildRemovedListener" flags="ig" index="j_Nrc" />
7986
<concept id="5818559022137644042" name="com.mbeddr.mpsutil.modellisteners.structure.ChildAddedListener" flags="ig" index="j_Nyg" />
87+
<concept id="5818559022137644848" name="com.mbeddr.mpsutil.modellisteners.structure.ChildRemovedListener" flags="ig" index="j_NIE" />
8088
<concept id="5818559022137597839" name="com.mbeddr.mpsutil.modellisteners.structure.ConceptModelListeners" flags="ng" index="jA7cl">
8189
<reference id="1213093996982" name="concept" index="1M2myG" />
8290
<child id="5818559022137986141" name="listeners" index="j$A37" />
@@ -102,6 +110,7 @@
102110
<child id="540871147943773366" name="argument" index="25WWJ7" />
103111
</concept>
104112
<concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
113+
<concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
105114
<concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
106115
<concept id="1165595910856" name="jetbrains.mps.baseLanguage.collections.structure.GetLastOperation" flags="nn" index="1yVyf7" />
107116
</language>
@@ -180,6 +189,31 @@
180189
</node>
181190
</node>
182191
</node>
192+
<node concept="j_NIE" id="4zw8TQtKYrG" role="j$A37">
193+
<node concept="3clFbS" id="4zw8TQtKYrI" role="2VODD2">
194+
<node concept="2xdQw9" id="4zw8TQtKYyJ" role="3cqZAp">
195+
<node concept="3cpWs3" id="4zw8TQtKZzE" role="9lYJi">
196+
<node concept="2OqwBi" id="4zw8TQtL2F3" role="3uHU7w">
197+
<node concept="2OqwBi" id="4zw8TQtL0kH" role="2Oq$k0">
198+
<node concept="2OqwBi" id="4zw8TQtKZXb" role="2Oq$k0">
199+
<node concept="j_vvf" id="4zw8TQtKZ$s" role="2Oq$k0" />
200+
<node concept="I4A8Y" id="4zw8TQtL0d5" role="2OqNvi" />
201+
</node>
202+
<node concept="2SmgA7" id="4zw8TQtL0tl" role="2OqNvi">
203+
<node concept="chp4Y" id="4zw8TQtL0u0" role="1dBWTz">
204+
<ref role="cht4Q" to="64jm:52ZF9D3bond" resolve="ChildConceptA" />
205+
</node>
206+
</node>
207+
</node>
208+
<node concept="34oBXx" id="4zw8TQtL5vz" role="2OqNvi" />
209+
</node>
210+
<node concept="Xl_RD" id="4zw8TQtKYyL" role="3uHU7B">
211+
<property role="Xl_RC" value="Size:" />
212+
</node>
213+
</node>
214+
</node>
215+
</node>
216+
</node>
183217
<node concept="3v3Eqs" id="5iW7uqbJrTk" role="j$A37">
184218
<ref role="j_u2Y" to="64jm:5iW7uqbJsoP" resolve="reference1" />
185219
<node concept="3clFbS" id="5iW7uqbJrTm" role="2VODD2">

0 commit comments

Comments
 (0)