added special annotations to helper concepts and docs

LionWeb-io · Oct 14, 2024 · 2c3254c · 2c3254c
1 parent 1096f99
commit 2c3254c
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 0 deletions.
diff --git a/docs/reference/converter-lang.adoc b/docs/reference/converter-lang.adoc
@@ -48,6 +48,16 @@ Converts all listed languages completely.
 If any element in the listed languages uses an element from a non-listed language, we include the element of the non-listed language -- but not any other elements of that non-listed language.
 We apply this strategy (known as _tree shaking_) transitively until we included all used elements.
 
+We can set some flags for special annotation handling:
+
+[horizontal]
+export description annotations::
+Whether concept descriptions should be exported as instances of `io.lionweb.mps.specific.lang.MPS-specific annotations.ConceptDescription`.
+
+export special annotations::
+Whether special concept annotations should be exported:
++
+* `jetbrains.mps.lang.structure.structure.DeprecatedNodeAnnotation` -> `io.lionweb.mps.specific.lang.MPS-specific annotations.Deprecated`
 
 [[instance-json]]
 == MPS Instance Model &harr; JSON

diff --git a/languages/io.lionweb.mps.converter.lang/models/io.lionweb.mps.converter.lang.editor.mps b/languages/io.lionweb.mps.converter.lang/models/io.lionweb.mps.converter.lang.editor.mps
@@ -257,6 +257,15 @@
             <ref role="1NtTu8" to="d0tf:5M8g5cT5W10" resolve="exportDescriptionAnnotations" />
           </node>
         </node>
+        <node concept="3EZMnI" id="6LPkCA_dTgd" role="3EZMnx">
+          <node concept="3F0ifn" id="6LPkCA_dTge" role="3EZMnx">
+            <property role="3F0ifm" value="Export special annotations:" />
+          </node>
+          <node concept="2iRfu4" id="6LPkCA_dTgf" role="2iSdaV" />
+          <node concept="3F0A7n" id="6LPkCA_dTgg" role="3EZMnx">
+            <ref role="1NtTu8" to="d0tf:6LPkCA_dTg9" resolve="exportSpecialAnnotations" />
+          </node>
+        </node>
       </node>
       <node concept="3F0ifn" id="1q44RFSZQQ1" role="3EZMnx" />
       <node concept="3F0ifn" id="4Yo3buYkNTb" role="3EZMnx">

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
@@ -2175,6 +2175,22 @@
                 </node>
               </node>
             </node>
+            <node concept="3clFbF" id="6LPkCA_dUlM" role="3cqZAp">
+              <node concept="2OqwBi" id="6LPkCA_dULJ" role="3clFbG">
+                <node concept="37vLTw" id="6LPkCA_dUlK" role="2Oq$k0">
+                  <ref role="3cqZAo" node="1q44RFT01lB" resolve="converter" />
+                </node>
+                <node concept="liA8E" id="6LPkCA_dUY9" role="2OqNvi">
+                  <ref role="37wK5l" to="6peh:6LPkCA$Ryk5" resolve="setExportSpecialAnnotations" />
+                  <node concept="2OqwBi" id="6LPkCA_dVng" role="37wK5m">
+                    <node concept="2Sf5sV" id="6LPkCA_dVbO" role="2Oq$k0" />
+                    <node concept="3TrcHB" id="6LPkCA_dVBV" role="2OqNvi">
+                      <ref role="3TsBF5" to="d0tf:6LPkCA_dTg9" resolve="exportSpecialAnnotations" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
             <node concept="3cpWs8" id="1q44RFT04hN" role="3cqZAp">
               <node concept="3cpWsn" id="1q44RFT04hO" role="3cpWs9">
                 <property role="TrG5h" value="languages" />

diff --git a/languages/io.lionweb.mps.converter.lang/models/io.lionweb.mps.converter.lang.structure.mps b/languages/io.lionweb.mps.converter.lang/models/io.lionweb.mps.converter.lang.structure.mps
@@ -228,6 +228,11 @@
       <property role="TrG5h" value="exportDescriptionAnnotations" />
       <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
     </node>
