Skip to content

Commit 0709c22

Browse files
mps-ci-buildbotmps-ci-buildbot
authored
Merge pull request #1623 from JetBrains/merge/mps20251
Merge maintenance/mps20241 into maintenance/mps20251
2 parents b8e2c14 + 76d04a3 commit 0709c22

File tree

9 files changed

+8884
-59
lines changed

9 files changed

+8884
-59
lines changed

‎code/.mps/.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
workspace.xml
22
product-workspace.xml
3+
4+
inspectionProfiles/
5+
shelf/

‎code/.mps/modules.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@
7373
<modulePath path="$PROJECT_DIR$/hacks/languages/de.slisson.mps.reflection/de.slisson.mps.reflection.mpl" folder="hacks" />
7474
<modulePath path="$PROJECT_DIR$/hacks/solutions/de.slisson.mps.hacks.editor/de.slisson.mps.hacks.editor.msd" folder="hacks" />
7575
<modulePath path="$PROJECT_DIR$/hacks/solutions/de.slisson.mps.reflection.runtime/de.slisson.mps.reflection.runtime.msd" folder="hacks" />
76+
<modulePath path="$PROJECT_DIR$/hasher/solutions/nl.f1re.mpsutil.hasher.tests/nl.f1re.mpsutil.hasher.tests.msd" folder="hasher" />
77+
<modulePath path="$PROJECT_DIR$/hasher/solutions/nl.f1re.mpsutil.hasher/nl.f1re.mpsutil.hasher.msd" folder="hasher" />
7678
<modulePath path="$PROJECT_DIR$/htmlcell/languages/de.itemis.mps.editor.htmlcell.demolang/de.itemis.mps.editor.htmlcell.demolang.mpl" folder="widgets" />
7779
<modulePath path="$PROJECT_DIR$/htmlcell/languages/de.itemis.mps.editor.htmlcell/de.itemis.mps.editor.htmlcell.mpl" folder="widgets" />
7880
<modulePath path="$PROJECT_DIR$/htmlcell/languages/de.itemis.mps.editor.htmlcell/sandbox/de.itemis.mps.editor.htmlcell.sandbox.msd" folder="widgets" />

‎code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps‎

Lines changed: 283 additions & 59 deletions
Large diffs are not rendered by default.

‎code/hasher/solutions/nl.f1re.mpsutil.hasher.tests/models/[email protected]‎

Lines changed: 5353 additions & 0 deletions
Large diffs are not rendered by default.

‎code/hasher/solutions/nl.f1re.mpsutil.hasher.tests/nl.f1re.mpsutil.hasher.tests.msd‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<solution name="nl.f1re.mpsutil.hasher.tests" uuid="35200322-041d-4e55-91d7-024e0b119604" moduleVersion="0">
3+
<models>
4+
<modelRoot contentPath="${module}" type="default">
5+
<sourceRoot location="models" />
6+
</modelRoot>
7+
</models>
8+
<facets>
9+
<facet type="java" compile="mps" classes="mps" ext="no">
10+
<classes generated="true" path="${module}/classes_gen" />
11+
</facet>
12+
<facet type="tests" />
13+
</facets>
14+
<dependencies>
15+
<dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
16+
<dependency reexport="false">078723b2-ab7f-48d1-b9bb-5f643b60d08e(nl.f1re.mpsutil.hasher)</dependency>
17+
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
18+
</dependencies>
19+
<languageVersions>
20+
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
21+
<language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
22+
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
23+
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
24+
<language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
25+
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
26+
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
27+
<language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="6" />
28+
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
29+
</languageVersions>
30+
<dependencyVersions>
31+
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
32+
<module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
33+
<module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
34+
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
35+
<module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
36+
<module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
37+
<module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
38+
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
39+
<module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
40+
<module reference="078723b2-ab7f-48d1-b9bb-5f643b60d08e(nl.f1re.mpsutil.hasher)" version="0" />
41+
<module reference="35200322-041d-4e55-91d7-024e0b119604(nl.f1re.mpsutil.hasher.tests)" version="0" />
42+
</dependencyVersions>
43+
</solution>
44+

‎code/hasher/solutions/nl.f1re.mpsutil.hasher/models/nl.f1re.mpsutil.hasher.mps‎

Lines changed: 3128 additions & 0 deletions
Large diffs are not rendered by default.

