Skip to content

Commit 64539db

Browse files
authored
Merge pull request #714 from IETS3/bugfix/improve_unit_error_msg
Improve unit error messages
2 parents d251c9a + 1f7fbb3 commit 64539db

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@
495495
</node>
496496
<node concept="3cpWs3" id="TcaAhOJ3xK" role="2MkJ7o">
497497
<node concept="Xl_RD" id="TcaAhOJ4bz" role="3uHU7B">
498-
<property role="Xl_RC" value="No common supertype found:" />
498+
<property role="Xl_RC" value="Incompatible element types – " />
499499
</node>
500500
<node concept="2OqwBi" id="TcaAhODq_G" role="3uHU7w">
501501
<node concept="Jnkvi" id="TcaAhODqaP" role="2Oq$k0">

code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units/models/org.iets3.core.expr.typetags.units.plugin.mps

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1168,7 +1168,7 @@
11681168
<ref role="1Pybhc" to="wyt6:~String" resolve="String" />
11691169
<ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...)" resolve="format" />
11701170
<node concept="Xl_RD" id="69hlyJ6fP5k" role="37wK5m">
1171-
<property role="Xl_RC" value="The different types \&quot;%s\&quot; cannot be combined. Only types with same unit can be combined." />
1171+
<property role="Xl_RC" value="The different types \&quot;%s\&quot; are incompatible. Only types with same unit are compatible." />
11721172
</node>
11731173
<node concept="37vLTw" id="69hlyJ6g7p8" role="37wK5m">
11741174
<ref role="3cqZAo" node="69hlyJ6g7oT" resolve="typesErrorMsg" />

0 commit comments

Comments
 (0)