From fdd7c7fb196b763716877549829225f9c3d7d81f Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Mon, 21 Oct 2019 16:28:55 +0200
Subject: [PATCH] New language j.m.bl.javadocExt to contain types aspect for
 javadoc.

---
 .mps/modules.xml                              |  1 +
 .../jetbrains.mps.baseLanguage.javadocExt.mpl | 61 +++++++++++++++++++
 ...s.mps.baseLanguage.javadocExt.behavior.mps | 12 ++++
 ...ps.baseLanguage.javadocExt.constraints.mps | 19 ++++++
 ...ins.mps.baseLanguage.javadocExt.editor.mps | 11 ++++
 ....mps.baseLanguage.javadocExt.structure.mps | 11 ++++
 ...ains.mps.baseLanguage.javadocExt.types.mps | 11 ++++
 ...mps.baseLanguage.javadocExt.typesystem.mps | 11 ++++
 8 files changed, 137 insertions(+)
 create mode 100644 samples/mpscore/languages/jetbrains.mps.baseLanguage.javadoc/jetbrains.mps.baseLanguage.javadocExt.mpl
 create mode 100644 samples/mpscore/languages/jetbrains.mps.baseLanguage.javadoc/models/jetbrains.mps.baseLanguage.javadocExt.behavior.mps
 create mode 100644 samples/mpscore/languages/jetbrains.mps.baseLanguage.javadoc/models/jetbrains.mps.baseLanguage.javadocExt.constraints.mps
 create mode 100644 samples/mpscore/languages/jetbrains.mps.baseLanguage.javadoc/models/jetbrains.mps.baseLanguage.javadocExt.editor.mps
 create mode 100644 samples/mpscore/languages/jetbrains.mps.baseLanguage.javadoc/models/jetbrains.mps.baseLanguage.javadocExt.structure.mps
 create mode 100644 samples/mpscore/languages/jetbrains.mps.baseLanguage.javadoc/models/jetbrains.mps.baseLanguage.javadocExt.types.mps
 create mode 100644 samples/mpscore/languages/jetbrains.mps.baseLanguage.javadoc/models/jetbrains.mps.baseLanguage.javadocExt.typesystem.mps

diff --git a/.mps/modules.xml b/.mps/modules.xml
index db8731b4..ce1aea23 100644
--- a/.mps/modules.xml
+++ b/.mps/modules.xml
@@ -36,6 +36,7 @@
       <modulePath path="$PROJECT_DIR$/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl" folder="samples.lambdacalc" />
       <modulePath path="$PROJECT_DIR$/samples/lambdacalc/solutions/samples.lambdacalc.build/samples.lambdacalc.build.msd" folder="samples.lambdacalc" />
       <modulePath path="$PROJECT_DIR$/samples/lambdacalc/solutions/samples.lambdacalc.demo/samples.lambdacalc.demo.msd" folder="samples.lambdacalc" />
+      <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadoc/jetbrains.mps.baseLanguage.javadocExt.mpl" folder="samples.mpscore.baseLanguageExt" />
       <modulePath path="$PROJECT_DIR$/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl" folder="samples.mpscore.baseLanguageExt" />
       <modulePath path="$PROJECT_DIR$/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd" folder="samples.mpscore.baseLanguageExt" />
       <modulePath path="$PROJECT_DIR$/samples/mpscore/solutions/samples.mpscore.build/samples.mpscore.build.msd" folder="samples.mpscore.build" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadoc/jetbrains.mps.baseLanguage.javadocExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadoc/jetbrains.mps.baseLanguage.javadocExt.mpl
