Skip to content

Commit 19d8053

Browse files
markusvoeltermarkusvoelter
committed
details
1 parent d846ecc commit 19d8053

File tree

8 files changed

+70
-26
lines changed

8 files changed

+70
-26
lines changed

‎mps/modules/ReactDemoLanguage.editor/ReactDemoLanguage.editor.msd‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
</facets>
1313
<dependencies>
1414
<dependency reexport="false">dce965c2-af99-4a0c-9895-485700f46864(ReactDemoLanguage)</dependency>
15+
<dependency reexport="false">208eaf68-fd3a-497a-a4b6-4923ff457c3b(org.modelix.mps.editor.common.stubs)</dependency>
1516
</dependencies>
1617
<languageVersions>
1718
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -27,7 +28,7 @@
2728
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
2829
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
2930
<language slang="l:67accce2-9676-4728-9e9c-8b15ea30d924:org.modelix.mps.react" version="0" />
30-
<language slang="l:09a61cec-0c2d-4a90-b590-25e493b12f35:org.modelix.mps.react.components" version="0" />
31+
<language slang="l:09a61cec-0c2d-4a90-b590-25e493b12f35:org.modelix.mps.react.muicomponents" version="0" />
3132
</languageVersions>
3233
<dependencyVersions>
3334
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />

‎mps/modules/ReactDemoLanguage.editor/models/ReactDemoLanguage.editor.modelix.mps‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
</languages>
99
<imports>
1010
<import index="oyym" ref="r:1570828e-e9a4-47ff-95d9-80c800704647(ReactDemoLanguage.structure)" />
11+
<import index="1ut2" ref="208eaf68-fd3a-497a-a4b6-4923ff457c3b/java:org.modelix.model.mpsadapters.tomps(org.modelix.mps.editor.common.stubs/)" />
1112
</imports>
1213
<registry>
1314
<language id="67accce2-9676-4728-9e9c-8b15ea30d924" name="org.modelix.mps.react">
@@ -46,7 +47,7 @@
4647
</language>
4748
<language id="09a61cec-0c2d-4a90-b590-25e493b12f35" name="org.modelix.mps.react.muicomponents">
4849
<concept id="2879488090861821590" name="org.modelix.mps.react.muicomponents.structure.Space" flags="ng" index="2Lfa6Z" />
49-
<concept id="2879488090860324692" name="org.modelix.mps.react.muicomponents.structure.VerticalLayout" flags="ng" index="2LhRxX">
50+
<concept id="2879488090860324692" name="org.modelix.mps.react.muicomponents.structure.LayoutVertical" flags="ng" index="2LhRxX">
5051
<property id="2879488090860368414" name="gap" index="2LhGOR" />
5152
</concept>
5253
<concept id="2879488090860989101" name="org.modelix.mps.react.muicomponents.structure.Header" flags="ng" index="2Lilm4">
@@ -56,7 +57,7 @@
5657
<concept id="2879488090859464565" name="org.modelix.mps.react.muicomponents.structure.Label" flags="ng" index="2Lk9xs">
5758
<child id="2879488090859488762" name="value" index="2Lk3Fj" />
5859
</concept>
59-
<concept id="2879488090859879787" name="org.modelix.mps.react.muicomponents.structure.HorizontalLayout" flags="ng" index="2Ln$92" />
60+
<concept id="2879488090859879787" name="org.modelix.mps.react.muicomponents.structure.LayoutHorizontal" flags="ng" index="2Ln$92" />
6061
<concept id="2879488090859879790" name="org.modelix.mps.react.muicomponents.structure.IMUILayoutComponent" flags="ngI" index="2Ln$97">
6162
<child id="2879488090859879792" name="children" index="2Ln$9p" />
6263
</concept>
@@ -90,7 +91,7 @@
9091
<node concept="2LhRxX" id="2vPZMAmGHZk" role="gmrTS">
9192
<property role="2LhGOR" value="20px" />
9293
<node concept="2Lilm4" id="2vPZMAmJgxt" role="2Ln$9p">
93-
<property role="2Lilm6" value="2" />
94+
<property role="2Lilm6" value="3" />
9495
<node concept="2OqwBi" id="2vPZMAmJgF4" role="2Lilmp">
9596
<node concept="ggAI9" id="2vPZMAmJgzw" role="2Oq$k0" />
9697
<node concept="3TrcHB" id="2vPZMAmJgMw" role="2OqNvi">

