Skip to content

Commit

Permalink
Merge pull request #2751 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 authored Feb 14, 2025
2 parents 0e5ef8c + 4b03483 commit dffcb5d
Showing 1 changed file with 62 additions and 39 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1297,6 +1297,68 @@
<node concept="m$_yC" id="ZhAg9Tj4d0" role="m$_yJ">
<ref role="m$_y1" to="90a9:4be$WTb1MZD" resolve="de.itemis.mps.editor.diagram" />
</node>
<node concept="m$_yC" id="26FYVWAjM5F" role="m$_yJ">
<ref role="m$_y1" to="90a9:6hpTCZQdXQX" resolve="com.mbeddr.mpsutil.editor.querylist" />
</node>
<node concept="3DQ70j" id="26FYVWAjNiw" role="lGtFl">
<property role="3V$3am" value="dependencies" />
<property role="3V$3ak" value="0cf935df-4699-4e9c-a132-fa109541cba3/6592112598314498932/6592112598314499028" />
<node concept="1Pa9Pv" id="26FYVWAjN_I" role="3DQ709">
<node concept="1PaTwC" id="26FYVWAjN_J" role="1PaQFQ">
<node concept="3oM_SD" id="26FYVWAjNT7" role="1PaTwD">
<property role="3oM_SC" value="querylist" />
</node>
<node concept="3oM_SD" id="26FYVWAjNT8" role="1PaTwD">
<property role="3oM_SC" value="language" />
</node>
<node concept="3oM_SD" id="26FYVWAjNTa" role="1PaTwD">
<property role="3oM_SC" value="is" />
</node>
<node concept="3oM_SD" id="26FYVWAjNTb" role="1PaTwD">
<property role="3oM_SC" value="used" />
</node>
<node concept="3oM_SD" id="26FYVWAjNTc" role="1PaTwD">
<property role="3oM_SC" value="by" />
</node>
<node concept="3oM_SD" id="26FYVWAjNTj" role="1PaTwD">
<property role="3oM_SC" value="com.mbeddr.core.base" />
</node>
<node concept="3oM_SD" id="26FYVWAjNTk" role="1PaTwD">
<property role="3oM_SC" value="but" />
</node>
<node concept="3oM_SD" id="26FYVWAjNTl" role="1PaTwD">
<property role="3oM_SC" value="MPS" />
</node>
<node concept="3oM_SD" id="26FYVWAjNTm" role="1PaTwD">
<property role="3oM_SC" value="does" />
</node>
<node concept="3oM_SD" id="26FYVWAjNTn" role="1PaTwD">
<property role="3oM_SC" value="not" />
</node>
<node concept="3oM_SD" id="26FYVWAjNTo" role="1PaTwD">
<property role="3oM_SC" value="detect" />
</node>
<node concept="3oM_SD" id="26FYVWAjNTp" role="1PaTwD">
<property role="3oM_SC" value="the" />
</node>
<node concept="3oM_SD" id="26FYVWAjNTq" role="1PaTwD">
<property role="3oM_SC" value="need" />
</node>
<node concept="3oM_SD" id="26FYVWAjNTr" role="1PaTwD">
<property role="3oM_SC" value="for" />
</node>
<node concept="3oM_SD" id="26FYVWAjNTs" role="1PaTwD">
<property role="3oM_SC" value="plugin" />
</node>
<node concept="3oM_SD" id="26FYVWAjNTt" role="1PaTwD">
<property role="3oM_SC" value="dependency" />
</node>
<node concept="3oM_SD" id="26FYVWAxG$u" role="1PaTwD">
<property role="3oM_SC" value="(MPS-38286)" />
</node>
</node>
</node>
</node>
</node>
<node concept="m$_wf" id="48qh2gYgNmx" role="3989C9">
<property role="m$_wk" value="com.mbeddr.codereview" />
Expand Down Expand Up @@ -2471,9 +2533,6 @@
</node>
</node>
</node>
<node concept="1E0d5M" id="2N1CSrzSKpw" role="1E1XAP">
<ref role="1E0d5P" to="90a9:4Hbnsm4OhEo" resolve="com.mbeddr.mpsutil.editor.querylist.runtime" />
</node>
<node concept="1SiIV0" id="2VC4eVYcgRz" role="3bR37C">
<node concept="3bR9La" id="2VC4eVYcgR$" role="1SiIV1">
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
Expand Down Expand Up @@ -5969,9 +6028,6 @@
</node>
</node>
</node>
<node concept="1E0d5M" id="4Wyno57pInJ" role="1E1XAP">
<ref role="1E0d5P" node="4gGXGcLV_Ec" resolve="com.mbeddr.mpsutil.multilingual.common.runtime" />
</node>
<node concept="1SiIV0" id="4Wyno57pLyD" role="3bR37C">
<node concept="1Busua" id="4Wyno57pLyE" role="1SiIV1">
<ref role="1Busuk" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
Expand Down Expand Up @@ -6032,9 +6088,6 @@
</node>
</node>
</node>
<node concept="1E0d5M" id="4Wyno57pMbF" role="1E1XAP">
<ref role="1E0d5P" node="4gGXGcLV_Ec" resolve="com.mbeddr.mpsutil.multilingual.common.runtime" />
</node>
<node concept="1yeLz9" id="4Wyno57pMbG" role="1TViLv">
<property role="TrG5h" value="com.mbeddr.mpsutil.suppresswarning.gen#9116320848000878819" />
<property role="3LESm3" value="3bfd5541-f576-4c45-928a-26e040d7e795" />
Expand Down Expand Up @@ -7110,9 +7163,6 @@
<node concept="1E0d5M" id="5GUwywcVawf" role="1E1XAP">
<ref role="1E0d5P" node="2bBLuwR9$cn" resolve="com.mbeddr.mpsutil.interpreter.rt" />
</node>
<node concept="1E0d5M" id="48h5VLcqgim" role="1E1XAP">
<ref role="1E0d5P" node="48h5VLcq9kG" resolve="com.mbeddr.mpsutil.interpreter.plugin" />
</node>
<node concept="1SiIV0" id="5GUwywcVawk" role="3bR37C">
<node concept="1Busua" id="5GUwywcVawl" role="1SiIV1">
<ref role="1Busuk" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
Expand Down Expand Up @@ -7234,9 +7284,6 @@
</node>
</node>
</node>
<node concept="1E0d5M" id="2bBLuwR9Lo3" role="1E1XAP">
<ref role="1E0d5P" node="2bBLuwR9$cn" resolve="com.mbeddr.mpsutil.interpreter.rt" />
</node>
<node concept="1SiIV0" id="15E$Thf$EyS" role="3bR37C">
<node concept="3bR9La" id="15E$Thf$EyT" role="1SiIV1">
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
Expand Down Expand Up @@ -7813,9 +7860,6 @@
<node concept="1E0d5M" id="35bnz87rMyb" role="1E1XAP">
<ref role="1E0d5P" node="2Nt6prolOb5" resolve="com.mbeddr.mpsutil.targetchooser" />
</node>
<node concept="1E0d5M" id="6TSV30uD3uz" role="1E1XAP">
<ref role="1E0d5P" node="7vUP_qcXuSh" resolve="com.mbeddr.mpsutil.contextactions.runtime" />
</node>
<node concept="1SiIV0" id="7PXVDj_0e8E" role="3bR37C">
<node concept="3bR9La" id="7PXVDj_0e8F" role="1SiIV1">
<ref role="3bR37D" to="ffeo:7Kfy9QB6LaO" resolve="jetbrains.mps.lang.structure" />
Expand Down Expand Up @@ -8543,9 +8587,6 @@
</node>
</node>
</node>
<node concept="1E0d5M" id="2mU72gDx9ym" role="1E1XAP">
<ref role="1E0d5P" to="90a9:4Hbnsm4OhEo" resolve="com.mbeddr.mpsutil.editor.querylist.runtime" />
</node>
<node concept="1SiIV0" id="3soxMz$rjnx" role="3bR37C">
<node concept="3bR9La" id="3soxMz$rjny" role="1SiIV1">
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
Expand Down Expand Up @@ -8709,9 +8750,6 @@
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
</node>
</node>
<node concept="1E0d5M" id="1qdZ14g6qsr" role="1E1XAP">
<ref role="1E0d5P" node="1qdZ14g6b3j" resolve="com.mbeddr.mpsutil.margincell.runtime" />
</node>
<node concept="1BupzO" id="4PRpvcZJNBL" role="3bR31x">
<property role="3ZfqAx" value="languageModels" />
<property role="1Hdu6h" value="true" />
Expand Down Expand Up @@ -9048,9 +9086,6 @@
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
</node>
</node>
<node concept="1E0d5M" id="1qdZ14g6roU" role="1E1XAP">
<ref role="1E0d5P" node="1qdZ14g6b3j" resolve="com.mbeddr.mpsutil.margincell.runtime" />
</node>
<node concept="1SiIV0" id="1qdZ14g6sSR" role="3bR37C">
<node concept="3bR9La" id="1qdZ14g6sSS" role="1SiIV1">
<ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
Expand Down Expand Up @@ -9231,9 +9266,6 @@
</node>
</node>
</node>
<node concept="1E0d5M" id="3cilTAC1nRw" role="1E1XAP">
<ref role="1E0d5P" node="1qdZ14g6b3j" resolve="com.mbeddr.mpsutil.margincell.runtime" />
</node>
<node concept="1SiIV0" id="3cilTAC4BA6" role="3bR37C">
<node concept="3bR9La" id="3cilTAC4BA7" role="1SiIV1">
<ref role="3bR37D" node="3cilTAC1ls6" resolve="com.mbeddr.mpsutil.review.runtime" />
Expand Down Expand Up @@ -10144,9 +10176,6 @@
</node>
</node>
</node>
<node concept="1E0d5M" id="KILMQH6G$4" role="1E1XAP">
<ref role="1E0d5P" node="1oM0ei222QR" resolve="com.mbeddr.mpsutil.spreferences.runtime" />
</node>
<node concept="1SiIV0" id="KILMQH6KHO" role="3bR37C">
<node concept="3bR9La" id="KILMQH6KHP" role="1SiIV1">
<ref role="3bR37D" to="ffeo:7Kfy9QB6L9O" resolve="jetbrains.mps.lang.smodel" />
Expand Down Expand Up @@ -13199,9 +13228,6 @@
</node>
</node>
</node>
<node concept="1E0d5M" id="4DtKYIYvlnf" role="1E1XAP">
<ref role="1E0d5P" node="4gGXGcLV_Ec" resolve="com.mbeddr.mpsutil.multilingual.common.runtime" />
</node>
<node concept="1SiIV0" id="4DtKYIYvnyM" role="3bR37C">
<node concept="3bR9La" id="4DtKYIYvnyN" role="1SiIV1">
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
Expand Down Expand Up @@ -16857,9 +16883,6 @@
<ref role="3bR37D" to="ffeo:1d41uYMTVPB" resolve="jetbrains.mps.lang.scopes.runtime" />
</node>
</node>
<node concept="1E0d5M" id="5NpY9mnqF3N" role="1E1XAP">
<ref role="1E0d5P" node="5NpY9mnqtrM" resolve="com.mbeddr.doc.pluginSolution" />
</node>
<node concept="1SiIV0" id="5NpY9mnqF3O" role="3bR37C">
<node concept="1Busua" id="5NpY9mnqF3P" role="1SiIV1">
<ref role="1Busuk" node="1YMM4SJ2m0" resolve="com.mbeddr.doc" />
Expand Down

0 comments on commit dffcb5d

Please sign in to comment.