‎code/hasher/solutions/nl.f1re.mpsutil.hasher/nl.f1re.mpsutil.hasher.msd‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<solution name="nl.f1re.mpsutil.hasher" uuid="078723b2-ab7f-48d1-b9bb-5f643b60d08e" moduleVersion="0">
3+
<models>
4+
<modelRoot contentPath="${module}" type="default">
5+
<sourceRoot location="models" />
6+
</modelRoot>
7+
</models>
8+
<facets>
9+
<facet type="java" compile="mps" classes="mps" ext="no">
10+
<classes generated="true" path="${module}/classes_gen" />
11+
</facet>
12+
</facets>
13+
<dependencies>
14+
<dependency reexport="false">ecfb9949-7433-4db5-85de-0f84d172e4ce(de.q60.mps.collections.libs)</dependency>
15+
<dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
16+
<dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
17+
<dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
18+
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
19+
</dependencies>
20+
<languageVersions>
21+
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
22+
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
23+
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
24+
<language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
25+
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
26+
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
27+
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
28+
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
29+
</languageVersions>
30+
<dependencyVersions>
31+
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
32+
<module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
33+
<module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
34+
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
35+
<module reference="ecfb9949-7433-4db5-85de-0f84d172e4ce(de.q60.mps.collections.libs)" version="0" />
36+
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
37+
<module reference="078723b2-ab7f-48d1-b9bb-5f643b60d08e(nl.f1re.mpsutil.hasher)" version="0" />
38+
</dependencyVersions>
39+
</solution>
40+

‎code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -570,6 +570,35 @@
570570
<property role="3oM_SC" value="components." />
571571
</node>
572572
</node>
573+
<node concept="2DRihI" id="3s41kb3Q2x$" role="15bAlk">
574+
<property role="2RT3bR" value="0" />
575+
<node concept="15Ami3" id="3s41kb3Q2y3" role="1PaTwD">
576+
<node concept="37shsh" id="3s41kb3Q2y5" role="15Aodc">
577+
<node concept="1dCxOk" id="3s41kb3Q2yb" role="37shsm">
578+
<property role="1XweGW" value="078723b2-ab7f-48d1-b9bb-5f643b60d08e" />
579+
<property role="1XxBO9" value="nl.f1re.mpsutil.hasher" />
580+
</node>
581+
</node>
582+
</node>
583+
<node concept="3oM_SD" id="3s41kb3Q2y2" role="1PaTwD">
584+
<property role="3oM_SC" value="Added" />
585+
</node>
586+
<node concept="3oM_SD" id="3s41kb3Q2yj" role="1PaTwD">
587+
<property role="3oM_SC" value="efficient," />
588+
</node>
589+
<node concept="3oM_SD" id="3s41kb3Q2yq" role="1PaTwD">
590+
<property role="3oM_SC" value="configurable" />
591+
</node>
592+
<node concept="3oM_SD" id="3s41kb3Q2yk" role="1PaTwD">
593+
<property role="3oM_SC" value="hashing" />
594+
</node>
595+
<node concept="3oM_SD" id="3s41kb3Q2yl" role="1PaTwD">
596+
<property role="3oM_SC" value="of" />
597+
</node>
598+
<node concept="3oM_SD" id="3s41kb3Q2yr" role="1PaTwD">
599+
<property role="3oM_SC" value="subtrees." />
600+
</node>
601+
</node>
573602
</node>
574603
<node concept="15bAme" id="iyWIxrRh41" role="15bAlL">
575604
<node concept="2DRihI" id="iyWIxrRh42" role="15bAlk">

‎scripts/build.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,10 @@
106106
<echo message="generating" />
107107
<generate fork="true" targetJavaVersion="1.8" logLevel="${mps.ant.log}">
108108
<settings refid="m2m-0" />
109+
<plugin path="${artifacts.mps}/lib/mps-workbench.jar" id="com.intellij.modules.mps" />
109110
<plugin path="${artifacts.mps}/plugins/mps-build" id="jetbrains.mps.build" />
110111
<plugin path="${artifacts.mps}/plugins/mps-core" id="jetbrains.mps.core" />
112+
<library file="${artifacts.mps}/languages/editor/jetbrains.mps.ide.editor.jar" />
111113
<chunk>
112114
<module file="${extensions.code}/build/solutions/de.itemis.mps.extensions.build/de.itemis.mps.extensions.build.msd" />
113115
</chunk>

0 commit comments

Comments
 (0)