Merge branch 'mps2021.2' into mps2021.3

# Conflicts: # gradle.properties
LionWeb-io · Jun 13, 2024 · e4434a3 · e4434a3
2 parents d94effb + e4bf409
commit e4434a3
Show file tree

Hide file tree

Showing 41 changed files with 8,662 additions and 534 deletions.
diff --git a/.mps/modules.xml b/.mps/modules.xml
@@ -3,6 +3,7 @@
   <component name="MPSProject">
     <projectModules>
       <modulePath path="$PROJECT_DIR$/languages/MultiRefLang/MultiRefLang.mpl" folder="test.langs" />
+      <modulePath path="$PROJECT_DIR$/languages/io.lionweb.mps.converter.TestAbstract/io.lionweb.mps.converter.TestAbstract.mpl" folder="test.langs" />
       <modulePath path="$PROJECT_DIR$/languages/io.lionweb.mps.converter.TestAllBuiltins/io.lionweb.mps.converter.TestAllBuiltins.mpl" folder="test.langs" />
       <modulePath path="$PROJECT_DIR$/languages/io.lionweb.mps.converter.TestAnnotation/io.lionweb.mps.converter.TestAnnotation.mpl" folder="test.langs" />
       <modulePath path="$PROJECT_DIR$/languages/io.lionweb.mps.converter.TestCoreRefLang/io.lionweb.mps.converter.TestCoreRefLang.mpl" folder="test.langs" />

diff --git a/build.xml b/build.xml
diff --git a/changelog.md b/changelog.md
@@ -1,6 +1,10 @@
 # Changelog for LionWeb-MPS
 
 ## Next
+* For concepts with alias and/or short description, export annotation with that information.  
+
+* Filter nodes of abstract concepts or interfaces from exporting to LionWeb JSON. 
+
 * Updated both technical and reference documentation.
 
 * Added intentions to assign LionWeb keys to all elements of a language.

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 version=0.2.4-SNAPSHOT
 lionwebRelease=2023.1
-lionwebJavaVersion=0.2.9
+lionwebJavaVersion=0.2.14
 mpsVersionSuffix=2021.3
 mpsVersion=2021.3.5
 mpsExtensionsVersion=2021.3.2713.aedb03a

