Skip to content

Commit

Permalink
Merge pull request #2634 from mbeddr/merge/mps20241
Browse files Browse the repository at this point in the history 
Merge maintenance/mps20232 into maintenance/mps20241
  • Loading branch information
@mps-ci-buildbot
mps-ci-buildbot authored Dec 4, 2024
2 parents c707a9e + a2bccbf commit c2cacf6
Show file tree
Hide file tree
Showing 4 changed files with 124 additions and 16 deletions.
1 change: 1 addition & 0 deletions ...eddr.doc.aspect/solutions/com.mbeddr.doc.aspect.runtime/com.mbeddr.doc.aspect.runtime.msd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<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="2" />
<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:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
<language slang="l:c0080a47-7e37-4558-bee9-9ae18e690549:jetbrains.mps.lang.extension" version="2" />
Expand Down
77 changes: 69 additions & 8 deletions ...c.aspect/solutions/com.mbeddr.doc.aspect.runtime/models/com/mbeddr/doc/aspect/runtime.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<use id="654422bf-e75f-44dc-936d-188890a746ce" name="de.slisson.mps.reflection" version="0" />
<use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
<use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
<use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
</languages>
<imports>
<import index="ze1i" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.runtime(MPS.Core/)" />
Expand Down Expand Up @@ -58,6 +59,9 @@
</concept>
<concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
<concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
<concept id="8118189177080264853" name="jetbrains.mps.baseLanguage.structure.AlternativeType" flags="ig" index="nSUau">
<child id="8118189177080264854" name="alternative" index="nSUat" />
</concept>
<concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
<concept id="1076505808687" name="jetbrains.mps.baseLanguage.structure.WhileStatement" flags="nn" index="2$JKZl">
<child id="1076505808688" name="condition" index="2$JKZa" />
Expand All @@ -82,6 +86,10 @@
<child id="1145553007750" name="creator" index="2ShVmc" />
</concept>
<concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA" />
<concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
<property id="1070475926801" name="value" index="Xl_RC" />
</concept>
<concept id="4952749571008284462" name="jetbrains.mps.baseLanguage.structure.CatchVariable" flags="ng" index="XOnhg" />
<concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
<concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
<reference id="1144433194310" name="classConcept" index="1Pybhc" />
Expand Down Expand Up @@ -142,6 +150,7 @@
<concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
<property id="1068580320021" name="value" index="3cmrfH" />
</concept>
<concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
<concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
<child id="1068581517676" name="expression" index="3cqZAk" />
</concept>
Expand Down Expand Up @@ -180,13 +189,21 @@
<child id="1081773367579" name="rightExpression" index="3uHU7w" />
<child id="1081773367580" name="leftExpression" index="3uHU7B" />
</concept>
<concept id="3093926081414150598" name="jetbrains.mps.baseLanguage.structure.MultipleCatchClause" flags="ng" index="3uVAMA">
<child id="8276990574895933173" name="catchBody" index="1zc67A" />
<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="ngI" index="1B3ioH">
<child id="1178549979242" name="visibility" index="1B3o_S" />
</concept>
<concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615">
<child id="1107797138135" name="extendedInterface" index="3HQHJm" />
</concept>
<concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
<child id="8276990574886367510" name="catchClause" index="1zxBo5" />
<child id="8276990574886367508" name="body" index="1zxBo7" />
</concept>
<concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
<child id="1163668914799" name="condition" index="3K4Cdx" />
<child id="1163668922816" name="ifTrue" index="3K4E3e" />
Expand Down Expand Up @@ -243,6 +260,13 @@
<property id="8970989240999019144" name="text" index="1dT_AB" />
</concept>
</language>
<language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
<concept id="2034914114981261497" name="jetbrains.mps.baseLanguage.logging.structure.LogLowLevelStatement" flags="ng" index="RRSsy">
<property id="2034914114981261751" name="severity" index="RRSoG" />
<child id="2034914114981261755" name="throwable" index="RRSow" />
<child id="2034914114981261753" name="message" index="RRSoy" />
</concept>
</language>
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
<concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
<reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
Expand Down Expand Up @@ -1750,18 +1774,55 @@
<node concept="3cpWs8" id="69s3uhHTfFQ" role="3cqZAp">
<node concept="3cpWsn" id="69s3uhHTfFR" role="3cpWs9">
<property role="TrG5h" value="docAspect" />
<property role="3TUv4t" value="true" />
<node concept="3uibUv" id="69s3uhHTfFO" role="1tU5fm">
<ref role="3uigEE" node="tBHOvWexR9" resolve="IDocumentationAspectDescriptor" />
</node>
<node concept="2OqwBi" id="69s3uhHTfFS" role="33vP2m">
<node concept="2GrUjf" id="qmep2lZ7S2" role="2Oq$k0">
<ref role="2Gs0qQ" node="qmep2lZ6vo" resolve="nextLanguage" />
<node concept="10Nm6u" id="3HwHK4HU6$o" role="33vP2m" />
</node>
</node>
<node concept="3J1_TO" id="3HwHK4HU8Gx" role="3cqZAp">
<node concept="3uVAMA" id="3HwHK4HU9Jq" role="1zxBo5">
<node concept="XOnhg" id="3HwHK4HU9Jr" role="1zc67B">
<property role="TrG5h" value="error" />
<node concept="nSUau" id="3HwHK4HU9Js" role="1tU5fm">
<node concept="3uibUv" id="3HwHK4HUaIy" role="nSUat">
<ref role="3uigEE" to="wyt6:~NoClassDefFoundError" resolve="NoClassDefFoundError" />
</node>
</node>
</node>
<node concept="3clFbS" id="3HwHK4HU9Jt" role="1zc67A">
<node concept="RRSsy" id="1J9MAka07Ny" role="3cqZAp">
<property role="RRSoG" value="gZ5fh_4/error" />
<node concept="3cpWs3" id="5094wKnoHEh" role="RRSoy">
<node concept="Xl_RD" id="5094wKnoHEi" role="3uHU7B">
<property role="Xl_RC" value="Failed to get editor aspect descriptor for language: " />
</node>
<node concept="2GrUjf" id="3HwHK4HVHd_" role="3uHU7w">
<ref role="2Gs0qQ" node="qmep2lZ6vo" resolve="nextLanguage" />
</node>
</node>
<node concept="37vLTw" id="1J9MAka0hmF" role="RRSow">
<ref role="3cqZAo" node="3HwHK4HU9Jr" resolve="error" />
</node>
</node>
<node concept="liA8E" id="69s3uhHTfFU" role="2OqNvi">
<ref role="37wK5l" to="vndm:~LanguageRuntime.getAspect(java.lang.Class)" resolve="getAspect" />
<node concept="3VsKOn" id="69s3uhHTfFV" role="37wK5m">
<ref role="3VsUkX" node="tBHOvWexR9" resolve="IDocumentationAspectDescriptor" />
</node>
</node>
<node concept="3clFbS" id="3HwHK4HU8Gz" role="1zxBo7">
<node concept="3clFbF" id="3HwHK4HU3Rn" role="3cqZAp">
<node concept="37vLTI" id="3HwHK4HU3Rp" role="3clFbG">
<node concept="2OqwBi" id="69s3uhHTfFS" role="37vLTx">
<node concept="2GrUjf" id="qmep2lZ7S2" role="2Oq$k0">
<ref role="2Gs0qQ" node="qmep2lZ6vo" resolve="nextLanguage" />
</node>
<node concept="liA8E" id="69s3uhHTfFU" role="2OqNvi">
<ref role="37wK5l" to="vndm:~LanguageRuntime.getAspect(java.lang.Class)" resolve="getAspect" />
<node concept="3VsKOn" id="69s3uhHTfFV" role="37wK5m">
<ref role="3VsUkX" node="tBHOvWexR9" resolve="IDocumentationAspectDescriptor" />
</node>
</node>
</node>
<node concept="37vLTw" id="3HwHK4HU3Rt" role="37vLTJ">
<ref role="3cqZAo" node="69s3uhHTfFR" resolve="docAspect" />
</node>
</node>
</node>
Expand Down
1 change: 1 addition & 0 deletions ...ges/com.mbeddr.doc.aspect/solutions/com.mbeddr.doc.aspect.ui/com.mbeddr.doc.aspect.ui.msd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
<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="2" />
<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:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
<language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
Expand Down
61 changes: 53 additions & 8 deletions ....doc.aspect/solutions/com.mbeddr.doc.aspect.ui/models/com/mbeddr/doc/aspect/ui/plugin.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<use id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text" version="0" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
<use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
<use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
</languages>
<imports>
<import index="exr9" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor(MPS.Editor/)" />
Expand Down Expand Up @@ -398,6 +399,13 @@
<child id="1205770614681" name="actualArgument" index="2XxRq1" />
</concept>
</language>
<language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
<concept id="2034914114981261497" name="jetbrains.mps.baseLanguage.logging.structure.LogLowLevelStatement" flags="ng" index="RRSsy">
<property id="2034914114981261751" name="severity" index="RRSoG" />
<child id="2034914114981261755" name="throwable" index="RRSow" />
<child id="2034914114981261753" name="message" index="RRSoy" />
</concept>
</language>
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
<concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
<reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
Expand Down Expand Up @@ -2388,18 +2396,55 @@
<node concept="3cpWs8" id="18EYPZeyJO8" role="3cqZAp">
<node concept="3cpWsn" id="18EYPZeyJO9" role="3cpWs9">
<property role="TrG5h" value="aspect" />
<property role="3TUv4t" value="true" />
<node concept="3uibUv" id="18EYPZeyJNZ" role="1tU5fm">
<ref role="3uigEE" to="ttl0:tBHOvWexR9" resolve="IDocumentationAspectDescriptor" />
</node>
<node concept="2OqwBi" id="18EYPZeyJOa" role="33vP2m">
<node concept="37vLTw" id="18EYPZeyJOb" role="2Oq$k0">
<ref role="3cqZAo" node="18EYPZeyJr8" resolve="languageRuntime" />
<node concept="10Nm6u" id="3HwHK4HUZAH" role="33vP2m" />
</node>
</node>
<node concept="3J1_TO" id="3HwHK4HUWVM" role="3cqZAp">
<node concept="3uVAMA" id="3HwHK4HUWZ3" role="1zxBo5">
<node concept="XOnhg" id="3HwHK4HUWZ4" role="1zc67B">
<property role="TrG5h" value="error" />
<node concept="nSUau" id="3HwHK4HUWZ5" role="1tU5fm">
<node concept="3uibUv" id="3HwHK4HUX5g" role="nSUat">
<ref role="3uigEE" to="wyt6:~NoClassDefFoundError" resolve="NoClassDefFoundError" />
</node>
</node>
<node concept="liA8E" id="18EYPZeyJOc" role="2OqNvi">
<ref role="37wK5l" to="vndm:~LanguageRuntime.getAspect(java.lang.Class)" resolve="getAspect" />
<node concept="3VsKOn" id="18EYPZeyJOd" role="37wK5m">
<ref role="3VsUkX" to="ttl0:tBHOvWexR9" resolve="IDocumentationAspectDescriptor" />
</node>
<node concept="3clFbS" id="3HwHK4HUWZ6" role="1zc67A">
<node concept="RRSsy" id="1J9MAka07Ny" role="3cqZAp">
<property role="RRSoG" value="gZ5fh_4/error" />
<node concept="3cpWs3" id="5094wKnoHEh" role="RRSoy">
<node concept="Xl_RD" id="5094wKnoHEi" role="3uHU7B">
<property role="Xl_RC" value="Failed to get editor aspect descriptor for language: " />
</node>
<node concept="37vLTw" id="5094wKnoHEj" role="3uHU7w">
<ref role="3cqZAo" node="18EYPZeyJr8" resolve="languageRuntime" />
</node>
</node>
<node concept="37vLTw" id="1J9MAka0hmF" role="RRSow">
<ref role="3cqZAo" node="3HwHK4HUWZ4" resolve="error" />
</node>
</node>
</node>
</node>
<node concept="3clFbS" id="3HwHK4HUWVO" role="1zxBo7">
<node concept="3clFbF" id="3HwHK4HUWkU" role="3cqZAp">
<node concept="37vLTI" id="3HwHK4HUWkW" role="3clFbG">
<node concept="2OqwBi" id="18EYPZeyJOa" role="37vLTx">
<node concept="37vLTw" id="18EYPZeyJOb" role="2Oq$k0">
<ref role="3cqZAo" node="18EYPZeyJr8" resolve="languageRuntime" />
</node>
<node concept="liA8E" id="18EYPZeyJOc" role="2OqNvi">
<ref role="37wK5l" to="vndm:~LanguageRuntime.getAspect(java.lang.Class)" resolve="getAspect" />
<node concept="3VsKOn" id="18EYPZeyJOd" role="37wK5m">
<ref role="3VsUkX" to="ttl0:tBHOvWexR9" resolve="IDocumentationAspectDescriptor" />
</node>
</node>
</node>
<node concept="37vLTw" id="3HwHK4HUWl0" role="37vLTJ">
<ref role="3cqZAo" node="18EYPZeyJO9" resolve="aspect" />
</node>
</node>
</node>
Expand Down

0 comments on commit c2cacf6

Please sign in to comment.