new file mode 100644
index 00000000..c91cec3c
--- /dev/null
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadoc/jetbrains.mps.baseLanguage.javadocExt.mpl
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<language namespace="jetbrains.mps.baseLanguage.javadocExt" uuid="42d031fd-ccb3-45db-91ef-f9621eb0549e" languageVersion="0" moduleVersion="0">
+  <models>
+    <modelRoot contentPath="${module}" type="default">
+      <sourceRoot location="models" />
+    </modelRoot>
+  </models>
+  <accessoryModels />
+  <sourcePath />
+  <languageVersions>
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="9" />
+    <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
+    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
+    <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
+    <language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
+    <language slang="l:c4803b19-6d89-4a3b-bf82-390769514add:jetbrains.mps.lang.coderules" version="15" />
+    <language slang="l:3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1:jetbrains.mps.lang.constraints" version="5" />
+    <language slang="l:e51810c5-7308-4642-bcb6-469e61b5dd18:jetbrains.mps.lang.constraints.msg.specification" version="0" />
+    <language slang="l:47257bf3-78d3-470b-89d9-8c3261a61d15:jetbrains.mps.lang.constraints.rules" version="0" />
+    <language slang="l:5dae8159-ab99-46bb-a40d-0cee30ee7018:jetbrains.mps.lang.constraints.rules.kinds" version="0" />
+    <language slang="l:134c38d4-e3af-4d9e-b069-1c7df0a4005d:jetbrains.mps.lang.constraints.rules.skeleton" version="0" />
+    <language slang="l:3ad5badc-1d9c-461c-b7b1-fa2fcd0a0ae7:jetbrains.mps.lang.context" version="0" />
+    <language slang="l:ea3159bf-f48e-4720-bde2-86dba75f0d34:jetbrains.mps.lang.context.defs" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="13" />
+    <language slang="l:ad93155d-79b2-4759-b10c-55123e763903:jetbrains.mps.lang.messages" version="0" />
+    <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="3" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
+    <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="17" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
+    <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+    <language slang="l:4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462:jetbrains.mps.lang.typechecking" version="0" />
+    <language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="4" />
+    <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="4" />
+  </languageVersions>
+  <dependencyVersions>
+    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+    <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+    <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+    <module reference="f2801650-65d5-424e-bb1b-463a8781b786(jetbrains.mps.baseLanguage.javadoc)" version="0" />
+    <module reference="42d031fd-ccb3-45db-91ef-f9621eb0549e(jetbrains.mps.baseLanguage.javadocExt)" version="0" />
+    <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+    <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
+    <module reference="9e98f4e2-decf-4e97-bf80-9109e8b759aa(jetbrains.mps.lang.feedback.context)" version="0" />
+  </dependencyVersions>
+  <extendedLanguages>
+    <extendedLanguage>f2801650-65d5-424e-bb1b-463a8781b786(jetbrains.mps.baseLanguage.javadoc)</extendedLanguage>
+  </extendedLanguages>
+</language>
+
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadoc/models/jetbrains.mps.baseLanguage.javadocExt.behavior.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadoc/models/jetbrains.mps.baseLanguage.javadocExt.behavior.mps
new file mode 100644
index 00000000..111bc95b
--- /dev/null
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadoc/models/jetbrains.mps.baseLanguage.javadocExt.behavior.mps
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:a00bf55a-29b1-4fb9-bb26-cd45245be5e6(jetbrains.mps.baseLanguage.javadocExt.behavior)">
+  <persistence version="9" />
+  <languages>
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="17" />
+    <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
+    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+  </languages>
+  <imports />
+  <registry />
+</model>
+
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadoc/models/jetbrains.mps.baseLanguage.javadocExt.constraints.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadoc/models/jetbrains.mps.baseLanguage.javadocExt.constraints.mps
new file mode 100644
index 00000000..c9036b96
--- /dev/null
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadoc/models/jetbrains.mps.baseLanguage.javadocExt.constraints.mps
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:9f0bc0e5-bf54-4e9a-a2de-554de532924a(jetbrains.mps.baseLanguage.javadocExt.constraints)">
+  <persistence version="9" />
+  <languages>
+    <use id="5dae8159-ab99-46bb-a40d-0cee30ee7018" name="jetbrains.mps.lang.constraints.rules.kinds" version="0" />
+    <use id="ea3159bf-f48e-4720-bde2-86dba75f0d34" name="jetbrains.mps.lang.context.defs" version="0" />
+    <use id="e51810c5-7308-4642-bcb6-469e61b5dd18" name="jetbrains.mps.lang.constraints.msg.specification" version="0" />
+    <use id="134c38d4-e3af-4d9e-b069-1c7df0a4005d" name="jetbrains.mps.lang.constraints.rules.skeleton" version="0" />
+    <use id="b3551702-269c-4f05-ba61-58060cef4292" name="jetbrains.mps.lang.rulesAndMessages" version="0" />
+    <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="5" />
+    <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
+    <use id="3ad5badc-1d9c-461c-b7b1-fa2fcd0a0ae7" name="jetbrains.mps.lang.context" version="0" />
+    <use id="ad93155d-79b2-4759-b10c-55123e763903" name="jetbrains.mps.lang.messages" version="0" />
+    <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
+  </languages>
+  <imports />
+  <registry />
+</model>
+
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadoc/models/jetbrains.mps.baseLanguage.javadocExt.editor.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadoc/models/jetbrains.mps.baseLanguage.javadocExt.editor.mps
new file mode 100644
index 00000000..cc168d1d
--- /dev/null
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadoc/models/jetbrains.mps.baseLanguage.javadocExt.editor.mps
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:6fa01963-69c8-44cf-8939-5d66ac8dea72(jetbrains.mps.baseLanguage.javadocExt.editor)">
+  <persistence version="9" />
+  <languages>
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="13" />
+    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+  </languages>
+  <imports />
+  <registry />
+</model>
+
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadoc/models/jetbrains.mps.baseLanguage.javadocExt.structure.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadoc/models/jetbrains.mps.baseLanguage.javadocExt.structure.mps
new file mode 100644
index 00000000..5104793f
--- /dev/null
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadoc/models/jetbrains.mps.baseLanguage.javadocExt.structure.mps
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:b2d894a5-1693-4770-a201-030edc6c1659(jetbrains.mps.baseLanguage.javadocExt.structure)">
+  <persistence version="9" />
+  <languages>
+    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
+    <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
+  </languages>
+  <imports />
+  <registry />
+</model>
+
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadoc/models/jetbrains.mps.baseLanguage.javadocExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadoc/models/jetbrains.mps.baseLanguage.javadocExt.types.mps
new file mode 100644
index 00000000..9fa636c3
--- /dev/null
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadoc/models/jetbrains.mps.baseLanguage.javadocExt.types.mps
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:992fb193-05bb-4cd5-a608-066498d6f2d3(jetbrains.mps.baseLanguage.javadocExt.types)">
+  <persistence version="9" />
+  <languages>
+    <use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="0" />
+    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+  </languages>
+  <imports />
+  <registry />
+</model>
+
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadoc/models/jetbrains.mps.baseLanguage.javadocExt.typesystem.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadoc/models/jetbrains.mps.baseLanguage.javadocExt.typesystem.mps
new file mode 100644
index 00000000..5f46369d
--- /dev/null
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.javadoc/models/jetbrains.mps.baseLanguage.javadocExt.typesystem.mps
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:e64b429f-7bc5-4a8e-8b64-ce4dd659aaa7(jetbrains.mps.baseLanguage.javadocExt.typesystem)">
+  <persistence version="9" />
+  <languages>
+    <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="4" />
+    <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
+  </languages>
+  <imports />
+  <registry />
+</model>
+