Skip to content

Commit

Permalink
Merge pull request #759 from JetBrains/merge/mps20213
Browse files Browse the repository at this point in the history 
Merge maintenance/mps20213 into maintenance/mps20222
  • Loading branch information
@alexanderpann
alexanderpann authored Feb 12, 2024
2 parents 4d27ff8 + 6f89e32 commit 254ed6e
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 48 deletions.
33 changes: 10 additions & 23 deletions ...olutions/de.itemis.mps.selection.runtime/models/de/itemis/mps/selection/runtime/mouse.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
<import index="z8iw" ref="r:dfdf3542-dbcf-43df-870a-3c3504b3c840(jetbrains.mps.baseLanguage.collections.custom)" implicit="true" />
<import index="fbzs" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.geom(JDK/)" implicit="true" />
<import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
</imports>
<registry>
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
Expand Down Expand Up @@ -98,6 +97,7 @@
</concept>
<concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
<concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
<concept id="1225271283259" name="jetbrains.mps.baseLanguage.structure.NPEEqualsExpression" flags="nn" index="17R0WA" />
<concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
<child id="5680397130376446158" name="type" index="1tU5fm" />
</concept>
Expand Down Expand Up @@ -209,9 +209,6 @@
</concept>
<concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
</language>
<language id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots">
<concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
</language>
<language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
<concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
<child id="1199569906740" name="parameter" index="1bW2Oz" />
Expand Down Expand Up @@ -2634,28 +2631,18 @@
</node>
</node>
<node concept="1Wc70l" id="630t2b8eeIY" role="3clFbw">
<node concept="3clFbC" id="630t2b8eeIZ" role="3uHU7w">
<node concept="2EnYce" id="630t2b8eeJ0" role="3uHU7w">
<node concept="2OqwBi" id="1k1VwvtQHgN" role="2Oq$k0">
<node concept="37vLTw" id="1k1VwvtQHgO" role="2Oq$k0">
<ref role="3cqZAo" node="630t2b8eeIF" resolve="toNode" />
</node>
<node concept="2NL2c5" id="1k1VwvtQHgP" role="2OqNvi" />
</node>
<node concept="liA8E" id="1k1VwvtQHgQ" role="2OqNvi">
<ref role="37wK5l" to="c17a:~SNamedElement.getName()" resolve="getName" />
<node concept="17R0WA" id="3oJDVADAKcB" role="3uHU7w">
<node concept="2OqwBi" id="3oJDVADAKcC" role="3uHU7B">
<node concept="37vLTw" id="3oJDVADAKcD" role="2Oq$k0">
<ref role="3cqZAo" node="630t2b8eeI_" resolve="fromNode" />
</node>
<node concept="2NL2c5" id="3oJDVADAKcE" role="2OqNvi" />
</node>
<node concept="2EnYce" id="630t2b8eeJ3" role="3uHU7B">
<node concept="2OqwBi" id="1k1VwvtQHgS" role="2Oq$k0">
<node concept="37vLTw" id="1k1VwvtQHgT" role="2Oq$k0">
<ref role="3cqZAo" node="630t2b8eeI_" resolve="fromNode" />
</node>
<node concept="2NL2c5" id="1k1VwvtQHgU" role="2OqNvi" />
</node>
<node concept="liA8E" id="1k1VwvtQHgV" role="2OqNvi">
<ref role="37wK5l" to="c17a:~SNamedElement.getName()" resolve="getName" />
<node concept="2OqwBi" id="3oJDVADAKcF" role="3uHU7w">
<node concept="37vLTw" id="3oJDVADAKcG" role="2Oq$k0">
<ref role="3cqZAo" node="630t2b8eeIF" resolve="toNode" />
</node>
<node concept="2NL2c5" id="3oJDVADAKcH" role="2OqNvi" />
</node>
</node>
<node concept="1Wc70l" id="630t2b8eeJ6" role="3uHU7B">
Expand Down
52 changes: 52 additions & 0 deletions .../com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
<import index="yyf4" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.util(MPS.OpenAPI/)" />
<import index="mmaq" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:org.jdom(MPS.Core/)" />
<import index="lzb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui(MPS.IDEA/)" />
<import index="zn9m" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.util(MPS.IDEA/)" />
<import index="9ti4" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.extensions(MPS.IDEA/)" implicit="true" />
</imports>
<registry>
<language id="654422bf-e75f-44dc-936d-188890a746ce" name="de.slisson.mps.reflection">
Expand Down Expand Up @@ -7002,6 +7004,32 @@
</node>
</node>
</node>
<node concept="3clFbF" id="56aJbp3MbDG" role="3cqZAp">
<node concept="2OqwBi" id="56aJbp3MtJb" role="3clFbG">
<node concept="2OqwBi" id="56aJbp3MhDc" role="2Oq$k0">
<node concept="10M0yZ" id="56aJbp3MecH" role="2Oq$k0">
<ref role="1PxDUh" to="k21q:~AbstractProjectViewPane" resolve="AbstractProjectViewPane" />
<ref role="3cqZAo" to="k21q:~AbstractProjectViewPane.EP" resolve="EP" />
</node>
<node concept="liA8E" id="56aJbp3Ml$n" role="2OqNvi">
<ref role="37wK5l" to="9ti4:~ProjectExtensionPointName.getPoint(com.intellij.openapi.extensions.AreaInstance)" resolve="getPoint" />
<node concept="37vLTw" id="56aJbp3M_t4" role="37wK5m">
<ref role="3cqZAo" node="2ZGhpRffcqr" resolve="ideaProject" />
</node>
</node>
</node>
<node concept="liA8E" id="56aJbp3MCHq" role="2OqNvi">
<ref role="37wK5l" to="9ti4:~ExtensionPoint.registerExtension(java.lang.Object,com.intellij.openapi.Disposable)" resolve="registerExtension" />
<node concept="37vLTw" id="56aJbp3N5pS" role="37wK5m">
<ref role="3cqZAo" node="VPgi8etJvN" resolve="pane" />
</node>
<node concept="2YIFZM" id="56aJbp3NULh" role="37wK5m">
<ref role="1Pybhc" to="zn9m:~Disposer" resolve="Disposer" />
<ref role="37wK5l" to="zn9m:~Disposer.newDisposable()" resolve="newDisposable" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -7047,6 +7075,7 @@
</node>
</node>
</node>
<node concept="3clFbH" id="56aJbp3NqF8" role="3cqZAp" />
<node concept="3clFbF" id="25jQj6XP1zC" role="3cqZAp">
<node concept="2OqwBi" id="25jQj6XP2uo" role="3clFbG">
<node concept="3EllGN" id="25jQj6XP2dw" role="2Oq$k0">
Expand Down Expand Up @@ -7127,6 +7156,29 @@
</node>
</node>
</node>
<node concept="3clFbF" id="56aJbp3NtF5" role="3cqZAp">
<node concept="2OqwBi" id="56aJbp3NtF6" role="3clFbG">
<node concept="2OqwBi" id="56aJbp3NtF7" role="2Oq$k0">
<node concept="10M0yZ" id="56aJbp3NtF8" role="2Oq$k0">
<ref role="1PxDUh" to="k21q:~AbstractProjectViewPane" resolve="AbstractProjectViewPane" />
<ref role="3cqZAo" to="k21q:~AbstractProjectViewPane.EP" resolve="EP" />
</node>
<node concept="liA8E" id="56aJbp3NtF9" role="2OqNvi">
<ref role="37wK5l" to="9ti4:~ProjectExtensionPointName.getPoint(com.intellij.openapi.extensions.AreaInstance)" resolve="getPoint" />
<node concept="37vLTw" id="56aJbp3NtFa" role="37wK5m">
<ref role="3cqZAo" node="VPgi8eujhM" resolve="ideaProject" />
</node>
</node>
</node>
<node concept="liA8E" id="56aJbp3NtFb" role="2OqNvi">
<ref role="37wK5l" to="9ti4:~ExtensionPoint.unregisterExtension(java.lang.Object)" resolve="unregisterExtension" />
<node concept="37vLTw" id="56aJbp3NtFc" role="37wK5m">
<ref role="3cqZAo" node="VPgi8eujhx" resolve="pane" />
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="56aJbp3PsVr" role="3cqZAp" />
<node concept="3clFbF" id="6B7erwvFIwS" role="3cqZAp">
<node concept="2OqwBi" id="6B7erwvFIGa" role="3clFbG">
<node concept="37vLTw" id="6B7erwvFIwQ" role="2Oq$k0">
Expand Down
49 changes: 24 additions & 25 deletions ...mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime/tree.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,6 @@
<concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
<reference id="1144433194310" name="classConcept" index="1Pybhc" />
</concept>
<concept id="1164991038168" name="jetbrains.mps.baseLanguage.structure.ThrowStatement" flags="nn" index="YS8fn">
<child id="1164991057263" name="throwable" index="YScLw" />
</concept>
<concept id="1081256982272" name="jetbrains.mps.baseLanguage.structure.InstanceOfExpression" flags="nn" index="2ZW3vV">
<child id="1081256993305" name="classType" index="2ZW6by" />
<child id="1081256993304" name="leftExpression" index="2ZW6bz" />
Expand Down Expand Up @@ -8825,26 +8822,6 @@
</node>
</node>
</node>
<node concept="3clFbJ" id="7PuCnELATv3" role="3cqZAp">
<node concept="3clFbS" id="7PuCnELATv5" role="3clFbx">
<node concept="YS8fn" id="7PuCnELAUJS" role="3cqZAp">
<node concept="2ShNRf" id="7PuCnELAUU9" role="YScLw">
<node concept="1pGfFk" id="7PuCnELAWEr" role="2ShVmc">
<ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String)" resolve="RuntimeException" />
<node concept="Xl_RD" id="7PuCnELAWO7" role="37wK5m">
<property role="Xl_RC" value="Tree is not set" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbC" id="7PuCnELAUdJ" role="3clFbw">
<node concept="10Nm6u" id="7PuCnELAUnd" role="3uHU7w" />
<node concept="37vLTw" id="7PuCnELATEy" role="3uHU7B">
<ref role="3cqZAo" node="7PuCnELASZc" resolve="tree" />
</node>
</node>
</node>
<node concept="3clFbF" id="7PuCnELAR2e" role="3cqZAp">
<node concept="10QFUN" id="7PuCnELAXUT" role="3clFbG">
<node concept="3uibUv" id="7PuCnELAYj6" role="10QFUM">
Expand Down Expand Up @@ -8887,11 +8864,33 @@
<ref role="37wK5l" to="7e8u:~MPSTreeNode.doUpdatePresentation()" resolve="doUpdatePresentation" />
</node>
</node>
<node concept="3cpWs8" id="632tebqvzpv" role="3cqZAp">
<node concept="3cpWsn" id="632tebqvzpw" role="3cpWs9">
<property role="TrG5h" value="tree" />
<node concept="3uibUv" id="632tebqvtJn" role="1tU5fm">
<ref role="3uigEE" node="7diJr$RhsEC" resolve="CustomProjectTree" />
</node>
<node concept="1rXfSq" id="632tebqvzpx" role="33vP2m">
<ref role="37wK5l" node="7PuCnELAR27" resolve="getTree" />
</node>
</node>
</node>
<node concept="3clFbJ" id="632tebqvM02" role="3cqZAp">
<node concept="3clFbS" id="632tebqvM04" role="3clFbx">
<node concept="3cpWs6" id="632tebqw7b2" role="3cqZAp" />
</node>
<node concept="3clFbC" id="632tebqvWtS" role="3clFbw">
<node concept="10Nm6u" id="632tebqw046" role="3uHU7w" />
<node concept="37vLTw" id="632tebqvQwi" role="3uHU7B">
<ref role="3cqZAo" node="632tebqvzpw" resolve="tree" />
</node>
</node>
</node>
<node concept="3clFbF" id="7PuCnELBlqI" role="3cqZAp">
<node concept="2OqwBi" id="7PuCnELBqRz" role="3clFbG">
<node concept="2OqwBi" id="7PuCnELBlWK" role="2Oq$k0">
<node concept="1rXfSq" id="7PuCnELBlqG" role="2Oq$k0">
<ref role="37wK5l" node="7PuCnELAR27" resolve="getTree" />
<node concept="37vLTw" id="632tebqvzpy" role="2Oq$k0">
<ref role="3cqZAo" node="632tebqvzpw" resolve="tree" />
</node>
<node concept="liA8E" id="7PuCnELBqLM" role="2OqNvi">
<ref role="37wK5l" node="7PuCnEL_inn" resolve="getUpdater" />
Expand Down

0 comments on commit 254ed6e

Please sign in to comment.