Merge pull request #1121 from IETS3/bugfix/hex_value_customization

IETS3 · Nov 18, 2024 · 977a8fd · 977a8fd
2 parents b69997a + 53e4c74
commit 977a8fd
Show file tree

Hide file tree

Showing 8 changed files with 212 additions and 117 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,16 @@ 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.
+
+### Changes
+
+- It is now possible to customize where hex values are enabled. With PrimitiveTypeMapper#filterHexadecimalSupportingNodes you can now enable/disable them for specific nodes.
+
 ## October 2024
 
 ### Fixed

diff --git a/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps b/code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps
@@ -1292,6 +1292,24 @@
       <node concept="3Tm1VV" id="5Ys_ngSn72W" role="1B3o_S" />
       <node concept="10P_77" id="5Ys_ngSn72X" role="3clF45" />
     </node>
+    <node concept="2tJIrI" id="CR1XcAuT6c" role="jymVt" />
+    <node concept="3clFb_" id="CR1XcAuTxl" role="jymVt">
+      <property role="TrG5h" value="filterHexadecimalSupportingNodes" />
+      <node concept="3clFbS" id="CR1XcAuTxm" role="3clF47">
+        <node concept="3clFbF" id="CR1XcAvbzH" role="3cqZAp">
+          <node concept="3clFbT" id="CR1XcAvbzG" role="3clFbG">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="CR1XcAuTxp" role="1B3o_S" />
+      <node concept="10P_77" id="CR1XcAuTxq" role="3clF45" />
+      <node concept="37vLTG" id="CR1XcAuW1g" role="3clF46">
+        <property role="TrG5h" value="node" />
+        <node concept="3Tqbb2" id="CR1XcAuW1f" role="1tU5fm" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="CR1XcAuTjT" role="jymVt" />
     <node concept="2tJIrI" id="5Ys_ngSn6GF" role="jymVt" />
     <node concept="3clFb_" id="1DSLxNDLebJ" role="jymVt">
       <property role="TrG5h" value="useParenthesisInsteadOfBracketsForTuples" />

diff --git a/...ges/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/constraints.mps b/...ges/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/constraints.mps
@@ -746,9 +746,10 @@
                       <node concept="1Wqviy" id="6QsMU1GXpok" role="37wK5m" />
                     </node>
                   </node>
-                  <node concept="2YIFZM" id="1drMthgyoUJ" role="3uHU7B">
-                    <ref role="37wK5l" to="xfg9:5Ys_ngSnp$h" resolve="allowHexadecimalNumbers" />
+                  <node concept="2YIFZM" id="j1$XMexE8y" role="3uHU7B">
+                    <ref role="37wK5l" to="xfg9:CR1XcAv3uo" resolve="areHexadecimalNumbersSupported" />
                     <ref role="1Pybhc" to="xfg9:2Qbt$1tTQaH" resolve="PTF" />
+                    <node concept="EsrRn" id="j1$XMexEeW" role="37wK5m" />
                   </node>
                 </node>
               </node>
@@ -952,9 +953,10 @@
                     <ref role="3cqZAo" node="5Ys_ngSoNsa" resolve="hexConcept" />
                   </node>
                 </node>
-                <node concept="2YIFZM" id="6mBw0A_6Huf" role="3uHU7B">
-                  <ref role="37wK5l" to="xfg9:5Ys_ngSnp$h" resolve="allowHexadecimalNumbers" />
+                <node concept="2YIFZM" id="j1$XMexDfT" role="3uHU7B">
+                  <ref role="37wK5l" to="xfg9:CR1XcAv3uo" resolve="areHexadecimalNumbersSupported" />
                   <ref role="1Pybhc" to="xfg9:2Qbt$1tTQaH" resolve="PTF" />
+                  <node concept="EsrRn" id="j1$XMexDRT" role="37wK5m" />
                 </node>
               </node>
             </node>
@@ -1024,9 +1026,10 @@
                       <node concept="1Wqviy" id="6QsMU1GSycK" role="37wK5m" />
                     </node>
                   </node>
-                  <node concept="2YIFZM" id="5WDn9aTqY$r" role="3uHU7B">
-                    <ref role="37wK5l" to="xfg9:5Ys_ngSnp$h" resolve="allowHexadecimalNumbers" />
+                  <node concept="2YIFZM" id="j1$XMexEno" role="3uHU7B">
+                    <ref role="37wK5l" to="xfg9:CR1XcAv3uo" resolve="areHexadecimalNumbersSupported" />
                     <ref role="1Pybhc" to="xfg9:2Qbt$1tTQaH" resolve="PTF" />
+                    <node concept="EsrRn" id="j1$XMexERA" role="37wK5m" />
                   </node>
                 </node>
               </node>
@@ -1230,9 +1233,10 @@
                     <ref role="3cqZAo" node="6QsMU1GXBJR" resolve="hexConcept" />
                   </node>
                 </node>
-                <node concept="2YIFZM" id="6mBw0A_6xhQ" role="3uHU7B">
-                  <ref role="37wK5l" to="xfg9:5Ys_ngSnp$h" resolve="allowHexadecimalNumbers" />
+                <node concept="2YIFZM" id="j1$XMexF0f" role="3uHU7B">
+                  <ref role="37wK5l" to="xfg9:CR1XcAv3uo" resolve="areHexadecimalNumbersSupported" />
                   <ref role="1Pybhc" to="xfg9:2Qbt$1tTQaH" resolve="PTF" />
+                  <node concept="EsrRn" id="j1$XMexFrP" role="37wK5m" />
                 </node>
               </node>
             </node>