Skip to content

Commit 637ea87

Browse files
markusvoeltermarkusvoelter
committed
moved all the modules into the "modules" directory, similar to the other ones
1 parent 21d8140 commit 637ea87

24 files changed

+1284
-38
lines changed

‎mps/.mps/modules.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,20 @@
22
<project version="4">
33
<component name="MPSProject">
44
<projectModules>
5-
<modulePath path="$PROJECT_DIR$/languages/ReactDemoLanguage/ReactDemoLanguage.mpl" folder="react.demo" />
65
<modulePath path="$PROJECT_DIR$/modules/ReactDemoLanguage.editor/ReactDemoLanguage.editor.msd" folder="react.demo" />
6+
<modulePath path="$PROJECT_DIR$/modules/ReactDemoLanguage.sandbox/ReactDemoLanguage.sandbox.msd" folder="react.demo" />
7+
<modulePath path="$PROJECT_DIR$/modules/ReactDemoLanguage/ReactDemoLanguage.mpl" folder="react.demo" />
78
<modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.notation.impl.baseLanguage/org.modelix.mps.notation.impl.baseLanguage.msd" folder="text" />
89
<modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.notation/org.modelix.mps.notation.mpl" folder="text" />
10+
<modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.react.components/org.modelix.mps.react.components.mpl" folder="react" />
11+
<modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.react.ide/org.modelix.mps.react.ide.msd" folder="react" />
912
<modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.react.impl.baseLanguage/org.modelix.mps.react.impl.baseLanguage.msd" folder="react" />
1013
<modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.react/org.modelix.mps.react.mpl" folder="react" />
1114
<modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.spreadsheets.sandbox/org.modelix.mps.spreadsheets.sandbox.msd" folder="spreadsheets" />
1215
<modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.spreadsheets/org.modelix.mps.spreadsheets.mpl" folder="spreadsheets" />
1316
<modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.webaspect.devkit/org.modelix.mps.webaspect.devkit.devkit" folder="aspect" />
1417
<modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.webaspect.genplan/org.modelix.mps.webaspect.genplan.msd" folder="aspect" />
1518
<modulePath path="$PROJECT_DIR$/modules/org.modelix.mps.webaspect.runtime/org.modelix.mps.webaspect.runtime.msd" folder="aspect" />
16-
<modulePath path="$PROJECT_DIR$/solutions/ReactDemoLanguage.sandbox/ReactDemoLanguage.sandbox.msd" folder="react.demo" />
17-
<modulePath path="$PROJECT_DIR$/solutions/org.modelix.mps.react.ide/org.modelix.mps.react.ide.msd" folder="react" />
1819
</projectModules>
1920
</component>
2021
</project>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
2828
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
2929
<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" />
3031
</languageVersions>
3132
<dependencyVersions>
3233
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />

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

