Merge pull request #111 from LionWeb-io/niko/version-string

Added optional `version` to LionWeb Language root in structure aspect
LionWeb-io · Dec 25, 2024 · b115bba · b115bba
2 parents edab462 + c13a236
commit b115bba
Show file tree

Hide file tree

Showing 46 changed files with 3,595 additions and 789 deletions.
diff --git a/build.xml b/build.xml
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,10 @@
 # Changelog for LionWeb-MPS
 
+## 0.2.10-2023.1
+
+* Added optional `version` to LionWeb Language root in structure aspect.
+  This value, if set, takes precendence over the language's version.
+
 ## 0.2.9-2023.1
 
 * Fixed using enumeration literal's key in all cases.

diff --git a/languages/MultiRefLang/models/MultiRefLang.structure.mps b/languages/MultiRefLang/models/MultiRefLang.structure.mps
@@ -41,7 +41,7 @@
       </concept>
     </language>
     <language id="411e5b27-8a76-482e-8af8-1704262b4468" name="io.lionweb.mps.structure.attribute">
-      <concept id="7205279169712116346" name="io.lionweb.mps.structure.attribute.structure.LionWebLanguageKey" flags="ng" index="2DM1_0" />
+      <concept id="7205279169712116346" name="io.lionweb.mps.structure.attribute.structure.LionWebLanguage" flags="ng" index="2DM1_0" />
       <concept id="7205279169712116353" name="io.lionweb.mps.structure.attribute.structure.ILionWebKey" flags="ng" index="2DM1AV">
         <property id="7205279169712116354" name="key" index="2DM1AS" />
       </concept>

diff --git a/...o.lionweb.mps.converter.TestLang3/models/io.lionweb.mps.converter.TestLang3.structure.mps b/...o.lionweb.mps.converter.TestLang3/models/io.lionweb.mps.converter.TestLang3.structure.mps
@@ -63,7 +63,9 @@
       </concept>
     </language>
     <language id="411e5b27-8a76-482e-8af8-1704262b4468" name="io.lionweb.mps.structure.attribute">
-      <concept id="7205279169712116346" name="io.lionweb.mps.structure.attribute.structure.LionWebLanguageKey" flags="ng" index="2DM1_0" />
+      <concept id="7205279169712116346" name="io.lionweb.mps.structure.attribute.structure.LionWebLanguage" flags="ng" index="2DM1_0">
+        <property id="7263087982341810717" name="version" index="2NbWok" />
+      </concept>
       <concept id="7205279169712116353" name="io.lionweb.mps.structure.attribute.structure.ILionWebKey" flags="ng" index="2DM1AV">
         <property id="7205279169712116354" name="key" index="2DM1AS" />
       </concept>
@@ -321,6 +323,7 @@
   </node>
   <node concept="2DM1_0" id="5AGBwuDAKCg">
     <property role="2DM1AS" value="My-TestLang3" />
+    <property role="2NbWok" value="00 my! VERSION 😀" />
   </node>
   <node concept="1TIwiD" id="6jI_U5eOwrW">
     <property role="EcuMT" value="7272917167317845756" />

diff --git a/languages/io.lionweb.mps.converter.lang/models/io.lionweb.mps.converter.lang.intentions.mps b/languages/io.lionweb.mps.converter.lang/models/io.lionweb.mps.converter.lang.intentions.mps
@@ -43,6 +43,12 @@
       <concept id="8118189177080264853" name="jetbrains.mps.baseLanguage.structure.AlternativeType" flags="ig" index="nSUau">
         <child id="8118189177080264854" name="alternative" index="nSUat" />
       </concept>
+      <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
+        <reference id="1188208074048" name="annotation" index="2AI5Lk" />
+      </concept>
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+        <child id="1188208488637" name="annotation" index="2AJF6D" />
+      </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
         <reference id="2820489544401957798" name="classifier" index="HV5vE" />
       </concept>
@@ -67,6 +73,9 @@
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
       <concept id="4952749571008284462" name="jetbrains.mps.baseLanguage.structure.CatchVariable" flags="ng" index="XOnhg" />
