Skip to content

Commit 9a4ffef

Browse files
author
Alexander Pann
authored
Merge pull request #1109 from JetBrains/bugfix/intention_support_nullpointer
mpsutil.intentions: only enable the intention menu producer when there is an UI
2 parents 9eff993 + 3865960 commit 9a4ffef

File tree

1 file changed

+33
-13
lines changed
  • code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime

1 file changed

+33
-13
lines changed

code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime/plugin.mps

Lines changed: 33 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
66
<use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="6" />
77
<use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
8+
<use id="654422bf-e75f-44dc-936d-188890a746ce" name="de.slisson.mps.reflection" version="0" />
89
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
910
</languages>
1011
<imports>
@@ -13,6 +14,9 @@
1314
<import index="ih8q" ref="r:990d360b-3ac3-45fa-8ed3-0bbf017bba84(com.mbeddr.mpsutil.intentions.runtime)" />
1415
</imports>
1516
<registry>
17+
<language id="654422bf-e75f-44dc-936d-188890a746ce" name="de.slisson.mps.reflection">
18+
<concept id="8473566765277240526" name="de.slisson.mps.reflection.structure.ReflectionMethodCall" flags="ng" index="1PvZjq" />
19+
</language>
1620
<language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
1721
<concept id="1204478074808" name="jetbrains.mps.lang.plugin.structure.ConceptFunctionParameter_MPSProject" flags="nn" index="1KvdUw" />
1822
</language>
@@ -67,6 +71,10 @@
6771
<concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
6872
<child id="1068580123156" name="expression" index="3clFbG" />
6973
</concept>
74+
<concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
75+
<child id="1068580123160" name="condition" index="3clFbw" />
76+
<child id="1068580123161" name="ifTrue" index="3clFbx" />
77+
</concept>
7078
<concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
7179
<child id="1068581517665" name="statement" index="3cqZAp" />
7280
</concept>
@@ -142,24 +150,36 @@
142150
<node concept="3cqZAl" id="3pwG8PSjTLM" role="3clF45" />
143151
<node concept="3Tm1VV" id="3pwG8PSjTLN" role="1B3o_S" />
144152
<node concept="3clFbS" id="3pwG8PSjTLP" role="3clF47">
145-
<node concept="3clFbF" id="2jDew64H8Xv" role="3cqZAp">
146-
<node concept="2OqwBi" id="2jDew64HaXY" role="3clFbG">
147-
<node concept="37vLTw" id="2jDew64H8Xt" role="2Oq$k0">
148-
<ref role="3cqZAo" node="3pwG8PSjTLK" resolve="editorComponent" />
149-
</node>
150-
<node concept="liA8E" id="2jDew64Hd5G" role="2OqNvi">
151-
<ref role="37wK5l" to="exr9:~EditorComponent.setIntentionMenuProducer(jetbrains.mps.editor.intentions.IntentionMenuProducer)" resolve="setIntentionMenuProducer" />
152-
<node concept="2ShNRf" id="2jDew64L6Ki" role="37wK5m">
153-
<node concept="1pGfFk" id="2jDew64L7EE" role="2ShVmc">
154-
<property role="373rjd" value="true" />
155-
<ref role="37wK5l" to="ih8q:2jDew64KaGG" resolve="MyIntentionMenuProducer" />
156-
<node concept="37vLTw" id="2jDew64OYEu" role="37wK5m">
157-
<ref role="3cqZAo" node="3pwG8PSjTLK" resolve="editorComponent" />
153+
<node concept="3clFbJ" id="6E9H6NYX$7F" role="3cqZAp">
154+
<node concept="3clFbS" id="6E9H6NYX$7H" role="3clFbx">
155+
<node concept="3clFbF" id="2jDew64H8Xv" role="3cqZAp">
156+
<node concept="2OqwBi" id="2jDew64HaXY" role="3clFbG">
157+
<node concept="37vLTw" id="2jDew64H8Xt" role="2Oq$k0">
158+
<ref role="3cqZAo" node="3pwG8PSjTLK" resolve="editorComponent" />
159+
</node>
160+
<node concept="liA8E" id="2jDew64Hd5G" role="2OqNvi">
161+
<ref role="37wK5l" to="exr9:~EditorComponent.setIntentionMenuProducer(jetbrains.mps.editor.intentions.IntentionMenuProducer)" resolve="setIntentionMenuProducer" />
162+
<node concept="2ShNRf" id="2jDew64L6Ki" role="37wK5m">
163+
<node concept="1pGfFk" id="2jDew64L7EE" role="2ShVmc">
164+
<property role="373rjd" value="true" />
165+
<ref role="37wK5l" to="ih8q:2jDew64KaGG" resolve="MyIntentionMenuProducer" />
166+
<node concept="37vLTw" id="2jDew64OYEu" role="37wK5m">
167+
<ref role="3cqZAo" node="3pwG8PSjTLK" resolve="editorComponent" />
168+
</node>
169+
</node>
158170
</node>
159171
</node>
160172
</node>
161173
</node>
162174
</node>
175+
<node concept="2OqwBi" id="6E9H6NYXx6d" role="3clFbw">
176+
<node concept="37vLTw" id="6E9H6NYXvkQ" role="2Oq$k0">
177+
<ref role="3cqZAo" node="3pwG8PSjTLK" resolve="editorComponent" />
178+
</node>
179+
<node concept="1PvZjq" id="6E9H6NYXzv7" role="2OqNvi">
180+
<ref role="37wK5l" to="exr9:~EditorComponent.hasUI()" resolve="hasUI" />
181+
</node>
182+
</node>
163183
</node>
164184
</node>
165185
</node>

0 commit comments

Comments
 (0)