Skip to content

Commit 43556db

Browse files
slissonslisson
authored
Merge pull request #461 from IETS3/remove-context-actions
Migration of the context actions to the MPS context actions
2 parents f5286c0 + cc18e3a commit 43556db

File tree

12 files changed

+2307
-1832
lines changed

12 files changed

+2307
-1832
lines changed

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

Lines changed: 481 additions & 2 deletions
Large diffs are not rendered by default.

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/models/plugin.mps‎

Lines changed: 0 additions & 341 deletions
Large diffs are not rendered by default.

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.math/org.iets3.core.expr.math.mpl‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,7 @@
2424
</facet>
2525
</facets>
2626
<external-templates />
27-
<languageVersions>
28-
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
29-
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
30-
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="3" />
31-
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
32-
</languageVersions>
27+
<languageVersions />
3328
<dependencyVersions>
3429
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
3530
<module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
@@ -85,7 +80,6 @@
8580
<sourcePath />
8681
<dependencies>
8782
<dependency reexport="false">0fcee1cf-8f59-441b-b9c7-7ff7bdd6bc97(de.itemis.mps.editor.math.symbols)</dependency>
88-
<dependency reexport="false">28583149-5b6e-4663-9c02-b9a8fa3cb099(com.mbeddr.mpsutil.contextactions.runtime)</dependency>
8983
<dependency reexport="false">6b277d9a-d52d-416f-a209-1919bd737f50(org.iets3.core.expr.simpleTypes)</dependency>
9084
<dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
9185
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
@@ -100,7 +94,6 @@
10094
<dependency reexport="false">ecfb9949-7433-4db5-85de-0f84d172e4ce(de.q60.mps.libs)</dependency>
10195
</dependencies>
10296
<languageVersions>
103-
<language slang="l:677f00fb-4488-405e-9885-abb75d472fd1:com.mbeddr.mpsutil.contextactions" version="0" />
10497
<language slang="l:766348f7-6a67-4b85-9323-384840132299:de.itemis.mps.editor.math" version="0" />
10598
<language slang="l:e359e0a2-368a-4c40-ae2a-e5a09f9cfd58:de.itemis.mps.editor.math.notations" version="0" />
10699
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
@@ -113,6 +106,7 @@
113106
<language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
114107
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
115108
<language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
109+
<language slang="l:b1c7d06f-525d-43b5-9b0a-2fc8f7f076ba:jetbrains.mps.editor.contextActionsTool.lang.menus" version="0" />
116110
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
117111
<language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
118112
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
@@ -162,7 +156,6 @@
162156
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
163157
<module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="3" />
164158
<module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
165-
<module reference="28583149-5b6e-4663-9c02-b9a8fa3cb099(com.mbeddr.mpsutil.contextactions.runtime)" version="0" />
166159
<module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
167160
<module reference="47f075a6-558e-4640-a606-7ce0236c8023(com.mbeddr.mpsutil.interpreter)" version="0" />
168161
<module reference="735f86bc-17fb-4d1c-a664-82c2b8e8a34e(com.mbeddr.mpsutil.interpreter.rt)" version="0" />

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/plugin.mps‎

