Skip to content

Commit d4f02bf

Browse files
kbirkenkbirken
authored
Merge pull request #1542 from IETS3/bugfix/quick_workaround_numberliteral_editor_exception_1541
Hotfix for exception due to previous PR in NumberLiteral editor (with hexadecimal format turned on)
2 parents def34f8 + 3c997d5 commit d4f02bf

File tree

1 file changed

+77
-76
lines changed
  • code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models

1 file changed

+77
-76
lines changed

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/editor.mps‎

Lines changed: 77 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@
218218
<concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
219219
<reference id="1144433057691" name="classifier" index="1PxDUh" />
220220
</concept>
221+
<concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
221222
<concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
222223
<child id="1070534934091" name="type" index="10QFUM" />
223224
<child id="1070534934092" name="expression" index="10QFUP" />
@@ -246,9 +247,6 @@
246247
<concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
247248
<child id="1068581517665" name="statement" index="3cqZAp" />
248249
</concept>
249-
<concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
250-
<property id="1068580123138" name="value" index="3clFbU" />
251-
</concept>
252250
<concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
253251
<property id="1068580320021" name="value" index="3cmrfH" />
254252
</concept>
@@ -272,13 +270,11 @@
272270
<child id="1081773367579" name="rightExpression" index="3uHU7w" />
273271
<child id="1081773367580" name="leftExpression" index="3uHU7B" />
274272
</concept>
273+
<concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
275274
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
276275
<child id="1178549979242" name="visibility" index="1B3o_S" />
277276
</concept>
278277
<concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
279-
<concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
280-
<reference id="1116615189566" name="classifier" index="3VsUkX" />
281-
</concept>
282278
</language>
283279
<language id="9d69e719-78c8-4286-90db-fb19c107d049" name="com.mbeddr.mpsutil.grammarcells">
284280
<concept id="1954385921685809440" name="com.mbeddr.mpsutil.grammarcells.structure.Parameter_node" flags="ng" index="313q4" />
@@ -530,97 +526,102 @@
530526
<node concept="3clFbS" id="6QsMU1GUYNh" role="2VODD2">
531527
<node concept="3clFbJ" id="1drMthg17uD" role="3cqZAp">
532528
<node concept="3clFbS" id="1drMthg17uF" role="3clFbx">
533-
<node concept="3cpWs8" id="6QsMU1GUYS0" role="3cqZAp">
534-
<node concept="3cpWsn" id="6QsMU1GUYS1" role="3cpWs9">
529+
<node concept="3cpWs8" id="3Pakbnma7aL" role="3cqZAp">
530+
<node concept="3cpWsn" id="3Pakbnma7aM" role="3cpWs9">
535531
<property role="TrG5h" value="propCell" />
536-
<node concept="3uibUv" id="6QsMU1GUYS2" role="1tU5fm">
532+
<node concept="3uibUv" id="3Pakbnma79q" role="1tU5fm">
537533
<ref role="3uigEE" to="g51k:~EditorCell_Property" resolve="EditorCell_Property" />
538534
</node>
539-
<node concept="2YIFZM" id="1BN5MJwdEtO" role="33vP2m">
540-
<ref role="37wK5l" to="g51k:~CellFinderUtil.findChildByClass(jetbrains.mps.openapi.editor.cells.EditorCell,java.lang.Class,boolean)" resolve="findChildByClass" />
541-
<ref role="1Pybhc" to="g51k:~CellFinderUtil" resolve="CellFinderUtil" />
542-
<node concept="1Q80Hy" id="1BN5MJwdE_0" role="37wK5m" />
543-
<node concept="3VsKOn" id="1BN5MJwdF55" role="37wK5m">
544-
<ref role="3VsUkX" to="g51k:~EditorCell_Property" resolve="EditorCell_Property" />
545-
</node>
546-
<node concept="3clFbT" id="1BN5MJwdFxl" role="37wK5m">
547-
<property role="3clFbU" value="true" />
535+
<node concept="10QFUN" id="3Pakbnma7aN" role="33vP2m">
536+
<node concept="3uibUv" id="3Pakbnma7aO" role="10QFUM">
537+
<ref role="3uigEE" to="g51k:~EditorCell_Property" resolve="EditorCell_Property" />
548538
</node>
539+
<node concept="1Q80Hy" id="3Pakbnma7aP" role="10QFUP" />
549540
</node>
550541
</node>
551542
</node>
552-
<node concept="3cpWs8" id="6UIgoJyD6uX" role="3cqZAp">
553-
<node concept="3cpWsn" id="6UIgoJyD6uY" role="3cpWs9">
554-
<property role="TrG5h" value="modelAccessor" />
555-
<node concept="3uibUv" id="6UIgoJyD6ai" role="1tU5fm">
556-
<ref role="3uigEE" to="g51k:~PropertyAccessor" resolve="PropertyAccessor" />
557-
</node>
558-
<node concept="10QFUN" id="6UIgoJyDggM" role="33vP2m">
559-
<node concept="3uibUv" id="6UIgoJyDgo1" role="10QFUM">
560-
<ref role="3uigEE" to="g51k:~PropertyAccessor" resolve="PropertyAccessor" />
561-
</node>
562-
<node concept="2OqwBi" id="6UIgoJyD6uZ" role="10QFUP">
563-
<node concept="37vLTw" id="6UIgoJyD6v0" role="2Oq$k0">
564-
<ref role="3cqZAo" node="6QsMU1GUYS1" resolve="propCell" />
543+
<node concept="3clFbJ" id="3Pakbnma96b" role="3cqZAp">
544+
<node concept="3clFbS" id="3Pakbnma96d" role="3clFbx">
545+
<node concept="3cpWs8" id="6UIgoJyD6uX" role="3cqZAp">
546+
<node concept="3cpWsn" id="6UIgoJyD6uY" role="3cpWs9">
547+
<property role="TrG5h" value="modelAccessor" />
548+
<node concept="3uibUv" id="6UIgoJyD6ai" role="1tU5fm">
549+
<ref role="3uigEE" to="g51k:~PropertyAccessor" resolve="PropertyAccessor" />
565550
</node>
566-
<node concept="liA8E" id="6UIgoJyD6v1" role="2OqNvi">
567-
<ref role="37wK5l" to="g51k:~EditorCell_Property.getModelAccessor()" resolve="getModelAccessor" />
568-
</node>
569-
</node>
570-
</node>
571-
</node>
572-
</node>
573-
<node concept="3clFbF" id="6UIgoJyD7UI" role="3cqZAp">
574-
<node concept="37vLTI" id="6UIgoJyDbPL" role="3clFbG">
575-
<node concept="2ShNRf" id="6UIgoJyDbZ5" role="37vLTx">
576-
<node concept="1pGfFk" id="6UIgoJyDfam" role="2ShVmc">
577-
<property role="373rjd" value="true" />
578-
<ref role="37wK5l" to="xfg9:6UIgoJyCv1T" resolve="HexPropertyAccessor" />
579-
<node concept="pncrf" id="6UIgoJyDfxj" role="37wK5m" />
580-
<node concept="2OqwBi" id="6UIgoJyDhJl" role="37wK5m">
581-
<node concept="37vLTw" id="6UIgoJyDhdz" role="2Oq$k0">
582-
<ref role="3cqZAo" node="6UIgoJyD6uY" resolve="modelAccessor" />
551+
<node concept="10QFUN" id="6UIgoJyDggM" role="33vP2m">
552+
<node concept="3uibUv" id="6UIgoJyDgo1" role="10QFUM">
553+
<ref role="3uigEE" to="g51k:~PropertyAccessor" resolve="PropertyAccessor" />
583554
</node>
584-
<node concept="liA8E" id="6UIgoJyDi6X" role="2OqNvi">
585-
<ref role="37wK5l" to="g51k:~PropertyAccessor.getProperty()" resolve="getProperty" />
555+
<node concept="2OqwBi" id="6UIgoJyD6uZ" role="10QFUP">
556+
<node concept="37vLTw" id="6UIgoJyD6v0" role="2Oq$k0">
557+
<ref role="3cqZAo" node="3Pakbnma7aM" resolve="propCell" />
558+
</node>
559+
<node concept="liA8E" id="6UIgoJyD6v1" role="2OqNvi">
560+
<ref role="37wK5l" to="g51k:~EditorCell_Property.getModelAccessor()" resolve="getModelAccessor" />
561+
</node>
586562
</node>
587563
</node>
588-
<node concept="2OqwBi" id="6UIgoJyDjLJ" role="37wK5m">
589-
<node concept="37vLTw" id="6UIgoJyDjcW" role="2Oq$k0">
590-
<ref role="3cqZAo" node="6UIgoJyD6uY" resolve="modelAccessor" />
591-
</node>
592-
<node concept="1PnCL0" id="6UIgoJyDkT$" role="2OqNvi">
593-
<ref role="2Oxat5" to="g51k:~PropertyAccessor.myReadOnly" resolve="myReadOnly" />
564+
</node>
565+
</node>
566+
<node concept="3clFbF" id="6UIgoJyD7UI" role="3cqZAp">
567+
<node concept="37vLTI" id="6UIgoJyDbPL" role="3clFbG">
568+
<node concept="2ShNRf" id="6UIgoJyDbZ5" role="37vLTx">
569+
<node concept="1pGfFk" id="6UIgoJyDfam" role="2ShVmc">
570+
<property role="373rjd" value="true" />
571+
<ref role="37wK5l" to="xfg9:6UIgoJyCv1T" resolve="HexPropertyAccessor" />
572+
<node concept="pncrf" id="6UIgoJyDfxj" role="37wK5m" />
573+
<node concept="2OqwBi" id="6UIgoJyDhJl" role="37wK5m">
574+
<node concept="37vLTw" id="6UIgoJyDhdz" role="2Oq$k0">
575+
<ref role="3cqZAo" node="6UIgoJyD6uY" resolve="modelAccessor" />
576+
</node>
577+
<node concept="liA8E" id="6UIgoJyDi6X" role="2OqNvi">
578+
<ref role="37wK5l" to="g51k:~PropertyAccessor.getProperty()" resolve="getProperty" />
579+
</node>
580+
</node>
581+
<node concept="2OqwBi" id="6UIgoJyDjLJ" role="37wK5m">
582+
<node concept="37vLTw" id="6UIgoJyDjcW" role="2Oq$k0">
583+
<ref role="3cqZAo" node="6UIgoJyD6uY" resolve="modelAccessor" />
584+
</node>
585+
<node concept="1PnCL0" id="6UIgoJyDkT$" role="2OqNvi">
586+
<ref role="2Oxat5" to="g51k:~PropertyAccessor.myReadOnly" resolve="myReadOnly" />
587+
</node>
588+
</node>
589+
<node concept="2OqwBi" id="6UIgoJyDlnq" role="37wK5m">
590+
<node concept="37vLTw" id="6UIgoJyDl3i" role="2Oq$k0">
591+
<ref role="3cqZAo" node="6UIgoJyD6uY" resolve="modelAccessor" />
592+
</node>
593+
<node concept="1PnCL0" id="6UIgoJyDlV2" role="2OqNvi">
594+
<ref role="2Oxat5" to="g51k:~PropertyAccessor.myAllowEmptyText" resolve="myAllowEmptyText" />
595+
</node>
596+
</node>
597+
<node concept="1Q80Hx" id="6UIgoJyDmvZ" role="37wK5m" />
594598
</node>
595599
</node>
596-
<node concept="2OqwBi" id="6UIgoJyDlnq" role="37wK5m">
597-
<node concept="37vLTw" id="6UIgoJyDl3i" role="2Oq$k0">
598-
<ref role="3cqZAo" node="6UIgoJyD6uY" resolve="modelAccessor" />
600+
<node concept="2OqwBi" id="6UIgoJyD8M$" role="37vLTJ">
601+
<node concept="37vLTw" id="6UIgoJyD7UG" role="2Oq$k0">
602+
<ref role="3cqZAo" node="3Pakbnma7aM" resolve="propCell" />
599603
</node>
600-
<node concept="1PnCL0" id="6UIgoJyDlV2" role="2OqNvi">
601-
<ref role="2Oxat5" to="g51k:~PropertyAccessor.myAllowEmptyText" resolve="myAllowEmptyText" />
604+
<node concept="1PnCL0" id="6UIgoJyDaHQ" role="2OqNvi">
605+
<ref role="2Oxat5" to="g51k:~EditorCell_Property.myModelAccessor" resolve="myModelAccessor" />
602606
</node>
603607
</node>
604-
<node concept="1Q80Hx" id="6UIgoJyDmvZ" role="37wK5m" />
605608
</node>
606609
</node>
607-
<node concept="2OqwBi" id="6UIgoJyD8M$" role="37vLTJ">
608-
<node concept="37vLTw" id="6UIgoJyD7UG" role="2Oq$k0">
609-
<ref role="3cqZAo" node="6QsMU1GUYS1" resolve="propCell" />
610-
</node>
611-
<node concept="1PnCL0" id="6UIgoJyDaHQ" role="2OqNvi">
612-
<ref role="2Oxat5" to="g51k:~EditorCell_Property.myModelAccessor" resolve="myModelAccessor" />
610+
<node concept="3clFbF" id="6UIgoJyFYf0" role="3cqZAp">
611+
<node concept="2OqwBi" id="6UIgoJyFYVP" role="3clFbG">
612+
<node concept="37vLTw" id="6UIgoJyFYeY" role="2Oq$k0">
613+
<ref role="3cqZAo" node="3Pakbnma7aM" resolve="propCell" />
614+
</node>
615+
<node concept="liA8E" id="6UIgoJyG1dX" role="2OqNvi">
616+
<ref role="37wK5l" to="g51k:~EditorCell_Property.synchronize()" resolve="synchronize" />
617+
</node>
613618
</node>
614619
</node>
615620
</node>
616-
</node>
617-
<node concept="3clFbF" id="6UIgoJyFYf0" role="3cqZAp">
618-
<node concept="2OqwBi" id="6UIgoJyFYVP" role="3clFbG">
619-
<node concept="37vLTw" id="6UIgoJyFYeY" role="2Oq$k0">
620-
<ref role="3cqZAo" node="6QsMU1GUYS1" resolve="propCell" />
621-
</node>
622-
<node concept="liA8E" id="6UIgoJyG1dX" role="2OqNvi">
623-
<ref role="37wK5l" to="g51k:~EditorCell_Property.synchronize()" resolve="synchronize" />
621+
<node concept="3y3z36" id="3Pakbnmaa9W" role="3clFbw">
622+
<node concept="10Nm6u" id="3PakbnmaaAf" role="3uHU7w" />
623+
<node concept="37vLTw" id="3Pakbnma9f5" role="3uHU7B">
624+
<ref role="3cqZAo" node="3Pakbnma7aM" resolve="propCell" />
624625
</node>
625626
</node>
626627
</node>

0 commit comments

Comments
 (0)