+      <concept id="1182160077978" name="jetbrains.mps.baseLanguage.structure.AnonymousClassCreator" flags="nn" index="YeOm9">
+        <child id="1182160096073" name="cls" index="YeSDq" />
+      </concept>
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
       </concept>
@@ -84,6 +93,12 @@
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123134" name="parameter" index="3clF46" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_" />
       <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
@@ -105,6 +120,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
       <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
         <child id="1079359253376" name="expression" index="1eOMHV" />
       </concept>
@@ -113,6 +129,10 @@
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
       <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
+      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
+        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
+      </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
@@ -125,6 +145,9 @@
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
       <concept id="5351203823916832286" name="jetbrains.mps.baseLanguage.structure.ResourceVariable" flags="ng" index="3J1hQo" />
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
         <child id="8276990574886367510" name="catchClause" index="1zxBo5" />
@@ -136,6 +159,11 @@
         <child id="1163668922816" name="ifTrue" index="3K4E3e" />
         <child id="1163668934364" name="ifFalse" index="3K4GZi" />
       </concept>
+      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+      <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
+      <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
+        <reference id="1170346070688" name="classifier" index="1Y3XeK" />
+      </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
@@ -1850,13 +1878,38 @@
                   <ref role="3uigEE" to="6peh:4R9posp5N7h" resolve="JsonToM1" />
                 </node>
                 <node concept="2ShNRf" id="18UigYOS37i" role="33vP2m">
-                  <node concept="1pGfFk" id="18UigYOS37j" role="2ShVmc">
-                    <ref role="37wK5l" to="6peh:4R9posp5Osb" resolve="JsonToM1" />
-                    <node concept="37vLTw" id="18UigYOS37k" role="37wK5m">
-                      <ref role="3cqZAo" node="5M3rB6BZyeP" resolve="repository" />
-                    </node>
-                    <node concept="37vLTw" id="18UigYOS37l" role="37wK5m">
-                      <ref role="3cqZAo" node="7W6jYlyR0iK" resolve="jsonNodes" />
+                  <node concept="YeOm9" id="6jbF0BoEZqE" role="2ShVmc">
+                    <node concept="1Y3b0j" id="6jbF0BoEZqH" role="YeSDq">
+                      <property role="2bfB8j" value="true" />
+                      <ref role="37wK5l" to="6peh:4R9posp5Osb" resolve="JsonToM1" />
+                      <ref role="1Y3XeK" to="6peh:4R9posp5N7h" resolve="JsonToM1" />
+                      <node concept="3Tm1VV" id="6jbF0BoEZqI" role="1B3o_S" />
+                      <node concept="37vLTw" id="18UigYOS37k" role="37wK5m">
+                        <ref role="3cqZAo" node="5M3rB6BZyeP" resolve="repository" />
+                      </node>
+                      <node concept="37vLTw" id="18UigYOS37l" role="37wK5m">
+                        <ref role="3cqZAo" node="7W6jYlyR0iK" resolve="jsonNodes" />
+                      </node>
+                      <node concept="3clFb_" id="6jbF0BoEZvp" role="jymVt">
+                        <property role="TrG5h" value="logWarning" />
+                        <node concept="3cqZAl" id="6jbF0BoEZvq" role="3clF45" />
+                        <node concept="3Tmbuc" id="6jbF0BoEZvr" role="1B3o_S" />
+                        <node concept="37vLTG" id="6jbF0BoEZvs" role="3clF46">
+                          <property role="TrG5h" value="message" />
+                          <node concept="17QB3L" id="6jbF0BoEZvt" role="1tU5fm" />
+                        </node>
+                        <node concept="3clFbS" id="6jbF0BoEZvA" role="3clF47">
+                          <node concept="2xdQw9" id="6jbF0BoF0s8" role="3cqZAp">
+                            <property role="2xdLsb" value="gZ5fksE/warn" />
+                            <node concept="37vLTw" id="6jbF0BoF0AO" role="9lYJi">
+                              <ref role="3cqZAo" node="6jbF0BoEZvs" resolve="message" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="2AHcQZ" id="6jbF0BoEZvB" role="2AJF6D">
+                          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                        </node>
+                      </node>
                     </node>
                   </node>
                 </node>

