Merge pull request #1051 from IETS3/bugfix/align20222

Get all relevant changes from 2022.3 to 2022.2

Author: arimer

CHANGELOG.md

@@ -7,10 +7,14 @@ The project does _not_ follow Semantic Versioning and the changes are documented
 
 ## August 2024
 
-### Fixed
+### Added
 
-- TraceExplorer can decorate editors of lambda nodes with their values. 
+- The name of the unitless unit can now be customized through the `PhysUnitLangConfig` extension point.
+
+### Fixed
 
+- The performance of error type propagation (especially in relation to type tags) was improved.
+- TraceExplorer can decorate editors of lambda nodes with their values.
 ## July 2024
 
 ### Added

code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/typesystem.mps

@@ -631,10 +631,24 @@
                     </node>
                   </node>
                 </node>
-                <node concept="3y3z36" id="7Wtc_Q2kU3O" role="3clFbw">
-                  <node concept="10Nm6u" id="7Wtc_Q2kU3V" role="3uHU7w" />
-                  <node concept="37vLTw" id="7Wtc_Q2kTVq" role="3uHU7B">
-                    <ref role="3cqZAo" node="7Wtc_Q2kRy5" resolve="wrappedOpType" />
+                <node concept="1Wc70l" id="TrLxV$B918" role="3clFbw">
+                  <node concept="3fqX7Q" id="TrLxV$BBr0" role="3uHU7w">
+                    <node concept="2OqwBi" id="TrLxV$BBr2" role="3fr31v">
+                      <node concept="37vLTw" id="TrLxV$BBr3" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7Wtc_Q2kRy5" resolve="wrappedOpType" />
+                      </node>
+                      <node concept="1mIQ4w" id="TrLxV$BBr4" role="2OqNvi">
+                        <node concept="chp4Y" id="TrLxV$BBr5" role="cj9EA">
+                          <ref role="cht4Q" to="tpd4:hfSilrT" resolve="RuntimeErrorType" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3y3z36" id="7Wtc_Q2kU3O" role="3uHU7B">
+                    <node concept="37vLTw" id="7Wtc_Q2kTVq" role="3uHU7B">
+                      <ref role="3cqZAo" node="7Wtc_Q2kRy5" resolve="wrappedOpType" />
+                    </node>
+                    <node concept="10Nm6u" id="7Wtc_Q2kU3V" role="3uHU7w" />
                   </node>
                 </node>
                 <node concept="9aQIb" id="7Wtc_Q2kUlm" role="9aQIa">
@@ -827,6 +841,38 @@
                           </node>
                           <node concept="9aQIb" id="5ya_dKpNFdb" role="9aQIa">
                             <node concept="3clFbS" id="5ya_dKpNFdc" role="9aQI4">
+                              <node concept="3clFbJ" id="TrLxV$GKl$" role="3cqZAp">
+                                <node concept="3clFbS" id="TrLxV$GKlA" role="3clFbx">
+                                  <node concept="2MkqsV" id="TrLxV$GKEm" role="3cqZAp">
+                                    <node concept="2OqwBi" id="TrLxV$GLgY" role="2MkJ7o">
+                                      <node concept="1PxgMI" id="TrLxV$GL0Z" role="2Oq$k0">
+                                        <node concept="chp4Y" id="TrLxV$GL1r" role="3oSUPX">
+                                          <ref role="cht4Q" to="tpd4:hfSilrT" resolve="RuntimeErrorType" />
+                                        </node>
+                                        <node concept="37vLTw" id="TrLxV$GKEy" role="1m5AlR">
+                                          <ref role="3cqZAo" node="6Mx2TmozGCe" resolve="operationType" />
+                                        </node>
+                                      </node>
+                                      <node concept="3TrcHB" id="TrLxV$GLD1" role="2OqNvi">
+                                        <ref role="3TsBF5" to="tpd4:hfSilrU" resolve="errorText" />
+                                      </node>
+                                    </node>
+                                    <node concept="1YBJjd" id="TrLxV$GLGl" role="1urrMF">
+                                      <ref role="1YBMHb" node="4rZeNQ6PB0M" resolve="be" />
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="2OqwBi" id="TrLxV$GKur" role="3clFbw">
+                                  <node concept="37vLTw" id="TrLxV$GKlJ" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="6Mx2TmozGCe" resolve="operationType" />
+                                  </node>
+                                  <node concept="1mIQ4w" id="TrLxV$GKAL" role="2OqNvi">
+                                    <node concept="chp4Y" id="TrLxV$GKCJ" role="cj9EA">
+                                      <ref role="cht4Q" to="tpd4:hfSilrT" resolve="RuntimeErrorType" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
                               <node concept="1Z5TYs" id="4rZeNQ6PBmp" role="3cqZAp">
                                 <node concept="mw_s8" id="4rZeNQ6PBmL" role="1ZfhKB">
                                   <node concept="37vLTw" id="3f3yNhCQlpZ" role="mwGJk">