Lines changed: 0 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
66
<use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="-1" />
77
<use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="-1" />
8-
<use id="677f00fb-4488-405e-9885-abb75d472fd1" name="com.mbeddr.mpsutil.contextactions" version="-1" />
98
<use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="-1" />
109
<use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="-1" />
1110
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
@@ -16,7 +15,6 @@
1615
<import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" />
1716
<import index="yv47" ref="r:da65683e-ff6f-430d-ab68-32a77df72c93(org.iets3.core.expr.toplevel.structure)" />
1817
<import index="vs0r" ref="r:f7764ca4-8c75-4049-922b-08516400a727(com.mbeddr.core.base.structure)" />
19-
<import index="1ne1" ref="r:e9a49de8-6adf-4c2e-b5c2-32fc88189c93(com.mbeddr.mpsutil.contextactions.runtime)" />
2018
<import index="4k19" ref="1fd846c3-c5f9-4b9e-9ecc-e716f7149f86/java:org.hamcrest(Hamcrest/)" />
2119
<import index="pq1l" ref="r:93cd1fe8-b296-405c-a6e6-040c940ccfa1(org.iets3.core.expr.toplevel.plugin)" />
2220
<import index="2ahs" ref="r:ea6cf71d-29d2-478d-8027-a9f4a4de53c4(com.mbeddr.mpsutil.interpreter.rt)" />
@@ -26,7 +24,6 @@
2624
</imports>
2725
<registry>
2826
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
29-
<concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
3027
<concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
3128
<child id="1068498886297" name="rValue" index="37vLTx" />
3229
<child id="1068498886295" name="lValue" index="37vLTJ" />
@@ -165,32 +162,24 @@
165162
<concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
166163
<concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
167164
<concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
168-
<concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
169165
</language>
170166
<language id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension">
171167
<concept id="6626851894249711936" name="jetbrains.mps.lang.extension.structure.ExtensionPointExpression" flags="nn" index="2O5UvJ">
172168
<reference id="6626851894249712469" name="extensionPoint" index="2O5UnU" />
173169
</concept>
174170
<concept id="3175313036448560967" name="jetbrains.mps.lang.extension.structure.GetExtensionObjectsOperation" flags="nn" index="SfwO_" />
175171
</language>
176-
<language id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots">
177-
<concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
178-
</language>
179172
<language id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem">
180173
<concept id="1176544042499" name="jetbrains.mps.lang.typesystem.structure.Node_TypeOperation" flags="nn" index="3JvlWi" />
181174
</language>
182175
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
183176
<concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
184177
<reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
185178
</concept>
186-
<concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
187179
<concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
188180
<child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
189181
<child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
190182
</concept>
191-
<concept id="1180031783296" name="jetbrains.mps.lang.smodel.structure.Concept_IsSubConceptOfOperation" flags="nn" index="2Zo12i">
192-
<child id="1180031783297" name="conceptArgument" index="2Zo12j" />
193-
</concept>
194183
<concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
195184
<child id="1177027386292" name="conceptArgument" index="cj9EA" />
196185
</concept>
@@ -207,22 +196,6 @@
207196
<property id="1169194664001" name="name" index="TrG5h" />
208197
</concept>
209198
</language>
210-
<language id="677f00fb-4488-405e-9885-abb75d472fd1" name="com.mbeddr.mpsutil.contextactions">
211-
<concept id="5022141054904911899" name="com.mbeddr.mpsutil.contextactions.structure.SubstituteActionExpression" flags="ng" index="gcnaP" />
212-
<concept id="5022141054903714507" name="com.mbeddr.mpsutil.contextactions.structure.ContextExpression" flags="ng" index="gKNx_" />
213-
<concept id="6294660000051228482" name="com.mbeddr.mpsutil.contextactions.structure.ContextActions" flags="ng" index="NGJ2D">
214-
<child id="6294660000051228527" name="sources" index="NGJ24" />
215-
<child id="8645458101902647485" name="isApplicable" index="3V_frF" />
216-
</concept>
217-
<concept id="6294660000051228497" name="com.mbeddr.mpsutil.contextactions.structure.SubstituteInfoSource" flags="ng" index="NGJ2U">
218-
<child id="5022141054904911832" name="include" index="gcnPQ" />
219-
<child id="573955333602854986" name="folder" index="37Ct4v" />
220-
</concept>
221-
<concept id="8009069486207462978" name="com.mbeddr.mpsutil.contextactions.structure.ActionSourceWithCondition" flags="ng" index="3_Xg01">
222-
<child id="8009069486207463378" name="sources" index="3_Xg6h" />
223-
<child id="8009069486207463329" name="condition" index="3_Xg7y" />
224-
</concept>
225-
</language>
226199
<language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
227200
<concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
228201
<child id="540871147943773366" name="argument" index="25WWJ7" />
@@ -377,82 +350,6 @@
377350
<node concept="2tJIrI" id="2Qbt$1tTQg5" role="jymVt" />
378351
<node concept="3Tm1VV" id="2Qbt$1tTQaI" role="1B3o_S" />
379352
</node>
380-
<node concept="NGJ2D" id="5tr7YH$UwTY">
381-
<property role="TrG5h" value="TestsContextActions" />
382-
<node concept="3_Xg01" id="1yW0h04Dqdd" role="NGJ24">
383-
<node concept="NGJ2U" id="5lGdLibZyEN" role="3_Xg6h">
384-
<node concept="Xl_RD" id="vR6ln0lJV1" role="37Ct4v">
385-
<property role="Xl_RC" value="KernelF - Tests" />
386-
</node>
387-
<node concept="2EnYce" id="6W_V$eaXQzr" role="gcnPQ">
388-
<node concept="2OqwBi" id="13LyZYiLeRB" role="2Oq$k0">
389-
<node concept="gcnaP" id="13LyZYiLeOf" role="2Oq$k0" />
390-
<node concept="liA8E" id="13LyZYiLfmB" role="2OqNvi">
391-
<ref role="37wK5l" to="1ne1:7vUP_qcwDWl" resolve="getOutputConceptLanguageName" />
392-
</node>
393-
</node>
394-
<node concept="liA8E" id="13LyZYiLfUs" role="2OqNvi">
395-
<ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
396-
<node concept="Xl_RD" id="13LyZYiLfVa" role="37wK5m">
397-
<property role="Xl_RC" value="test" />
398-
</node>
399-
</node>
400-
</node>
401-
</node>
402-
<node concept="1Wc70l" id="4v5hZncVr8y" role="3_Xg7y">
403-
<node concept="2OqwBi" id="4v5hZncVr8z" role="3uHU7B">
404-
<node concept="2OqwBi" id="4v5hZncVr8$" role="2Oq$k0">
405-
<node concept="gKNx_" id="4v5hZncVr8_" role="2Oq$k0" />
406-
<node concept="liA8E" id="4v5hZncVr8A" role="2OqNvi">
407-
<ref role="37wK5l" to="1ne1:5tr7YH$Ux7R" resolve="getSNode" />
408-
</node>
409-
</node>
410-
<node concept="1mIQ4w" id="4v5hZncVr8B" role="2OqNvi">
411-
<node concept="chp4Y" id="4v5hZncVEfD" role="cj9EA">
412-
<ref role="cht4Q" to="yv47:2uR5X5ayM7T" resolve="IToplevelExprContent" />
413-
</node>
414-
</node>
415-
</node>
416-
<node concept="1eOMI4" id="4v5hZncVr8D" role="3uHU7w">
417-
<node concept="22lmx$" id="4v5hZncVr8E" role="1eOMHV">
418-
<node concept="2OqwBi" id="4v5hZncVr8F" role="3uHU7B">
419-
<node concept="2OqwBi" id="4v5hZncVr8G" role="2Oq$k0">
420-
<node concept="2OqwBi" id="4v5hZncVr8H" role="2Oq$k0">
421-
<node concept="gKNx_" id="4v5hZncVr8I" role="2Oq$k0" />
422-
<node concept="liA8E" id="4v5hZncVr8J" role="2OqNvi">
423-
<ref role="37wK5l" to="1ne1:5tr7YH$Ux7R" resolve="getSNode" />
424-
</node>
425-
</node>
426-
<node concept="2yIwOk" id="4v5hZncVr8K" role="2OqNvi" />
427-
</node>
428-
<node concept="liA8E" id="4v5hZncVr8L" role="2OqNvi">
429-
<ref role="37wK5l" to="c17a:~SAbstractConcept.isAbstract()" resolve="isAbstract" />
430-
</node>
431-
</node>
432-
<node concept="2OqwBi" id="4v5hZncVr8N" role="3uHU7w">
433-
<node concept="2OqwBi" id="4v5hZncVr8O" role="2Oq$k0">
434-
<node concept="2OqwBi" id="4v5hZncVr8P" role="2Oq$k0">
435-
<node concept="gKNx_" id="4v5hZncVr8Q" role="2Oq$k0" />
436-
<node concept="liA8E" id="4v5hZncVr8R" role="2OqNvi">
437-
<ref role="37wK5l" to="1ne1:5tr7YH$Ux7R" resolve="getSNode" />
438-
</node>
439-
</node>
440-
<node concept="2yIwOk" id="4v5hZncVr8S" role="2OqNvi" />
441-
</node>
442-
<node concept="2Zo12i" id="4v5hZncVFbB" role="2OqNvi">
443-
<node concept="chp4Y" id="4v5hZncVFhl" role="2Zo12j">
444-
<ref role="cht4Q" to="vs0r:Ug1QzfhXN3" resolve="IEmpty" />
445-
</node>
446-
</node>
447-
</node>
448-
</node>
449-
</node>
450-
</node>
451-
</node>
452-
<node concept="3clFbT" id="13LyZYiLqnI" role="3V_frF">
453-
<property role="3clFbU" value="true" />
454-
</node>
455-
</node>
456353
<node concept="312cEu" id="5Pgo_AS6VnV">
457354
<property role="TrG5h" value="ConstraintFailed" />
458355
<node concept="2tJIrI" id="2LEfNl_1Ps6" role="jymVt" />

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/org.iets3.core.expr.tests.mpl‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@
157157
<dependency reexport="false">f61473f9-130f-42f6-b98d-6c438812c2f6(jetbrains.mps.baseLanguage.unitTest)</dependency>
158158
<dependency reexport="false">8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test)</dependency>
159159
<dependency reexport="false">707c4fde-f79a-44b5-b3d7-b5cef8844ccf(jetbrains.mps.lang.test.runtime)</dependency>
160-
<dependency reexport="false">28583149-5b6e-4663-9c02-b9a8fa3cb099(com.mbeddr.mpsutil.contextactions.runtime)</dependency>
161160
<dependency reexport="false">2022a471-10ba-4431-ba5d-622df898f3c6(org.iets3.core.expr.testExecution)</dependency>
162161
<dependency reexport="false">dbe08fb5-334d-4b64-86a0-622406fa0e87(org.iets3.core.expr.base.runtime)</dependency>
163162
<dependency reexport="false">b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)</dependency>
@@ -166,7 +165,6 @@
166165
</dependencies>
167166
<languageVersions>
168167
<language slang="l:f3b3dc28-fee3-49e1-a46e-685e96389094:com.mbeddr.mpsutil.bldoc" version="0" />
169-
<language slang="l:677f00fb-4488-405e-9885-abb75d472fd1:com.mbeddr.mpsutil.contextactions" version="0" />
170168
<language slang="l:120e1c9d-4e27-4478-b2af-b2c3bd3850b0:com.mbeddr.mpsutil.editor.querylist" version="0" />
171169
<language slang="l:b33d119e-196d-4497-977c-5c167b21fe33:com.mbeddr.mpsutil.framecell" version="0" />
172170
<language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="1" />
@@ -245,7 +243,6 @@
245243
<module reference="920eaa0e-ecca-46bc-bee7-4e5c59213dd6(Testbench)" version="0" />
246244
<module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="3" />
247245
<module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
248-
<module reference="28583149-5b6e-4663-9c02-b9a8fa3cb099(com.mbeddr.mpsutil.contextactions.runtime)" version="0" />
249246
<module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
250247
<module reference="b33d119e-196d-4497-977c-5c167b21fe33(com.mbeddr.mpsutil.framecell)" version="0" />
251248
<module reference="47f075a6-558e-4640-a606-7ce0236c8023(com.mbeddr.mpsutil.interpreter)" version="0" />

0 commit comments

Comments
 (0)