‎mps/modules/ReactDemoLanguage.sandbox/models/ReactDemoLanguage.sandbox.m1.mps‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
</language>
1818
</registry>
1919
<node concept="1WCD2c" id="4OeoZ0Osahp">
20-
<property role="bwaGp" value="HelloVideo3_1" />
20+
<property role="bwaGp" value="HelloVideo3_1fdfsdfsf" />
2121
<node concept="2LzhVZ" id="2vPZMAmufQY" role="2LzhVL">
22-
<property role="2LzhVY" value="e1" />
22+
<property role="2LzhVY" value="e2" />
2323
</node>
2424
<node concept="2LzhVZ" id="2vPZMAmufQZ" role="2LzhVL">
2525
<property role="2LzhVY" value="e2" />

‎mps/modules/org.modelix.mps.react.muicomponents/generator/templates/org.modelix.mps.react.muicomponents.generator.templates@generator.mps‎

Lines changed: 58 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -607,16 +607,68 @@
607607
<node concept="gn1nE" id="2vPZMAmJj2X" role="gn1nH">
608608
<property role="gn1nW" value="variant" />
609609
<node concept="ghjhU" id="2vPZMAmJjsD" role="gn1nU">
610-
<node concept="Xl_RD" id="2vPZMAmJjsC" role="ghjhc">
611-
<property role="Xl_RC" value="h1" />
610+
<node concept="3cpWs3" id="2vPZMAmU4Zx" role="ghjhc">
611+
<node concept="Xl_RD" id="2vPZMAmJjsC" role="3uHU7B">
612+
<property role="Xl_RC" value="h" />
613+
</node>
614+
<node concept="Xl_RD" id="2vPZMAmU69p" role="3uHU7w">
615+
<property role="Xl_RC" value="1" />
616+
<node concept="17Uvod" id="2vPZMAmU6a1" role="lGtFl">
617+
<property role="2qtEX9" value="value" />
618+
<property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
619+
<node concept="3zFVjK" id="2vPZMAmU6a2" role="3zH0cK">
620+
<node concept="3clFbS" id="2vPZMAmU6a3" role="2VODD2">
621+
<node concept="3clFbF" id="2vPZMAmU6aH" role="3cqZAp">
622+
<node concept="3cpWs3" id="2vPZMAmUfhF" role="3clFbG">
623+
<node concept="Xl_RD" id="2vPZMAmUfhJ" role="3uHU7w">
624+
<property role="Xl_RC" value="" />
625+
</node>
626+
<node concept="2OqwBi" id="2vPZMAmU6oh" role="3uHU7B">
627+
<node concept="30H73N" id="2vPZMAmU6aG" role="2Oq$k0" />
628+
<node concept="3TrcHB" id="2vPZMAmU6YC" role="2OqNvi">
629+
<ref role="3TsBF5" to="zaxg:2vPZMAmJaEJ" resolve="level" />
630+
</node>
631+
</node>
632+
</node>
633+
</node>
634+
</node>
635+
</node>
636+
</node>
637+
</node>
612638
</node>
613639
</node>
614640
</node>
615-
<node concept="gn1nE" id="2vPZMAmJjsO" role="gn1nH">
641+
<node concept="gn1nE" id="2vPZMAmUg8R" role="gn1nH">
616642
<property role="gn1nW" value="component" />
617-
<node concept="ghjhU" id="2vPZMAmJjtR" role="gn1nU">
618-
<node concept="Xl_RD" id="2vPZMAmJjtQ" role="ghjhc">
619-
<property role="Xl_RC" value="h1" />
643+
<node concept="ghjhU" id="2vPZMAmUg8S" role="gn1nU">
644+
<node concept="3cpWs3" id="2vPZMAmUg8T" role="ghjhc">
645+
<node concept="Xl_RD" id="2vPZMAmUg8U" role="3uHU7B">
646+
<property role="Xl_RC" value="h" />
647+
</node>
648+
<node concept="Xl_RD" id="2vPZMAmUg8V" role="3uHU7w">
649+
<property role="Xl_RC" value="1" />
650+
<node concept="17Uvod" id="2vPZMAmUg8W" role="lGtFl">
651+
<property role="2qtEX9" value="value" />
652+
<property role="P4ACc" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1070475926800/1070475926801" />
653+
<node concept="3zFVjK" id="2vPZMAmUg8X" role="3zH0cK">
654+
<node concept="3clFbS" id="2vPZMAmUg8Y" role="2VODD2">
655+
<node concept="3clFbF" id="2vPZMAmUg8Z" role="3cqZAp">
656+
<node concept="3cpWs3" id="2vPZMAmUg90" role="3clFbG">
657+
<node concept="Xl_RD" id="2vPZMAmUg91" role="3uHU7w">
658+
<property role="Xl_RC" value="" />
659+
</node>
660+
<node concept="2OqwBi" id="2vPZMAmUg92" role="3uHU7B">
661+
<node concept="30H73N" id="2vPZMAmUg93" role="2Oq$k0" />
662+
<node concept="3TrcHB" id="2vPZMAmUg94" role="2OqNvi">
663+
<ref role="3TsBF5" to="zaxg:2vPZMAmJaEJ" resolve="level" />
664+
</node>
665+
</node>
666+
</node>
667+
</node>
668+
</node>
669+
</node>
670+
</node>
671+
</node>
620672
</node>
621673
</node>
622674
</node>