@@ -3495,6 +3541,31 @@
                         </node>
                       </node>
                     </node>
+                    <node concept="Jncv_" id="4f0EPAKOOym" role="3cqZAp">
+                      <ref role="JncvD" to="tpd4:hfSilrT" resolve="RuntimeErrorType" />
+                      <node concept="37vLTw" id="4f0EPAKOZtu" role="JncvB">
+                        <ref role="3cqZAo" node="6KhzXd8iOxU" resolve="r" />
+                      </node>
+                      <node concept="3clFbS" id="4f0EPAKOOyq" role="Jncv$">
+                        <node concept="2MkqsV" id="4f0EPAKP3GE" role="3cqZAp">
+                          <node concept="37vLTw" id="4f0EPAKPaat" role="1urrMF">
+                            <ref role="3cqZAo" node="12WRc28WHKr" resolve="toBeTypedNode" />
+                          </node>
+                          <node concept="2OqwBi" id="4f0EPAKP8ff" role="2MkJ7o">
+                            <node concept="Jnkvi" id="4f0EPAKP7Uc" role="2Oq$k0">
+                              <ref role="1M0zk5" node="4f0EPAKOOys" resolve="errorType" />
+                            </node>
+                            <node concept="3TrcHB" id="4f0EPAKP9mS" role="2OqNvi">
+                              <ref role="3TsBF5" to="tpd4:hfSilrU" resolve="errorText" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="JncvC" id="4f0EPAKOOys" role="JncvA">
+                        <property role="TrG5h" value="errorType" />
+                        <node concept="2jxLKc" id="4f0EPAKOOyt" role="1tU5fm" />
+                      </node>
+                    </node>
                     <node concept="1Z5TYs" id="6KhzXd8iOXW" role="3cqZAp">
                       <node concept="mw_s8" id="6KhzXd8iOZy" role="1ZfhKB">
                         <node concept="37vLTw" id="6KhzXd8iOZw" role="mwGJk">
@@ -6831,6 +6902,10 @@
             </node>
           </node>
         </node>
+        <node concept="2X1qdy" id="46cplYwOkUY" role="2X0Ygz">
+          <property role="TrG5h" value="sub" />
+          <node concept="2jxLKc" id="46cplYwOkUZ" role="1tU5fm" />
+        </node>
         <node concept="1Z2H0r" id="46cplYwOl9S" role="nvjzm">
           <node concept="2OqwBi" id="46cplYwOlam" role="1Z2MuG">
             <node concept="1YBJjd" id="5P6itWnRcUe" role="2Oq$k0">
@@ -6841,10 +6916,6 @@
             </node>
           </node>
         </node>
-        <node concept="2X1qdy" id="46cplYwOkUY" role="2X0Ygz">
-          <property role="TrG5h" value="sub" />
-          <node concept="2jxLKc" id="46cplYwOkUZ" role="1tU5fm" />
-        </node>
       </node>
     </node>
     <node concept="1YaCAy" id="5aHkq2w4PM6" role="1YuTPh">

code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/org.iets3.core.expr.base.mpl

@@ -36,6 +36,7 @@
     <language slang="l:1fc20ffe-f35b-4791-a0b7-d706bad5c49a:com.mbeddr.mpsutil.refactoring" version="0" />
     <language slang="l:1919c723-b60b-4592-9318-9ce96d91da44:de.itemis.mps.editor.celllayout" version="0" />
     <language slang="l:b8bb702e-43ed-4090-a902-d180d3e5f292:de.slisson.mps.conditionalEditor" version="0" />
+    <language slang="l:654422bf-e75f-44dc-936d-188890a746ce:de.slisson.mps.reflection" version="0" />
     <language slang="l:52733268-be24-4f5f-ab84-a73b7c0c03b0:de.slisson.mps.richtext.customcell" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />

code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.base/org.iets3.core.expr.genjava.base.mpl

@@ -54,7 +54,6 @@
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
         <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-        <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
         <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />

code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.contracts/org.iets3.core.expr.genjava.contracts.mpl

@@ -43,7 +43,6 @@
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
         <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-        <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
         <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />

code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.data/org.iets3.core.expr.genjava.data.mpl

@@ -45,7 +45,6 @@
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
         <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-        <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
         <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />

code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.datetime/org.iets3.core.expr.genjava.datetime.mpl

@@ -49,7 +49,6 @@
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
         <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-        <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
         <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />

code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.simpleTypes/org.iets3.core.expr.genjava.simpleTypes.mpl

@@ -50,7 +50,6 @@
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
         <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-        <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
         <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />

code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.temporal/org.iets3.core.expr.genjava.temporal.mpl

@@ -53,7 +53,6 @@
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
         <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-        <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
         <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />

code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.tests/org.iets3.core.expr.genjava.tests.mpl

@@ -50,7 +50,6 @@
         <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
         <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
-        <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
         <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />