Merge pull request #1046 from IETS3/bugfix/unitless_customization

IETS3 · Aug 27, 2024 · 44eeca8 · 44eeca8
2 parents 7281ff7 + ad95b76
commit 44eeca8
Show file tree

Hide file tree

Showing 5 changed files with 157 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ The project does _not_ follow Semantic Versioning and the changes are documented
 
 ## August 2024
 
+### Added
+
+- The name of the unitless unit can now be customized through the `PhysUnitLangConfig` extension point.
+
 ### Fixed
 
 - TraceExplorer can decorate editors of lambda nodes with their values. 

diff --git a/...ore.expr.typetags.physunits/models/org.iets3.core.expr.typetags.physunits.constraints.mps b/...ore.expr.typetags.physunits/models/org.iets3.core.expr.typetags.physunits.constraints.mps
@@ -15,7 +15,13 @@
     <import index="hm2y" ref="r:66e07cb4-a4b0-4bf3-a36d-5e9ed1ff1bd3(org.iets3.core.expr.base.structure)" />
     <import index="i3ya" ref="r:4f64e2f0-6a4e-4db3-b3bf-7977f44949b6(org.iets3.core.expr.typetags.physunits.structure)" />
     <import index="rppw" ref="r:720d563d-1633-46b3-a98e-08d2fde4c4a8(org.iets3.core.expr.typetags.physunits.behavior)" />
+    <import index="65nr" ref="r:6e69e40f-b186-4866-917f-dbdef5b3c590(org.iets3.core.expr.typetags.physunits.plugin)" />
+    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
+    <import index="3a50" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide(MPS.Platform/)" />
+    <import index="wyuk" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.components(MPS.Core/)" />
+    <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
     <import index="vs0r" ref="r:f7764ca4-8c75-4049-922b-08516400a727(com.mbeddr.core.base.structure)" implicit="true" />
+    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
     <import index="hwgx" ref="r:fd2980c8-676c-4b19-b524-18c70e02f8b7(com.mbeddr.core.base.behavior)" implicit="true" />
     <import index="qlm2" ref="r:c0482758-b46b-48c3-8482-fa4a3115b53b(org.iets3.core.expr.typetags.behavior)" implicit="true" />
   </imports>
@@ -88,6 +94,9 @@
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
+      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
+        <reference id="1107535924139" name="classifier" index="3uigEE" />
+      </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
@@ -101,6 +110,10 @@
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
         <child id="8356039341262087992" name="line" index="1aUNEU" />
       </concept>
+      <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
+        <reference id="1116615189566" name="classifier" index="3VsUkX" />
+      </concept>
+      <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints">
       <concept id="6702802731807351367" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_CanBeAChild" flags="in" index="9S07l" />
@@ -146,6 +159,10 @@
         <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
         <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
       </concept>
+      <concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
+      <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
+        <child id="1145404616321" name="leftExpression" index="2JrQYb" />
+      </concept>
       <concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
       <concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
         <reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
@@ -644,6 +661,105 @@
   <node concept="1M2fIO" id="1KUmgSFvSuo">
     <property role="3GE5qa" value="definition.unit" />
     <ref role="1M2myG" to="i3ya:7eOyx9r3jsZ" resolve="Unit" />