Lines changed: 34 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<persistence version="9" />
44
<languages>
55
<use id="67accce2-9676-4728-9e9c-8b15ea30d924" name="org.modelix.mps.react" version="0" />
6+
<use id="09a61cec-0c2d-4a90-b590-25e493b12f35" name="org.modelix.mps.react.components" version="0" />
67
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
78
</languages>
89
<imports>
@@ -25,7 +26,6 @@
2526
<concept id="8876946878574735510" name="org.modelix.mps.react.structure.PropertyChangeHandler" flags="ng" index="ghf2L">
2627
<reference id="8876946878574742616" name="property" index="gh8LZ" />
2728
<child id="8876946878574742646" name="value" index="gh8Lh" />
28-
<child id="8876946878574742620" name="node" index="gh8LV" />
2929
</concept>
3030
<concept id="8876946878574654557" name="org.modelix.mps.react.structure.PrimitivePropertyValue" flags="ng" index="ghjhU">
3131
<child id="8876946878574654571" name="value" index="ghjhc" />
@@ -72,8 +72,23 @@
7272
<concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
7373
<property id="1070475926801" name="value" index="Xl_RC" />
7474
</concept>
75+
<concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
76+
<concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
77+
<child id="1081773367579" name="rightExpression" index="3uHU7w" />
78+
<child id="1081773367580" name="leftExpression" index="3uHU7B" />
79+
</concept>
80+
</language>
81+
<language id="09a61cec-0c2d-4a90-b590-25e493b12f35" name="org.modelix.mps.react.components">
82+
<concept id="2879488090856866837" name="org.modelix.mps.react.components.structure.NodePropRef" flags="ng" index="2Ly3GW">
83+
<reference id="2879488090856866839" name="property" index="2Ly3GY" />
84+
<child id="2879488090856866838" name="node" index="2Ly3GZ" />
85+
</concept>
86+
<concept id="2879488090856848295" name="org.modelix.mps.react.components.structure.TextField" flags="ng" index="2Ly8ie">
87+
<child id="2879488090856866844" name="context" index="2Ly3GP" />
88+
</concept>
7589
</language>
7690
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
91+
<concept id="1179168000618" name="jetbrains.mps.lang.smodel.structure.Node_GetIndexInParentOperation" flags="nn" index="2bSWHS" />
7792
<concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
7893
<reference id="1138056395725" name="property" index="3TsBF5" />
7994
</concept>
@@ -187,37 +202,28 @@
187202
<ref role="3JBHV4" to="oyym:2vPZMAmue7m" resolve="Element" />
188203
<node concept="gmrTC" id="2vPZMAmuLYY" role="gmrTS">
189204
<property role="gmPZ6" value="html.li" />
190-
<node concept="ggXia" id="2vPZMAmuRqf" role="gn1nJ">
191-
<node concept="Xl_RD" id="2vPZMAmuRqu" role="ggXio">
192-
<property role="Xl_RC" value="DSumm&lt;" />
193-
</node>
194-
</node>
195-
<node concept="gmrTC" id="2vPZMAmuLYZ" role="gn1nJ">
196-
<property role="gmPZ6" value="mui.TextField" />
197-
<node concept="gn1nE" id="2vPZMAmuLZ0" role="gn1nH">
198-
<property role="gn1nW" value="onChange" />
199-
<node concept="ghf20" id="2vPZMAmuLZ1" role="gn1nU">
200-
<node concept="ghf2L" id="2vPZMAmuLZ2" role="ghfyX">
201-
<ref role="gh8LZ" to="oyym:2vPZMAmue7n" resolve="label" />
202-
<node concept="gh8L1" id="2vPZMAmuLZ3" role="gh8Lh">
203-
<property role="gh8Lj" value="event.target.value" />
204-
</node>
205-
<node concept="ggAI9" id="2vPZMAmuMuP" role="gh8LV" />
205+
<node concept="gmrTC" id="2vPZMAmBbY6" role="gn1nJ">
206+
<property role="gmPZ6" value="html.div" />
207+
<node concept="ggXia" id="2vPZMAmBbYt" role="gn1nJ">
208+
<node concept="3cpWs3" id="2vPZMAmBLZG" role="ggXio">
209+
<node concept="Xl_RD" id="2vPZMAmBLZJ" role="3uHU7w">
210+
<property role="Xl_RC" value=": " />
206211
</node>
207-
<node concept="ghf2g" id="2vPZMAmuLZ5" role="ghf3w">
208-
<property role="TrG5h" value="event" />
212+
<node concept="3cpWs3" id="2vPZMAmBEjN" role="3uHU7B">
213+
<node concept="Xl_RD" id="2vPZMAmBEjQ" role="3uHU7B">
214+
<property role="Xl_RC" value="Number " />
215+
</node>
216+
<node concept="2OqwBi" id="2vPZMAmBEc5" role="3uHU7w">
217+
<node concept="ggAI9" id="2vPZMAmBE4x" role="2Oq$k0" />
218+
<node concept="2bSWHS" id="2vPZMAmBEjx" role="2OqNvi" />
219+
</node>
209220
</node>
210221
</node>
211222
</node>
212-
<node concept="gn1nE" id="2vPZMAmuLZ6" role="gn1nH">
213-
<property role="gn1nW" value="value" />
214-
<node concept="ghjhU" id="2vPZMAmuLZ7" role="gn1nU">
215-
<node concept="2OqwBi" id="2vPZMAmuLZ8" role="ghjhc">
216-
<node concept="ggAI9" id="2vPZMAmuMuZ" role="2Oq$k0" />
217-
<node concept="3TrcHB" id="2vPZMAmuLZa" role="2OqNvi">
218-
<ref role="3TsBF5" to="oyym:2vPZMAmue7n" resolve="label" />
219-
</node>
220-
</node>
223+
<node concept="2Ly8ie" id="2vPZMAmBbY7" role="gn1nJ">
224+
<node concept="2Ly3GW" id="2vPZMAmBbY8" role="2Ly3GP">
225+
<ref role="2Ly3GY" to="oyym:2vPZMAmue7n" resolve="label" />
226+
<node concept="ggAI9" id="2vPZMAmBbY9" role="2Ly3GZ" />
221227
</node>
222228
</node>
223229
</node>