diff --git a/languages/io.lionweb.mps.converter.TestAbstract/io.lionweb.mps.converter.TestAbstract.mpl b/languages/io.lionweb.mps.converter.TestAbstract/io.lionweb.mps.converter.TestAbstract.mpl
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<language namespace="io.lionweb.mps.converter.TestAbstract" uuid="3ecd737b-418b-4a70-a991-f6b83f0e3247" languageVersion="0" moduleVersion="0">
+  <models>
+    <modelRoot contentPath="${module}" type="default">
+      <sourceRoot location="models" />
+    </modelRoot>
+  </models>
+  <facets>
+    <facet type="java">
+      <classes generated="true" path="${module}/classes_gen" />
+    </facet>
+  </facets>
+  <accessoryModels />
+  <sourcePath />
+  <languageVersions>
+    <language slang="l:411e5b27-8a76-482e-8af8-1704262b4468:io.lionweb.mps.structure.attribute" version="0" />
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
+    <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: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="14" />
+    <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="18" />
+    <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" />
+  </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="3ecd737b-418b-4a70-a991-f6b83f0e3247(io.lionweb.mps.converter.TestAbstract)" 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" />
+  </dependencyVersions>
+  <extendedLanguages />
+</language>
+
diff --git a/...nweb.mps.converter.TestAbstract/models/io.lionweb.mps.converter.TestAbstract.behavior.mps b/...nweb.mps.converter.TestAbstract/models/io.lionweb.mps.converter.TestAbstract.behavior.mps
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:0478e58a-48be-465a-8746-cdda32500d67(io.lionweb.mps.converter.TestAbstract.behavior)">
+  <persistence version="9" />
+  <languages>
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="18" />
+    <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/...ionweb.mps.converter.TestAbstract/models/io.lionweb.mps.converter.TestAbstract.editor.mps b/...ionweb.mps.converter.TestAbstract/models/io.lionweb.mps.converter.TestAbstract.editor.mps
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:afd9773d-b2e7-47c8-846a-0af196ddacb4(io.lionweb.mps.converter.TestAbstract.editor)">
+  <persistence version="9" />
+  <languages>
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
+    <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
+    <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
+  </languages>
+  <imports>
+    <import index="nnlr" ref="r:a08e442f-c741-4fbc-a54c-eca0c8e3790c(io.lionweb.mps.converter.TestAbstract.structure)" implicit="true" />
+    <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
+  </imports>
+  <registry>
+    <language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
+      <concept id="1071666914219" name="jetbrains.mps.lang.editor.structure.ConceptEditorDeclaration" flags="ig" index="24kQdi" />
+      <concept id="1080736578640" name="jetbrains.mps.lang.editor.structure.BaseEditorComponent" flags="ig" index="2wURMF">
+        <child id="1080736633877" name="cellModel" index="2wV5jI" />
+      </concept>
+      <concept id="1078939183254" name="jetbrains.mps.lang.editor.structure.CellModel_Component" flags="sg" stub="3162947552742194261" index="PMmxH">
+        <reference id="1078939183255" name="editorComponent" index="PMmxG" />
+      </concept>
+      <concept id="1073389577006" name="jetbrains.mps.lang.editor.structure.CellModel_Constant" flags="sn" stub="3610246225209162225" index="3F0ifn">
+        <property id="1073389577007" name="text" index="3F0ifm" />
+      </concept>
+      <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
+        <reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="24kQdi" id="34Q84zM$yU3">
+    <ref role="1XX52x" to="nnlr:34Q84zM$f9f" resolve="AbstractInterface" />
+    <node concept="3F0ifn" id="34Q84zM$z2l" role="2wV5jI">
+      <property role="3F0ifm" value="AbstractInterface" />
+    </node>
+  </node>
+  <node concept="24kQdi" id="34Q84zM$BIQ">
+    <ref role="1XX52x" to="nnlr:34Q84zM$f97" resolve="AbstractConcept" />
+    <node concept="PMmxH" id="34Q84zM$BIS" role="2wV5jI">
+      <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+    </node>
+  </node>
+  <node concept="24kQdi" id="34Q84zM$BJk">
+    <ref role="1XX52x" to="nnlr:34Q84zM$f0U" resolve="AbstractPartition" />
+    <node concept="PMmxH" id="34Q84zM$BJm" role="2wV5jI">
+      <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+    </node>
+  </node>
+</model>
+
diff --git a/...web.mps.converter.TestAbstract/models/io.lionweb.mps.converter.TestAbstract.structure.mps b/...web.mps.converter.TestAbstract/models/io.lionweb.mps.converter.TestAbstract.structure.mps
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:a08e442f-c741-4fbc-a54c-eca0c8e3790c(io.lionweb.mps.converter.TestAbstract.structure)">
+  <persistence version="9" />
+  <languages>
+    <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
+    <use id="411e5b27-8a76-482e-8af8-1704262b4468" name="io.lionweb.mps.structure.attribute" version="0" />
+    <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
+  </languages>
+  <imports>
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
+  </imports>
+  <registry>
+    <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
+      <concept id="2992811758677295509" name="jetbrains.mps.lang.structure.structure.AttributeInfo" flags="ng" index="M6xJ_" />
+      <concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
+        <property id="6714410169261853888" name="conceptId" index="EcuMT" />
+        <property id="4628067390765907488" name="conceptShortDescription" index="R4oN_" />
+        <property id="4628067390765956802" name="abstract" index="R5$K7" />
+        <property id="5092175715804935370" name="conceptAlias" index="34LRSv" />
+      </concept>
+      <concept id="1169125989551" name="jetbrains.mps.lang.structure.structure.InterfaceConceptDeclaration" flags="ig" index="PlHQZ" />
+      <concept id="1071489090640" name="jetbrains.mps.lang.structure.structure.ConceptDeclaration" flags="ig" index="1TIwiD">
+        <property id="1096454100552" name="rootable" index="19KtqR" />
+        <reference id="1071489389519" name="extends" index="1TJDcQ" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
+        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
+      </concept>
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+    <language id="411e5b27-8a76-482e-8af8-1704262b4468" name="io.lionweb.mps.structure.attribute">
+      <concept id="6461713321120959620" name="io.lionweb.mps.structure.attribute.structure.LionWebPartitionConcept" flags="ng" index="3KvTa3">
+        <property id="6461713321120959627" name="partition" index="3KvTac" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="1TIwiD" id="34Q84zM$f0U">
+    <property role="EcuMT" value="3546057254280163386" />
+    <property role="TrG5h" value="AbstractPartition" />
+    <property role="R5$K7" value="true" />
+    <property role="19KtqR" value="true" />
+    <property role="34LRSv" value="AbstractPartition" />
+    <property role="R4oN_" value="Short Desc AbstractPartition" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="3KvTa3" id="34Q84zM$f93" role="lGtFl">
+      <property role="3KvTac" value="true" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="34Q84zM$f95">
+    <property role="EcuMT" value="3546057254280163909" />
+    <property role="TrG5h" value="ConcretePartition" />
+    <property role="19KtqR" value="true" />
+    <property role="34LRSv" value="ConcretePartition" />
+    <property role="R4oN_" value="Short Desc ConcretePartition" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="3KvTa3" id="34Q84zM$f96" role="lGtFl">
+      <property role="3KvTac" value="true" />
+    </node>
+  </node>
+  <node concept="1TIwiD" id="34Q84zM$f97">
+    <property role="EcuMT" value="3546057254280163911" />
+    <property role="TrG5h" value="AbstractConcept" />
+    <property role="R5$K7" value="true" />
+    <property role="34LRSv" value="AbstractConcept" />
+    <property role="R4oN_" value="Short Desc AbstractConcept" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+  </node>
+  <node concept="1TIwiD" id="34Q84zM$f99">
+    <property role="EcuMT" value="3546057254280163913" />
+    <property role="TrG5h" value="ConcreteConcept" />
+    <property role="34LRSv" value="ConcreteConcept" />
+    <property role="R4oN_" value="Short Desc ConcreteConcept" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+  </node>
+  <node concept="1TIwiD" id="34Q84zM$f9a">
+    <property role="EcuMT" value="3546057254280163914" />
+    <property role="TrG5h" value="AbstractAnnotation" />
+    <property role="R5$K7" value="true" />
+    <property role="34LRSv" value="AbstractAnnotation" />
+    <property role="R4oN_" value="Short Desc AbstractAnnotation" />
+    <ref role="1TJDcQ" to="tpck:2ULFgo8_XDk" resolve="NodeAttribute" />
+    <node concept="M6xJ_" id="34Q84zM$f9b" role="lGtFl" />
+  </node>
+  <node concept="1TIwiD" id="34Q84zM$f9d">
+    <property role="EcuMT" value="3546057254280163917" />
+    <property role="TrG5h" value="ConcreteAnnotation" />
+    <property role="34LRSv" value="ConcreteAnnotation" />
+    <property role="R4oN_" value="Short Desc ConcreteAnnotation" />
+    <ref role="1TJDcQ" to="tpck:2ULFgo8_XDk" resolve="NodeAttribute" />
+    <node concept="M6xJ_" id="34Q84zM$f9e" role="lGtFl" />
+  </node>
+  <node concept="PlHQZ" id="34Q84zM$f9f">
+    <property role="EcuMT" value="3546057254280163919" />
+    <property role="TrG5h" value="AbstractInterface" />
+    <property role="R4oN_" value="Short Desc AbstractInterface" />
+    <property role="34LRSv" value="AbstractInterface" />
+  </node>
+</model>
+
diff --git a/languages/io.lionweb.mps.converter.lang/io.lionweb.mps.converter.lang.mpl b/languages/io.lionweb.mps.converter.lang/io.lionweb.mps.converter.lang.mpl
@@ -24,6 +24,7 @@
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">7350a1d7-537e-4f0d-9965-e91c82522d7d(io.lionweb.mps.m3.runtime)</dependency>
+    <dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />