Skip to content

Commit

Permalink
Merge pull request #926 from JetBrains/merge/EditorComponentCreationL…
Browse files Browse the repository at this point in the history 
…istener
  • Loading branch information
@alexanderpann
alexanderpann authored Aug 19, 2024
2 parents 77962ae + 84e8c43 commit bcab7dd
Show file tree
Hide file tree
Showing 7 changed files with 513 additions and 216 deletions.
11 changes: 0 additions & 11 deletions .../build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2313,11 +2313,6 @@
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
</node>
</node>
<node concept="1SiIV0" id="2hz1PZpEco5" role="3bR37C">
<node concept="3bR9La" id="2hz1PZpEco6" role="1SiIV1">
<ref role="3bR37D" node="64TsoMQT2qP" resolve="de.slisson.mps.hacks.editor" />
</node>
</node>
<node concept="3rtmxn" id="3xFG3bj5MoU" role="3bR31x">
<node concept="3LXTmp" id="3xFG3bj5MoV" role="3rtmxm">
<node concept="3qWCbU" id="3xFG3bj5MoW" role="3LXTna">
Expand Down Expand Up @@ -6354,12 +6349,6 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="6SVXTgIekIm" role="3bR37C">
<node concept="3bR9La" id="6SVXTgIekIn" role="1SiIV1">
<property role="3bR36h" value="true" />
<ref role="3bR37D" node="64TsoMQT2qP" resolve="de.slisson.mps.hacks.editor" />
</node>
</node>
<node concept="1SiIV0" id="6SVXTgIekIo" role="3bR37C">
<node concept="3bR9La" id="6SVXTgIekIp" role="1SiIV1">
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
Expand Down
2 changes: 0 additions & 2 deletions ...ions/de.slisson.mps.editor.celllayout.runtime/de.itemis.mps.editor.celllayout.runtime.msd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
<dependencies>
<dependency reexport="true">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
<dependency reexport="true">f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)</dependency>
<dependency reexport="true">24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)</dependency>
</dependencies>
<languageVersions>
Expand Down Expand Up @@ -48,7 +47,6 @@
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
<module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
<module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
<module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
</dependencyVersions>
</solution>
Expand Down
219 changes: 167 additions & 52 deletions ...n.mps.editor.celllayout.runtime/models/de/itemis/mps/editor/celllayout/runtime/plugin.mps
View file

Large diffs are not rendered by default.