diff --git a/languages/io.lionweb.mps.m3/models/io.lionweb.mps.m3.builtin.mps b/languages/io.lionweb.mps.m3/models/io.lionweb.mps.m3.builtin.mps
@@ -35,7 +35,7 @@
   </registry>
   <node concept="2RzRRF" id="2ju2syjnJjW">
     <property role="TrG5h" value="Built-in DataTypes" />
-    <property role="3HH78N" value="1" />
+    <property role="3HH78N" value="2023.1" />
     <property role="2RzON1" value="LionCore-builtins" />
     <node concept="2RzSJf" id="2ju2syjnJjX" role="2RzR6B">
       <property role="2RzON1" value="LionCore-builtins-String" />

diff --git a/languages/io.lionweb.mps.m3/models/io.lionweb.mps.m3.structure.mps b/languages/io.lionweb.mps.m3/models/io.lionweb.mps.m3.structure.mps
@@ -62,7 +62,9 @@
       </concept>
     </language>
     <language id="411e5b27-8a76-482e-8af8-1704262b4468" name="io.lionweb.mps.structure.attribute">
-      <concept id="7205279169712116346" name="io.lionweb.mps.structure.attribute.structure.LionWebLanguageKey" flags="ng" index="2DM1_0" />
+      <concept id="7205279169712116346" name="io.lionweb.mps.structure.attribute.structure.LionWebLanguage" flags="ng" index="2DM1_0">
+        <property id="7263087982341810717" name="version" index="2NbWok" />
+      </concept>
       <concept id="7205279169712116353" name="io.lionweb.mps.structure.attribute.structure.ILionWebKey" flags="ng" index="2DM1AV">
         <property id="7205279169712116354" name="key" index="2DM1AS" />
       </concept>
@@ -443,6 +445,7 @@
   </node>
   <node concept="2DM1_0" id="5AGBwuDAKCg">
     <property role="2DM1AS" value="LionCore-M3" />
+    <property role="2NbWok" value="2023.1" />
   </node>
   <node concept="1TIwiD" id="18UigYQyrxa">
     <property role="EcuMT" value="1313442573167736906" />

diff --git a/languages/io.lionweb.mps.structure.attribute/io.lionweb.mps.structure.attribute.mpl b/languages/io.lionweb.mps.structure.attribute/io.lionweb.mps.structure.attribute.mpl
@@ -15,6 +15,7 @@
   <dependencies>
     <dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
+    <dependency reexport="false">7350a1d7-537e-4f0d-9965-e91c82522d7d(io.lionweb.mps.m3.runtime)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
@@ -59,6 +60,7 @@
     <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="7350a1d7-537e-4f0d-9965-e91c82522d7d(io.lionweb.mps.m3.runtime)" version="0" />
     <module reference="411e5b27-8a76-482e-8af8-1704262b4468(io.lionweb.mps.structure.attribute)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />

diff --git a/...io.lionweb.mps.structure.attribute/models/io.lionweb.mps.structure.attribute.behavior.mps b/...io.lionweb.mps.structure.attribute/models/io.lionweb.mps.structure.attribute.behavior.mps
@@ -59,7 +59,7 @@
     </language>
   </registry>
   <node concept="13h7C7" id="3M8YG$9uJLd">
-    <ref role="13h7C2" to="234s:6fYiNFad_9U" resolve="LionWebLanguageKey" />
+    <ref role="13h7C2" to="234s:6fYiNFad_9U" resolve="LionWebLanguage" />
     <node concept="13hLZK" id="3M8YG$9uJLe" role="13h7CW">
       <node concept="3clFbS" id="3M8YG$9uJLf" role="2VODD2" />
     </node>