+    <node concept="EnEH3" id="3xwfj1iseUc" role="1MhHOB">
+      <ref role="EomxK" to="tpck:h0TrG11" resolve="name" />
+      <node concept="Eqf_E" id="3xwfj1ivqJx" role="EtsB7">
+        <node concept="3clFbS" id="3xwfj1ivqJy" role="2VODD2">
+          <node concept="3cpWs8" id="3xwfj1iDGp$" role="3cqZAp">
+            <node concept="3cpWsn" id="3xwfj1iDGp_" role="3cpWs9">
+              <property role="TrG5h" value="repository" />
+              <node concept="3uibUv" id="3xwfj1iDG7i" role="1tU5fm">
+                <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+              </node>
+              <node concept="2OqwBi" id="3xwfj1iDGpA" role="33vP2m">
+                <node concept="2JrnkZ" id="3xwfj1iDGpB" role="2Oq$k0">
+                  <node concept="2OqwBi" id="3xwfj1iDGpC" role="2JrQYb">
+                    <node concept="EsrRn" id="3xwfj1iDGpD" role="2Oq$k0" />
+                    <node concept="I4A8Y" id="3xwfj1iDGpE" role="2OqNvi" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="3xwfj1iDGpF" role="2OqNvi">
+                  <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbJ" id="3xwfj1iDGGE" role="3cqZAp">
+            <node concept="3clFbS" id="3xwfj1iDGGG" role="3clFbx">
+              <node concept="3clFbF" id="3xwfj1iDHcG" role="3cqZAp">
+                <node concept="37vLTI" id="3xwfj1iIHEZ" role="3clFbG">
+                  <node concept="37vLTw" id="3xwfj1iDHcE" role="37vLTJ">
+                    <ref role="3cqZAo" node="3xwfj1iDGp_" resolve="repository" />
+                  </node>
+                  <node concept="2OqwBi" id="4wvzrd4Fdye" role="37vLTx">
+                    <node concept="2OqwBi" id="4wvzrd4Fcgl" role="2Oq$k0">
+                      <node concept="2YIFZM" id="4wvzrd4FbSN" role="2Oq$k0">
+                        <ref role="37wK5l" to="3a50:~MPSCoreComponents.getInstance()" resolve="getInstance" />
+                        <ref role="1Pybhc" to="3a50:~MPSCoreComponents" resolve="MPSCoreComponents" />
+                      </node>
+                      <node concept="liA8E" id="4wvzrd4Fd3P" role="2OqNvi">
+                        <ref role="37wK5l" to="3a50:~MPSCoreComponents.getPlatform()" resolve="getPlatform" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="4wvzrd4Fe1R" role="2OqNvi">
+                      <ref role="37wK5l" to="wyuk:~ComponentHost.findComponent(java.lang.Class)" resolve="findComponent" />
+                      <node concept="3VsKOn" id="4wvzrd4Fj$z" role="37wK5m">
+                        <ref role="3VsUkX" to="w1kc:~MPSModuleRepository" resolve="MPSModuleRepository" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbC" id="3xwfj1iDGZp" role="3clFbw">
+              <node concept="10Nm6u" id="3xwfj1iDH7j" role="3uHU7w" />
+              <node concept="37vLTw" id="3xwfj1iDGP5" role="3uHU7B">
+                <ref role="3cqZAo" node="3xwfj1iDGp_" resolve="repository" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbJ" id="3xwfj1ivqTE" role="3cqZAp">
+            <node concept="3clFbS" id="3xwfj1ivqTG" role="3clFbx">
+              <node concept="3cpWs6" id="3xwfj1ivuHD" role="3cqZAp">
+                <node concept="2OqwBi" id="3xwfj1ivyIG" role="3cqZAk">
+                  <node concept="2YIFZM" id="3xwfj1ivyvg" role="2Oq$k0">
+                    <ref role="37wK5l" to="65nr:4qv99IrBnzk" resolve="getConfig" />
+                    <ref role="1Pybhc" to="65nr:4qv99IrBkzE" resolve="PhysUnitLangConfigHelper" />
+                  </node>
+                  <node concept="liA8E" id="3xwfj1ivySq" role="2OqNvi">
+                    <ref role="37wK5l" to="65nr:3xwfj1imT4h" resolve="getUnitLessUnitName" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1Wc70l" id="3xwfj1iILD7" role="3clFbw">
+              <node concept="3y3z36" id="3xwfj1iILYH" role="3uHU7B">
+                <node concept="10Nm6u" id="3xwfj1iIM8q" role="3uHU7w" />
+                <node concept="37vLTw" id="3xwfj1iILLo" role="3uHU7B">
+                  <ref role="3cqZAo" node="3xwfj1iDGp_" resolve="repository" />
+                </node>
+              </node>
+              <node concept="2YIFZM" id="3xwfj1ivsdh" role="3uHU7w">
+                <ref role="37wK5l" to="rppw:l_FyLXfCFW" resolve="isUnitLessUnit" />
+                <ref role="1Pybhc" to="rppw:3xM68GMxWv0" resolve="StandardUnitHelper" />
+                <node concept="EsrRn" id="3xwfj1ivsjE" role="37wK5m" />
+                <node concept="37vLTw" id="3xwfj1iDGpG" role="37wK5m">
+                  <ref role="3cqZAo" node="3xwfj1iDGp_" resolve="repository" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs6" id="3xwfj1ivz4w" role="3cqZAp">
+            <node concept="2OqwBi" id="3xwfj1ivAwP" role="3cqZAk">
+              <node concept="EsrRn" id="3xwfj1ivzaR" role="2Oq$k0" />
+              <node concept="3TrcHB" id="3xwfj1ivB96" role="2OqNvi">
+                <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="1N5Pfh" id="1KUmgSFvSup" role="1Mr941">
       <ref role="1N5Vy1" to="i3ya:1KUmgSFpwWq" resolve="quantity" />
       <node concept="3dgokm" id="1KUmgSFvSut" role="1N6uqs">

