From c8549597a9c8b3077b2399a885eae869e9961ce9 Mon Sep 17 00:00:00 2001
From: Artem Tikhomirov <tikhomirov.artem@gmail.com>
Date: Wed, 14 Aug 2024 15:52:52 +0300
Subject: [PATCH] hacks.editor: EditorExtensionRegistry is now CC

to access IDEA's Component and MPS CoreComponent in uniform way, use MPSProject.getComponent()
---
 .../models/de/slisson/mps/hacks/editor.mps    | 95 +++++++++++++++----
 .../de/itemis/mps/tooltips/runtime/plugin.mps | 27 ------
 2 files changed, 78 insertions(+), 44 deletions(-)

diff --git a/code/hacks/solutions/de.slisson.mps.hacks.editor/models/de/slisson/mps/hacks/editor.mps b/code/hacks/solutions/de.slisson.mps.hacks.editor/models/de/slisson/mps/hacks/editor.mps
index 330fe1084..cbbf60074 100644
--- a/code/hacks/solutions/de.slisson.mps.hacks.editor/models/de/slisson/mps/hacks/editor.mps
+++ b/code/hacks/solutions/de.slisson.mps.hacks.editor/models/de/slisson/mps/hacks/editor.mps
@@ -847,10 +847,10 @@
     <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" />
@@ -858,14 +858,14 @@
       <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>
@@ -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>
@@ -999,12 +999,73 @@
     <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">
@@ -1012,7 +1073,7 @@
                 <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>
@@ -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>
diff --git a/code/tooltips/solutions/de.itemis.mps.tooltips.runtime/models/de/itemis/mps/tooltips/runtime/plugin.mps b/code/tooltips/solutions/de.itemis.mps.tooltips.runtime/models/de/itemis/mps/tooltips/runtime/plugin.mps
index b382be0af..2e580da51 100644
--- a/code/tooltips/solutions/de.itemis.mps.tooltips.runtime/models/de/itemis/mps/tooltips/runtime/plugin.mps
+++ b/code/tooltips/solutions/de.itemis.mps.tooltips.runtime/models/de/itemis/mps/tooltips/runtime/plugin.mps
@@ -51,9 +51,6 @@
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
-      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
-        <child id="1068431790190" name="initializer" index="33vP2m" />
-      </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
@@ -80,10 +77,6 @@
       <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
-      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
-        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
-      </concept>
-      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
@@ -133,13 +126,6 @@
   <node concept="2DaZZR" id="2vJRo8g$$xe" />
   <node concept="2uRRBy" id="2vJRo8g$$xf">
     <property role="TrG5h" value="ProjectPlugin" />
-    <node concept="2BZ0e9" id="2vJRo8g$$xg" role="2uRRBA">
-      <property role="TrG5h" value="myConnection" />
-      <node concept="3Tm6S6" id="2vJRo8g$$xh" role="1B3o_S" />
-      <node concept="3uibUv" id="2vJRo8g$$xi" role="1tU5fm">
-        <ref role="3uigEE" to="4b2m:~MessageBusConnection" resolve="MessageBusConnection" />
-      </node>
-    </node>
     <node concept="2BZ0e9" id="5VSAssGMyfR" role="2uRRBA">
       <property role="TrG5h" value="myCreateListener" />
       <node concept="3Tm6S6" id="5VSAssGMyfS" role="1B3o_S" />
@@ -149,19 +135,6 @@
     </node>
     <node concept="2uRRBT" id="2vJRo8g$$xj" role="2uRRB$">
       <node concept="3clFbS" id="2vJRo8g$$xk" role="2VODD2">
-        <node concept="3cpWs8" id="2vJRo8g$$xl" role="3cqZAp">
-          <node concept="3cpWsn" id="2vJRo8g$$xm" role="3cpWs9">
-            <property role="TrG5h" value="ideaProject" />
-            <node concept="3uibUv" id="2vJRo8g$$xn" role="1tU5fm">
-              <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
-            </node>
-            <node concept="2YIFZM" id="2vJRo8g$$xo" role="33vP2m">
-              <ref role="37wK5l" to="alof:~ProjectHelper.toIdeaProject(jetbrains.mps.project.Project)" resolve="toIdeaProject" />
-              <ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
-              <node concept="1KvdUw" id="2vJRo8g$$xp" role="37wK5m" />
-            </node>
-          </node>
-        </node>
         <node concept="3clFbH" id="5VSAssGMnPV" role="3cqZAp" />
         <node concept="3clFbF" id="5VSAssGMySi" role="3cqZAp">
           <node concept="37vLTI" id="5VSAssGMz1G" role="3clFbG">