Skip to content

Commit

Permalink
Merge pull request #2693 from mbeddr/merge/mps20243
Browse files Browse the repository at this point in the history 
Merge maintenance/mps20241 into maintenance/mps20243
  • Loading branch information
@mps-ci-buildbot
mps-ci-buildbot authored Jan 21, 2025
2 parents 4a4df59 + 91f9604 commit 2ee26be
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 33 deletions.
39 changes: 26 additions & 13 deletions ...c.aspect/solutions/com.mbeddr.doc.aspect.runtime/models/com/mbeddr/doc/aspect/runtime.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,12 @@
<import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
<import index="1i04" ref="r:3270011d-8b2d-4938-8dff-d256a759e017(jetbrains.mps.lang.behavior.structure)" />
<import index="itts" ref="39983771-4e9b-401b-a1a9-1da6c777c843/java:com.github.benmanes.caffeine.cache(MPS.ThirdParty/)" />
<import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
<import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" implicit="true" />
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
<import index="4gky" ref="r:e1dfab1d-c7a7-43e7-9f26-028afd483e82(com.mbeddr.doc.behavior)" implicit="true" />
<import index="tpcn" ref="r:00000000-0000-4000-0000-011c8959028b(jetbrains.mps.lang.structure.behavior)" implicit="true" />
<import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" implicit="true" />
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
</imports>
<registry>
Expand Down Expand Up @@ -281,10 +283,6 @@
<concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
<concept id="8866923313515890008" name="jetbrains.mps.lang.smodel.structure.AsNodeOperation" flags="nn" index="FGMqu" />
<concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
<concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
<concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
<child id="1145404616321" name="leftExpression" index="2JrQYb" />
</concept>
<concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
<concept id="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
<concept id="1171323947159" name="jetbrains.mps.lang.smodel.structure.Model_NodesOperation" flags="nn" index="2SmgA7">
Expand Down Expand Up @@ -427,6 +425,9 @@
<node concept="3uibUv" id="1XKxHZsSvB1" role="1tU5fm">
<ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
</node>
<node concept="2AHcQZ" id="3RY4lWmLvCT" role="2AJF6D">
<ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
</node>
</node>
<node concept="37vLTG" id="1XKxHZsSvB2" role="3clF46">
<property role="TrG5h" value="selectedNode" />
Expand Down Expand Up @@ -1322,6 +1323,9 @@
<node concept="3uibUv" id="2DFA9RLl8eX" role="1tU5fm">
<ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
</node>
<node concept="2AHcQZ" id="3RY4lWmLw_V" role="2AJF6D">
<ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
</node>
</node>
<node concept="37vLTG" id="2DFA9RLl8eY" role="3clF46">
<property role="TrG5h" value="concept" />
Expand Down Expand Up @@ -1632,6 +1636,9 @@
<node concept="3uibUv" id="qh7UMGiqr7" role="1tU5fm">
<ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
</node>
<node concept="2AHcQZ" id="3RY4lWmLv1_" role="2AJF6D">
<ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
</node>
</node>
<node concept="37vLTG" id="qh7UMGipdd" role="3clF46">
<property role="TrG5h" value="concept" />
Expand Down Expand Up @@ -1673,6 +1680,9 @@
<node concept="3uibUv" id="6SZYYyyjzc6" role="1tU5fm">
<ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
</node>
<node concept="2AHcQZ" id="3RY4lWmLybj" role="2AJF6D">
<ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
</node>
</node>
<node concept="37vLTG" id="6SZYYyyjzc7" role="3clF46">
<property role="TrG5h" value="concept" />
Expand Down Expand Up @@ -2036,6 +2046,9 @@
<node concept="3uibUv" id="4LTL3HuD2ph" role="1tU5fm">
<ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
</node>
<node concept="2AHcQZ" id="3RY4lWmL$qw" role="2AJF6D">
<ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
</node>
</node>
<node concept="37vLTG" id="4LTL3HuD2TG" role="3clF46">
<property role="TrG5h" value="concept" />
Expand Down Expand Up @@ -3047,17 +3060,17 @@
<node concept="3Tqbb2" id="11K_5nNfog1" role="1tU5fm" />
<node concept="1rXfSq" id="1GfgNpVXlZA" role="33vP2m">
<ref role="37wK5l" node="1XKxHZsSs$9" resolve="getDocumentation" />
<node concept="2OqwBi" id="1GfgNpVXlsH" role="37wK5m">
<node concept="2JrnkZ" id="1GfgNpVXlsI" role="2Oq$k0">
<node concept="2OqwBi" id="1GfgNpVXlsJ" role="2JrQYb">
<node concept="37vLTw" id="1GfgNpVXlsK" role="2Oq$k0">
<ref role="3cqZAo" node="68WEpgCynYA" resolve="n" />
</node>
<node concept="I4A8Y" id="1GfgNpVXlsL" role="2OqNvi" />
<node concept="2OqwBi" id="6d_vyLJIqkd" role="37wK5m">
<node concept="2OqwBi" id="6d_vyLJIo1I" role="2Oq$k0">
<node concept="37vLTw" id="6d_vyLJInu7" role="2Oq$k0">
<ref role="3cqZAo" node="qmep2m2lij" resolve="editorCell" />
</node>
<node concept="liA8E" id="6d_vyLJIq8A" role="2OqNvi">
<ref role="37wK5l" to="f4zo:~EditorCell.getContext()" resolve="getContext" />
</node>
</node>
<node concept="liA8E" id="1GfgNpVXlsM" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
<node concept="liA8E" id="6d_vyLJIqMX" role="2OqNvi">
<ref role="37wK5l" to="cj4x:~EditorContext.getRepository()" resolve="getRepository" />
</node>
</node>
<node concept="37vLTw" id="1GfgNpVXlsN" role="37wK5m">
Expand Down
20 changes: 0 additions & 20 deletions ....doc.aspect/solutions/com.mbeddr.doc.aspect.ui/models/com/mbeddr/doc/aspect/ui/plugin.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,6 @@
<child id="5386424596292315200" name="componentExpression" index="3PF$jx" />
</concept>
<concept id="5538333046911348654" name="jetbrains.mps.lang.plugin.structure.RequiredCondition" flags="ng" index="1oajcY" />
<concept id="5818192529492099570" name="jetbrains.mps.lang.plugin.structure.CloseTabOperation" flags="nn" index="3ryLUP">
<child id="5818192529492102108" name="componentExpression" index="3ryLir" />
</concept>
<concept id="1208528650020" name="jetbrains.mps.lang.plugin.structure.ToolType" flags="in" index="1xUVSX">
<reference id="1208529537963" name="tool" index="1xYkEM" />
</concept>
Expand Down Expand Up @@ -3950,23 +3947,6 @@
</node>
</node>
</node>
<node concept="9aQIb" id="DxJoPcq$il" role="9aQIa">
<node concept="3clFbS" id="DxJoPcq$im" role="9aQI4">
<node concept="3clFbF" id="DxJoPcq$in" role="3cqZAp">
<node concept="2OqwBi" id="DxJoPcq$io" role="3clFbG">
<node concept="2WthIp" id="DxJoPcq$ip" role="2Oq$k0" />
<node concept="3ryLUP" id="DxJoPcq$iq" role="2OqNvi">
<node concept="2OqwBi" id="DxJoPcq$ir" role="3ryLir">
<node concept="2WthIp" id="DxJoPcq$is" role="2Oq$k0" />
<node concept="2BZ7hE" id="DxJoPcq$it" role="2OqNvi">
<ref role="2WH_rO" node="19PERUGMVUM" resolve="conceptDocPanel" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1Wc70l" id="DxJoPcqDbE" role="3clFbw">
<node concept="3y3z36" id="DxJoPcqEl2" role="3uHU7w">
<node concept="10Nm6u" id="DxJoPcqFlW" role="3uHU7w" />
Expand Down

0 comments on commit 2ee26be

Please sign in to comment.