Skip to content

Commit

Permalink
Merge pull request #2664 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 18, 2024
2 parents 57ee11d + b1c6f54 commit ca7c413
Show file tree
Hide file tree
Showing 13 changed files with 430 additions and 777 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ Semantic Versioning and the changes are simply documented in reverse chronologic

# December 2024

## com.mbeddr.core.base

### Changed

- The mbeddr search tool was improved: It can now also search languages, the project and globally. It also got options for approximate searching with an error distance matching the case and searching by a regular expression. Nodes that should or should not be filter, can now be customized through the extension point `SearchNodeFilter`. The UI was also improved.

## com.mbeddr.mpsutil

### Fixed
Expand Down
167 changes: 86 additions & 81 deletions ...uages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,13 +302,13 @@
<node concept="m$_yC" id="64SK4bcNVGq" role="m$_yJ">
<ref role="m$_y1" node="DnqfiuSO_Q" resolve="com.mbeddr.mpsutil.compare" />
</node>
<node concept="m$_yC" id="4wBLq3Y5yV5" role="m$_yJ">
<ref role="m$_y1" to="90a9:2OJNL7ElZsF" resolve="de.q60.mps.collections.libs" />
</node>
<node concept="2iUeEo" id="7yAshxDtnaX" role="2iVFfd">
<property role="2iUeEt" value="mbeddr" />
<property role="2iUeEu" value="http://mbeddr.com" />
</node>
<node concept="m$_yC" id="4wBLq3Y5yV5" role="m$_yJ">
<ref role="m$_y1" to="90a9:2OJNL7ElZsF" resolve="de.q60.mps.collections.libs" />
</node>
<node concept="m$_yC" id="2DDNE2eaR2F" role="m$_yJ">
<ref role="m$_y1" to="90a9:3$A0JaN5ezp" resolve="MPS.ThirdParty" />
</node>
Expand Down Expand Up @@ -11576,6 +11576,11 @@
<ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
</node>
</node>
<node concept="1SiIV0" id="2hC83VQr5x" role="3bR37C">
<node concept="3bR9La" id="2hC83VQr5y" role="1SiIV1">
<ref role="3bR37D" to="90a9:3$A0JaN5bpX" resolve="MPS.ThirdParty" />
</node>
</node>
<node concept="1BupzO" id="4PRpvcZJNIA" role="3bR31x">
<property role="3ZfqAx" value="models" />
<property role="1Hdu6h" value="true" />
Expand All @@ -11598,11 +11603,6 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="2hC83VQr5x" role="3bR37C">
<node concept="3bR9La" id="2hC83VQr5y" role="1SiIV1">
<ref role="3bR37D" to="90a9:3$A0JaN5bpX" resolve="MPS.ThirdParty" />
</node>
</node>
</node>
</node>
<node concept="2G$12M" id="3quoVcnGzl$" role="3989C9">
Expand Down Expand Up @@ -12716,44 +12716,6 @@
<ref role="3bR37D" to="ffeo:1xb0AuwN7WS" resolve="JUnit" />
</node>
</node>
<node concept="1BupzO" id="4PRpvcZJNQx" role="3bR31x">
<property role="3ZfqAx" value="models" />
<property role="1Hdu6h" value="true" />
<property role="1HemKv" value="true" />
<node concept="3LXTmp" id="4PRpvcZJNQy" role="1HemKq">
<node concept="398BVA" id="4PRpvcZJNQm" role="3LXTmr">
<ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
<node concept="2Ry0Ak" id="4PRpvcZJNQn" role="iGT6I">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="4PRpvcZJNQo" role="2Ry0An">
<property role="2Ry0Am" value="org.mockito" />
<node concept="2Ry0Ak" id="4PRpvcZJNQp" role="2Ry0An">
<property role="2Ry0Am" value="models" />
</node>
</node>
</node>
</node>
<node concept="3qWCbU" id="4PRpvcZJNQz" role="3LXTna">
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
</node>
</node>
</node>
<node concept="3rtmxn" id="59cfP9ua2O$" role="3bR31x">
<node concept="3LXTmp" id="59cfP9ua2O_" role="3rtmxm">
<node concept="3qWCbU" id="59cfP9ua2OA" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="398BVA" id="59cfP9ua2OB" role="3LXTmr">
<ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
<node concept="2Ry0Ak" id="59cfP9ua2OC" role="iGT6I">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="59cfP9ua2OD" role="2Ry0An">
<property role="2Ry0Am" value="org.mockito" />
</node>
</node>
</node>
</node>
</node>
<node concept="1SiIV0" id="1dlPbo9VK9P" role="3bR37C">
<node concept="1BurEX" id="1dlPbo9VK9Q" role="1SiIV1">
<node concept="398BVA" id="1dlPbo9VK9C" role="1BurEY">
Expand Down Expand Up @@ -12830,6 +12792,44 @@
</node>
</node>
</node>
<node concept="1BupzO" id="4PRpvcZJNQx" role="3bR31x">
<property role="3ZfqAx" value="models" />
<property role="1Hdu6h" value="true" />
<property role="1HemKv" value="true" />
<node concept="3LXTmp" id="4PRpvcZJNQy" role="1HemKq">
<node concept="398BVA" id="4PRpvcZJNQm" role="3LXTmr">
<ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
<node concept="2Ry0Ak" id="4PRpvcZJNQn" role="iGT6I">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="4PRpvcZJNQo" role="2Ry0An">
<property role="2Ry0Am" value="org.mockito" />
<node concept="2Ry0Ak" id="4PRpvcZJNQp" role="2Ry0An">
<property role="2Ry0Am" value="models" />
</node>
</node>
</node>
</node>
<node concept="3qWCbU" id="4PRpvcZJNQz" role="3LXTna">
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
</node>
</node>
</node>
<node concept="3rtmxn" id="59cfP9ua2O$" role="3bR31x">
<node concept="3LXTmp" id="59cfP9ua2O_" role="3rtmxm">
<node concept="3qWCbU" id="59cfP9ua2OA" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="398BVA" id="59cfP9ua2OB" role="3LXTmr">
<ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
<node concept="2Ry0Ak" id="59cfP9ua2OC" role="iGT6I">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="59cfP9ua2OD" role="2Ry0An">
<property role="2Ry0Am" value="org.mockito" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2G$12M" id="3quoVcnF8Rx" role="3989C9">
Expand Down Expand Up @@ -14683,16 +14683,16 @@
<ref role="3bR37D" to="ffeo:3qkjbZn808a" resolve="jetbrains.mps.lang.constraints.rules.runtime" />
</node>
</node>
<node concept="1SiIV0" id="6lcdwS9PGDu" role="3bR37C">
<node concept="3bR9La" id="6lcdwS9PGDv" role="1SiIV1">
<ref role="3bR37D" to="ffeo:HHlBn9$wJ2" resolve="org.jdom" />
</node>
</node>
<node concept="1SiIV0" id="3AVU87RT5z6" role="3bR37C">
<node concept="3bR9La" id="3AVU87RT5z7" role="1SiIV1">
<ref role="3bR37D" to="90a9:4be$WTb1AQa" resolve="de.itemis.mps.editor.diagram.runtime" />
</node>
</node>
<node concept="1SiIV0" id="1dH515xDROo" role="3bR37C">
<node concept="3bR9La" id="1dH515xDROp" role="1SiIV1">
<ref role="3bR37D" to="90a9:3$A0JaN5bpX" resolve="MPS.ThirdParty" />
</node>
</node>
</node>
<node concept="1E1JtD" id="$bJ0jguQfr" role="2G$12L">
<property role="BnDLt" value="true" />
Expand Down Expand Up @@ -14937,6 +14937,11 @@
<ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
</node>
</node>
<node concept="1SiIV0" id="55oOaAG4FTH" role="3bR37C">
<node concept="3bR9La" id="55oOaAG4FTI" role="1SiIV1">
<ref role="3bR37D" node="$bJ0jguQdz" resolve="com.mbeddr.core.base.pluginSolution" />
</node>
</node>
</node>
</node>
<node concept="2G$12M" id="7Nsh5Tc2mTg" role="3989C9">
Expand Down Expand Up @@ -18542,28 +18547,6 @@
<ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
</node>
</node>
<node concept="1BupzO" id="4PRpvcZJO4S" role="3bR31x">
<property role="3ZfqAx" value="models" />
<property role="1Hdu6h" value="true" />
<property role="1HemKv" value="true" />
<node concept="3LXTmp" id="4PRpvcZJO4T" role="1HemKq">
<node concept="398BVA" id="4PRpvcZJO4H" role="3LXTmr">
<ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
<node concept="2Ry0Ak" id="4PRpvcZJO4I" role="iGT6I">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="4PRpvcZJO4J" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.mpsutil.jfreechart.runtime" />
<node concept="2Ry0Ak" id="4PRpvcZJO4K" role="2Ry0An">
<property role="2Ry0Am" value="models" />
</node>
</node>
</node>
</node>
<node concept="3qWCbU" id="4PRpvcZJO4U" role="3LXTna">
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
</node>
</node>
</node>
<node concept="1SiIV0" id="1dlPbo9VKv3" role="3bR37C">
<node concept="1BurEX" id="1dlPbo9VKv4" role="1SiIV1">
<node concept="398BVA" id="1dlPbo9VKuQ" role="1BurEY">
Expand Down Expand Up @@ -18602,6 +18585,28 @@
</node>
</node>
</node>
<node concept="1BupzO" id="4PRpvcZJO4S" role="3bR31x">
<property role="3ZfqAx" value="models" />
<property role="1Hdu6h" value="true" />
<property role="1HemKv" value="true" />
<node concept="3LXTmp" id="4PRpvcZJO4T" role="1HemKq">
<node concept="398BVA" id="4PRpvcZJO4H" role="3LXTmr">
<ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
<node concept="2Ry0Ak" id="4PRpvcZJO4I" role="iGT6I">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="4PRpvcZJO4J" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.mpsutil.jfreechart.runtime" />
<node concept="2Ry0Ak" id="4PRpvcZJO4K" role="2Ry0An">
<property role="2Ry0Am" value="models" />
</node>
</node>
</node>
</node>
<node concept="3qWCbU" id="4PRpvcZJO4U" role="3LXTna">
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
</node>
</node>
</node>
</node>
<node concept="1E1JtD" id="7uOgiTapi$" role="2G$12L">
<property role="BnDLt" value="true" />
Expand Down Expand Up @@ -20569,11 +20574,6 @@
<ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
</node>
</node>
<node concept="1SiIV0" id="5bVx5KEQpYM" role="3bR37C">
<node concept="3bR9La" id="5bVx5KEQpYN" role="1SiIV1">
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
</node>
</node>
<node concept="1BupzO" id="3lcj7hzsBO0" role="3bR31x">
<property role="3ZfqAx" value="models" />
<property role="1Hdu6h" value="true" />
Expand Down Expand Up @@ -20612,6 +20612,11 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="5bVx5KEQpYM" role="3bR37C">
<node concept="3bR9La" id="5bVx5KEQpYN" role="1SiIV1">
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
</node>
</node>
<node concept="1SiIV0" id="4wBLq3Y5yBj" role="3bR37C">
<node concept="3bR9La" id="4wBLq3Y5yBk" role="1SiIV1">
<ref role="3bR37D" to="90a9:6fQhGuklQWU" resolve="de.q60.mps.collections.libs" />
Expand All @@ -20624,9 +20629,6 @@
<node concept="m$_yC" id="3lcj7hzsAhP" role="m$_yJ">
<ref role="m$_y1" to="ffeo:4k71ibbKLe8" resolve="jetbrains.mps.core" />
</node>
<node concept="m$_yC" id="4wBLq3Y5zxU" role="m$_yJ">
<ref role="m$_y1" to="90a9:2OJNL7ElZsF" resolve="de.q60.mps.collections.libs" />
</node>
<node concept="3_J27D" id="3lcj7hzsuXh" role="m$_yQ">
<node concept="3Mxwew" id="3lcj7hzszbz" role="3MwsjC">
<property role="3MwjfP" value="com.mbeddr.mpsutil.logicalChild" />
Expand All @@ -20649,6 +20651,9 @@
<node concept="m$f5U" id="3lcj7hzs_XZ" role="m$_yh">
<ref role="m$f5T" node="3lcj7hzsgVW" resolve="com.mbeddr.mpsutil.logicalChild" />
</node>
<node concept="m$_yC" id="4wBLq3Y5zxU" role="m$_yJ">
<ref role="m$_y1" to="90a9:2OJNL7ElZsF" resolve="de.q60.mps.collections.libs" />
</node>
</node>
<node concept="2G$12M" id="2hNr1jFzOYr" role="3989C9">
<property role="TrG5h" value="com.mbeddr.mpsutil.checkinHandler" />
Expand Down
33 changes: 23 additions & 10 deletions .../languages/com.mbeddr.cc/languages/com.mbeddr.cc.requirements/languageModels/behavior.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2078,17 +2078,30 @@
</node>
</node>
</node>
<node concept="2OqwBi" id="jpyKDg1A6F" role="3uHU7B">
<node concept="2OqwBi" id="jpyKDg1A6f" role="2Oq$k0">
<node concept="13iPFW" id="jpyKDg1A5U" role="2Oq$k0" />
<node concept="3TrcHB" id="jpyKDg1A6l" role="2OqNvi">
<ref role="3TsBF5" to="75wo:2WRRjDdoyr7" resolve="summmary" />
<node concept="1eOMI4" id="74_l$W0KJ_2" role="3uHU7B">
<node concept="1Wc70l" id="74_l$W0KJBB" role="1eOMHV">
<node concept="3y3z36" id="74_l$W0KNGL" role="3uHU7B">
<node concept="10Nm6u" id="74_l$W0KOu9" role="3uHU7w" />
<node concept="2OqwBi" id="74_l$W0KKb9" role="3uHU7B">
<node concept="13iPFW" id="74_l$W0KJN$" role="2Oq$k0" />
<node concept="3TrcHB" id="74_l$W0KMlY" role="2OqNvi">
<ref role="3TsBF5" to="75wo:2WRRjDdoyr7" resolve="summmary" />
</node>
</node>
</node>
</node>
<node concept="liA8E" id="jpyKDg1A6L" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
<node concept="37vLTw" id="jpyKDg1A6M" role="37wK5m">
<ref role="3cqZAo" node="jpyKDg1xQE" resolve="text" />
<node concept="2OqwBi" id="jpyKDg1A6F" role="3uHU7w">
<node concept="2OqwBi" id="jpyKDg1A6f" role="2Oq$k0">
<node concept="13iPFW" id="jpyKDg1A5U" role="2Oq$k0" />
<node concept="3TrcHB" id="jpyKDg1A6l" role="2OqNvi">
<ref role="3TsBF5" to="75wo:2WRRjDdoyr7" resolve="summmary" />
</node>
</node>
<node concept="liA8E" id="jpyKDg1A6L" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
<node concept="37vLTw" id="jpyKDg1A6M" role="37wK5m">
<ref role="3cqZAo" node="jpyKDg1xQE" resolve="text" />
</node>
</node>
</node>
</node>
</node>
Expand Down
Loading

0 comments on commit ca7c413

Please sign in to comment.