Skip to content

Commit b633ef3

Browse files
sergej-koscejevsergej-koscejev
authored
Merge pull request #2831 from mbeddr/build/migrate-everything
Include all MPS projects into automated migration
2 parents b3a4508 + 7172425 commit b633ef3

File tree

58 files changed

+659
-8853
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+659
-8853
lines changed

‎CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
55
The format is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). The project does _not_ follow
66
Semantic Versioning and the changes are simply documented in reverse chronological order, grouped by calendar month.
77

8+
# March 2025
9+
10+
## com.mbeddr.doc
11+
12+
- 🚨 Stubs for POI and other libraries were moved from language `com.mbeddr.spreadsheat`
13+
to solution `com.mbeddr.spreadsheet.libs`.
14+
- During generation non-root Document nodes will be kept even if they are not referenced by any other document. This
15+
enables using Document nodes in tests, for example.
16+
817
# January 2025
918

1019
## com.mbeddr.build

‎code/languages/com.mbeddr.build/solutions/com.mbeddr.cc.tests.dev.build/models/com/mbeddr/cc/tests/dev/build/build.mps

Lines changed: 69 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
</imports>
1515
<registry>
1616
<language id="3600cb0a-44dd-4a5b-9968-22924406419e" name="jetbrains.mps.build.mps.tests">
17+
<concept id="4560297596904469355" name="jetbrains.mps.build.mps.tests.structure.BuildMps_TestModuleGroup" flags="ng" index="22LTRF">
18+
<reference id="4560297596904469356" name="group" index="22LTRG" />
19+
</concept>
1720
<concept id="4560297596904469357" name="jetbrains.mps.build.mps.tests.structure.BuildAspect_MpsTestModules" flags="nn" index="22LTRH">
1821
<child id="4560297596904469360" name="modules" index="22LTRK" />
1922
<child id="6593674873639474544" name="options" index="24cAkG" />
2023
</concept>
21-
<concept id="4560297596904469362" name="jetbrains.mps.build.mps.tests.structure.BuildMps_TestModule" flags="nn" index="22LTRM">
22-
<reference id="4560297596904469363" name="module" index="22LTRN" />
23-
</concept>
2424
<concept id="6593674873639474400" name="jetbrains.mps.build.mps.tests.structure.BuildMps_TestModules_Options" flags="ng" index="24cAiW" />
2525
<concept id="4005526075820600484" name="jetbrains.mps.build.mps.tests.structure.BuildModuleTestsPlugin" flags="ng" index="1gjT0q" />
2626
</language>
@@ -249,26 +249,8 @@
249249
<node concept="L2wRC" id="352CMsvKMMs" role="39821P">
250250
<ref role="L2wRA" node="352CMsvKMzF" resolve="test.ts.cc.var.composition" />
251251
</node>
252-
</node>
253-
<node concept="m$_wf" id="7eF9rfAnzV5" role="3989C9">
254-
<property role="m$_wk" value="dummy" />
255-
<node concept="3_J27D" id="7eF9rfAnzV6" role="m$_yQ">
256-
<node concept="3Mxwew" id="7eF9rfAnzV7" role="3MwsjC">
257-
<property role="3MwjfP" value="dummy" />
258-
</node>
259-
</node>
260-
<node concept="3_J27D" id="7eF9rfAnzV8" role="m_cZH">
261-
<node concept="3Mxwew" id="7eF9rfAnzV9" role="3MwsjC">
262-
<property role="3MwjfP" value="dummy" />
263-
</node>
264-
</node>
265-
<node concept="3_J27D" id="7eF9rfAnzVa" role="m$_w8">
266-
<node concept="3Mxwew" id="7eF9rfAnzVb" role="3MwsjC">
267-
<property role="3MwjfP" value="1.0" />
268-
</node>
269-
</node>
270-
<node concept="m$_yC" id="7eF9rfAnzVc" role="m$_yJ">
271-
<ref role="m$_y1" to="ffeo:5CFKsRWRuFN" resolve="jetbrains.mps.debugger.api" />
252+
<node concept="L2wRC" id="WD9jaanOij" role="39821P">
253+
<ref role="L2wRA" node="WD9jaanOgz" resolve="tests.ts.doc" />
272254
</node>
273255
</node>
274256
<node concept="2G$12M" id="7eF9rfAnzVd" role="3989C9">
@@ -498,19 +480,74 @@
498480
</node>
499481
</node>
500482
</node>
483+
<node concept="1E1JtA" id="WD9jaanOgz" role="2G$12L">
484+
<property role="BnDLt" value="true" />
485+
<property role="TrG5h" value="tests.ts.doc" />
486+
<property role="3LESm3" value="fdf8949f-50fd-4f1a-ba07-726db58b6214" />
487+
<property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
488+
<node concept="398BVA" id="WD9jaanOgB" role="3LF7KH">
489+
<ref role="398BVh" node="7eF9rfAnzUi" resolve="mbeddr.cc" />
490+
<node concept="2Ry0Ak" id="WD9jaanOgF" role="iGT6I">
491+
<property role="2Ry0Am" value="tests" />
492+
<node concept="2Ry0Ak" id="WD9jaanOgI" role="2Ry0An">
493+
<property role="2Ry0Am" value="tests.ts.doc" />
494+
<node concept="2Ry0Ak" id="WD9jaanOgL" role="2Ry0An">
495+
<property role="2Ry0Am" value="tests.ts.doc.msd" />
496+
</node>
497+
</node>
498+
</node>
499+
</node>
500+
<node concept="1SiIV0" id="WD9jaanOhU" role="3bR37C">
501+
<node concept="3bR9La" id="WD9jaanOhV" role="1SiIV1">
502+
<ref role="3bR37D" to="al5i:1YMM4SJ2m0" resolve="com.mbeddr.doc" />
503+
</node>
504+
</node>
505+
<node concept="1BupzO" id="WD9jaanOie" role="3bR31x">
506+
<property role="3ZfqAx" value="models" />
507+
<property role="1Hdu6h" value="true" />
508+
<property role="1HemKv" value="true" />
509+
<node concept="3LXTmp" id="WD9jaanOif" role="1HemKq">
510+
<node concept="398BVA" id="WD9jaanOhW" role="3LXTmr">
511+
<ref role="398BVh" node="7eF9rfAnzUi" resolve="mbeddr.cc" />
512+
<node concept="2Ry0Ak" id="WD9jaanOhX" role="iGT6I">
513+
<property role="2Ry0Am" value="tests" />
514+
<node concept="2Ry0Ak" id="WD9jaanOhY" role="2Ry0An">
515+
<property role="2Ry0Am" value="tests.ts.doc" />
516+
<node concept="2Ry0Ak" id="WD9jaanOhZ" role="2Ry0An">
517+
<property role="2Ry0Am" value="models" />
518+
</node>
519+
</node>
520+
</node>
521+
</node>
522+
<node concept="3qWCbU" id="WD9jaanOig" role="3LXTna">
523+
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
524+
</node>
525+
</node>
526+
</node>
527+
<node concept="3rtmxn" id="D2wbO5CO$k" role="3bR31x">
528+
<node concept="3LXTmp" id="D2wbO5CO$l" role="3rtmxm">
529+
<node concept="3qWCbU" id="D2wbO5CO$m" role="3LXTna">
530+
<property role="3qWCbO" value="icons/**, resources/**" />
531+
</node>
532+
<node concept="398BVA" id="D2wbO5CO$n" role="3LXTmr">
533+
<ref role="398BVh" node="7eF9rfAnzUi" resolve="mbeddr.cc" />
534+
<node concept="2Ry0Ak" id="D2wbO5CO$o" role="iGT6I">
535+
<property role="2Ry0Am" value="tests" />
536+
<node concept="2Ry0Ak" id="D2wbO5CO$p" role="2Ry0An">
537+
<property role="2Ry0Am" value="tests.ts.doc" />
538+
</node>
539+
</node>
540+
</node>
541+
</node>
542+
</node>
543+
</node>
501544
</node>
502545
<node concept="22LTRH" id="7eF9rfAnzVt" role="1hWBAP">
503546
<property role="TrG5h" value="com.mbeddr.cc.tests" />
504-
<node concept="22LTRM" id="7eF9rfAnzVu" role="22LTRK">
505-
<ref role="22LTRN" node="7eF9rfAnzVo" resolve="test.ts.cc.var.c" />
506-
</node>
507-
<node concept="22LTRM" id="7eF9rfAnzVw" role="22LTRK">
508-
<ref role="22LTRN" node="7eF9rfAnzVe" resolve="test.ts.requirements" />
509-
</node>
510-
<node concept="22LTRM" id="352CMsvKMSn" role="22LTRK">
511-
<ref role="22LTRN" node="352CMsvKMzF" resolve="test.ts.cc.var.composition" />
512-
</node>
513547
<node concept="24cAiW" id="76N1O$Kj6vp" role="24cAkG" />
548+
<node concept="22LTRF" id="WD9jaanOih" role="22LTRK">
549+
<ref role="22LTRG" node="7eF9rfAnzVd" resolve="com.mbeddr.cc.test" />
550+
</node>
514551
</node>
515552
</node>
516553
<node concept="1l3spW" id="7eF9rfAnzVx">

‎code/languages/com.mbeddr.cc/.mps/libraries.xml

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,35 @@
33
<component name="ProjectLibraryManager">
44
<option name="libraries">
55
<map>
6-
<entry key="mbeddr">
6+
<entry key="core">
77
<value>
88
<Library>
9-
<option name="name" value="mbeddr" />
10-
<option name="path" value="${mbeddr.github.core.home}/code" />
9+
<option name="name" value="core" />
10+
<option name="path" value="${mbeddr.github.core.home}/code/languages/com.mbeddr.core" />
11+
</Library>
12+
</value>
13+
</entry>
14+
<entry key="doc">
15+
<value>
16+
<Library>
17+
<option name="name" value="doc" />
18+
<option name="path" value="${mbeddr.github.core.home}/code/languages/com.mbeddr.doc" />
19+
</Library>
20+
</value>
21+
</entry>
22+
<entry key="ext">
23+
<value>
24+
<Library>
25+
<option name="name" value="ext" />
26+
<option name="path" value="${mbeddr.github.core.home}/code/languages/com.mbeddr.ext" />
27+
</Library>
28+
</value>
29+
</entry>
30+
<entry key="mpsutil">
31+
<value>
32+
<Library>
33+
<option name="name" value="mpsutil" />
34+
<option name="path" value="${mbeddr.github.core.home}/code/languages/com.mbeddr.mpsutil" />
1135
</Library>
1236
</value>
1337
</entry>

‎code/languages/com.mbeddr.cc/.mps/modules.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.cc.requirements.c.interpreter/com.mbeddr.cc.requirements.c.interpreter.msd" folder="requirements" />
3232
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.cc.var.annotations.interpreter/com.mbeddr.cc.var.annotations.interpreter.msd" folder="ple_var" />
3333
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.cc.var.fm.interpreter/com.mbeddr.cc.var.fm.interpreter.msd" folder="ple_var" />
34+
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.doc.doc/com.mbeddr.doc.doc.msd" folder="doc" />
3435
<modulePath path="$PROJECT_DIR$/tests/test.ex.cc.fm/fm.msd" folder="tests" />
3536
<modulePath path="$PROJECT_DIR$/tests/test.ex.cc.fmrt/fmrt.msd" folder="tests" />
3637
<modulePath path="$PROJECT_DIR$/tests/test.ex.cc.requirements.c/c.msd" folder="tests" />
@@ -41,6 +42,7 @@
4142
<modulePath path="$PROJECT_DIR$/tests/test.ts.cc.requirements/requirements.msd" folder="tests" />
4243
<modulePath path="$PROJECT_DIR$/tests/test.ts.cc.var.c/c.msd" folder="tests" />
4344
<modulePath path="$PROJECT_DIR$/tests/test.ts.cc.var.composition/test.ts.cc.var.composition.msd" folder="tests" />
45+
<modulePath path="$PROJECT_DIR$/tests/tests.ts.doc/tests.ts.doc.msd" folder="tests.doc" />
4446
</projectModules>
4547
</component>
4648
</project>

‎code/languages/com.mbeddr.cc/.mps/vcs.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project version="4">
33
<component name="VcsDirectoryMappings">
4-
<mapping directory="$mbeddr.github.core.home$" vcs="Git" />
4+
<mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
55
</component>
66
</project>

