Skip to content

Commit

Permalink
Merge pull request #991 from IETS3/merge/mps20222
Browse files Browse the repository at this point in the history 
Merge maintenance/mps20222 into maintenance/mps20223
  • Loading branch information
@arimer
arimer authored Jun 24, 2024
2 parents 73783aa + f50312e commit dc6a534
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 3 deletions.
13 changes: 10 additions & 3 deletions code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<use id="b1ab8c10-c118-4755-bf2a-cebab35cf533" name="jetbrains.mps.lang.editor.tooltips" version="0" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
<use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
<use id="654422bf-e75f-44dc-936d-188890a746ce" name="de.slisson.mps.reflection" version="0" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
</languages>
<imports>
Expand Down Expand Up @@ -42,6 +43,8 @@
<import index="q4oi" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.cellActions(MPS.Editor/)" />
<import index="av1m" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.menus.style(MPS.Editor/)" />
<import index="fulz" ref="r:6f792c44-2a5d-40e8-9f05-33f7d4ae26ec(jetbrains.mps.editor.runtime.completion)" />
<import index="uddc" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.menus.transformation(MPS.Editor/)" />
<import index="u59o" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.menus.transformation(MPS.Editor/)" />
<import index="gdgh" ref="r:e4d9478b-ae0e-416e-be60-73d136571015(org.iets3.core.base.behavior)" implicit="true" />
<import index="vs0r" ref="r:f7764ca4-8c75-4049-922b-08516400a727(com.mbeddr.core.base.structure)" implicit="true" />
<import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
Expand Down Expand Up @@ -101,6 +104,7 @@
<concept id="1237307900041" name="jetbrains.mps.lang.editor.structure.IndentLayoutIndentStyleClassItem" flags="ln" index="lj46D" />
<concept id="784421273959492578" name="jetbrains.mps.lang.editor.structure.TransformationMenuPart_IncludeMenu" flags="ng" index="mvV$s">
<child id="784421273959492606" name="nodeFunction" index="mvV$0" />
<child id="6718020819487784677" name="menuReference" index="A14EM" />
</concept>
<concept id="784421273959493166" name="jetbrains.mps.lang.editor.structure.QueryFunction_TransformationMenu_TargetNode" flags="ig" index="mvVNg" />
<concept id="1142886221719" name="jetbrains.mps.lang.editor.structure.QueryFunction_NodeCondition" flags="in" index="pkWqt" />
Expand Down Expand Up @@ -139,7 +143,6 @@
<child id="1638911550608610281" name="executeFunction" index="IWgqQ" />
<child id="5692353713941573325" name="textFunction" index="1hCUd6" />
</concept>
<concept id="8449131619432941427" name="jetbrains.mps.lang.editor.structure.TransformationMenuPart_Super" flags="ng" index="L$LW2" />
<concept id="1160493135005" name="jetbrains.mps.lang.editor.structure.CellMenuPart_PropertyValues_GetValues" flags="in" index="MLZmj" />
<concept id="1164824717996" name="jetbrains.mps.lang.editor.structure.CellMenuDescriptor" flags="ng" index="OXEIz">
<child id="1164824815888" name="cellMenuPart" index="OY2wv" />
Expand Down Expand Up @@ -6949,11 +6952,15 @@
</node>
</node>
</node>
<node concept="22hDWj" id="uuJ7IpZtt1" role="22hAXT" />
<node concept="1Qtc8_" id="1Va40GREEjv" role="IW6Ez">
<node concept="3eGOoe" id="1Va40GREEq3" role="1Qtc8$" />
<node concept="L$LW2" id="1Va40GS0Bif" role="1Qtc8A" />
<node concept="mvV$s" id="1b$B7Ao25mP" role="1Qtc8A">
<node concept="A1WHr" id="1b$B7Ao25vq" role="A14EM">
<ref role="2ZyFGn" to="tpck:gw2VY9q" resolve="BaseConcept" />
</node>
</node>
</node>
<node concept="22hDWj" id="uuJ7IpZtt1" role="22hAXT" />
</node>
<node concept="22mcaB" id="2gD$V1Yh9AA">
<ref role="aqKnT" to="hm2y:6BCTLIjCra2" resolve="IControlAdvancedFeatures_old" />
Expand Down
51 changes: 51 additions & 0 deletions ...3.core.expr.typetags.physunits/models/org.iets3.core.expr.typetags.physunits.behavior.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1972,6 +1972,24 @@
</node>
</node>
</node>
<node concept="13i0hz" id="7JDqwWRX00k" role="13h7CS">
<property role="TrG5h" value="quantity" />
<ref role="13i0hy" node="7JDqwWRWT0R" resolve="quantity" />
<node concept="3Tm1VV" id="7JDqwWRX00l" role="1B3o_S" />
<node concept="3clFbS" id="7JDqwWRX00o" role="3clF47">
<node concept="3clFbF" id="7JDqwWRX0F2" role="3cqZAp">
<node concept="2OqwBi" id="7JDqwWRX15j" role="3clFbG">
<node concept="13iPFW" id="7JDqwWRX0F1" role="2Oq$k0" />
<node concept="3TrEf2" id="7JDqwWRX23A" role="2OqNvi">
<ref role="3Tt5mk" to="i3ya:1KUmgSFpwWq" resolve="quantity" />
</node>
</node>
</node>
</node>
<node concept="3Tqbb2" id="7JDqwWRX00p" role="3clF45">
<ref role="ehGHo" to="i3ya:1KUmgSFpwWn" resolve="Quantity" />
</node>
</node>
</node>
<node concept="13h7C7" id="6Mx2Tmonp$n">
<property role="3GE5qa" value="definition.unit" />
Expand Down Expand Up @@ -11768,6 +11786,16 @@
</node>
<node concept="3clFbS" id="1KUmgSF_6QS" role="3clF47" />
</node>
<node concept="13i0hz" id="7JDqwWRWT0R" role="13h7CS">
<property role="13i0iv" value="true" />
<property role="13i0it" value="true" />
<property role="TrG5h" value="quantity" />
<node concept="3Tm1VV" id="7JDqwWRWT0S" role="1B3o_S" />
<node concept="3Tqbb2" id="7JDqwWRWYh5" role="3clF45">
<ref role="ehGHo" to="i3ya:1KUmgSFpwWn" resolve="Quantity" />
</node>
<node concept="3clFbS" id="7JDqwWRWT0U" role="3clF47" />
</node>
</node>
<node concept="13h7C7" id="7SygLIkQlVh">
<property role="3GE5qa" value="interfaces" />
Expand Down Expand Up @@ -16861,6 +16889,29 @@
</node>
</node>
</node>
<node concept="3clFbF" id="7JDqwWRWD0e" role="3cqZAp">
<node concept="1rXfSq" id="7JDqwWRWD0f" role="3clFbG">
<ref role="37wK5l" to="33ny:~HashMap.put(java.lang.Object,java.lang.Object)" resolve="put" />
<node concept="Xl_RD" id="7JDqwWRWD0g" role="37wK5m">
<property role="Xl_RC" value="µ" />
</node>
<node concept="2ry78W" id="7JDqwWRWD0h" role="37wK5m">
<ref role="2ryb1Q" node="7i1yFLlKmzB" resolve="DecimalMetricUnitPrefix" />
<node concept="2r$n1x" id="7JDqwWRWD0i" role="2r_Bvh">
<ref role="2r$qp6" node="2hbaSyB0ITt" resolve="name" />
<node concept="Xl_RD" id="7JDqwWRWD0j" role="2r_lH1">
<property role="Xl_RC" value="micro" />
</node>
</node>
<node concept="2r$n1x" id="7JDqwWRWD0k" role="2r_Bvh">
<ref role="2r$qp6" node="2hbaSyB0ITv" resolve="factor" />
<node concept="3cmrfG" id="7JDqwWRWD0l" role="2r_lH1">
<property role="3cmrfH" value="-6" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="6RONOaU6swF" role="3cqZAp">
<node concept="1rXfSq" id="6RONOaU6swG" role="3clFbG">
<ref role="37wK5l" to="33ny:~HashMap.put(java.lang.Object,java.lang.Object)" resolve="put" />
Expand Down

0 comments on commit dc6a534

Please sign in to comment.