Skip to content

Commit

Permalink
Merge maintenance/mps20213 into maintenance/mps20222 (#2343)
Browse files Browse the repository at this point in the history 
* Fix and improve trace explorer (#2328)

* ComputationTrace: Added popup menu for filtering #2319

- Fixed update and un-/folding of trace tree
- Fixed NPE
- Fixed possible endless loop when a used filter is not avoiding it and did massive cleanups
- No more lazy creation of children in ComputationTrace.

* Automatically remove assessment result entries with invalid references

* Fix typo in changelog

* Update to 2021.3.5

* Bugfix/2329 follows up 2319 further improvements for the trace explorer (#2335)

* ComputationTrace: improved filter interface and refactored handling of options used by the TraceTab #2329

* ComputationTrace: Fixed argument for @NotNull parameter must not be null #2341 (#2342)

* interpreter: generalize the evaluate methods into one method with options

---------

Co-authored-by: Michael Gronover <38247916+mgronover@users.noreply.github.com>
Co-authored-by: Alexander Pann <apann@itemis.com>
Co-authored-by: Michael Gronover <mgronover@itemis.com>
Co-authored-by: Alexander Pann <88385944+alexanderpann@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
@github-actions @mgronover @alexanderpann
5 people committed Dec 14, 2023
1 parent 2b52349 commit 1cadcb9
Show file tree
Hide file tree
Showing 5 changed files with 1,951 additions and 1,342 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,20 @@ All notable changes to this project will be documented in this file.
The format is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). The project does _not_ follow
Semantic Versioning and the changes are simply documented in reverse chronological order, grouped by calendar month.

# December 2023

## com.mbeddr.mpsutils

### Changed

- Enhanced TraceExplorer to hide toolbar buttons.

## com.mbeddr.core.base

### Changed

- Assessement result entries with invalid references are now automatically removed.

# November 2023

## com.mbeddr.doc
Expand Down
153 changes: 137 additions & 16 deletions code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/editor.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
<import index="qkt" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.actionSystem(MPS.IDEA/)" />
<import index="lzb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui(MPS.IDEA/)" />
<import index="g1qu" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.util.ui(MPS.IDEA/)" />
<import index="bd8o" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.application(MPS.IDEA/)" />
<import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
<import index="z1c4" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" implicit="true" />
<import index="tp25" ref="r:00000000-0000-4000-0000-011c89590301(jetbrains.mps.lang.smodel.structure)" implicit="true" />
Expand Down Expand Up @@ -706,6 +707,7 @@
</concept>
<concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
<concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
<concept id="8758390115028452779" name="jetbrains.mps.lang.smodel.structure.Node_GetReferencesOperation" flags="nn" index="2z74zc" />
<concept id="1138757581985" name="jetbrains.mps.lang.smodel.structure.Link_SetNewChildOperation" flags="nn" index="zfrQC" />
<concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
<child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
Expand Down Expand Up @@ -3397,24 +3399,143 @@
<property role="VOm3f" value="true" />
</node>
</node>
<node concept="3F2HdR" id="5_l8w1EmTdN" role="3EZMnx">
<property role="2czwfO" value="\n\n" />
<ref role="1NtTu8" to="vs0r:K292flwCEX" resolve="assessments" />
<node concept="pj6Ft" id="7apEgWbIFgt" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="2iRkQZ" id="K292flwD4q" role="2czzBx" />
<node concept="ljvvj" id="7apEgWbIFgv" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="pVoyu" id="7apEgWbIHBM" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="3F0ifn" id="4usdeMNVnYj" role="2czzBI">
<property role="3F0ifm" value="" />
<node concept="VPxyj" id="4usdeMNVnYk" role="3F10Kt">
<node concept="3ZSo5i" id="4u0NPMncAUg" role="3EZMnx">
<node concept="3F2HdR" id="5_l8w1EmTdN" role="3EZMny">
<property role="2czwfO" value="\n\n" />
<ref role="1NtTu8" to="vs0r:K292flwCEX" resolve="assessments" />
<node concept="pj6Ft" id="7apEgWbIFgt" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="l2Vlx" id="4u0NPMnhwoI" role="2czzBx" />
<node concept="ljvvj" id="7apEgWbIFgv" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="pVoyu" id="7apEgWbIHBM" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="3F0ifn" id="4usdeMNVnYj" role="2czzBI">
<property role="3F0ifm" value="" />
<node concept="VPxyj" id="4usdeMNVnYk" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
</node>
<node concept="3VJUX5" id="4u0NPMncB26" role="3ZZHOD">
<node concept="3clFbS" id="4u0NPMncB27" role="2VODD2">
<node concept="3clFbF" id="4u0NPMncIQ0" role="3cqZAp">
<node concept="2OqwBi" id="4u0NPMncVwb" role="3clFbG">
<node concept="2OqwBi" id="4u0NPMncJ9U" role="2Oq$k0">
<node concept="pncrf" id="4u0NPMncIPZ" role="2Oq$k0" />
<node concept="2Rf3mk" id="4u0NPMncTYV" role="2OqNvi">
<node concept="1xMEDy" id="4u0NPMncTYX" role="1xVPHs">
<node concept="chp4Y" id="4u0NPMncU8h" role="ri$Ld">
<ref role="cht4Q" to="vs0r:K292flwDNu" resolve="AssessmentResultEntry" />
</node>
</node>
</node>
</node>
<node concept="2es0OD" id="4u0NPMncXec" role="2OqNvi">
<node concept="1bVj0M" id="4u0NPMncXee" role="23t8la">
<node concept="3clFbS" id="4u0NPMncXef" role="1bW5cS">
<node concept="3clFbF" id="4u0NPMncXmx" role="3cqZAp">
<node concept="2OqwBi" id="3Fe92PR2X5I" role="3clFbG">
<node concept="2OqwBi" id="3Fe92PR2WFd" role="2Oq$k0">
<node concept="2OqwBi" id="4u0NPMncXPn" role="2Oq$k0">
<node concept="37vLTw" id="4u0NPMncXAh" role="2Oq$k0">
<ref role="3cqZAo" node="4u0NPMncXeg" resolve="it" />
</node>
<node concept="3TrEf2" id="4u0NPMncYaT" role="2OqNvi">
<ref role="3Tt5mk" to="vs0r:K292flwHwj" resolve="result" />
</node>
</node>
<node concept="2z74zc" id="3Fe92PR2WSw" role="2OqNvi" />
</node>
<node concept="2es0OD" id="3Fe92PR38PN" role="2OqNvi">
<node concept="1bVj0M" id="3Fe92PR38PP" role="23t8la">
<node concept="3clFbS" id="3Fe92PR38PQ" role="1bW5cS">
<node concept="3clFbJ" id="3Fe92PR38Xy" role="3cqZAp">
<node concept="3clFbS" id="3Fe92PR38X$" role="3clFbx">
<node concept="3clFbF" id="4u0NPMneItu" role="3cqZAp">
<node concept="2OqwBi" id="4u0NPMneJIC" role="3clFbG">
<node concept="2YIFZM" id="4u0NPMneIC0" role="2Oq$k0">
<ref role="37wK5l" to="bd8o:~ApplicationManager.getApplication()" resolve="getApplication" />
<ref role="1Pybhc" to="bd8o:~ApplicationManager" resolve="ApplicationManager" />
</node>
<node concept="liA8E" id="4u0NPMneKfg" role="2OqNvi">
<ref role="37wK5l" to="bd8o:~Application.invokeLater(java.lang.Runnable)" resolve="invokeLater" />
<node concept="1bVj0M" id="4u0NPMneKms" role="37wK5m">
<node concept="3clFbS" id="4u0NPMneKmt" role="1bW5cS">
<node concept="1QHqEO" id="4u0NPMneazH" role="3cqZAp">
<node concept="1QHqEC" id="4u0NPMneazJ" role="1QHqEI">
<node concept="3clFbS" id="4u0NPMneazL" role="1bW5cS">
<node concept="3clFbF" id="4u0NPMndBJj" role="3cqZAp">
<node concept="2OqwBi" id="4u0NPMndBX5" role="3clFbG">
<node concept="37vLTw" id="4u0NPMndBJi" role="2Oq$k0">
<ref role="3cqZAo" node="4u0NPMncXeg" resolve="entry" />
</node>
<node concept="3YRAZt" id="4u0NPMndCkx" role="2OqNvi" />
</node>
</node>
</node>
</node>
<node concept="2OqwBi" id="4u0NPMneaTu" role="ukAjM">
<node concept="1Q80Hx" id="4u0NPMneaHF" role="2Oq$k0" />
<node concept="liA8E" id="4u0NPMnebai" role="2OqNvi">
<ref role="37wK5l" to="cj4x:~EditorContext.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbC" id="3Fe92PR384d" role="3clFbw">
<node concept="10Nm6u" id="3Fe92PR38mm" role="3uHU7w" />
<node concept="2OqwBi" id="3Fe92PR2XRg" role="3uHU7B">
<node concept="2OqwBi" id="3Fe92PR2Xwf" role="2Oq$k0">
<node concept="37vLTw" id="3Fe92PR2XoQ" role="2Oq$k0">
<ref role="3cqZAo" node="3Fe92PR38PR" resolve="it" />
</node>
<node concept="liA8E" id="3Fe92PR2XHR" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SReference.getTargetNodeReference()" resolve="getTargetNodeReference" />
</node>
</node>
<node concept="liA8E" id="3Fe92PR2Y36" role="2OqNvi">
<ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
<node concept="2OqwBi" id="4u0NPMncZ6C" role="37wK5m">
<node concept="1Q80Hx" id="4u0NPMncYVj" role="2Oq$k0" />
<node concept="liA8E" id="4u0NPMncZnM" role="2OqNvi">
<ref role="37wK5l" to="cj4x:~EditorContext.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="Rh6nW" id="3Fe92PR38PR" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="3Fe92PR38PS" role="1tU5fm" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="Rh6nW" id="4u0NPMncXeg" role="1bW2Oz">
<property role="TrG5h" value="entry" />
<node concept="2jxLKc" id="4u0NPMncXeh" role="1tU5fm" />
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="4u0NPMncIis" role="3cqZAp">
<node concept="1Q80Hy" id="4u0NPMncIir" role="3clFbG" />
</node>
</node>
</node>
</node>
<node concept="2iRkQZ" id="K292flwD4p" role="2iSdaV" />
Expand Down
Loading

0 comments on commit 1cadcb9

Please sign in to comment.