‎code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.doc/.gitignore renamed to ‎code/languages/com.mbeddr.cc/solutions/com.mbeddr.doc.doc/.gitignore

File renamed without changes.

‎code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.doc/build-doc.sh renamed to ‎code/languages/com.mbeddr.cc/solutions/com.mbeddr.doc.doc/build-doc.sh

File renamed without changes.

‎code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.doc/com.mbeddr.doc.doc.msd renamed to ‎code/languages/com.mbeddr.cc/solutions/com.mbeddr.doc.doc/com.mbeddr.doc.doc.msd

File renamed without changes.

‎code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.doc/images/ash26.png renamed to ‎code/languages/com.mbeddr.cc/solutions/com.mbeddr.doc.doc/images/ash26.png

File renamed without changes.

‎code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.doc/models/exampleCCode.mps renamed to ‎code/languages/com.mbeddr.cc/solutions/com.mbeddr.doc.doc/models/exampleCCode.mps

File renamed without changes.

‎code/languages/com.mbeddr.doc/solutions/com.mbeddr.doc.doc/models/main.mps renamed to ‎code/languages/com.mbeddr.cc/solutions/com.mbeddr.doc.doc/models/main.mps

File renamed without changes.

‎code/languages/com.mbeddr.doc/tests/tests.ts.doc/models/testBCPresence.mps renamed to ‎code/languages/com.mbeddr.cc/tests/tests.ts.doc/models/testBCPresence.mps

File renamed without changes.

‎code/languages/com.mbeddr.doc/tests/tests.ts.doc/models/[email protected] renamed to ‎code/languages/com.mbeddr.cc/tests/tests.ts.doc/models/[email protected]

File renamed without changes.

‎code/languages/com.mbeddr.doc/tests/tests.ts.doc/tests.ts.doc.msd renamed to ‎code/languages/com.mbeddr.cc/tests/tests.ts.doc/tests.ts.doc.msd

File renamed without changes.

‎code/languages/com.mbeddr.core/.mps/libraries.xml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,27 @@
33
<component name="ProjectLibraryManager">
44
<option name="libraries">
55
<map>
6-
<entry key="mbeddr">
6+
<entry key="doc">
77
<value>
88
<Library>
9-
<option name="name" value="mbeddr" />
10-
<option name="path" value="${mbeddr.github.core.home}/code" />
9+
<option name="name" value="doc" />
10+
<option name="path" value="${mbeddr.github.core.home}/code/languages/com.mbeddr.doc" />
11+
</Library>
12+
</value>
13+
</entry>
14+
<entry key="doc.aspect">
15+
<value>
16+
<Library>
17+
<option name="name" value="doc.aspect" />
18+
<option name="path" value="${mbeddr.github.core.home}/code/languages/com.mbeddr.doc.aspect" />
19+
</Library>
20+
</value>
21+
</entry>
22+
<entry key="mpsutil">
23+
<value>
24+
<Library>
25+
<option name="name" value="mpsutil" />
26+
<option name="path" value="${mbeddr.github.core.home}/code/languages/com.mbeddr.mpsutil" />
1127
</Library>
1228
</value>
1329
</entry>

‎code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/structure.mps

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<model ref="r:61d840b4-12c1-49ea-b142-b2a1550a9b15(com.mbeddr.core.udt.structure)">
33
<persistence version="9" />
44
<languages>
5-
<use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="-1" />
6-
<use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
5+
<use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
6+
<devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
77
</languages>
88
<imports>
99
<import index="mj1l" ref="r:c371cf98-dcc8-4a43-8eb8-8a8096de18b2(com.mbeddr.core.expressions.structure)" />

‎code/languages/com.mbeddr.core/languages/com.mbeddr.core.unittest/generator/template/[email protected]

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,6 @@
329329
<child id="1167945861827" name="conditionFunction" index="3IZSJc" />
330330
</concept>
331331
<concept id="1118786554307" name="jetbrains.mps.lang.generator.structure.LoopMacro" flags="ln" index="1WS0z7">
332-
<property id="7430509679011668804" name="counterVarName" index="1qytDF" />
333332
<child id="1167952069335" name="sourceNodesQuery" index="3Jn$fo" />
334333
</concept>
335334
<concept id="1088761943574" name="jetbrains.mps.lang.generator.structure.ReferenceMacro" flags="ln" index="1ZhdrF">
@@ -6677,7 +6676,6 @@
66776676
</node>
66786677
</node>
66796678
<node concept="1WS0z7" id="VRzgMEbb3O" role="lGtFl">
6680-
<property role="1qytDF" value="" />
66816679
<node concept="3JmXsc" id="VRzgMEbb3R" role="3Jn$fo">
66826680
<node concept="3clFbS" id="VRzgMEbb3S" role="2VODD2">
66836681
<node concept="3clFbF" id="VRzgMEbb3Y" role="3cqZAp">
@@ -7139,7 +7137,6 @@
71397137
</node>
71407138
</node>
71417139
<node concept="1WS0z7" id="VRzgMEbwIm" role="lGtFl">
7142-
<property role="1qytDF" value="" />
71437140
<node concept="3JmXsc" id="VRzgMEbwIp" role="3Jn$fo">
71447141
<node concept="3clFbS" id="VRzgMEbwIq" role="2VODD2">
71457142
<node concept="3clFbF" id="VRzgMEbwIw" role="3cqZAp">

‎code/languages/com.mbeddr.doc.aspect/.mps/libraries.xml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,19 @@
33
<component name="ProjectLibraryManager">
44
<option name="libraries">
55
<map>
6-
<entry key="mbeddr">
6+
<entry key="doc">
77
<value>
88
<Library>
9-
<option name="name" value="mbeddr" />
10-
<option name="path" value="${mbeddr.github.core.home}/code" />
9+
<option name="name" value="doc" />
10+
<option name="path" value="${mbeddr.github.core.home}/code/languages/com.mbeddr.doc" />
11+
</Library>
12+
</value>
13+
</entry>
14+
<entry key="mpsutil">
15+
<value>
16+
<Library>
17+
<option name="name" value="mpsutil" />
18+
<option name="path" value="${mbeddr.github.core.home}/code/languages/com.mbeddr.mpsutil" />
1119
</Library>
1220
</value>
1321
</entry>

‎code/languages/com.mbeddr.doc.aspect/.mps/vcs.xml

100755100644
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
<project version="4">
33
<component name="VcsDirectoryMappings">
44
<mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
5-
<mapping directory="$mbeddr.github.core.home$" vcs="Git" />
65
</component>
76
</project>

‎code/languages/com.mbeddr.doc.aspect/languages/com.mbeddr.doc.aspect.exampleLanguage/models/com/mbeddr/doc/aspect/exampleLanguage/structure.mps

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<model ref="r:489c719c-7616-403c-a112-c95a57d1fcd3(com.mbeddr.doc.aspect.exampleLanguage.structure)">
33
<persistence version="9" />
44
<languages>
5+
<use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
56
<devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
67
</languages>
78
<imports>

‎code/languages/com.mbeddr.doc/.mps/libraries.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<component name="ProjectLibraryManager">
44
<option name="libraries">
55
<map>
6-
<entry key="mbeddr">
6+
<entry key="mpsutil">
77
<value>
88
<Library>
9-
<option name="name" value="mbeddr" />
10-
<option name="path" value="${mbeddr.github.core.home}/code" />
9+
<option name="name" value="mpsutil" />
10+
<option name="path" value="${mbeddr.github.core.home}/code/languages/com.mbeddr.mpsutil" />
1111
</Library>
1212
</value>
1313
</entry>

‎code/languages/com.mbeddr.doc/.mps/modules.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,11 @@
1818
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.slides/com.mbeddr.slides.mpl" folder="lang" />
1919
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.spreadsheat/spreadsheat.mpl" folder="lang" />
2020
<modulePath path="$PROJECT_DIR$/languages/terms/com.mbeddr.doc.terms.mpl" folder="lang" />
21-
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.doc.doc/com.mbeddr.doc.doc.msd" folder="" />
2221
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.doc.markdown.sandbox/com.mbeddr.doc.markdown.sandbox.msd" folder="lang" />
2322
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.doc.slides.sandbox/com.mbeddr.doc.slides.sandbox.msd" folder="lang" />
2423
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.doc.test.documents/com.mbeddr.doc.test.documents.msd" folder="test" />
2524
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.spreadsheat.sandbox/com.mbeddr.spreadsheat.sandbox.msd" folder="lang" />
26-
<modulePath path="$PROJECT_DIR$/tests/tests.ts.doc/tests.ts.doc.msd" folder="test" />
25+
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.spreadsheet.libs/com.mbeddr.spreadsheet.libs.msd" folder="lang" />
2726
</projectModules>
2827
</component>
2928
</project>

‎code/languages/com.mbeddr.doc/.mps/vcs.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project version="4">
33
<component name="VcsDirectoryMappings">
4-
<mapping directory="$mbeddr.github.core.home$" vcs="Git" />
4+
<mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
55
</component>
66
</project>

‎code/languages/com.mbeddr.doc/languages/com.mbeddr.doc.gen_xhtml/generator/template/com/mbeddr/doc/gen_xhtml/generator/template/[email protected]

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6470,15 +6470,17 @@
64706470
<ref role="2pJxaS" to="iuxj:1q3yNZeAEkj" resolve="XmlText" />
64716471
<node concept="2pJxcG" id="2pjWqF4zPY_" role="2pJxcM">
64726472
<ref role="2pJxcJ" to="iuxj:1q3yNZeAEDC" resolve="value" />
6473-
<node concept="2YIFZM" id="2pjWqF4EGTa" role="28ntcv">
6474-
<ref role="37wK5l" to="btm1:~StringEscapeUtils.escapeXml10(java.lang.String)" resolve="escapeXml10" />
6475-
<ref role="1Pybhc" to="btm1:~StringEscapeUtils" resolve="StringEscapeUtils" />
6476-
<node concept="AH0OO" id="2pjWqF4EHTY" role="37wK5m">
6477-
<node concept="37vLTw" id="2pjWqF4EI7x" role="AHEQo">
6478-
<ref role="3cqZAo" node="2pjWqF4z$VZ" resolve="i" />
6479-
</node>
6480-
<node concept="37vLTw" id="2pjWqF4EHva" role="AHHXb">
6481-
<ref role="3cqZAo" node="2pjWqF4zzl9" resolve="split" />
6473+
<node concept="WxPPo" id="4FGGPxWq6Y3" role="28ntcv">
6474+
<node concept="2YIFZM" id="2pjWqF4EGTa" role="WxPPp">
6475+
<ref role="37wK5l" to="btm1:~StringEscapeUtils.escapeXml10(java.lang.String)" resolve="escapeXml10" />
6476+
<ref role="1Pybhc" to="btm1:~StringEscapeUtils" resolve="StringEscapeUtils" />
6477+
<node concept="AH0OO" id="2pjWqF4EHTY" role="37wK5m">
6478+
<node concept="37vLTw" id="2pjWqF4EI7x" role="AHEQo">
6479+
<ref role="3cqZAo" node="2pjWqF4z$VZ" resolve="i" />
6480+
</node>
6481+
<node concept="37vLTw" id="2pjWqF4EHva" role="AHHXb">
6482+
<ref role="3cqZAo" node="2pjWqF4zzl9" resolve="split" />
6483+
</node>
64826484
</node>
64836485
</node>
64846486
</node>

‎code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/generator/template/com/mbeddr/doc/generator/template/[email protected]

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4647,8 +4647,8 @@
46474647
<node concept="2OqwBi" id="7U$sKL0$Bnv" role="2Oq$k0">
46484648
<node concept="2OqwBi" id="7U$sKL0$xXm" role="2Oq$k0">
46494649
<node concept="1Q6Npb" id="7U$sKL0$xBb" role="2Oq$k0" />
4650-
<node concept="2SmgA7" id="7U$sKL0$yZY" role="2OqNvi">
4651-
<node concept="chp4Y" id="7U$sKL0$z0g" role="1dBWTz">
4650+
<node concept="2RRcyG" id="WD9jaaosyO" role="2OqNvi">
4651+
<node concept="chp4Y" id="WD9jaaosST" role="3MHsoP">
46524652
<ref role="cht4Q" to="2c95:2TZO3DbuxwK" resolve="Document" />
46534653
</node>
46544654
</node>

0 commit comments

Comments
 (0)