95 changes: 78 additions & 17 deletions code/hacks/solutions/de.slisson.mps.hacks.editor/models/de/slisson/mps/hacks/editor.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -847,25 +847,25 @@
<property role="1sVAO0" value="true" />
<node concept="2tJIrI" id="2WlJ6VKPQeq" role="jymVt" />
<node concept="312cEg" id="2WlJ6VKPQi6" role="jymVt">
<property role="TrG5h" value="myIdeaProject" />
<property role="TrG5h" value="myProject" />
<node concept="3Tm6S6" id="2WlJ6VKPQi7" role="1B3o_S" />
<node concept="3uibUv" id="2WlJ6VKQO3B" role="1tU5fm">
<ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
<ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
</node>
</node>
<node concept="2tJIrI" id="2WlJ6VKQQft" role="jymVt" />
<node concept="3clFbW" id="3pwG8PSjV93" role="jymVt">
<node concept="3cqZAl" id="3pwG8PSjV95" role="3clF45" />
<node concept="3Tm1VV" id="3pwG8PSjV96" role="1B3o_S" />
<node concept="3clFbS" id="3pwG8PSjV97" role="3clF47">
<node concept="1VxSAg" id="3pwG8PSjXP3" role="3cqZAp">
<ref role="37wK5l" node="2WlJ6VKQQJ7" resolve="EditorComponentCreationListener" />
<node concept="2YIFZM" id="3pwG8PSjXQ8" role="37wK5m">
<ref role="37wK5l" to="alof:~ProjectHelper.toIdeaProject(jetbrains.mps.project.Project)" resolve="toIdeaProject" />
<ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
<node concept="37vLTw" id="3pwG8PSjXRm" role="37wK5m">
<node concept="3clFbF" id="DrREDhnysd" role="3cqZAp">
<node concept="37vLTI" id="DrREDhn$dp" role="3clFbG">
<node concept="37vLTw" id="DrREDhn_6m" role="37vLTx">
<ref role="3cqZAo" node="3pwG8PSjXGn" resolve="project" />
</node>
<node concept="37vLTw" id="DrREDhnysb" role="37vLTJ">
<ref role="3cqZAo" node="2WlJ6VKPQi6" resolve="myProject" />
</node>
</node>
</node>
</node>
Expand All @@ -882,12 +882,12 @@
<node concept="3cqZAl" id="2WlJ6VKQQJ8" role="3clF45" />
<node concept="3Tm1VV" id="2WlJ6VKQQJ9" role="1B3o_S" />
<node concept="3clFbS" id="2WlJ6VKQQJb" role="3clF47">
<node concept="3clFbF" id="2WlJ6VKQQJf" role="3cqZAp">
<node concept="37vLTI" id="2WlJ6VKQQJh" role="3clFbG">
<node concept="37vLTw" id="2WlJ6VKQQJl" role="37vLTJ">
<ref role="3cqZAo" node="2WlJ6VKPQi6" resolve="myIdeaProject" />
</node>
<node concept="37vLTw" id="2WlJ6VKQQJm" role="37vLTx">
<node concept="1VxSAg" id="DrREDhnDk4" role="3cqZAp">
<ref role="37wK5l" node="3pwG8PSjV93" resolve="EditorComponentCreationListener" />
<node concept="2YIFZM" id="DrREDhn_xo" role="37wK5m">
<ref role="37wK5l" to="alof:~ProjectHelper.fromIdeaProject(com.intellij.openapi.project.Project)" resolve="fromIdeaProject" />
<ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
<node concept="37vLTw" id="DrREDhn_xp" role="37wK5m">
<ref role="3cqZAo" node="2WlJ6VKQQJe" resolve="ideaProject" />
</node>
</node>
Expand Down Expand Up @@ -999,20 +999,81 @@
<node concept="3clFb_" id="2WlJ6VKQR6W" role="jymVt">
<property role="TrG5h" value="start" />
<node concept="37vLTG" id="2WlJ6VKQWQ$" role="3clF46">
<property role="TrG5h" value="eventForExisting" />
<property role="TrG5h" value="ignored_eventForExisting" />
<node concept="10P_77" id="2WlJ6VKQX0w" role="1tU5fm" />
</node>
<node concept="3cqZAl" id="2WlJ6VKQR6Y" role="3clF45" />
<node concept="3Tm1VV" id="2WlJ6VKQR6Z" role="1B3o_S" />
<node concept="3clFbS" id="2WlJ6VKQR70" role="3clF47">
<node concept="3SKdUt" id="DrREDhnFwc" role="3cqZAp">
<node concept="1PaTwC" id="DrREDhnFwd" role="1aUNEU">
<node concept="3oM_SD" id="DrREDhnFHG" role="1PaTwD">
<property role="3oM_SC" value="EditorExtensionRegistry" />
</node>
<node concept="3oM_SD" id="DrREDhnFHX" role="1PaTwD">
<property role="3oM_SC" value="is" />
</node>
<node concept="3oM_SD" id="DrREDhnFIP" role="1PaTwD">
<property role="3oM_SC" value="MPS" />
</node>
<node concept="3oM_SD" id="DrREDhnFOl" role="1PaTwD">
<property role="3oM_SC" value="CoreComponent" />
</node>
<node concept="3oM_SD" id="DrREDhnFLy" role="1PaTwD">
<property role="3oM_SC" value="since" />
</node>
<node concept="3oM_SD" id="DrREDhnFT$" role="1PaTwD">
<property role="3oM_SC" value="2024.1," />
</node>
<node concept="3oM_SD" id="DrREDhnFVb" role="1PaTwD">
<property role="3oM_SC" value="use" />
</node>
<node concept="3oM_SD" id="DrREDhnFX8" role="1PaTwD">
<property role="3oM_SC" value="MPS" />
</node>
<node concept="3oM_SD" id="DrREDhnFXp" role="1PaTwD">
<property role="3oM_SC" value="project" />
</node>
<node concept="3oM_SD" id="DrREDhnFZQ" role="1PaTwD">
<property role="3oM_SC" value="to" />
</node>
<node concept="3oM_SD" id="DrREDhnFZR" role="1PaTwD">
<property role="3oM_SC" value="access" />
</node>
<node concept="3oM_SD" id="DrREDhnG0I" role="1PaTwD">
<property role="3oM_SC" value="component" />
</node>
<node concept="3oM_SD" id="DrREDhnG0J" role="1PaTwD">
<property role="3oM_SC" value="instance" />
</node>
<node concept="3oM_SD" id="DrREDhnG1Q" role="1PaTwD">
<property role="3oM_SC" value="(backward" />
</node>
<node concept="3oM_SD" id="DrREDhnG5p" role="1PaTwD">
<property role="3oM_SC" value="compatible" />
</node>
<node concept="3oM_SD" id="DrREDhnG7m" role="1PaTwD">
<property role="3oM_SC" value="with" />
</node>
<node concept="3oM_SD" id="DrREDhnG9N" role="1PaTwD">
<property role="3oM_SC" value="earlier" />
</node>
<node concept="3oM_SD" id="DrREDhnGba" role="1PaTwD">
<property role="3oM_SC" value="MPS" />
</node>
<node concept="3oM_SD" id="DrREDhnGch" role="1PaTwD">
<property role="3oM_SC" value="versions)" />
</node>
</node>
</node>
<node concept="3clFbF" id="2BYLcdcOEca" role="3cqZAp">
<node concept="2OqwBi" id="2BYLcdcOFbX" role="3clFbG">
<node concept="2OqwBi" id="2BYLcdcOEvN" role="2Oq$k0">
<node concept="37vLTw" id="2BYLcdcOVvK" role="2Oq$k0">
<ref role="3cqZAo" node="2WlJ6VKPQi6" resolve="myIdeaProject" />
</node>
<node concept="liA8E" id="2BYLcdcOEIo" role="2OqNvi">
<ref role="37wK5l" to="1m72:~ComponentManager.getComponent(java.lang.Class)" resolve="getComponent" />
<ref role="37wK5l" to="z1c3:~Project.getComponent(java.lang.Class)" resolve="getComponent" />
<node concept="3VsKOn" id="2BYLcdcOF5v" role="37wK5m">
<ref role="3VsUkX" to="wvnl:~EditorExtensionRegistry" resolve="EditorExtensionRegistry" />
</node>
Expand All @@ -1039,7 +1100,7 @@
<ref role="3cqZAo" node="2WlJ6VKPQi6" resolve="myIdeaProject" />
</node>
<node concept="liA8E" id="2BYLcdcOVTA" role="2OqNvi">
<ref role="37wK5l" to="1m72:~ComponentManager.getComponent(java.lang.Class)" resolve="getComponent" />
<ref role="37wK5l" to="z1c3:~Project.getComponent(java.lang.Class)" resolve="getComponent" />
<node concept="3VsKOn" id="2BYLcdcOVTB" role="37wK5m">
<ref role="3VsUkX" to="wvnl:~EditorExtensionRegistry" resolve="EditorExtensionRegistry" />
</node>
Expand Down
Loading

0 comments on commit bcab7dd

Please sign in to comment.