diff --git a/...s/io.lionweb.mps.structure.attribute/models/io.lionweb.mps.structure.attribute.editor.mps b/...s/io.lionweb.mps.structure.attribute/models/io.lionweb.mps.structure.attribute.editor.mps
@@ -39,6 +39,7 @@
       </concept>
       <concept id="1088185857835" name="jetbrains.mps.lang.editor.structure.InlineEditorComponent" flags="ig" index="1sVBvm" />
       <concept id="1139848536355" name="jetbrains.mps.lang.editor.structure.CellModel_WithRole" flags="ng" index="1$h60E">
+        <property id="1140114345053" name="allowEmptyText" index="1O74Pk" />
         <reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
       </concept>
       <concept id="1073389446423" name="jetbrains.mps.lang.editor.structure.CellModel_Collection" flags="sn" stub="3013115976261988961" index="3EZMnI">
@@ -101,7 +102,7 @@
     </language>
   </registry>
   <node concept="24kQdi" id="6fYiNFad_f3">
-    <ref role="1XX52x" to="234s:6fYiNFad_9U" resolve="LionWebLanguageKey" />
+    <ref role="1XX52x" to="234s:6fYiNFad_9U" resolve="LionWebLanguage" />
     <node concept="3EZMnI" id="3M8YG$9urTp" role="2wV5jI">
       <node concept="3EZMnI" id="3M8YG$9urTH" role="3EZMnx">
         <ref role="1k5W1q" to="tpch:24YP6ZDyde4" resolve="Keyword" />
@@ -116,10 +117,39 @@
           </node>
         </node>
       </node>
-      <node concept="3F0A7n" id="3M8YG$9urTr" role="3EZMnx">
-        <ref role="1NtTu8" to="234s:6fYiNFad_a2" resolve="key" />
+      <node concept="3EZMnI" id="6jbF0BnTw3u" role="3EZMnx">
+        <node concept="VPM3Z" id="6jbF0BnTw3w" role="3F10Kt" />
+        <node concept="3XFhqQ" id="6jbF0BnTw3I" role="3EZMnx" />
+        <node concept="3EZMnI" id="6jbF0BnTw3O" role="3EZMnx">
+          <node concept="VPM3Z" id="6jbF0BnTw3Q" role="3F10Kt" />
+          <node concept="3EZMnI" id="6jbF0BnTw3Z" role="3EZMnx">
+            <node concept="VPM3Z" id="6jbF0BnTw41" role="3F10Kt" />
+            <node concept="3F0ifn" id="6jbF0BnTw49" role="3EZMnx">
+              <property role="3F0ifm" value="key" />
+            </node>
+            <node concept="3XFhqQ" id="6jbF0BnTw4f" role="3EZMnx" />
+            <node concept="3F0A7n" id="6jbF0BnTw4s" role="3EZMnx">
+              <ref role="1NtTu8" to="234s:6fYiNFad_a2" resolve="key" />
+            </node>
+            <node concept="2iRfu4" id="6jbF0BnTw44" role="2iSdaV" />
+          </node>
+          <node concept="3EZMnI" id="6jbF0BnTw4x" role="3EZMnx">
+            <node concept="VPM3Z" id="6jbF0BnTw4y" role="3F10Kt" />
+            <node concept="3F0ifn" id="6jbF0BnTw4z" role="3EZMnx">
+              <property role="3F0ifm" value="version" />
+            </node>
+            <node concept="3XFhqQ" id="6jbF0BnTw4$" role="3EZMnx" />
+            <node concept="3F0A7n" id="6jbF0BnTw4_" role="3EZMnx">
+              <property role="1O74Pk" value="true" />
+              <ref role="1NtTu8" to="234s:6jbF0BnT6Ct" resolve="version" />
+            </node>
+            <node concept="2iRfu4" id="6jbF0BnTw4A" role="2iSdaV" />
+          </node>
+          <node concept="2iRkQZ" id="6jbF0BnTw3T" role="2iSdaV" />
+        </node>
+        <node concept="2iRfu4" id="6jbF0BnTw3z" role="2iSdaV" />
       </node>
-      <node concept="2iRfu4" id="3M8YG$9urTs" role="2iSdaV" />
+      <node concept="2iRkQZ" id="6jbF0BnTw3k" role="2iSdaV" />
     </node>
   </node>
   <node concept="PKFIW" id="6fYiNFatshQ">