mps/solutions/ReactDemoLanguage.sandbox/ReactDemoLanguage.sandbox.msd renamed to mps/modules/ReactDemoLanguage.sandbox/ReactDemoLanguage.sandbox.msd

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@
1010
<classes generated="true" path="${module}/classes_gen" />
1111
</facet>
1212
</facets>
13-
<languageVersions />
13+
<languageVersions>
14+
<language slang="l:dce965c2-af99-4a0c-9895-485700f46864:ReactDemoLanguage" version="0" />
15+
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
16+
</languageVersions>
1417
<dependencyVersions>
1518
<module reference="48e09223-cba5-4cff-897a-77a4f9af8a15(ReactDemoLanguage.sandbox)" version="0" />
1619
</dependencyVersions>

mps/solutions/ReactDemoLanguage.sandbox/models/ReactDemoLanguage.sandbox.m1.mps renamed to mps/modules/ReactDemoLanguage.sandbox/models/ReactDemoLanguage.sandbox.m1.mps

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
<node concept="1WCD2c" id="4OeoZ0Osahp">
2020
<property role="bwaGp" value="HelloVideo" />
2121
<node concept="2LzhVZ" id="2vPZMAmufQY" role="2LzhVL">
22-
<property role="2LzhVY" value="e121312312312312321312231232" />
22+
<property role="2LzhVY" value="e1" />
2323
</node>
2424
<node concept="2LzhVZ" id="2vPZMAmufQZ" role="2LzhVL">
25-
<property role="2LzhVY" value="2e23123123" />
25+
<property role="2LzhVY" value="e2" />
2626
</node>
2727
</node>
2828
</model>

mps/languages/ReactDemoLanguage/ReactDemoLanguage.mpl renamed to mps/modules/ReactDemoLanguage/ReactDemoLanguage.mpl

File renamed without changes.

mps/languages/ReactDemoLanguage/generator/templates/ReactDemoLanguage.generator.templates@generator.mps renamed to mps/modules/ReactDemoLanguage/generator/templates/ReactDemoLanguage.generator.templates@generator.mps

File renamed without changes.

mps/languages/ReactDemoLanguage/models/ReactDemoLanguage.behavior.mps renamed to mps/modules/ReactDemoLanguage/models/ReactDemoLanguage.behavior.mps

File renamed without changes.

mps/languages/ReactDemoLanguage/models/ReactDemoLanguage.constraints.mps renamed to mps/modules/ReactDemoLanguage/models/ReactDemoLanguage.constraints.mps

File renamed without changes.

mps/languages/ReactDemoLanguage/models/ReactDemoLanguage.editor.mps renamed to mps/modules/ReactDemoLanguage/models/ReactDemoLanguage.editor.mps

File renamed without changes.

0 commit comments

Comments
 (0)