Skip to content

Commit 8c5dfab

Browse files
committed
bugfix/ async Editor Highlightning #459: Adds null check
1 parent 99a2431 commit 8c5dfab

File tree

1 file changed

+49
-43
lines changed
  • code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models

1 file changed

+49
-43
lines changed

code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/plugin.mps

Lines changed: 49 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -223,10 +223,6 @@
223223
<concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
224224
<child id="1081516765348" name="expression" index="3fr31v" />
225225
</concept>
226-
<concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
227-
<child id="1160998896846" name="condition" index="1gVkn0" />
228-
<child id="1160998916832" name="message" index="1gVpfI" />
229-
</concept>
230226
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
231227
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
232228
<child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -296,6 +292,7 @@
296292
<reference id="1116615189566" name="classifier" index="3VsUkX" />
297293
</concept>
298294
<concept id="1178893518978" name="jetbrains.mps.baseLanguage.structure.ThisConstructorInvocation" flags="nn" index="1VxSAg" />
295+
<concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
299296
<concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
300297
<reference id="1170346070688" name="classifier" index="1Y3XeK" />
301298
<child id="1201186121363" name="typeParameter" index="2Ghqu4" />
@@ -501,6 +498,7 @@
501498
<child id="1240687658305" name="delimiter" index="3uJOhx" />
502499
</concept>
503500
<concept id="7125221305512719026" name="jetbrains.mps.baseLanguage.collections.structure.CollectionType" flags="in" index="3vKaQO" />
501+
<concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
504502
<concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
505503
<concept id="1197932370469" name="jetbrains.mps.baseLanguage.collections.structure.MapElement" flags="nn" index="3EllGN">
506504
<child id="1197932505799" name="map" index="3ElQJh" />
@@ -4131,8 +4129,46 @@
41314129
</node>
41324130
<node concept="X8dFx" id="1ukHH8$v5Q3" role="2OqNvi">
41334131
<node concept="2OqwBi" id="1ukHH8$v9k3" role="25WWJ7">
4134-
<node concept="37vLTw" id="1ukHH8$v5XA" role="2Oq$k0">
4135-
<ref role="3cqZAo" node="1ukHH8$uSKO" resolve="messages" />
4132+
<node concept="2OqwBi" id="4fQRPNheW9m" role="2Oq$k0">
4133+
<node concept="37vLTw" id="1ukHH8$v5XA" role="2Oq$k0">
4134+
<ref role="3cqZAo" node="1ukHH8$uSKO" resolve="messages" />
4135+
</node>
4136+
<node concept="3zZkjj" id="4fQRPNheXGm" role="2OqNvi">
4137+
<node concept="1bVj0M" id="4fQRPNheXGo" role="23t8la">
4138+
<node concept="3clFbS" id="4fQRPNheXGp" role="1bW5cS">
4139+
<node concept="3clFbF" id="4fQRPNheYjX" role="3cqZAp">
4140+
<node concept="1Wc70l" id="2SyD3e2oVnd" role="3clFbG">
4141+
<node concept="3y3z36" id="4fQRPNhf0YQ" role="3uHU7B">
4142+
<node concept="2OqwBi" id="4fQRPNheYI1" role="3uHU7B">
4143+
<node concept="37vLTw" id="4fQRPNheYjW" role="2Oq$k0">
4144+
<ref role="3cqZAo" node="4fQRPNheXGq" resolve="it" />
4145+
</node>
4146+
<node concept="2OwXpG" id="4fQRPNhf0wm" role="2OqNvi">
4147+
<ref role="2Oxat5" node="2f_Mi5n9flk" resolve="node" />
4148+
</node>
4149+
</node>
4150+
<node concept="10Nm6u" id="4fQRPNhf1vN" role="3uHU7w" />
4151+
</node>
4152+
<node concept="3y3z36" id="2SyD3e2oUlI" role="3uHU7w">
4153+
<node concept="10Nm6u" id="2SyD3e2oUXX" role="3uHU7w" />
4154+
<node concept="2OqwBi" id="2SyD3e2oROp" role="3uHU7B">
4155+
<node concept="37vLTw" id="2SyD3e2oRly" role="2Oq$k0">
4156+
<ref role="3cqZAo" node="4fQRPNheXGq" resolve="it" />
4157+
</node>
4158+
<node concept="2OwXpG" id="2SyD3e2oTkN" role="2OqNvi">
4159+
<ref role="2Oxat5" node="2f_Mi5n99G5" resolve="type" />
4160+
</node>
4161+
</node>
4162+
</node>
4163+
</node>
4164+
</node>
4165+
</node>
4166+
<node concept="Rh6nW" id="4fQRPNheXGq" role="1bW2Oz">
4167+
<property role="TrG5h" value="it" />
4168+
<node concept="2jxLKc" id="4fQRPNheXGr" role="1tU5fm" />
4169+
</node>
4170+
</node>
4171+
</node>
41364172
</node>
41374173
<node concept="3$u5V9" id="1ukHH8$vaHo" role="2OqNvi">
41384174
<node concept="1bVj0M" id="1ukHH8$vaHq" role="23t8la">
@@ -4185,52 +4221,22 @@
41854221
<node concept="3uibUv" id="6EayTQ8tcuJ" role="1tU5fm">
41864222
<ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
41874223
</node>
4188-
<node concept="3K4zz7" id="6EayTQ8tif5" role="33vP2m">
4189-
<node concept="10Nm6u" id="6EayTQ8tin3" role="3K4E3e" />
4190-
<node concept="3clFbC" id="6EayTQ8thWC" role="3K4Cdx">
4191-
<node concept="10Nm6u" id="6EayTQ8ticN" role="3uHU7w" />
4192-
<node concept="2OqwBi" id="6EayTQ8thpF" role="3uHU7B">
4193-
<node concept="37vLTw" id="6EayTQ8thjh" role="2Oq$k0">
4224+
<node concept="2OqwBi" id="6EayTQ8tgJF" role="33vP2m">
4225+
<node concept="2JrnkZ" id="6EayTQ8tgJG" role="2Oq$k0">
4226+
<node concept="2OqwBi" id="6EayTQ8tgJH" role="2JrQYb">
4227+
<node concept="37vLTw" id="6EayTQ8tgJI" role="2Oq$k0">
41944228
<ref role="3cqZAo" node="2f_Mi5nd$db" resolve="message" />
41954229
</node>
4196-
<node concept="2OwXpG" id="6EayTQ8thGA" role="2OqNvi">
4230+
<node concept="2OwXpG" id="6EayTQ8tgJJ" role="2OqNvi">
41974231
<ref role="2Oxat5" node="2f_Mi5n9flk" resolve="node" />
41984232
</node>
41994233
</node>
42004234
</node>
4201-
<node concept="2OqwBi" id="6EayTQ8tgJF" role="3K4GZi">
4202-
<node concept="2JrnkZ" id="6EayTQ8tgJG" role="2Oq$k0">
4203-
<node concept="2OqwBi" id="6EayTQ8tgJH" role="2JrQYb">
4204-
<node concept="37vLTw" id="6EayTQ8tgJI" role="2Oq$k0">
4205-
<ref role="3cqZAo" node="2f_Mi5nd$db" resolve="message" />
4206-
</node>
4207-
<node concept="2OwXpG" id="6EayTQ8tgJJ" role="2OqNvi">
4208-
<ref role="2Oxat5" node="2f_Mi5n9flk" resolve="node" />
4209-
</node>
4210-
</node>
4211-
</node>
4212-
<node concept="liA8E" id="6EayTQ8tgJK" role="2OqNvi">
4213-
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
4214-
</node>
4215-
</node>
4216-
</node>
4217-
</node>
4218-
</node>
4219-
<node concept="1gVbGN" id="7S7fpHYCcUY" role="3cqZAp">
4220-
<node concept="3y3z36" id="7S7fpHYCd_s" role="1gVkn0">
4221-
<node concept="10Nm6u" id="7S7fpHYCdI9" role="3uHU7w" />
4222-
<node concept="2OqwBi" id="7S7fpHYCd7R" role="3uHU7B">
4223-
<node concept="37vLTw" id="7S7fpHYCcZM" role="2Oq$k0">
4224-
<ref role="3cqZAo" node="2f_Mi5nd$db" resolve="message" />
4225-
</node>
4226-
<node concept="2OwXpG" id="7S7fpHYCdqD" role="2OqNvi">
4227-
<ref role="2Oxat5" node="2f_Mi5n9flk" resolve="node" />
4235+
<node concept="liA8E" id="6EayTQ8tgJK" role="2OqNvi">
4236+
<ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
42284237
</node>
42294238
</node>
42304239
</node>
4231-
<node concept="Xl_RD" id="7S7fpHYCdMt" role="1gVpfI">
4232-
<property role="Xl_RC" value="no node for message" />
4233-
</node>
42344240
</node>
42354241
<node concept="3cpWs8" id="6zyGvyQnZ$X" role="3cqZAp">
42364242
<node concept="3cpWsn" id="6zyGvyQnZ$Y" role="3cpWs9">

0 commit comments

Comments
 (0)