+    <node concept="1TJgyi" id="6LPkCA_dTg9" role="1TKVEl">
+      <property role="IQ2nx" value="7815243479507244041" />
+      <property role="TrG5h" value="exportSpecialAnnotations" />
+      <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
+    </node>
     <node concept="PrWs8" id="1q44RFSZQBV" role="PzmwI">
       <ref role="PrY4T" node="1q44RFSZQFB" resolve="ILanguageIdentityContainer" />
     </node>

diff --git a/...ns/io.lionweb.mps.converter.test/models/io.lionweb.mps.converter.test.converter@tests.mps b/...ns/io.lionweb.mps.converter.test/models/io.lionweb.mps.converter.test.converter@tests.mps
@@ -24,6 +24,12 @@
   </imports>
   <registry>
     <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
+      <concept id="1215603922101" name="jetbrains.mps.lang.test.structure.NodeOperationsContainer" flags="ng" index="7CXmI">
+        <child id="1215604436604" name="nodeOperations" index="7EUXB" />
+      </concept>
+      <concept id="1215607067978" name="jetbrains.mps.lang.test.structure.CheckNodeForErrorMessagesOperation" flags="ng" index="7OXhh">
+        <property id="3743352646565420194" name="includeSelf" index="GvXf4" />
+      </concept>
       <concept id="1211979288880" name="jetbrains.mps.lang.test.structure.AssertMatch" flags="nn" index="JA50E">
         <child id="1211979305365" name="before" index="JA92f" />
         <child id="1211979322383" name="after" index="JAdkl" />
@@ -151,9 +157,15 @@
     </language>
     <language id="97ef2b8d-23e1-433e-8d23-48f916dd314d" name="io.lionweb.mps.converter.lang">
       <concept id="5066961138993480707" name="io.lionweb.mps.converter.lang.structure.ConvertLanguageToLionCore" flags="ng" index="qeN9c" />
+      <concept id="5028875375328515028" name="io.lionweb.mps.converter.lang.structure.APathConverter" flags="ng" index="VS7hm">
+        <property id="5028875375328515031" name="path" index="VS7hl" />
+      </concept>
       <concept id="1622443184644647655" name="io.lionweb.mps.converter.lang.structure.ILanguageIdentityContainer" flags="ng" index="3IuRAt">
         <child id="5066961138993587939" name="languages" index="qeD2G" />
       </concept>
+      <concept id="1622443184644647418" name="io.lionweb.mps.converter.lang.structure.ExportMpsLanguageToJson" flags="ng" index="3IuRE0">
+        <property id="548682208089002477" name="scope" index="2G9pTy" />
+      </concept>
     </language>
     <language id="4a963078-62c4-4f96-9b52-198a0c63da4b" name="io.lionweb.mps.testsupport">
       <concept id="797107380639005765" name="io.lionweb.mps.testsupport.structure.AssertMatchVerbose" flags="ng" index="1PQTyP" />
@@ -3718,5 +3730,24 @@
       </node>
     </node>
   </node>
+  <node concept="1lH9Xt" id="6LPkCA_eaHl">
+    <property role="TrG5h" value="ExportMpsLanguageToJson" />
+    <node concept="1qefOq" id="6LPkCA_eaP1" role="1SKRRt">
+      <node concept="3IuRE0" id="6LPkCA_eaP5" role="1qenE9">
+        <property role="TrG5h" value="bla" />
+        <property role="VS7hl" value="myPath" />
+        <property role="2G9pTy" value="utjSYFIcjG/fineGrainedClosure" />
+        <node concept="2V$Bhx" id="6LPkCA_eaP7" role="qeD2G">
+          <property role="2V$B1T" value="08caad75-8246-4427-bb4d-8444b6c5c729" />
+          <property role="2V$B1Q" value="io.lionweb.mps.converter.TestLang" />
+        </node>
+        <node concept="7CXmI" id="6LPkCA_eaP9" role="lGtFl">
+          <node concept="7OXhh" id="6LPkCA_eaPb" role="7EUXB">
+            <property role="GvXf4" value="true" />
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>