‎mps/modules/org.modelix.mps.react.muicomponents/models/org.modelix.mps.react.muicomponents.constraints.mps‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,7 @@
22
<model ref="r:8d811361-f899-4c36-a43a-0099c1a206c5(org.modelix.mps.react.muicomponents.constraints)">
33
<persistence version="9" />
44
<languages>
5-
<use id="5dae8159-ab99-46bb-a40d-0cee30ee7018" name="jetbrains.mps.lang.constraints.rules.kinds" version="0" />
6-
<use id="ea3159bf-f48e-4720-bde2-86dba75f0d34" name="jetbrains.mps.lang.context.defs" version="0" />
7-
<use id="e51810c5-7308-4642-bcb6-469e61b5dd18" name="jetbrains.mps.lang.constraints.msg.specification" version="0" />
8-
<use id="134c38d4-e3af-4d9e-b069-1c7df0a4005d" name="jetbrains.mps.lang.constraints.rules.skeleton" version="0" />
9-
<use id="b3551702-269c-4f05-ba61-58060cef4292" name="jetbrains.mps.lang.rulesAndMessages" version="0" />
105
<use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="6" />
11-
<use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
12-
<use id="3ad5badc-1d9c-461c-b7b1-fa2fcd0a0ae7" name="jetbrains.mps.lang.context" version="0" />
13-
<use id="ad93155d-79b2-4759-b10c-55123e763903" name="jetbrains.mps.lang.messages" version="0" />
146
<devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
157
<devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
168
</languages>

‎mps/modules/org.modelix.mps.react.muicomponents/models/org.modelix.mps.react.muicomponents.editor.mps‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
</node>
119119
</node>
120120
<node concept="24kQdi" id="2vPZMAmEWcY">
121-
<ref role="1XX52x" to="zaxg:2vPZMAmEVPF" resolve="HorizontalLayout" />
121+
<ref role="1XX52x" to="zaxg:2vPZMAmEVPF" resolve="LayoutHorizontal" />
122122
<node concept="3EZMnI" id="2vPZMAmEWd8" role="2wV5jI">
123123
<node concept="2iRkQZ" id="2vPZMAmEWd9" role="2iSdaV" />
124124
<node concept="3EZMnI" id="2vPZMAmEWd3" role="3EZMnx">
@@ -146,7 +146,7 @@
146146
</node>
147147
</node>
148148
<node concept="24kQdi" id="2vPZMAmGCtm">
149-
<ref role="1XX52x" to="zaxg:2vPZMAmGCtk" resolve="VerticalLayout" />
149+
<ref role="1XX52x" to="zaxg:2vPZMAmGCtk" resolve="LayoutVertical" />
150150
<node concept="3EZMnI" id="2vPZMAmGCto" role="2wV5jI">
151151
<node concept="2iRkQZ" id="2vPZMAmGCtp" role="2iSdaV" />
152152
<node concept="3EZMnI" id="2vPZMAmGCtq" role="3EZMnx">

‎mps/modules/org.modelix.mps.react.muicomponents/models/org.modelix.mps.react.muicomponents.structure.mps‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
</node>
9999
<node concept="1TIwiD" id="2vPZMAmEVPF">
100100
<property role="EcuMT" value="2879488090859879787" />
101-
<property role="TrG5h" value="HorizontalLayout" />
101+
<property role="TrG5h" value="LayoutHorizontal" />
102102
<property role="34LRSv" value="horizontal" />
103103
<ref role="1TJDcQ" to="tpck:gw2VY9q" />
104104
<node concept="PrWs8" id="2vPZMAmEVPN" role="PzmwI">
@@ -128,7 +128,7 @@
128128
</node>
129129
<node concept="1TIwiD" id="2vPZMAmGCtk">
130130
<property role="EcuMT" value="2879488090860324692" />
131-
<property role="TrG5h" value="VerticalLayout" />
131+
<property role="TrG5h" value="LayoutVertical" />
132132
<property role="34LRSv" value="vertical" />
133133
<ref role="1TJDcQ" to="tpck:gw2VY9q" />
134134
<node concept="PrWs8" id="2vPZMAmGCtl" role="PzmwI">

‎mps/modules/org.modelix.mps.react.muicomponents/org.modelix.mps.react.muicomponents.mpl‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,12 @@
8989
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
9090
<language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
9191
<language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
92-
<language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
9392
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
9493
<language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
9594
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
9695
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
9796
<language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
9897
<language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
99-
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
10098
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
10199
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
102100
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />

0 commit comments

Comments
 (0)