Skip to content

Commit

Permalink
Merge pull request #2650 from mbeddr/bugfix/improve_search_tool
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexanderpann
alexanderpann authored Dec 18, 2024
2 parents ecfd074 + d948b7d commit 3fe2499
Show file tree
Hide file tree
Showing 12 changed files with 5,631 additions and 2,383 deletions.
12 changes: 9 additions & 3 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 All @@ -18,7 +24,7 @@ Semantic Versioning and the changes are simply documented in reverse chronologic

## com.mbeddr.mpsutil

### Feature
### Added

- A new language `com.mbeddr.mpsutil.collections` was added that adds support for a set type `nset` that use nodes as the values of the set. Equivalence of nodes is checked structurally. The hash code calculation is done for all properties and children and the first level of references. The runtime solution also contains a more general class `EquivalenceHashSet` to implement hashsets with arbitrary `equals` and `hashcode` methods.

Expand Down Expand Up @@ -46,7 +52,7 @@ Semantic Versioning and the changes are simply documented in reverse chronologic

## com.mbeddr.mpsutil.interpreter

### Feature
### Added

- Added user defineable call back function when trace node is added to the trace tree

Expand All @@ -64,7 +70,7 @@ Semantic Versioning and the changes are simply documented in reverse chronologic

## com.mbeddr.mpsutil.checkinHandler

### Feature
### Added

- A new kind of Checkin handlers (background handler) now support the interface `CommitCheck` which allows more options like running the code after the commit or in the background.

Expand Down
15 changes: 10 additions & 5 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 @@ -14872,16 +14872,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 @@ -15126,6 +15126,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
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 @@ -185,6 +186,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
Loading

0 comments on commit 3fe2499

Please sign in to comment.