Skip to content

Commit

Permalink
Merge pull request #2420 from mbeddr/feature/AssertNodeEqualsWithDiff…
Browse files Browse the repository at this point in the history 
…s_2022.2

Diff tool for assert not equal statements
  • Loading branch information
@alexanderpann
alexanderpann authored Apr 25, 2024
2 parents cacf60d + aa22b52 commit 7228b75
Show file tree
Hide file tree
Showing 26 changed files with 4,586 additions and 179 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ Semantic Versioning and the changes are simply documented in reverse chronologic
- Hyperlink: `HyperlinkUtil.openInBrowser()` behaves like no-op instead of raising an exception on null or empty URLs.
- Asynccell: Stops polling for the calculated value in case the poll-request throws an exception and shows to the user, that the calculation has failed together with the thrown exception, instead of spamming the log on each poll with the exception.

### Added

- The comparator language now supports a diff tool that can be activated through the `show diff` checkbox.

# March 2024

## com.mbeddr.mpsutil
Expand Down
165 changes: 114 additions & 51 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 @@ -7612,6 +7612,41 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="6HovwvvzfY2" role="3bR37C">
<node concept="3bR9La" id="6HovwvvzfY3" role="1SiIV1">
<ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
</node>
</node>
<node concept="1SiIV0" id="6HovwvvzfY6" role="3bR37C">
<node concept="3bR9La" id="6HovwvvzfY7" role="1SiIV1">
<ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
</node>
</node>
<node concept="1SiIV0" id="6HovwvvzfY8" role="3bR37C">
<node concept="3bR9La" id="6HovwvvzfY9" role="1SiIV1">
<ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
</node>
</node>
<node concept="1SiIV0" id="2RIzFJ84PQv" role="3bR37C">
<node concept="3bR9La" id="2RIzFJ84PQw" role="1SiIV1">
<ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
</node>
</node>
<node concept="1SiIV0" id="2RIzFJ84PQx" role="3bR37C">
<node concept="3bR9La" id="2RIzFJ84PQy" role="1SiIV1">
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
</node>
</node>
<node concept="1SiIV0" id="2RIzFJ84PQz" role="3bR37C">
<node concept="3bR9La" id="2RIzFJ84PQ$" role="1SiIV1">
<ref role="3bR37D" to="ffeo:ymnOULAU0H" resolve="jetbrains.mps.lang.test" />
</node>
</node>
<node concept="1SiIV0" id="2RIzFJ84PQ_" role="3bR37C">
<node concept="3bR9La" id="2RIzFJ84PQA" role="1SiIV1">
<ref role="3bR37D" to="ffeo:7Kfy9QB6LaO" resolve="jetbrains.mps.lang.structure" />
</node>
</node>
</node>
<node concept="1BupzO" id="4PRpvcZJNpF" role="3bR31x">
<property role="3ZfqAx" value="languageModels" />
Expand All @@ -7635,16 +7670,21 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="4BQS8fdsw3f" role="3bR37C">
<node concept="Rbm2T" id="4BQS8fdsw3g" role="1SiIV1">
<ref role="1E1Vl2" to="ffeo:7Kfy9QB6L9O" resolve="jetbrains.mps.lang.smodel" />
</node>
</node>
<node concept="1SiIV0" id="4BQS8fdsw3h" role="3bR37C">
<node concept="Rbm2T" id="4BQS8fdsw3i" role="1SiIV1">
<ref role="1E1Vl2" to="ffeo:7Kfy9QB6L0h" resolve="jetbrains.mps.baseLanguage.collections" />
</node>
</node>
<node concept="1SiIV0" id="6GJZxHzA9pX" role="3bR37C">
<node concept="3bR9La" id="6GJZxHzA9pY" role="1SiIV1">
<ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
</node>
</node>
<node concept="1SiIV0" id="NgM4xWL$1T" role="3bR37C">
<node concept="Rbm2T" id="NgM4xWL$1U" role="1SiIV1">
<ref role="1E1Vl2" to="ffeo:ymnOULAU0H" resolve="jetbrains.mps.lang.test" />
</node>
</node>
</node>
<node concept="1E1JtA" id="776vT$mQZbf" role="2G$12L">
<property role="BnDLt" value="true" />
Expand Down Expand Up @@ -7725,6 +7765,26 @@
<ref role="3bR37D" to="ffeo:7Kfy9QB6LaO" resolve="jetbrains.mps.lang.structure" />
</node>
</node>
<node concept="1SiIV0" id="6HovwvvzfYn" role="3bR37C">
<node concept="3bR9La" id="6HovwvvzfYo" role="1SiIV1">
<ref role="3bR37D" to="ffeo:39HJr_hyEzS" resolve="jetbrains.mps.ide.vcs.platform" />
</node>
</node>
<node concept="1SiIV0" id="6HovwvvzfYp" role="3bR37C">
<node concept="3bR9La" id="6HovwvvzfYq" role="1SiIV1">
<ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
</node>
</node>
<node concept="1SiIV0" id="6HovwvvzfYr" role="3bR37C">
<node concept="3bR9La" id="6HovwvvzfYs" role="1SiIV1">
<ref role="3bR37D" to="ffeo:ymnOULAU0H" resolve="jetbrains.mps.lang.test" />
</node>
</node>
<node concept="1SiIV0" id="6GJZxHzA9qn" role="3bR37C">
<node concept="3bR9La" id="6GJZxHzA9qo" role="1SiIV1">
<ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
</node>
</node>
</node>
<node concept="1E1JtD" id="4oNjwzxq1FR" role="2G$12L">
<property role="BnDLt" value="true" />
Expand Down Expand Up @@ -8337,6 +8397,9 @@
<node concept="m$_yC" id="7wOeVMeCel8" role="m$_yJ">
<ref role="m$_y1" to="ffeo:ymnOULATpW" resolve="jetbrains.mps.testing" />
</node>
<node concept="m$_yC" id="6HovwvvzhsW" role="m$_yJ">
<ref role="m$_y1" to="ffeo:RJsmGEieyQ" resolve="jetbrains.mps.vcs" />
</node>
</node>
<node concept="2G$12M" id="3quoVcnNsFs" role="3989C9">
<property role="TrG5h" value="group.httpsupport" />
Expand Down Expand Up @@ -17881,6 +17944,44 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="2tOXMOy_0rv" role="3bR37C">
<node concept="1BurEX" id="2tOXMOy_0rw" role="1SiIV1">
<node concept="398BVA" id="2tOXMOy_0ri" role="1BurEY">
<ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
<node concept="2Ry0Ak" id="2tOXMOy_0rj" role="iGT6I">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="2tOXMOy_0rk" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.spreadsheat" />
<node concept="2Ry0Ak" id="2tOXMOy_0rl" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="2tOXMOy_0rm" role="2Ry0An">
<property role="2Ry0Am" value="poi-ooxml-lite-5.0.0.jar" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1SiIV0" id="BNROLcYFVv" role="3bR37C">
<node concept="1BurEX" id="BNROLcYFVw" role="1SiIV1">
<node concept="398BVA" id="BNROLcYFVi" role="1BurEY">
<ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
<node concept="2Ry0Ak" id="BNROLcYFVj" role="iGT6I">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="BNROLcYFVk" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.spreadsheat" />
<node concept="2Ry0Ak" id="BNROLcYFVl" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="BNROLcYFVm" role="2Ry0An">
<property role="2Ry0Am" value="xmlbeans-4.0.0.jar" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1yeLz9" id="4aKYPQyrdec" role="1TViLv">
<property role="TrG5h" value="com.mbeddr.spreadsheat#4354378109086982931" />
<property role="3LESm3" value="7986ede4-bb02-4e5d-8e13-03458d393ab7" />
Expand Down Expand Up @@ -17942,44 +18043,6 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="2tOXMOy_0rv" role="3bR37C">
<node concept="1BurEX" id="2tOXMOy_0rw" role="1SiIV1">
<node concept="398BVA" id="2tOXMOy_0ri" role="1BurEY">
<ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
<node concept="2Ry0Ak" id="2tOXMOy_0rj" role="iGT6I">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="2tOXMOy_0rk" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.spreadsheat" />
<node concept="2Ry0Ak" id="2tOXMOy_0rl" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="2tOXMOy_0rm" role="2Ry0An">
<property role="2Ry0Am" value="poi-ooxml-lite-5.0.0.jar" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1SiIV0" id="BNROLcYFVv" role="3bR37C">
<node concept="1BurEX" id="BNROLcYFVw" role="1SiIV1">
<node concept="398BVA" id="BNROLcYFVi" role="1BurEY">
<ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
<node concept="2Ry0Ak" id="BNROLcYFVj" role="iGT6I">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="BNROLcYFVk" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.spreadsheat" />
<node concept="2Ry0Ak" id="BNROLcYFVl" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="BNROLcYFVm" role="2Ry0An">
<property role="2Ry0Am" value="xmlbeans-4.0.0.jar" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1E1JtD" id="5xsBLDL_TZv" role="2G$12L">
<property role="BnDLt" value="true" />
Expand Down Expand Up @@ -19775,11 +19838,6 @@
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
</node>
</node>
<node concept="1SiIV0" id="1Alud3KWJdb" role="3bR37C">
<node concept="3bR9La" id="1Alud3KWJdc" role="1SiIV1">
<ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
</node>
</node>
<node concept="1BupzO" id="4PRpvcZJO9z" role="3bR31x">
<property role="3ZfqAx" value="models" />
<property role="1Hdu6h" value="true" />
Expand All @@ -19802,6 +19860,11 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="1Alud3KWJdb" role="3bR37C">
<node concept="3bR9La" id="1Alud3KWJdc" role="1SiIV1">
<ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
</node>
</node>
<node concept="1SiIV0" id="1Alud3KWJdd" role="3bR37C">
<node concept="3bR9La" id="1Alud3KWJde" role="1SiIV1">
<ref role="3bR37D" to="ffeo:1TaHNgiIbJ$" resolve="jetbrains.mps.ide.editor" />
Expand Down Expand Up @@ -19843,6 +19906,9 @@
<node concept="m$_yC" id="NMVW79y25B" role="m$_yJ">
<ref role="m$_y1" to="ffeo:4k71ibbKLe8" resolve="jetbrains.mps.core" />
</node>
<node concept="m$_yC" id="75qFqB425iF" role="m$_yJ">
<ref role="m$_y1" to="90a9:3$A0JaN5ezp" resolve="MPS.ThirdParty" />
</node>
<node concept="3_J27D" id="NMVW79y25C" role="m_cZH">
<node concept="3Mxwew" id="NMVW79y25D" role="3MwsjC">
<property role="3MwjfP" value="com.mbeddr.mpsutil.json" />
Expand All @@ -19852,9 +19918,6 @@
<property role="2iUeEt" value="mbeddr" />
<property role="2iUeEu" value="http://mbeddr.com" />
</node>
<node concept="m$_yC" id="75qFqB425iF" role="m$_yJ">
<ref role="m$_y1" to="90a9:3$A0JaN5ezp" resolve="MPS.ThirdParty" />
</node>
</node>
<node concept="2G$12M" id="48qh2gYg815" role="3989C9">
<property role="TrG5h" value="com.mbeddr.core.codereview" />
Expand Down
3 changes: 3 additions & 0 deletions code/languages/com.mbeddr.mpsutil/.mps/modules.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<modulePath path="$PROJECT_DIR$/devkits/com.mbeddr.commenting.devkit" folder="staging.margincell_review" />
<modulePath path="$PROJECT_DIR$/devkits/com.mbeddr.mpsutil.guides/com.mbeddr.mpsutil.guides.devkit" folder="staging.editingGuide" />
<modulePath path="$PROJECT_DIR$/languages/EcoreImporter_TestLanguage1/EcoreImporter_TestLanguage1.mpl" folder="testlanguages" />
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.demo.comparator.diff/com.mbeddr.demo.comparator.diff.mpl" folder="staging.comparator.demo" />
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.mpsutil.actionsfilter/com.mbeddr.mpsutil.actionsfilter.mpl" folder="staging.actionsfilter" />
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.mpsutil.asynccell.sandbox/com.mbeddr.mpsutil.asynccell.sandbox.mpl" folder="asynccell" />
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.mpsutil.bldoc/com.mbeddr.mpsutil.bldoc.mpl" folder="rest" />
Expand Down Expand Up @@ -112,6 +113,8 @@
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.ccmenu.runtime/com.mbeddr.mpsutil.ccmenu.runtime.msd" folder="rest.ccmenu" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.ccmenu.sandbox/com.mbeddr.mpsutil.ccmenu.sandbox.msd" folder="rest.ccmenu" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.common/com.mbeddr.mpsutil.common.msd" folder="staging" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.comparator.diff.demo.genplan/com.mbeddr.mpsutil.comparator.diff.demo.genplan.msd" folder="staging.comparator.demo" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/com.mbeddr.mpsutil.comparator.diff.demo.tests.msd" folder="staging.comparator.demo" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.comparator/comparator.msd" folder="staging.comparator" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.compare.pattern.generator.runtime/com.mbeddr.mpsutil.compare.pattern.generator.runtime.msd" folder="staging.comparator" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.compare.pattern.runtime/com.mbeddr.mpsutil.compare.pattern.runtime.msd" folder="staging.comparator" />
Expand Down
Loading

0 comments on commit 7228b75

Please sign in to comment.