Merge pull request #1111 from IETS3/bugfix/show_hexvalue_in_diff_view

IETS3 · Nov 12, 2024 · 468d2e3 · 468d2e3
2 parents 86ada24 + e8521ad
commit 468d2e3
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project are documented in this file.
 Format of the log is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 The project does _not_ follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.
 
+## November 2024
+
+### Fixed
+
+- Hexadecimal attributes are now better visible in the diff view.
+
 ## October 2024
 
 ### Fixed

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps
@@ -7900,7 +7900,44 @@
   <node concept="24kQdi" id="2KEzU_jECqA">
     <property role="3GE5qa" value="numeric" />
     <ref role="1XX52x" to="hm2y:5Ys_ngSnA9h" resolve="HexValue" />
-    <node concept="2SsqMj" id="2KEzU_jGitL" role="2wV5jI" />
+    <node concept="3EZMnI" id="6fDAI2XnWnF" role="2wV5jI">
+      <node concept="3F0ifn" id="6fDAI2XnWnH" role="3EZMnx">
+        <property role="3F0ifm" value="@hex value" />
+        <ref role="1k5W1q" to="itrz:3_9S6lia_no" resolve="iets3PassiveText" />
+        <node concept="pkWqt" id="6fDAI2XriW1" role="pqm2j">
+          <node concept="3clFbS" id="6fDAI2XriW2" role="2VODD2">
+            <node concept="3clFbF" id="6fDAI2Xs3qH" role="3cqZAp">
+              <node concept="2OqwBi" id="6fDAI2XsbtB" role="3clFbG">
+                <node concept="2OqwBi" id="6fDAI2Xs5Wp" role="2Oq$k0">
+                  <node concept="2OqwBi" id="6fDAI2Xs4db" role="2Oq$k0">
+                    <node concept="2OqwBi" id="6fDAI2Xs3KQ" role="2Oq$k0">
+                      <node concept="1Q80Hx" id="6fDAI2Xs3qG" role="2Oq$k0" />
+                      <node concept="liA8E" id="6fDAI2Xs43o" role="2OqNvi">
+                        <ref role="37wK5l" to="cj4x:~EditorContext.getEditorComponent()" resolve="getEditorComponent" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="6fDAI2Xs4ur" role="2OqNvi">
+                      <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="6fDAI2Xs9Yy" role="2OqNvi">
+                    <ref role="37wK5l" to="wyt6:~Class.getName()" resolve="getName" />
+                  </node>
+                </node>
+                <node concept="liA8E" id="6fDAI2Xsdxe" role="2OqNvi">
+                  <ref role="37wK5l" to="wyt6:~String.startsWith(java.lang.String)" resolve="startsWith" />
+                  <node concept="Xl_RD" id="6fDAI2Xsdxh" role="37wK5m">
+                    <property role="Xl_RC" value="jetbrains.mps.vcs" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2iRfu4" id="6fDAI2Xv1ec" role="2iSdaV" />
+      <node concept="2SsqMj" id="2KEzU_jGitL" role="3EZMnx" />
+    </node>
   </node>
   <node concept="22mcaB" id="5JKfLQ96phH">
     <property role="3GE5qa" value="numeric.number" />

diff --git a/...ages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/intentions.mps b/...ages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/intentions.mps
@@ -15,6 +15,7 @@
     <import index="5qo5" ref="r:6d93ddb1-b0b0-4eee-8079-51303666672a(org.iets3.core.expr.simpleTypes.structure)" />
     <import index="b1h1" ref="r:ac5f749f-6179-4d4f-ad24-ad9edbd8077b(org.iets3.core.expr.simpleTypes.behavior)" />
     <import index="hm2y" ref="r:66e07cb4-a4b0-4bf3-a36d-5e9ed1ff1bd3(org.iets3.core.expr.base.structure)" />
+    <import index="xfg9" ref="r:ac28053f-2041-47f6-806b-ecfaca05a64a(org.iets3.core.expr.base.runtime.runtime)" />
     <import index="pbu6" ref="r:83e946de-2a7f-4a4c-b3c9-4f671aa7f2db(org.iets3.core.expr.base.behavior)" implicit="true" />
   </imports>
   <registry>
@@ -51,6 +52,9 @@
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
+      <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
+        <reference id="1144433194310" name="classConcept" index="1Pybhc" />
+      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
@@ -1051,6 +1055,20 @@
     </node>
     <node concept="2SaL7w" id="65S0ZNFIgIr" role="2ZfVeh">
       <node concept="3clFbS" id="65S0ZNFIgIs" role="2VODD2">
+        <node concept="3clFbJ" id="7NAAzNNnujE" role="3cqZAp">
+          <node concept="3clFbS" id="7NAAzNNnujG" role="3clFbx">
+            <node concept="3cpWs6" id="7NAAzNNnuq_" role="3cqZAp">
+              <node concept="3clFbT" id="7NAAzNNnuqQ" role="3cqZAk" />
+            </node>
+          </node>
+          <node concept="3fqX7Q" id="7NAAzNNnun3" role="3clFbw">
+            <node concept="2YIFZM" id="7NAAzNNnun5" role="3fr31v">
+              <ref role="37wK5l" to="xfg9:5Ys_ngSnp$h" resolve="allowHexadecimalNumbers" />
+              <ref role="1Pybhc" to="xfg9:2Qbt$1tTQaH" resolve="PTF" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="7NAAzNNnuhL" role="3cqZAp" />
         <node concept="3clFbJ" id="65S0ZNFIhcM" role="3cqZAp">
           <node concept="3clFbS" id="65S0ZNFIhcO" role="3clFbx">
             <node concept="3cpWs6" id="65S0ZNFIhH9" role="3cqZAp">