Skip to content

Commit

Permalink
Merge pull request #858 from IETS3/merge/mps20213
Browse files Browse the repository at this point in the history 
Merge/mps20213
  • Loading branch information
@arimer
arimer authored Mar 19, 2024
2 parents 46224c6 + c999e79 commit b8f891b
Show file tree
Hide file tree
Showing 35 changed files with 1,931 additions and 1,100 deletions.
40 changes: 30 additions & 10 deletions code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/editor.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<imports>
<import index="l80j" ref="r:9e71c0de-f9ab-4b67-96cc-7d9c857513f6(org.iets3.analysis.base.structure)" />
<import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
<import index="lzb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui(MPS.IDEA/)" />
</imports>
<registry>
<language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
Expand Down Expand Up @@ -275,17 +276,36 @@
<node concept="3ZlJ5R" id="WieAE6Vwpv" role="VblUZ">
<node concept="3clFbS" id="WieAE6Vwpw" role="2VODD2">
<node concept="3cpWs6" id="1LoQHJHx1Sh" role="3cqZAp">
<node concept="2ShNRf" id="WieAE6Vwqq" role="3cqZAk">
<node concept="1pGfFk" id="WieAE6Vz$8" role="2ShVmc">
<ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
<node concept="3cmrfG" id="WieAE6Vz_i" role="37wK5m">
<property role="3cmrfH" value="240" />
</node>
<node concept="3cmrfG" id="WieAE6VzB_" role="37wK5m">
<property role="3cmrfH" value="250" />
<node concept="2ShNRf" id="2GzLOsT9A24" role="3cqZAk">
<node concept="1pGfFk" id="2GzLOsT9POZ" role="2ShVmc">
<ref role="37wK5l" to="lzb2:~JBColor.&lt;init&gt;(java.awt.Color,java.awt.Color)" resolve="JBColor" />
<node concept="2ShNRf" id="WieAE6Vwqq" role="37wK5m">
<node concept="1pGfFk" id="WieAE6Vz$8" role="2ShVmc">
<ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
<node concept="3cmrfG" id="WieAE6Vz_i" role="37wK5m">
<property role="3cmrfH" value="240" />
</node>
<node concept="3cmrfG" id="WieAE6VzB_" role="37wK5m">
<property role="3cmrfH" value="250" />
</node>
<node concept="3cmrfG" id="WieAE6VzGw" role="37wK5m">
<property role="3cmrfH" value="250" />
</node>
</node>
</node>
<node concept="3cmrfG" id="WieAE6VzGw" role="37wK5m">
<property role="3cmrfH" value="250" />
<node concept="2ShNRf" id="2GzLOsT9PYQ" role="37wK5m">
<node concept="1pGfFk" id="2GzLOsT9Qtf" role="2ShVmc">
<ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
<node concept="3cmrfG" id="2GzLOsT9Qz9" role="37wK5m">
<property role="3cmrfH" value="10" />
</node>
<node concept="3cmrfG" id="2GzLOsT9QEk" role="37wK5m">
<property role="3cmrfH" value="0" />
</node>
<node concept="3cmrfG" id="2GzLOsT9QPt" role="37wK5m">
<property role="3cmrfH" value="0" />
</node>
</node>
</node>
</node>
</node>
Expand Down
38 changes: 29 additions & 9 deletions code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/behavior.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
<import index="zn9m" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.util(MPS.IDEA/)" />
<import index="zf81" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.net(JDK/)" />
<import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
<import index="lzb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui(MPS.IDEA/)" />
<import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
<import index="19m5" ref="r:854255a4-0f76-4555-8c94-d91e2ad4eb02(org.iets3.core.expr.statemachines.structure)" implicit="true" />
</imports>
Expand Down Expand Up @@ -2753,21 +2754,40 @@
<property role="TrG5h" value="characteristicColor" />
<node concept="3Tm1VV" id="6$fTUGAuTlS" role="1B3o_S" />
<node concept="3uibUv" id="6$fTUGAuTlT" role="3clF45">
<ref role="3uigEE" to="z60i:~Color" resolve="Color" />
<ref role="3uigEE" to="lzb2:~JBColor" resolve="JBColor" />
</node>
<node concept="3clFbS" id="6$fTUGAuTlU" role="3clF47">
<node concept="3clFbF" id="6$fTUGAuYX9" role="3cqZAp">
<node concept="2ShNRf" id="7Atos1xLApp" role="3clFbG">
<node concept="1pGfFk" id="7Atos1xLApo" role="2ShVmc">
<ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
<node concept="3cmrfG" id="7Atos1xLApO" role="37wK5m">
<property role="3cmrfH" value="210" />
</node>
<node concept="3cmrfG" id="7Atos1xLA$B" role="37wK5m">
<property role="3cmrfH" value="210" />
<ref role="37wK5l" to="lzb2:~JBColor.&lt;init&gt;(java.awt.Color,java.awt.Color)" resolve="JBColor" />
<node concept="2ShNRf" id="2GzLOsT9SNg" role="37wK5m">
<node concept="1pGfFk" id="2GzLOsT9TG8" role="2ShVmc">
<ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
<node concept="3cmrfG" id="7Atos1xLApO" role="37wK5m">
<property role="3cmrfH" value="210" />
</node>
<node concept="3cmrfG" id="7Atos1xLA$B" role="37wK5m">
<property role="3cmrfH" value="210" />
</node>
<node concept="3cmrfG" id="7Atos1xLAEm" role="37wK5m">
<property role="3cmrfH" value="210" />
</node>
</node>
</node>
<node concept="3cmrfG" id="7Atos1xLAEm" role="37wK5m">
<property role="3cmrfH" value="210" />
<node concept="2ShNRf" id="2GzLOsT9TO7" role="37wK5m">
<node concept="1pGfFk" id="2GzLOsT9UEU" role="2ShVmc">
<ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
<node concept="3cmrfG" id="2GzLOsT9UGs" role="37wK5m">
<property role="3cmrfH" value="210" />
</node>
<node concept="3cmrfG" id="2GzLOsT9UJN" role="37wK5m">
<property role="3cmrfH" value="210" />
</node>
<node concept="3cmrfG" id="2GzLOsT9UNn" role="37wK5m">
<property role="3cmrfH" value="210" />
</node>
</node>
</node>
</node>
</node>
Expand Down
128 changes: 84 additions & 44 deletions code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/editor.mps
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<model ref="r:04f1cb74-fc0c-4bf2-94b8-b7470b9d8339(org.iets3.components.core.editor)">
<persistence version="9" />
<attribute name="doNotGenerate" value="false" />
<languages>
<use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
<use id="9d69e719-78c8-4286-90db-fb19c107d049" name="com.mbeddr.mpsutil.grammarcells" version="2" />
Expand Down Expand Up @@ -52,6 +53,7 @@
<import index="zf81" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.net(JDK/)" />
<import index="zn9m" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.util(MPS.IDEA/)" />
<import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
<import index="lzb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui(MPS.IDEA/)" />
<import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" implicit="true" />
<import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
<import index="itrz" ref="r:80fb0853-eb3b-4e84-aebd-cc7fdb011d97(org.iets3.core.base.editor)" implicit="true" />
Expand Down Expand Up @@ -1417,16 +1419,35 @@
<node concept="3clFbS" id="2Df8LH1ei$3" role="2VODD2">
<node concept="3clFbF" id="2Df8LH1ei$Z" role="3cqZAp">
<node concept="2ShNRf" id="2Df8LH1ei$X" role="3clFbG">
<node concept="1pGfFk" id="2Df8LH1ej4K" role="2ShVmc">
<ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
<node concept="3cmrfG" id="2Df8LH1ej5U" role="37wK5m">
<property role="3cmrfH" value="29" />
</node>
<node concept="3cmrfG" id="2Df8LH1ej9M" role="37wK5m">
<property role="3cmrfH" value="116" />
<node concept="1pGfFk" id="2GzLOsTeMIC" role="2ShVmc">
<ref role="37wK5l" to="lzb2:~JBColor.&lt;init&gt;(java.awt.Color,java.awt.Color)" resolve="JBColor" />
<node concept="2ShNRf" id="2GzLOsTeMNk" role="37wK5m">
<node concept="1pGfFk" id="2Df8LH1ej4K" role="2ShVmc">
<ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
<node concept="3cmrfG" id="2Df8LH1ej5U" role="37wK5m">
<property role="3cmrfH" value="29" />
</node>
<node concept="3cmrfG" id="2Df8LH1ej9M" role="37wK5m">
<property role="3cmrfH" value="116" />
</node>
<node concept="3cmrfG" id="2Df8LH1ejiA" role="37wK5m">
<property role="3cmrfH" value="145" />
</node>
</node>
</node>
<node concept="3cmrfG" id="2Df8LH1ejiA" role="37wK5m">
<property role="3cmrfH" value="145" />
<node concept="2ShNRf" id="2GzLOsTeN0n" role="37wK5m">
<node concept="1pGfFk" id="2GzLOsTeN0m" role="2ShVmc">
<ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
<node concept="3cmrfG" id="2GzLOsTeN9Y" role="37wK5m">
<property role="3cmrfH" value="63" />
</node>
<node concept="3cmrfG" id="2GzLOsTeN_h" role="37wK5m">
<property role="3cmrfH" value="179" />
</node>
<node concept="3cmrfG" id="2GzLOsTeO8Q" role="37wK5m">
<property role="3cmrfH" value="217" />
</node>
</node>
</node>
</node>
</node>
Expand All @@ -1446,16 +1467,35 @@
<node concept="3clFbS" id="2Df8LH1kXkC" role="2VODD2">
<node concept="3clFbF" id="2Df8LH1kXkD" role="3cqZAp">
<node concept="2ShNRf" id="2Df8LH1kXkE" role="3clFbG">
<node concept="1pGfFk" id="2Df8LH1kXkF" role="2ShVmc">
<ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
<node concept="3cmrfG" id="2Df8LH1kXkG" role="37wK5m">
<property role="3cmrfH" value="145" />
</node>
<node concept="3cmrfG" id="2Df8LH1kXkH" role="37wK5m">
<property role="3cmrfH" value="136" />
<node concept="1pGfFk" id="2GzLOsTeRgV" role="2ShVmc">
<ref role="37wK5l" to="lzb2:~JBColor.&lt;init&gt;(java.awt.Color,java.awt.Color)" resolve="JBColor" />
<node concept="2ShNRf" id="2GzLOsTeRlX" role="37wK5m">
<node concept="1pGfFk" id="2Df8LH1kXkF" role="2ShVmc">
<ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
<node concept="3cmrfG" id="2Df8LH1kXkG" role="37wK5m">
<property role="3cmrfH" value="145" />
</node>
<node concept="3cmrfG" id="2Df8LH1kXkH" role="37wK5m">
<property role="3cmrfH" value="136" />
</node>
<node concept="3cmrfG" id="2Df8LH1kXkI" role="37wK5m">
<property role="3cmrfH" value="1" />
</node>
</node>
</node>
<node concept="3cmrfG" id="2Df8LH1kXkI" role="37wK5m">
<property role="3cmrfH" value="1" />
<node concept="2ShNRf" id="2GzLOsTeSQd" role="37wK5m">
<node concept="1pGfFk" id="2GzLOsTeTWi" role="2ShVmc">
<ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
<node concept="3cmrfG" id="2GzLOsTeUaH" role="37wK5m">
<property role="3cmrfH" value="254" />
</node>
<node concept="3cmrfG" id="2GzLOsTeUo3" role="37wK5m">
<property role="3cmrfH" value="237" />
</node>
<node concept="3cmrfG" id="2GzLOsTeUrD" role="37wK5m">
<property role="3cmrfH" value="1" />
</node>
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -8218,10 +8258,6 @@
</node>
<node concept="3clFbF" id="mIQkxg7PZU" role="3cqZAp">
<node concept="3K4zz7" id="mIQkxg7PZV" role="3clFbG">
<node concept="10M0yZ" id="mIQkxg7PZW" role="3K4GZi">
<ref role="1PxDUh" to="z60i:~Color" resolve="Color" />
<ref role="3cqZAo" to="z60i:~Color.darkGray" resolve="darkGray" />
</node>
<node concept="2OqwBi" id="7Atos1xSkJ6" role="3K4E3e">
<node concept="37vLTw" id="mIQkxg7PZX" role="2Oq$k0">
<ref role="3cqZAo" node="mIQkxg7PZL" resolve="cc" />
Expand All @@ -8236,6 +8272,10 @@
<ref role="3cqZAo" node="mIQkxg7PZL" resolve="cc" />
</node>
</node>
<node concept="10M0yZ" id="38mO9wfOBX9" role="3K4GZi">
<ref role="3cqZAo" to="lzb2:~JBColor.darkGray" resolve="darkGray" />
<ref role="1PxDUh" to="lzb2:~JBColor" resolve="JBColor" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -8444,13 +8484,13 @@
<node concept="1xnly_" id="7sZ012ggLBB" role="3K4Cdx">
<ref role="1xnlzC" node="7sZ012ggL_p" resolve="isInline" />
</node>
<node concept="10M0yZ" id="siw10FNCar" role="3K4GZi">
<ref role="1PxDUh" to="z60i:~Color" resolve="Color" />
<ref role="3cqZAo" to="z60i:~Color.gray" resolve="gray" />
<node concept="10M0yZ" id="38mO9wfOHok" role="3K4E3e">
<ref role="3cqZAo" to="lzb2:~JBColor.blue" resolve="blue" />
<ref role="1PxDUh" to="lzb2:~JBColor" resolve="JBColor" />
</node>
<node concept="10M0yZ" id="7sZ012ggM1f" role="3K4E3e">
<ref role="3cqZAo" to="z60i:~Color.blue" resolve="blue" />
<ref role="1PxDUh" to="z60i:~Color" resolve="Color" />
<node concept="10M0yZ" id="38mO9wfOHmM" role="3K4GZi">
<ref role="3cqZAo" to="lzb2:~JBColor.gray" resolve="gray" />
<ref role="1PxDUh" to="lzb2:~JBColor" resolve="JBColor" />
</node>
</node>
</node>
Expand Down Expand Up @@ -8545,13 +8585,13 @@
<node concept="3clFbS" id="x8tpS_trC$" role="3clFbx">
<node concept="3clFbF" id="x8tpS_tsfq" role="3cqZAp">
<node concept="37vLTI" id="x8tpS_tstt" role="3clFbG">
<node concept="10M0yZ" id="x8tpS_tsxh" role="37vLTx">
<ref role="1PxDUh" to="z60i:~Color" resolve="Color" />
<ref role="3cqZAo" to="z60i:~Color.BLACK" resolve="BLACK" />
</node>
<node concept="37vLTw" id="x8tpS_ttF$" role="37vLTJ">
<ref role="3cqZAo" node="x8tpS_ttu9" resolve="colorToUse" />
</node>
<node concept="10M0yZ" id="38mO9wfOQCO" role="37vLTx">
<ref role="3cqZAo" to="lzb2:~JBColor.black" resolve="black" />
<ref role="1PxDUh" to="lzb2:~JBColor" resolve="JBColor" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -8860,10 +8900,6 @@
</node>
<node concept="3clFbF" id="mIQkxg7Qnv" role="3cqZAp">
<node concept="3K4zz7" id="mIQkxg7Qnw" role="3clFbG">
<node concept="10M0yZ" id="mIQkxg7Qnx" role="3K4GZi">
<ref role="1PxDUh" to="z60i:~Color" resolve="Color" />
<ref role="3cqZAo" to="z60i:~Color.darkGray" resolve="darkGray" />
</node>
<node concept="2OqwBi" id="7nsgDAXRGpz" role="3K4E3e">
<node concept="37vLTw" id="mIQkxg7Qny" role="2Oq$k0">
<ref role="3cqZAo" node="mIQkxg7Qnm" resolve="cc" />
Expand All @@ -8878,6 +8914,10 @@
<ref role="3cqZAo" node="mIQkxg7Qnm" resolve="cc" />
</node>
</node>
<node concept="10M0yZ" id="38mO9wfOQk8" role="3K4GZi">
<ref role="3cqZAo" to="lzb2:~JBColor.darkGray" resolve="darkGray" />
<ref role="1PxDUh" to="lzb2:~JBColor" resolve="JBColor" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -9175,10 +9215,6 @@
</node>
<node concept="3clFbF" id="mIQkxg7P7Z" role="3cqZAp">
<node concept="3K4zz7" id="mIQkxg7Pja" role="3clFbG">
<node concept="10M0yZ" id="mIQkxg7Pt_" role="3K4GZi">
<ref role="3cqZAo" to="z60i:~Color.darkGray" resolve="darkGray" />
<ref role="1PxDUh" to="z60i:~Color" resolve="Color" />
</node>
<node concept="2OqwBi" id="7nsgDAXRFMy" role="3K4E3e">
<node concept="37vLTw" id="mIQkxg7Pos" role="2Oq$k0">
<ref role="3cqZAo" node="mIQkxg7P1s" resolve="cc" />
Expand All @@ -9193,6 +9229,10 @@
<ref role="3cqZAo" node="mIQkxg7P1s" resolve="cc" />
</node>
</node>
<node concept="10M0yZ" id="38mO9wfOPyd" role="3K4GZi">
<ref role="3cqZAo" to="lzb2:~JBColor.darkGray" resolve="darkGray" />
<ref role="1PxDUh" to="lzb2:~JBColor" resolve="JBColor" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -12347,10 +12387,6 @@
</node>
<node concept="3clFbF" id="1yY6_UjcdqC" role="3cqZAp">
<node concept="3K4zz7" id="1yY6_UjcdqD" role="3clFbG">
<node concept="10M0yZ" id="1yY6_UjcdqE" role="3K4GZi">
<ref role="3cqZAo" to="z60i:~Color.darkGray" resolve="darkGray" />
<ref role="1PxDUh" to="z60i:~Color" resolve="Color" />
</node>
<node concept="2OqwBi" id="1yY6_UjcdqF" role="3K4E3e">
<node concept="37vLTw" id="1yY6_UjcdqG" role="2Oq$k0">
<ref role="3cqZAo" node="1yY6_Ujcdqv" resolve="cc" />
Expand All @@ -12365,6 +12401,10 @@
<ref role="3cqZAo" node="1yY6_Ujcdqv" resolve="cc" />
</node>
</node>
<node concept="10M0yZ" id="38mO9wfOOyO" role="3K4GZi">
<ref role="3cqZAo" to="lzb2:~JBColor.darkGray" resolve="darkGray" />
<ref role="1PxDUh" to="lzb2:~JBColor" resolve="JBColor" />
</node>
</node>
</node>
</node>
Expand Down
Loading

0 comments on commit b8f891b

Please sign in to comment.