diff --git a/...ts3.core.expr.typetags.physunits/models/org.iets3.core.expr.typetags.physunits.plugin.mps b/...ts3.core.expr.typetags.physunits/models/org.iets3.core.expr.typetags.physunits.plugin.mps
@@ -46,6 +46,9 @@
         <child id="1068498886297" name="rValue" index="37vLTx" />
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
+      <concept id="2323553266850475941" name="jetbrains.mps.baseLanguage.structure.IHasModifiers" flags="ng" index="2frcj7">
+        <child id="2323553266850475953" name="modifiers" index="2frcjj" />
+      </concept>
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
@@ -58,6 +61,7 @@
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
         <reference id="2820489544401957798" name="classifier" index="HV5vE" />
       </concept>
+      <concept id="4678410916365116210" name="jetbrains.mps.baseLanguage.structure.DefaultModifier" flags="ng" index="2JFqV2" />
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
         <child id="1154032183016" name="body" index="2LFqv$" />
       </concept>
@@ -944,6 +948,27 @@
       </node>
     </node>
     <node concept="2tJIrI" id="3wrpJuqrQ2f" role="jymVt" />
+    <node concept="3clFb_" id="3xwfj1imT4h" role="jymVt">
+      <property role="TrG5h" value="getUnitLessUnitName" />
+      <node concept="3clFbS" id="3xwfj1imT4i" role="3clF47">
+        <node concept="3clFbF" id="3xwfj1iEUKU" role="3cqZAp">
+          <node concept="Xl_RD" id="3xwfj1iEUKT" role="3clFbG">
+            <property role="Xl_RC" value="unitless" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="3xwfj1imT4j" role="1B3o_S" />
+      <node concept="17QB3L" id="3xwfj1imT4k" role="3clF45" />
+      <node concept="P$JXv" id="3xwfj1imT4l" role="lGtFl">
+        <node concept="TZ5HA" id="3xwfj1imT4m" role="TZ5H$">
+          <node concept="1dT_AC" id="3xwfj1imT4n" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns the name used for the unspecified dimension in the UI." />
+          </node>
+        </node>
+      </node>
+      <node concept="2JFqV2" id="3xwfj1iEU_N" role="2frcjj" />
+    </node>
+    <node concept="2tJIrI" id="3xwfj1imSXs" role="jymVt" />
     <node concept="3clFb_" id="3wrpJuqrQh9" role="jymVt">
       <property role="TrG5h" value="implicitConversionIsEnabled" />
       <node concept="3clFbS" id="3wrpJuqrQhc" role="3clF47" />

diff --git a/...nguages/org.iets3.core.expr.typetags.physunits/org.iets3.core.expr.typetags.physunits.mpl b/...nguages/org.iets3.core.expr.typetags.physunits/org.iets3.core.expr.typetags.physunits.mpl
@@ -27,6 +27,8 @@
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">cf90f965-8554-4a16-aa0b-6387f27474ab(org.iets3.core.expr.base.interpreter)</dependency>
     <dependency reexport="false">197e2a32-ff26-4358-af5c-731ae2b35f83(org.iets3.core.expr.simpleTypes.interpreter)</dependency>
+    <dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
+    <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />

diff --git a/...ensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps b/...ensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
@@ -2436,6 +2436,16 @@
             <ref role="3bR37D" node="44TucI396gt" resolve="org.iets3.core.expr.base.interpreter" />
           </node>
         </node>
+        <node concept="1SiIV0" id="3xwfj1iIO1s" role="3bR37C">
+          <node concept="3bR9La" id="3xwfj1iIO1t" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="3xwfj1iIO1u" role="3bR37C">
+          <node concept="3bR9La" id="3xwfj1iIO1v" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="_I$tx9JvQU" role="2G$12L">
         <property role="BnDLt" value="true" />