Merge pull request #1120 from JetBrains/merge/master

Merge maintenance/mps20243 into master
JetBrains · Jan 9, 2025 · d6a58f9 · d6a58f9
2 parents 801cd0f + ab014ab
commit d6a58f9
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 12 deletions.
diff --git a/....itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/plugin.mps b/....itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/plugin.mps
@@ -4466,13 +4466,22 @@
               <ref role="3uigEE" to="z60i:~Color" resolve="Color" />
             </node>
             <node concept="2OqwBi" id="5CBfeKkID_D" role="33vP2m">
-              <node concept="2YIFZM" id="5CBfeKkICS5" role="2Oq$k0">
-                <ref role="37wK5l" to="hox0:~StyleRegistry.getInstance()" resolve="getInstance" />
-                <ref role="1Pybhc" to="hox0:~StyleRegistry" resolve="StyleRegistry" />
-              </node>
               <node concept="liA8E" id="5CBfeKkIEHk" role="2OqNvi">
                 <ref role="37wK5l" to="hox0:~StyleRegistry.getEditorBackground()" resolve="getEditorBackground" />
               </node>
+              <node concept="2OqwBi" id="6SqTcxhYYFX" role="2Oq$k0">
+                <node concept="2OqwBi" id="6SqTcxhYTbv" role="2Oq$k0">
+                  <node concept="37vLTw" id="6SqTcxhYRnd" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5CBfeKl7WTx" resolve="cell" />
+                  </node>
+                  <node concept="liA8E" id="6SqTcxhYX2n" role="2OqNvi">
+                    <ref role="37wK5l" to="f4zo:~EditorCell.getEditorComponent()" resolve="getEditorComponent" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="6SqTcxhZ2Bs" role="2OqNvi">
+                  <ref role="37wK5l" to="cj4x:~EditorComponent.getStyleRegistry()" resolve="getStyleRegistry" />
+                </node>
+              </node>
             </node>
           </node>
         </node>

diff --git a/...temis.mps.editor.pagination.runtime/models/de.itemis.mps.editor.pagination.runtime.ui.mps b/...temis.mps.editor.pagination.runtime/models/de.itemis.mps.editor.pagination.runtime.ui.mps
@@ -1445,13 +1445,22 @@
                             <ref role="37wK5l" to="lzb2:~ColorUtil.mix(java.awt.Color,java.awt.Color,double)" resolve="mix" />
                             <ref role="1Pybhc" to="lzb2:~ColorUtil" resolve="ColorUtil" />
                             <node concept="2OqwBi" id="2mFBf1FJbuC" role="37wK5m">
-                              <node concept="2YIFZM" id="2mFBf1FJall" role="2Oq$k0">
-                                <ref role="37wK5l" to="hox0:~StyleRegistry.getInstance()" resolve="getInstance" />
-                                <ref role="1Pybhc" to="hox0:~StyleRegistry" resolve="StyleRegistry" />
-                              </node>
                               <node concept="liA8E" id="2mFBf1FJcDr" role="2OqNvi">
                                 <ref role="37wK5l" to="hox0:~StyleRegistry.getEditorBackground()" resolve="getEditorBackground" />
                               </node>
+                              <node concept="2OqwBi" id="6SqTcxhZAkL" role="2Oq$k0">
+                                <node concept="2OqwBi" id="6SqTcxhZzBF" role="2Oq$k0">
+                                  <node concept="37vLTw" id="6SqTcxhZy$d" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="1wtMaD$hD8" resolve="myContext" />
+                                  </node>
+                                  <node concept="liA8E" id="6SqTcxhZ_zC" role="2OqNvi">
+                                    <ref role="37wK5l" to="cj4x:~EditorContext.getEditorComponent()" resolve="getEditorComponent" />
+                                  </node>
+                                </node>
+                                <node concept="liA8E" id="6SqTcxhZBHZ" role="2OqNvi">
+                                  <ref role="37wK5l" to="cj4x:~EditorComponent.getStyleRegistry()" resolve="getStyleRegistry" />
+                                </node>
+                              </node>
                             </node>
                             <node concept="10M0yZ" id="2mFBf1FJgg2" role="37wK5m">
                               <ref role="3cqZAo" to="lzb2:~DarculaColors.RED" resolve="RED" />

diff --git a/...es/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps b/...es/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps
@@ -9378,13 +9378,17 @@
                         <node concept="liA8E" id="1oWwpQE9jla" role="2OqNvi">
                           <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
                           <node concept="2OqwBi" id="2fUANpqbWX0" role="37wK5m">
-                            <node concept="2YIFZM" id="2fUANpqbUXE" role="2Oq$k0">
-                              <ref role="37wK5l" to="hox0:~StyleRegistry.getInstance()" resolve="getInstance" />
-                              <ref role="1Pybhc" to="hox0:~StyleRegistry" resolve="StyleRegistry" />
-                            </node>
                             <node concept="liA8E" id="2fUANpqc2Yr" role="2OqNvi">
                               <ref role="37wK5l" to="hox0:~StyleRegistry.getEditorBackground()" resolve="getEditorBackground" />
                             </node>
+                            <node concept="2OqwBi" id="6SqTcxhWFkj" role="2Oq$k0">
+                              <node concept="37vLTw" id="6SqTcxhWtkz" role="2Oq$k0">
+                                <ref role="3cqZAo" node="5prQSJ52grS" resolve="comp" />
+                              </node>
+                              <node concept="liA8E" id="6SqTcxhWMkP" role="2OqNvi">
+                                <ref role="37wK5l" to="exr9:~EditorComponent.getStyleRegistry()" resolve="getStyleRegistry" />
+                              </node>
+                            </node>
                           </node>
                         </node>
                       </node>