Skip to content

Commit ca6d916

Browse files
markusvoeltermarkusvoelter
committed
did the cleanup. No change in functionality.
1 parent 127211d commit ca6d916

File tree

7 files changed

+264
-168
lines changed

7 files changed

+264
-168
lines changed

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

Lines changed: 236 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
<use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="5" />
1111
<use id="b8bb702e-43ed-4090-a902-d180d3e5f292" name="de.slisson.mps.conditionalEditor" version="0" />
1212
<use id="52733268-be24-4f5f-ab84-a73b7c0c03b0" name="de.slisson.mps.richtext.customcell" version="0" />
13-
<use id="120e1c9d-4e27-4478-b2af-b2c3bd3850b0" name="com.mbeddr.mpsutil.editor.querylist" version="0" />
14-
<use id="b33d119e-196d-4497-977c-5c167b21fe33" name="com.mbeddr.mpsutil.framecell" version="0" />
1513
<use id="b1ab8c10-c118-4755-bf2a-cebab35cf533" name="jetbrains.mps.lang.editor.tooltips" version="0" />
1614
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
1715
</languages>
@@ -38,6 +36,8 @@
3836
<import index="vndm" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.language(MPS.Core/)" />
3937
<import index="6lvu" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.cellMenu(MPS.Editor/)" />
4038
<import index="q4oi" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.cellActions(MPS.Editor/)" />
39+
<import index="av1m" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.menus.style(MPS.Editor/)" />
40+
<import index="fulz" ref="r:6f792c44-2a5d-40e8-9f05-33f7d4ae26ec(jetbrains.mps.editor.runtime.completion)" />
4141
<import index="gdgh" ref="r:e4d9478b-ae0e-416e-be60-73d136571015(org.iets3.core.base.behavior)" implicit="true" />
4242
<import index="vs0r" ref="r:f7764ca4-8c75-4049-922b-08516400a727(com.mbeddr.core.base.structure)" implicit="true" />
4343
</imports>
@@ -372,6 +372,10 @@
372372
<concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
373373
<concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
374374
<concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
375+
<concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
376+
<child id="1070534934091" name="type" index="10QFUM" />
377+
<child id="1070534934092" name="expression" index="10QFUP" />
378+
</concept>
375379
<concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
376380
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
377381
<property id="1176718929932" name="isFinal" index="3TUv4t" />
@@ -425,6 +429,7 @@
425429
</concept>
426430
<concept id="1068581242869" name="jetbrains.mps.baseLanguage.structure.MinusExpression" flags="nn" index="3cpWsd" />
427431
<concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
432+
<concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
428433
<concept id="1206060495898" name="jetbrains.mps.baseLanguage.structure.ElsifClause" flags="ng" index="3eNFk2">
429434
<child id="1206060619838" name="condition" index="3eO9$A" />
430435
<child id="1206060644605" name="statementList" index="3eOfB_" />
@@ -6865,5 +6870,234 @@
68656870
</node>
68666871
</node>
68676872
</node>
6873+
<node concept="312cEu" id="jqB9UdvFo_">
6874+
<property role="TrG5h" value="PriorisationHelper" />
6875+
<node concept="2tJIrI" id="jqB9UdvFSX" role="jymVt" />
6876+
<node concept="2YIFZL" id="jqB9UdvG0w" role="jymVt">
6877+
<property role="TrG5h" value="prioritizeByRef" />
6878+
<node concept="3cqZAl" id="jqB9UdvG0y" role="3clF45" />
6879+
<node concept="3Tm1VV" id="jqB9UdvG0z" role="1B3o_S" />
6880+
<node concept="3clFbS" id="jqB9UdvG0$" role="3clF47">
6881+
<node concept="3cpWs8" id="6wzrxL3tVqH" role="3cqZAp">
6882+
<node concept="3cpWsn" id="6wzrxL3tVqI" role="3cpWs9">
6883+
<property role="TrG5h" value="ppc" />
6884+
<node concept="3Tqbb2" id="6wzrxL3tVeR" role="1tU5fm">
6885+
<ref role="ehGHo" to="hm2y:6wzrxL38hak" resolve="IPreferredProposalContext" />
6886+
</node>
6887+
<node concept="2OqwBi" id="6wzrxL3tVqJ" role="33vP2m">
6888+
<node concept="37vLTw" id="jqB9UdvH4U" role="2Oq$k0">
6889+
<ref role="3cqZAo" node="jqB9UdvGL1" resolve="parent" />
6890+
</node>
6891+
<node concept="2Xjw5R" id="6wzrxL3tVqL" role="2OqNvi">
6892+
<node concept="1xMEDy" id="6wzrxL3tVqM" role="1xVPHs">
6893+
<node concept="chp4Y" id="6wzrxL3tVqN" role="ri$Ld">
6894+
<ref role="cht4Q" to="hm2y:6wzrxL38hak" resolve="IPreferredProposalContext" />
6895+
</node>
6896+
</node>
6897+
<node concept="1xIGOp" id="6wzrxL3tVqO" role="1xVPHs" />
6898+
</node>
6899+
</node>
6900+
</node>
6901+
</node>
6902+
<node concept="3clFbJ" id="6wzrxL3tTQz" role="3cqZAp">
6903+
<node concept="3clFbS" id="6wzrxL3tTQ_" role="3clFbx">
6904+
<node concept="3clFbF" id="6wzrxL3a_k5" role="3cqZAp">
6905+
<node concept="2OqwBi" id="6wzrxL3a_or" role="3clFbG">
6906+
<node concept="37vLTw" id="jqB9UdvJ82" role="2Oq$k0">
6907+
<ref role="3cqZAo" node="jqB9UdvJbd" resolve="style" />
6908+
</node>
6909+
<node concept="liA8E" id="6wzrxL3a_Ak" role="2OqNvi">
6910+
<ref role="37wK5l" to="av1m:~EditorMenuItemStyle.setPriority(double)" resolve="setPriority" />
6911+
<node concept="3cmrfG" id="6wzrxL3a_Hn" role="37wK5m">
6912+
<property role="3cmrfH" value="100" />
6913+
</node>
6914+
</node>
6915+
</node>
6916+
</node>
6917+
<node concept="3clFbF" id="6wzrxL3aZyv" role="3cqZAp">
6918+
<node concept="2OqwBi" id="6wzrxL3aZFC" role="3clFbG">
6919+
<node concept="37vLTw" id="jqB9UdvJ83" role="2Oq$k0">
6920+
<ref role="3cqZAo" node="jqB9UdvJbd" resolve="style" />
6921+
</node>
6922+
<node concept="liA8E" id="6wzrxL3aZXi" role="2OqNvi">
6923+
<ref role="37wK5l" to="av1m:~EditorMenuItemStyle.setBackgroundColor(java.awt.Color)" resolve="setBackgroundColor" />
6924+
<node concept="2YIFZM" id="6wzrxL3b0wN" role="37wK5m">
6925+
<ref role="37wK5l" to="z60i:~Color.decode(java.lang.String)" resolve="decode" />
6926+
<ref role="1Pybhc" to="z60i:~Color" resolve="Color" />
6927+
<node concept="Xl_RD" id="6wzrxL3b0Em" role="37wK5m">
6928+
<property role="Xl_RC" value="#eeeeee" />
6929+
</node>
6930+
</node>
6931+
</node>
6932+
</node>
6933+
</node>
6934+
</node>
6935+
<node concept="1Wc70l" id="6wzrxL3tVIE" role="3clFbw">
6936+
<node concept="2OqwBi" id="6wzrxL3tW1Z" role="3uHU7w">
6937+
<node concept="37vLTw" id="6wzrxL3tVLl" role="2Oq$k0">
6938+
<ref role="3cqZAo" node="6wzrxL3tVqI" resolve="ppc" />
6939+
</node>
6940+
<node concept="2qgKlT" id="6wzrxL3tWtr" role="2OqNvi">
6941+
<ref role="37wK5l" to="pbu6:6wzrxL38h$$" resolve="isPreferred" />
6942+
<node concept="1eOMI4" id="6wzrxL3tXot" role="37wK5m">
6943+
<node concept="10QFUN" id="6wzrxL3tXos" role="1eOMHV">
6944+
<node concept="2OqwBi" id="6wzrxL3tXop" role="10QFUP">
6945+
<node concept="37vLTw" id="jqB9UdvHrX" role="2Oq$k0">
6946+
<ref role="3cqZAo" node="jqB9UdvHO8" resolve="info" />
6947+
</node>
6948+
<node concept="liA8E" id="6wzrxL3tXor" role="2OqNvi">
6949+
<ref role="37wK5l" to="fulz:6MqJAGngeyx" resolve="getParameterObject" />
6950+
</node>
6951+
</node>
6952+
<node concept="3Tqbb2" id="6wzrxL3tXoo" role="10QFUM" />
6953+
</node>
6954+
</node>
6955+
<node concept="37vLTw" id="jqB9UdvIKW" role="37wK5m">
6956+
<ref role="3cqZAo" node="jqB9UdvItU" resolve="currentChild" />
6957+
</node>
6958+
</node>
6959+
</node>
6960+
<node concept="2OqwBi" id="6wzrxL3tUMB" role="3uHU7B">
6961+
<node concept="37vLTw" id="6wzrxL3tVqP" role="2Oq$k0">
6962+
<ref role="3cqZAo" node="6wzrxL3tVqI" resolve="ppc" />
6963+
</node>
6964+
<node concept="3x8VRR" id="6wzrxL3tV9s" role="2OqNvi" />
6965+
</node>
6966+
</node>
6967+
</node>
6968+
</node>
6969+
<node concept="37vLTG" id="jqB9UdvHO8" role="3clF46">
6970+
<property role="TrG5h" value="info" />
6971+
<node concept="3uibUv" id="jqB9UdvHYA" role="1tU5fm">
6972+
<ref role="3uigEE" to="fulz:6MqJAGng6el" resolve="CompletionItemInformation" />
6973+
</node>
6974+
</node>
6975+
<node concept="37vLTG" id="jqB9UdvJbd" role="3clF46">
6976+
<property role="TrG5h" value="style" />
6977+
<node concept="3uibUv" id="jqB9UdvJe7" role="1tU5fm">
6978+
<ref role="3uigEE" to="av1m:~EditorMenuItemStyle" resolve="EditorMenuItemStyle" />
6979+
</node>
6980+
</node>
6981+
<node concept="37vLTG" id="jqB9UdvGL1" role="3clF46">
6982+
<property role="TrG5h" value="parent" />
6983+
<node concept="3Tqbb2" id="jqB9UdvGL0" role="1tU5fm" />
6984+
</node>
6985+
<node concept="37vLTG" id="jqB9UdvItU" role="3clF46">
6986+
<property role="TrG5h" value="currentChild" />
6987+
<node concept="3Tqbb2" id="jqB9UdvIC4" role="1tU5fm" />
6988+
</node>
6989+
</node>
6990+
<node concept="2YIFZL" id="jqB9UdvOlZ" role="jymVt">
6991+
<property role="TrG5h" value="prioritizeByConcept" />
6992+
<node concept="3cqZAl" id="jqB9UdvOm0" role="3clF45" />
6993+
<node concept="3Tm1VV" id="jqB9UdvOm1" role="1B3o_S" />
6994+
<node concept="3clFbS" id="jqB9UdvOm2" role="3clF47">
6995+
<node concept="3cpWs8" id="jqB9UdvOm3" role="3cqZAp">
6996+
<node concept="3cpWsn" id="jqB9UdvOm4" role="3cpWs9">
6997+
<property role="TrG5h" value="ppc" />
6998+
<node concept="3Tqbb2" id="jqB9UdvOm5" role="1tU5fm">
6999+
<ref role="ehGHo" to="hm2y:6wzrxL38hak" resolve="IPreferredProposalContext" />
7000+
</node>
7001+
<node concept="2OqwBi" id="jqB9UdvOm6" role="33vP2m">
7002+
<node concept="37vLTw" id="jqB9UdvOm7" role="2Oq$k0">
7003+
<ref role="3cqZAo" node="jqB9UdvOmF" resolve="parent" />
7004+
</node>
7005+
<node concept="2Xjw5R" id="jqB9UdvOm8" role="2OqNvi">
7006+
<node concept="1xMEDy" id="jqB9UdvOm9" role="1xVPHs">
7007+
<node concept="chp4Y" id="jqB9UdvOma" role="ri$Ld">
7008+
<ref role="cht4Q" to="hm2y:6wzrxL38hak" resolve="IPreferredProposalContext" />
7009+
</node>
7010+
</node>
7011+
<node concept="1xIGOp" id="jqB9UdvOmb" role="1xVPHs" />
7012+
</node>
7013+
</node>
7014+
</node>
7015+
</node>
7016+
<node concept="3clFbJ" id="jqB9UdvOmc" role="3cqZAp">
7017+
<node concept="3clFbS" id="jqB9UdvOmd" role="3clFbx">
7018+
<node concept="3clFbF" id="jqB9UdvOme" role="3cqZAp">
7019+
<node concept="2OqwBi" id="jqB9UdvOmf" role="3clFbG">
7020+
<node concept="37vLTw" id="jqB9UdvOmg" role="2Oq$k0">
7021+
<ref role="3cqZAo" node="jqB9UdvOmD" resolve="style" />
7022+
</node>
7023+
<node concept="liA8E" id="jqB9UdvOmh" role="2OqNvi">
7024+
<ref role="37wK5l" to="av1m:~EditorMenuItemStyle.setPriority(double)" resolve="setPriority" />
7025+
<node concept="3cmrfG" id="jqB9UdvOmi" role="37wK5m">
7026+
<property role="3cmrfH" value="100" />
7027+
</node>
7028+
</node>
7029+
</node>
7030+
</node>
7031+
<node concept="3clFbF" id="jqB9UdvOmj" role="3cqZAp">
7032+
<node concept="2OqwBi" id="jqB9UdvOmk" role="3clFbG">
7033+
<node concept="37vLTw" id="jqB9UdvOml" role="2Oq$k0">
7034+
<ref role="3cqZAo" node="jqB9UdvOmD" resolve="style" />
7035+
</node>
7036+
<node concept="liA8E" id="jqB9UdvOmm" role="2OqNvi">
7037+
<ref role="37wK5l" to="av1m:~EditorMenuItemStyle.setBackgroundColor(java.awt.Color)" resolve="setBackgroundColor" />
7038+
<node concept="2YIFZM" id="jqB9UdvOmn" role="37wK5m">
7039+
<ref role="37wK5l" to="z60i:~Color.decode(java.lang.String)" resolve="decode" />
7040+
<ref role="1Pybhc" to="z60i:~Color" resolve="Color" />
7041+
<node concept="Xl_RD" id="jqB9UdvOmo" role="37wK5m">
7042+
<property role="Xl_RC" value="#eeeeee" />
7043+
</node>
7044+
</node>
7045+
</node>
7046+
</node>
7047+
</node>
7048+
</node>
7049+
<node concept="1Wc70l" id="jqB9UdvOmp" role="3clFbw">
7050+
<node concept="2OqwBi" id="jqB9UdvOmq" role="3uHU7w">
7051+
<node concept="37vLTw" id="jqB9UdvOmr" role="2Oq$k0">
7052+
<ref role="3cqZAo" node="jqB9UdvOm4" resolve="ppc" />
7053+
</node>
7054+
<node concept="2qgKlT" id="jqB9UdvOms" role="2OqNvi">
7055+
<ref role="37wK5l" to="pbu6:jqB9UdsEeJ" resolve="isPreferred" />
7056+
<node concept="2OqwBi" id="jqB9UdvQn5" role="37wK5m">
7057+
<node concept="37vLTw" id="jqB9UdvQcE" role="2Oq$k0">
7058+
<ref role="3cqZAo" node="jqB9UdvOmB" resolve="info" />
7059+
</node>
7060+
<node concept="liA8E" id="jqB9UdvQAJ" role="2OqNvi">
7061+
<ref role="37wK5l" to="fulz:6MqJAGngeyC" resolve="getOutputConcept" />
7062+
</node>
7063+
</node>
7064+
<node concept="37vLTw" id="jqB9UdvOmz" role="37wK5m">
7065+
<ref role="3cqZAo" node="jqB9UdvOmH" resolve="currentChild" />
7066+
</node>
7067+
</node>
7068+
</node>
7069+
<node concept="2OqwBi" id="jqB9UdvOm$" role="3uHU7B">
7070+
<node concept="37vLTw" id="jqB9UdvOm_" role="2Oq$k0">
7071+
<ref role="3cqZAo" node="jqB9UdvOm4" resolve="ppc" />
7072+
</node>
7073+
<node concept="3x8VRR" id="jqB9UdvOmA" role="2OqNvi" />
7074+
</node>
7075+
</node>
7076+
</node>
7077+
</node>
7078+
<node concept="37vLTG" id="jqB9UdvOmB" role="3clF46">
7079+
<property role="TrG5h" value="info" />
7080+
<node concept="3uibUv" id="jqB9UdvOmC" role="1tU5fm">
7081+
<ref role="3uigEE" to="fulz:6MqJAGng6el" resolve="CompletionItemInformation" />
7082+
</node>
7083+
</node>
7084+
<node concept="37vLTG" id="jqB9UdvOmD" role="3clF46">
7085+
<property role="TrG5h" value="style" />
7086+
<node concept="3uibUv" id="jqB9UdvOmE" role="1tU5fm">
7087+
<ref role="3uigEE" to="av1m:~EditorMenuItemStyle" resolve="EditorMenuItemStyle" />
7088+
</node>
7089+
</node>
7090+
<node concept="37vLTG" id="jqB9UdvOmF" role="3clF46">
7091+
<property role="TrG5h" value="parent" />
7092+
<node concept="3Tqbb2" id="jqB9UdvOmG" role="1tU5fm" />
7093+
</node>
7094+
<node concept="37vLTG" id="jqB9UdvOmH" role="3clF46">
7095+
<property role="TrG5h" value="currentChild" />
7096+
<node concept="3Tqbb2" id="jqB9UdvOmI" role="1tU5fm" />
7097+
</node>
7098+
</node>
7099+
<node concept="2tJIrI" id="jqB9UdvFT2" role="jymVt" />
7100+
<node concept="3Tm1VV" id="jqB9UdvFoA" role="1B3o_S" />
7101+
</node>
68687102
</model>
68697103

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,10 @@
2626
<dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
2727
<dependency reexport="false">dbe08fb5-334d-4b64-86a0-622406fa0e87(org.iets3.core.expr.base.runtime)</dependency>
2828
<dependency reexport="false">00ca1323-762b-4f39-ab5a-6a6bd602dc4b(org.iets3.core.expr.base.shared.runtime)</dependency>
29+
<dependency reexport="false">34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)</dependency>
2930
</dependencies>
3031
<languageVersions>
3132
<language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
32-
<language slang="l:120e1c9d-4e27-4478-b2af-b2c3bd3850b0:com.mbeddr.mpsutil.editor.querylist" version="0" />
33-
<language slang="l:b33d119e-196d-4497-977c-5c167b21fe33:com.mbeddr.mpsutil.framecell" version="0" />
3433
<language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="2" />
3534
<language slang="l:b4f35ed8-45af-4efa-abe4-00ac26956e69:com.mbeddr.mpsutil.grammarcells.runtimelang" version="0" />
3635
<language slang="l:b92f861d-0184-446d-b88b-6dcf0e070241:com.mbeddr.mpsutil.intentions" version="0" />
@@ -117,6 +116,7 @@
117116
<module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
118117
<module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
119118
<module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
119+
<module reference="34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)" version="0" />
120120
<module reference="5b1f863d-65a0-41a6-a801-33896be24202(jetbrains.mps.ide.editor)" version="0" />
121121
<module reference="23865718-e2ed-41b5-a132-0da1d04e266d(jetbrains.mps.ide.httpsupport.manager)" version="0" />
122122
<module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />

0 commit comments

Comments
 (0)