Skip to content

Commit 795c61e

Browse files
HeikoBeckerHeikoBecker
authored
Merge pull request #676 from IETS3/bugfix/typetags_editor_675
Add a EndCell to tagged expressions (#675)
2 parents 3df8c7e + 480e9c7 commit 795c61e

File tree

3 files changed

+112
-1
lines changed

3 files changed

+112
-1
lines changed

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

Lines changed: 95 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@
1010
<imports>
1111
<import index="itrz" ref="r:80fb0853-eb3b-4e84-aebd-cc7fdb011d97(org.iets3.core.base.editor)" />
1212
<import index="w1hl" ref="r:04b74a30-84ff-4d44-89e3-8084278f9c79(org.iets3.core.expr.typetags.structure)" />
13+
<import index="hwgx" ref="r:fd2980c8-676c-4b19-b524-18c70e02f8b7(com.mbeddr.core.base.behavior)" />
14+
<import index="vs0r" ref="r:f7764ca4-8c75-4049-922b-08516400a727(com.mbeddr.core.base.structure)" />
15+
<import index="m999" ref="r:1d6bd88a-7393-4b32-b0e6-2d8b3094776e(org.iets3.core.expr.toplevel.editor)" />
16+
<import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
1317
<import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
14-
<import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" implicit="true" />
1518
<import index="qlm2" ref="r:c0482758-b46b-48c3-8482-fa4a3115b53b(org.iets3.core.expr.typetags.behavior)" implicit="true" />
1619
<import index="hm2y" ref="r:66e07cb4-a4b0-4bf3-a36d-5e9ed1ff1bd3(org.iets3.core.expr.base.structure)" implicit="true" />
1720
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
@@ -34,7 +37,11 @@
3437
<child id="1140524464359" name="emptyCellModel" index="2czzBI" />
3538
<child id="1233141163694" name="separatorStyle" index="sWeuL" />
3639
</concept>
40+
<concept id="1078308402140" name="jetbrains.mps.lang.editor.structure.CellModel_Custom" flags="sg" stub="8104358048506730068" index="gc7cB">
41+
<child id="1176795024817" name="cellProvider" index="3YsKMw" />
42+
</concept>
3743
<concept id="1237303669825" name="jetbrains.mps.lang.editor.structure.CellLayout_Indent" flags="nn" index="l2Vlx" />
44+
<concept id="1142886811589" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_node" flags="nn" index="pncrf" />
3845
<concept id="1233148810477" name="jetbrains.mps.lang.editor.structure.InlineStyleDeclaration" flags="ng" index="tppnM" />
3946
<concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
4047
<child id="1080736633877" name="cellModel" index="2wV5jI" />
@@ -147,6 +154,7 @@
147154
<child id="7980428675268276157" name="locations" index="1Qtc8$" />
148155
<child id="7980428675268276159" name="parts" index="1Qtc8A" />
149156
</concept>
157+
<concept id="1176749715029" name="jetbrains.mps.lang.editor.structure.QueryFunction_CellProvider" flags="in" index="3VJUX4" />
150158
<concept id="1950447826681509042" name="jetbrains.mps.lang.editor.structure.ApplyStyleClass" flags="lg" index="3Xmtl4">
151159
<child id="1950447826683828796" name="target" index="3XvnJa" />
152160
</concept>
@@ -157,6 +165,9 @@
157165
</language>
158166
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
159167
<concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
168+
<concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
169+
<child id="1082485599096" name="statements" index="9aQI4" />
170+
</concept>
160171
<concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
161172
<child id="1068498886297" name="rValue" index="37vLTx" />
162173
<child id="1068498886295" name="lValue" index="37vLTJ" />
@@ -201,6 +212,7 @@
201212
</concept>
202213
<concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
203214
<concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
215+
<child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
204216
<child id="1068580123160" name="condition" index="3clFbw" />
205217
<child id="1068580123161" name="ifTrue" index="3clFbx" />
206218
</concept>
@@ -224,6 +236,10 @@
224236
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
225237
<child id="1068499141038" name="actualArgument" index="37wK5m" />
226238
</concept>
239+
<concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
240+
<concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
241+
<reference id="1107535924139" name="classifier" index="3uigEE" />
242+
</concept>
227243
<concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
228244
<child id="1081773367579" name="rightExpression" index="3uHU7w" />
229245
<child id="1081773367580" name="leftExpression" index="3uHU7B" />
@@ -288,6 +304,10 @@
288304
<concept id="6677504323281689838" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3bZ5Sz">
289305
<reference id="6677504323281689839" name="conceptDeclaraton" index="3bZ5Sy" />
290306
</concept>
307+
<concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
308+
<concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
309+
<child id="1177027386292" name="conceptArgument" index="cj9EA" />
310+
</concept>
291311
<concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
292312
<concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
293313
<concept id="1144100932627" name="jetbrains.mps.lang.smodel.structure.OperationParm_Inclusion" flags="ng" index="1xIGOp" />
@@ -635,6 +655,80 @@
635655
</node>
636656
</node>
637657
</node>
658+
<node concept="gc7cB" id="54iJjjLL2bx" role="3EZMnx">
659+
<node concept="3VJUX4" id="54iJjjLL2bz" role="3YsKMw">
660+
<node concept="3clFbS" id="54iJjjLL2b_" role="2VODD2">
661+
<node concept="3cpWs8" id="264ij5$S6x1" role="3cqZAp">
662+
<node concept="3cpWsn" id="264ij5$S6x2" role="3cpWs9">
663+
<property role="TrG5h" value="pp" />
664+
<node concept="3Tqbb2" id="264ij5$S6x3" role="1tU5fm" />
665+
<node concept="2OqwBi" id="264ij5$S6x4" role="33vP2m">
666+
<node concept="pncrf" id="54iJjjLL2pu" role="2Oq$k0" />
667+
<node concept="1mfA1w" id="264ij5$S6x6" role="2OqNvi" />
668+
</node>
669+
</node>
670+
</node>
671+
<node concept="3clFbJ" id="264ij5$S6x7" role="3cqZAp">
672+
<node concept="2OqwBi" id="264ij5$S6x8" role="3clFbw">
673+
<node concept="37vLTw" id="264ij5$S6x9" role="2Oq$k0">
674+
<ref role="3cqZAo" node="264ij5$S6x2" resolve="pp" />
675+
</node>
676+
<node concept="1mIQ4w" id="264ij5$S6xa" role="2OqNvi">
677+
<node concept="chp4Y" id="264ij5$S6xb" role="cj9EA">
678+
<ref role="cht4Q" to="vs0r:7uLL3Mf3udZ" resolve="ITextBlockOwner" />
679+
</node>
680+
</node>
681+
</node>
682+
<node concept="3clFbS" id="264ij5$S6xc" role="3clFbx">
683+
<node concept="3cpWs8" id="264ij5$S6xd" role="3cqZAp">
684+
<node concept="3cpWsn" id="264ij5$S6xe" role="3cpWs9">
685+
<property role="TrG5h" value="color" />
686+
<node concept="3uibUv" id="264ij5$S6xf" role="1tU5fm">
687+
<ref role="3uigEE" to="z60i:~Color" resolve="Color" />
688+
</node>
689+
<node concept="2OqwBi" id="264ij5$S6xg" role="33vP2m">
690+
<node concept="1PxgMI" id="264ij5$S6xh" role="2Oq$k0">
691+
<node concept="37vLTw" id="264ij5$S6xi" role="1m5AlR">
692+
<ref role="3cqZAo" node="264ij5$S6x2" resolve="pp" />
693+
</node>
694+
<node concept="chp4Y" id="264ij5$S6xj" role="3oSUPX">
695+
<ref role="cht4Q" to="vs0r:7uLL3Mf3udZ" resolve="ITextBlockOwner" />
696+
</node>
697+
</node>
698+
<node concept="2qgKlT" id="264ij5$S6xk" role="2OqNvi">
699+
<ref role="37wK5l" to="hwgx:BsHjoDQZaR" resolve="getTextColor" />
700+
</node>
701+
</node>
702+
</node>
703+
</node>
704+
<node concept="3cpWs6" id="264ij5$S6xl" role="3cqZAp">
705+
<node concept="2ShNRf" id="264ij5$S6xm" role="3cqZAk">
706+
<node concept="1pGfFk" id="264ij5$S6xn" role="2ShVmc">
707+
<ref role="37wK5l" to="m999:1F0U9H74l9y" resolve="EndCell" />
708+
<node concept="pncrf" id="264ij5$S6xo" role="37wK5m" />
709+
<node concept="37vLTw" id="264ij5$S6xp" role="37wK5m">
710+
<ref role="3cqZAo" node="264ij5$S6xe" resolve="color" />
711+
</node>
712+
</node>
713+
</node>
714+
</node>
715+
</node>
716+
<node concept="9aQIb" id="264ij5$S6xq" role="9aQIa">
717+
<node concept="3clFbS" id="264ij5$S6xr" role="9aQI4">
718+
<node concept="3cpWs6" id="264ij5$S6xs" role="3cqZAp">
719+
<node concept="2ShNRf" id="264ij5$S6xt" role="3cqZAk">
720+
<node concept="1pGfFk" id="264ij5$S6xu" role="2ShVmc">
721+
<ref role="37wK5l" to="m999:1F0U9H74l9q" resolve="EndCell" />
722+
<node concept="pncrf" id="264ij5$S6xv" role="37wK5m" />
723+
</node>
724+
</node>
725+
</node>
726+
</node>
727+
</node>
728+
</node>
729+
</node>
730+
</node>
731+
</node>
638732
<node concept="l2Vlx" id="7eOyx9r3D2u" role="2iSdaV" />
639733
<node concept="34QqEe" id="4Lmaxwvrdv7" role="3F10Kt">
640734
<property role="VOm3f" value="true" />

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@
107107
<dependency reexport="false">7a5dda62-9140-4668-ab76-d5ed1746f2b2(jetbrains.mps.lang.typesystem)</dependency>
108108
<dependency reexport="false">47f075a6-558e-4640-a606-7ce0236c8023(com.mbeddr.mpsutil.interpreter)</dependency>
109109
<dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
110+
<dependency reexport="false">d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)</dependency>
111+
<dependency reexport="false">71934284-d7d1-45ee-a054-8c072591085f(org.iets3.core.expr.toplevel)</dependency>
110112
</dependencies>
111113
<languageVersions>
112114
<language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="2" />
@@ -161,6 +163,7 @@
161163
<module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
162164
<module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
163165
<module reference="726886d1-ef90-4249-a08f-1e3ec23a7113(com.mbeddr.mpsutil.traceExplorer)" version="0" />
166+
<module reference="3819ba36-98f4-49ac-b779-34f3a458c09b(com.mbeddr.mpsutil.varscope)" version="0" />
164167
<module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
165168
<module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
166169
<module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
@@ -187,6 +190,10 @@
187190
<module reference="db8bd035-3f51-41d8-8fed-954c202d18be(org.iets3.analysis.base)" version="1" />
188191
<module reference="7b68d745-a7b8-48b9-bd9c-05c0f8725a35(org.iets3.core.base)" version="0" />
189192
<module reference="cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)" version="3" />
193+
<module reference="2f7e2e35-6e74-4c43-9fa5-2465d68f5996(org.iets3.core.expr.collections)" version="5" />
194+
<module reference="9464fa06-5ab9-409b-9274-64ab29588457(org.iets3.core.expr.lambda)" version="0" />
195+
<module reference="f3eafff0-30d2-46d6-9150-f0f3b880ce27(org.iets3.core.expr.path)" version="0" />
196+
<module reference="71934284-d7d1-45ee-a054-8c072591085f(org.iets3.core.expr.toplevel)" version="2" />
190197
<module reference="5186c6ce-428c-4f09-a9df-73d9e86c27d3(org.iets3.core.expr.typetags)" version="0" />
191198
</dependencyVersions>
192199
<extendedLanguages>

‎code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1663,6 +1663,16 @@
16631663
<ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
16641664
</node>
16651665
</node>
1666+
<node concept="1SiIV0" id="54iJjjLMxbN" role="3bR37C">
1667+
<node concept="3bR9La" id="54iJjjLMxbO" role="1SiIV1">
1668+
<ref role="3bR37D" to="al5i:$bJ0jguQfr" resolve="com.mbeddr.core.base" />
1669+
</node>
1670+
</node>
1671+
<node concept="1SiIV0" id="54iJjjLMxbP" role="3bR37C">
1672+
<node concept="3bR9La" id="54iJjjLMxbQ" role="1SiIV1">
1673+
<ref role="3bR37D" node="2uR5X5azttH" resolve="org.iets3.core.expr.toplevel" />
1674+
</node>
1675+
</node>
16661676
</node>
16671677
<node concept="1E1JtD" id="JUiQTzdtrz" role="2G$12L">
16681678
<property role="BnDLt" value="true" />

0 commit comments

Comments
 (0)