Skip to content

Commit

Permalink
Merge pull request #2665 from mbeddr/merge/mps20243
Browse files Browse the repository at this point in the history 
Merge maintenance/mps20241 into maintenance/mps20243
  • Loading branch information
@mps-ci-buildbot
mps-ci-buildbot authored Jan 8, 2025
2 parents eecccac + 76f9776 commit 0371ed6
Show file tree
Hide file tree
Showing 14 changed files with 480 additions and 1,031 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
290 changes: 12 additions & 278 deletions ...uages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
View file

Large diffs are not rendered by default.

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
84 changes: 20 additions & 64 deletions code/languages/com.mbeddr.core/languages/com.mbeddr.core.arrays/languageModels/behavior.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,6 @@
<concept id="1883223317721008713" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfVariable" flags="ng" index="JncvC" />
<concept id="1883223317721107059" name="jetbrains.mps.lang.smodel.structure.IfInstanceOfVarReference" flags="nn" index="Jnkvi" />
<concept id="1171305280644" name="jetbrains.mps.lang.smodel.structure.Node_GetDescendantsOperation" flags="nn" index="2Rf3mk" />
<concept id="1171310072040" name="jetbrains.mps.lang.smodel.structure.Node_GetContainingRootOperation" flags="nn" index="2Rxl7S" />
<concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
<reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
</concept>
Expand Down Expand Up @@ -2899,17 +2898,28 @@
<node concept="3Tm1VV" id="5MaVmNI51Wh" role="1B3o_S" />
<node concept="3clFbS" id="5MaVmNI51Wm" role="3clF47">
<node concept="3clFbF" id="5MaVmNI5n1_" role="3cqZAp">
<node concept="2OqwBi" id="5MaVmNI5v1m" role="3clFbG">
<node concept="2OqwBi" id="5MaVmNI5nf7" role="2Oq$k0">
<node concept="13iPFW" id="5MaVmNI5n1y" role="2Oq$k0" />
<node concept="3TrcHB" id="5MaVmNI5tda" role="2OqNvi">
<ref role="3TsBF5" to="yq40:5jmmCdx$f5U" resolve="value" />
<node concept="1Wc70l" id="6KjVnJpTKyq" role="3clFbG">
<node concept="3y3z36" id="6KjVnJpTNHJ" role="3uHU7B">
<node concept="10Nm6u" id="6KjVnJpTOCf" role="3uHU7w" />
<node concept="2OqwBi" id="6KjVnJpTKT4" role="3uHU7B">
<node concept="13iPFW" id="6KjVnJpTKz_" role="2Oq$k0" />
<node concept="3TrcHB" id="6KjVnJpTKVe" role="2OqNvi">
<ref role="3TsBF5" to="yq40:5jmmCdx$f5U" resolve="value" />
</node>
</node>
</node>
<node concept="liA8E" id="5MaVmNI5xUz" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
<node concept="37vLTw" id="5MaVmNI5xYb" role="37wK5m">
<ref role="3cqZAo" node="5MaVmNI51Wn" resolve="text" />
<node concept="2OqwBi" id="5MaVmNI5v1m" role="3uHU7w">
<node concept="2OqwBi" id="5MaVmNI5nf7" role="2Oq$k0">
<node concept="13iPFW" id="5MaVmNI5n1y" role="2Oq$k0" />
<node concept="3TrcHB" id="5MaVmNI5tda" role="2OqNvi">
<ref role="3TsBF5" to="yq40:5jmmCdx$f5U" resolve="value" />
</node>
</node>
<node concept="liA8E" id="5MaVmNI5xUz" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
<node concept="37vLTw" id="5MaVmNI5xYb" role="37wK5m">
<ref role="3cqZAo" node="5MaVmNI51Wn" resolve="text" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -2949,60 +2959,6 @@
</node>
<node concept="17QB3L" id="5MaVmNI5y3E" role="3clF45" />
</node>
<node concept="13i0hz" id="5MaVmNI5CU2" role="13h7CS">
<property role="13i0iv" value="false" />
<property role="13i0it" value="false" />
<property role="TrG5h" value="resultNamespace" />
<ref role="13i0hy" to="hwgx:jpyKDg2TXB" resolve="resultNamespace" />
<node concept="3Tm1VV" id="5MaVmNI5CU3" role="1B3o_S" />
<node concept="3clFbS" id="5MaVmNI5CU6" role="3clF47">
<node concept="3cpWs8" id="1ki5dbA8JW3" role="3cqZAp">
<node concept="3cpWsn" id="1ki5dbA8JW4" role="3cpWs9">
<property role="TrG5h" value="r" />
<node concept="3Tqbb2" id="1ki5dbA8JW0" role="1tU5fm" />
<node concept="2OqwBi" id="1ki5dbA8JW5" role="33vP2m">
<node concept="13iPFW" id="1ki5dbA8JW6" role="2Oq$k0" />
<node concept="2Rxl7S" id="1ki5dbA8JW7" role="2OqNvi" />
</node>
</node>
</node>
<node concept="3clFbJ" id="1ki5dbA8JUr" role="3cqZAp">
<node concept="3clFbS" id="1ki5dbA8JUu" role="3clFbx">
<node concept="3cpWs6" id="1ki5dbA8KxP" role="3cqZAp">
<node concept="2OqwBi" id="1ki5dbA8KNH" role="3cqZAk">
<node concept="1PxgMI" id="1ki5dbA8KGc" role="2Oq$k0">
<node concept="chp4Y" id="79i$vAY5OOo" role="3oSUPX">
<ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
</node>
<node concept="37vLTw" id="1ki5dbA8KB_" role="1m5AlR">
<ref role="3cqZAo" node="1ki5dbA8JW4" resolve="r" />
</node>
</node>
<node concept="3TrcHB" id="1ki5dbA8LwA" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
</node>
</node>
<node concept="2OqwBi" id="1ki5dbA8K2v" role="3clFbw">
<node concept="37vLTw" id="1ki5dbA8JZO" role="2Oq$k0">
<ref role="3cqZAo" node="1ki5dbA8JW4" resolve="r" />
</node>
<node concept="1mIQ4w" id="1ki5dbA8Kv$" role="2OqNvi">
<node concept="chp4Y" id="1ki5dbA8KwD" role="cj9EA">
<ref role="cht4Q" to="tpck:h0TrEE$" resolve="INamedConcept" />
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="5MaVmNI5DkK" role="3cqZAp">
<node concept="Xl_RD" id="1ki5dbA8L$I" role="3clFbG">
<property role="Xl_RC" value="" />
</node>
</node>
</node>
<node concept="17QB3L" id="5MaVmNI5CU7" role="3clF45" />
</node>
<node concept="13i0hz" id="5jmmCdx$f5W" role="13h7CS">
<property role="TrG5h" value="isStaticallyEvaluatable" />
<ref role="13i0hy" to="ywuz:3ilck8Kr3zN" resolve="isStaticallyEvaluatable" />
Expand Down
2 changes: 2 additions & 0 deletions code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/base.mpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@
<dependency reexport="false">86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)</dependency>
<dependency reexport="false">528ff3b9-5fc4-40dd-931f-c6ce3650640e(jetbrains.mps.lang.migration.runtime)</dependency>
<dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
<dependency reexport="false">9e24fcdc-a232-4d24-8c95-1f525946191a(com.mbeddr.core.base.pluginSolution)</dependency>
</dependencies>
<languageVersions>
<language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
Expand Down Expand Up @@ -186,6 +187,7 @@
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
<module reference="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" version="0" />
<module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="3" />
<module reference="9e24fcdc-a232-4d24-8c95-1f525946191a(com.mbeddr.core.base.pluginSolution)" version="0" />
<module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
<module reference="c7a315e6-1d93-4186-85bc-2dfafd1ccc21(com.mbeddr.mpsutil.common)" version="0" />
<module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
Expand Down
132 changes: 57 additions & 75 deletions code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
<import index="qq03" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.actions(MPS.Platform/)" />
<import index="6xgk" ref="r:6e9ad488-5df2-49e4-8c01-8a7f3812adf7(jetbrains.mps.lang.scopes.runtime)" />
<import index="z1c5" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.project(MPS.Platform/)" />
<import index="d244" ref="r:0a882e21-5553-485b-8777-3b0ace5a0d84(com.mbeddr.core.base.pluginSolution.plugin)" />
<import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
<import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" implicit="true" />
<import index="z8iw" ref="r:dfdf3542-dbcf-43df-870a-3c3504b3c840(jetbrains.mps.baseLanguage.collections.custom)" implicit="true" />
Expand Down Expand Up @@ -1020,17 +1021,28 @@
<node concept="3Tm1VV" id="4ueXZrqtwBR" role="1B3o_S" />
<node concept="3clFbS" id="4ueXZrqtwBS" role="3clF47">
<node concept="3clFbF" id="4ueXZrqtwC7" role="3cqZAp">
<node concept="2OqwBi" id="4ueXZrqtwCT" role="3clFbG">
<node concept="2OqwBi" id="4ueXZrqtwCt" role="2Oq$k0">
<node concept="13iPFW" id="4ueXZrqtwC8" role="2Oq$k0" />
<node concept="3TrEf2" id="4ueXZrqtwCz" role="2OqNvi">
<ref role="3Tt5mk" to="vs0r:3wX8xlocnjN" resolve="text" />
<node concept="1Wc70l" id="74_l$W0LTj4" role="3clFbG">
<node concept="3y3z36" id="7dimqCumkVo" role="3uHU7B">
<node concept="10Nm6u" id="7dimqCuml0j" role="3uHU7w" />
<node concept="2OqwBi" id="7dimqCumkg6" role="3uHU7B">
<node concept="13iPFW" id="7dimqCumjYi" role="2Oq$k0" />
<node concept="3TrEf2" id="7dimqCumkIv" role="2OqNvi">
<ref role="3Tt5mk" to="vs0r:3wX8xlocnjN" resolve="text" />
</node>
</node>
</node>
<node concept="2qgKlT" id="4ueXZrqtwCZ" role="2OqNvi">
<ref role="37wK5l" node="jpyKDg1A7A" resolve="containsText" />
<node concept="37vLTw" id="4ueXZrqtwD0" role="37wK5m">
<ref role="3cqZAo" node="4ueXZrqtwBT" resolve="text" />
<node concept="2OqwBi" id="4ueXZrqtwCT" role="3uHU7w">
<node concept="2OqwBi" id="4ueXZrqtwCt" role="2Oq$k0">
<node concept="13iPFW" id="4ueXZrqtwC8" role="2Oq$k0" />
<node concept="3TrEf2" id="4ueXZrqtwCz" role="2OqNvi">
<ref role="3Tt5mk" to="vs0r:3wX8xlocnjN" resolve="text" />
</node>
</node>
<node concept="2qgKlT" id="4ueXZrqtwCZ" role="2OqNvi">
<ref role="37wK5l" node="jpyKDg1A7A" resolve="containsText" />
<node concept="37vLTw" id="4ueXZrqtwD0" role="37wK5m">
<ref role="3cqZAo" node="4ueXZrqtwBT" resolve="text" />
</node>
</node>
</node>
</node>
Expand Down Expand Up @@ -1134,74 +1146,15 @@
</node>
</node>
<node concept="3cpWs6" id="4ueXZrqtwHb" role="3cqZAp">
<node concept="Xl_RD" id="4ueXZrqtwHd" role="3cqZAk">
<property role="Xl_RC" value="&lt;documentation&gt;" />
</node>
</node>
</node>
<node concept="17QB3L" id="4ueXZrqtwC1" role="3clF45" />
</node>
<node concept="13i0hz" id="4ueXZrqtwC2" role="13h7CS">
<property role="13i0iv" value="false" />
<property role="13i0it" value="false" />
<property role="TrG5h" value="resultQualifiedName" />
<ref role="13i0hy" node="jpyKDg2TXB" resolve="resultNamespace" />
<node concept="3Tm1VV" id="4ueXZrqtwC3" role="1B3o_S" />
<node concept="3clFbS" id="4ueXZrqtwC4" role="3clF47">
<node concept="3clFbJ" id="4ueXZrqtwHe" role="3cqZAp">
<node concept="3clFbS" id="4ueXZrqtwHf" role="3clFbx">
<node concept="3cpWs6" id="4ueXZrqtwHg" role="3cqZAp">
<node concept="2OqwBi" id="4ueXZrqtwHh" role="3cqZAk">
<node concept="1PxgMI" id="4ueXZrqtwHi" role="2Oq$k0">
<node concept="chp4Y" id="79i$vAY5P5s" role="3oSUPX">
<ref role="cht4Q" to="vs0r:65XyadYKJgN" resolve="IIdentifierNamedConcept" />
</node>
<node concept="2OqwBi" id="4ueXZrqtwHj" role="1m5AlR">
<node concept="13iPFW" id="4ueXZrqtwHk" role="2Oq$k0" />
<node concept="1mfA1w" id="4ueXZrqtwHl" role="2OqNvi" />
</node>
</node>
<node concept="2qgKlT" id="6wvhQs7nAwi" role="2OqNvi">
<ref role="37wK5l" node="4JF77iuPCMH" resolve="qualifiedName" />
</node>
</node>
</node>
</node>
<node concept="2OqwBi" id="4ueXZrqtwHn" role="3clFbw">
<node concept="2OqwBi" id="4ueXZrqtwHo" role="2Oq$k0">
<node concept="13iPFW" id="4ueXZrqtwHp" role="2Oq$k0" />
<node concept="1mfA1w" id="4ueXZrqtwHq" role="2OqNvi" />
</node>
<node concept="1mIQ4w" id="4ueXZrqtwHr" role="2OqNvi">
<node concept="chp4Y" id="4ueXZrqtwHs" role="cj9EA">
<ref role="cht4Q" to="vs0r:65XyadYKJgN" resolve="IIdentifierNamedConcept" />
</node>
</node>
</node>
<node concept="9aQIb" id="4ueXZrqtwHw" role="9aQIa">
<node concept="3clFbS" id="4ueXZrqtwHx" role="9aQI4">
<node concept="3cpWs6" id="4ueXZrqtwHy" role="3cqZAp">
<node concept="2OqwBi" id="jpyKDg34h6" role="3cqZAk">
<node concept="2OqwBi" id="jpyKDg34h7" role="2Oq$k0">
<node concept="13iPFW" id="jpyKDg34h8" role="2Oq$k0" />
<node concept="2Xjw5R" id="jpyKDg34h9" role="2OqNvi">
<node concept="1xMEDy" id="jpyKDg34ha" role="1xVPHs">
<node concept="chp4Y" id="jpyKDg34hb" role="ri$Ld">
<ref role="cht4Q" to="vs0r:65XyadYKJgN" resolve="IIdentifierNamedConcept" />
</node>
</node>
</node>
</node>
<node concept="2qgKlT" id="6wvhQs7nAwk" role="2OqNvi">
<ref role="37wK5l" node="6wvhQs7n_YM" resolve="namespace" />
</node>
</node>
</node>
<node concept="2OqwBi" id="55oOaAF$R5c" role="3cqZAk">
<node concept="13iPFW" id="55oOaAF$QMb" role="2Oq$k0" />
<node concept="2qgKlT" id="55oOaAF_1Rr" role="2OqNvi">
<ref role="37wK5l" to="tpcu:fB3l80ylIb" resolve="getTextualRepresentation" />
</node>
</node>
</node>
</node>
<node concept="17QB3L" id="4ueXZrqtwC5" role="3clF45" />
<node concept="17QB3L" id="4ueXZrqtwC1" role="3clF45" />
</node>
<node concept="13i0hz" id="BsHjoDSP5B" role="13h7CS">
<property role="TrG5h" value="getTextColor" />
Expand Down Expand Up @@ -1547,6 +1500,19 @@
</node>
</node>
</node>
<node concept="3clFbJ" id="3G2A$fwKZFz" role="3cqZAp">
<node concept="3clFbS" id="3G2A$fwKZF_" role="3clFbx">
<node concept="3cpWs6" id="3G2A$fwL1xS" role="3cqZAp">
<node concept="10Nm6u" id="3G2A$fwL1zT" role="3cqZAk" />
</node>
</node>
<node concept="3clFbC" id="3G2A$fwL18N" role="3clFbw">
<node concept="10Nm6u" id="3G2A$fwL18Q" role="3uHU7w" />
<node concept="37vLTw" id="3G2A$fwKZI$" role="3uHU7B">
<ref role="3cqZAo" node="6wvhQs7nA1E" resolve="qn" />
</node>
</node>
</node>
<node concept="3cpWs8" id="6wvhQs7nA0d" role="3cqZAp">
<node concept="3cpWsn" id="6wvhQs7nA0e" role="3cpWs9">
<property role="TrG5h" value="dotPos" />
Expand Down Expand Up @@ -2486,12 +2452,28 @@
<node concept="3clFbS" id="jpyKDg1pW8" role="3clF47" />
</node>
<node concept="13i0hz" id="jpyKDg2TXB" role="13h7CS">
<property role="13i0iv" value="true" />
<property role="13i0it" value="true" />
<property role="TrG5h" value="resultNamespace" />
<node concept="3Tm1VV" id="jpyKDg2TXC" role="1B3o_S" />
<node concept="17QB3L" id="jpyKDg2TXD" role="3clF45" />
<node concept="3clFbS" id="jpyKDg2TXE" role="3clF47" />
<node concept="3clFbS" id="jpyKDg2TXE" role="3clF47">
<node concept="3SKdUt" id="55oOaAG4QOO" role="3cqZAp">
<node concept="1PaTwC" id="55oOaAG4QOP" role="1aUNEU">
<node concept="3oM_SD" id="55oOaAG4Rli" role="1PaTwD">
<property role="3oM_SC" value="delegate" />
</node>
<node concept="3oM_SD" id="55oOaAG4Rlj" role="1PaTwD">
<property role="3oM_SC" value="to" />
</node>
<node concept="3oM_SD" id="55oOaAG5XHN" role="1PaTwD">
<property role="3oM_SC" value="SearchEngine#getNameSpace" />
</node>
</node>
</node>
<node concept="3clFbF" id="55oOaAG4PP6" role="3cqZAp">
<node concept="10Nm6u" id="55oOaAG4PP5" role="3clFbG" />
</node>
</node>
</node>
<node concept="13hLZK" id="jpyKDg1on_" role="13h7CW">
<node concept="3clFbS" id="jpyKDg1onA" role="2VODD2" />
Expand Down
Loading

0 comments on commit 0371ed6

Please sign in to comment.