From 2ea0ea1ac1cdf333827a7c7b1a9271b42bc3eb77 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 16 Jan 2024 10:35:48 +0100 Subject: [PATCH] Merge maintenance/mps20213 into maintenance/mps20222 (#2353) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 * core.base: run assessement result entry removal under write acces in EDT With the previous implementation, the removed node didn't show up on the left side of the diff view. * mpsutil.contextactions: do not update the tool when the node is null * Use reusable automerge workflow * mpsutil.interpreter: add a dummy computation trace when the computation trace is not available --------- Co-authored-by: Michael Gronover <38247916+mgronover@users.noreply.github.com> Co-authored-by: Alexander Pann Co-authored-by: Michael Gronover 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> Co-authored-by: Sergej Koščejev --- .github/workflows/PR-into-next-version.yml | 61 +- CHANGELOG.md | 4 + build/com.mbeddr.allScripts/build.xml | 3 + .../languageModels/editor.mps | 105 +- .../generator/template/main@generator.mps | 92 +- .../com/mbeddr/mpsutil/interpreter/rt.mps | 273 ++ .../mbeddr/mpsutil/contextactions/runtime.mps | 46 +- ...om.mbeddr.mpsutil.traceExplorer.plugin.mps | 3683 ++++++++--------- 8 files changed, 2286 insertions(+), 1981 deletions(-) diff --git a/.github/workflows/PR-into-next-version.yml b/.github/workflows/PR-into-next-version.yml index 6703ba468a5..663913ca5d9 100644 --- a/.github/workflows/PR-into-next-version.yml +++ b/.github/workflows/PR-into-next-version.yml @@ -7,63 +7,4 @@ on: jobs: create-pr: - runs-on: ubuntu-latest - steps: - - shell: bash - env: - GH_TOKEN: ${{ github.token }} - owner_and_repo: ${{ github.repository }} - run: | - echo "Calculating PR branches:" - - # Next branch matching refs/heads/maintenance/* pattern, or empty if we're on the last one - next_maintenance_branch=$(gh api "/repos/$owner_and_repo/git/matching-refs/heads/maintenance/mps" \ - --jq 'map(.ref | ltrimstr("refs/heads/") | select(. > "${{ github.ref_name }}" and . < "maintenance/mps3")) | min') - echo " Next maintenance branch: ${next_maintenance_branch:-(none)}" - - # Substitute the default branch if empty - default_branch=${{ github.event.repository.default_branch }} - base_branch=${next_maintenance_branch:-$default_branch} - echo " PR base branch: $base_branch" - - # Calculate PR head branch name (the branch to merge) by substituting 'maintenance' for 'merge' - head_branch=${{ github.ref_name }} - merge_branch=${head_branch/#maintenance/merge} - echo " Merge branch (will be used as PR head): $merge_branch" - - echo "" - - echo "Pushing ${{ github.ref_name }} to $merge_branch" - - # Create or update $merge_branch - if gh api repos/$owner_and_repo/git/ref/heads/$merge_branch --silent - then - # Branch exists, merge $head_branch into it - gh api repos/$owner_and_repo/merges --silent --method=POST -f base=$merge_branch -f head=$head_branch || - (echo "Merging $head_branch to existing $merge_branch failed, aborting." ; exit 1) - else - # Branch does not exist, create it from $head_branch - gh api repos/$owner_and_repo/git/refs --silent --method=POST -f ref="refs/heads/$merge_branch" -f sha=${{ github.sha }} || - (echo "Could not create merge branch $merge_branch" ; exit 1) - fi - - # Merge $base_branch -> $merge_branch, in order for $merge_branch to be up to date, as required by the branch - # protection rules. - - # The head and base arguments are intentionally reversed because this is a reverse merge. - gh api repos/$owner_and_repo/merges --silent --method=POST -f base=$merge_branch -f head=$base_branch || - echo "Updating $merge_branch from $base_branch failed, please do it manually." - - # Create PR if it does not exist yet - existing_pr_url=$(gh pr list --repo $owner_and_repo --head $merge_branch --base $base_branch --json url --jq 'map(.url[]).[]') - if [[ $existing_pr_url ]] - then - echo "Pull request $merge_branch -> $base_branch already exists at $existing_pr_url" - else - echo "Creating a new pull request $merge_branch -> $base_branch" - gh pr create --repo $owner_and_repo --head $merge_branch --base $base_branch \ - --title "Merge ${{ github.ref_name }} into $base_branch" \ - --body "An automatic PR to merge changes from \`${{ github.ref_name }}\` to \`$base_branch\`." \ - --assignee '${{ github.actor }}' \ - --reviewer '${{ github.actor }}' - fi + uses: specificlanguages/cascading-merge/.github/workflows/workflow.yml@v1 diff --git a/CHANGELOG.md b/CHANGELOG.md index be70433ab3b..179c4b28a97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ Semantic Versioning and the changes are simply documented in reverse chronologic ## com.mbeddr.mpsutils +### Changed + +- A dummy computation trace is now used when the computation trace is not available in the interpreter to prevent NullPointerExceptions. + ### Removed - The deprecated language `com.mbeddr.mpsutil.coverage.emma` was removed. As a replacement, the diff --git a/build/com.mbeddr.allScripts/build.xml b/build/com.mbeddr.allScripts/build.xml index fc14d6da7c1..3d0e2f45550 100644 --- a/build/com.mbeddr.allScripts/build.xml +++ b/build/com.mbeddr.allScripts/build.xml @@ -819,6 +819,9 @@ + + + diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/editor.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/editor.mps index d16b634ec32..a7e1522f649 100644 --- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/editor.mps +++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/editor.mps @@ -67,6 +67,7 @@ + @@ -3399,62 +3400,63 @@ - - + + + - + - - + + - + - + - + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - + - + - - - - - + + + + + @@ -3471,7 +3473,7 @@ - + @@ -3491,22 +3493,22 @@ - - - - - - + + + + + + - + - + - - - + + + @@ -3515,30 +3517,29 @@ - + - + - + - + - - + + - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/generator/template/main@generator.mps index 8456cad99e7..6c62131e6a9 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/generator/template/main@generator.mps @@ -108,6 +108,9 @@ + + + @@ -133,6 +136,7 @@ + @@ -321,6 +325,9 @@ + + + @@ -2781,22 +2788,81 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2807,6 +2873,10 @@ + + + + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps index 0937f64a5f1..b355cf1e624 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps @@ -18197,5 +18197,278 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.contextactions.runtime/models/com/mbeddr/mpsutil/contextactions/runtime.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.contextactions.runtime/models/com/mbeddr/mpsutil/contextactions/runtime.mps index b3d36f7a510..f47298f518d 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.contextactions.runtime/models/com/mbeddr/mpsutil/contextactions/runtime.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.contextactions.runtime/models/com/mbeddr/mpsutil/contextactions/runtime.mps @@ -419,6 +419,7 @@ + @@ -3701,29 +3702,42 @@ - - - - + + + + - - + + - + - - - - - - - + + + + + + + + + + - - + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.traceExplorer/models/com.mbeddr.mpsutil.traceExplorer.plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.traceExplorer/models/com.mbeddr.mpsutil.traceExplorer.plugin.mps index 22413756f84..605a3c16272 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.traceExplorer/models/com.mbeddr.mpsutil.traceExplorer.plugin.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.traceExplorer/models/com.mbeddr.mpsutil.traceExplorer.plugin.mps @@ -1,7 +1,6 @@ - @@ -14,9 +13,9 @@ + - @@ -46,12 +45,12 @@ - - + + - + @@ -3361,12 +3360,12 @@ - - - + + + - + @@ -10312,2273 +10311,2273 @@ - - - - - - - - + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + - - - + + + + - - - - - + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + - - + + + - + - - - - - - + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + - - - + + + + + + - - - - - - - - - + + + + + + + + + + + + + - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - + + + + - - - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + + - - - - - - - + + + - - - + + + + + + + + - - + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - + + + - - - - - + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + - - - - - - - - + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - + + + + + + + + + + - - - - - - - - - - - + + + - - - + + + + + + + - - - + + + - - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - + + + + - - + + - - - - - - - - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + - - - + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - + + + + + - - - + + + - - - - - - - + + + + + + + + + + + + + - - - - - - - - - + + + + - - - - - - - - - - - - + - + + - - + + - - + + - + - + - - - - - - - + + + + + + + - - - - + + + + - - - - - + + + + + - - - + + + - - + + - - + + - + - - + + - - + + - - - - - - - - - - - + + + + + + + + + + + - - - + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - + + - - - - - + + + + + + - - + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + + + + + + + + + + + + + - - - + + + + + - - - + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + - - - - - - - + + + + + + + + + - + - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + - - - - - - - - - - + + + - - - + + + + + - - - - - - - - - - + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + - - + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - + + + + - - - - - - - + + + - - - - - - - - + + + + + + + + + + + - - - - + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + - - - - - - - - - - + + + + + + + + + - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - + + + + - - - - - - - - - - - - - - - - - - - + + + - - - + + + - - + + + + - - - - + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - + + + + + + + - - - - + + + + - - - - - - - + + + + + - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - + + - - - + + + + + + + - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - + + + - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - - + + - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - + + - - - - - - - - + + + + + + + + + + + + + + + + + - - + + + - - - - - - - - + + + + - - - - - - - - + + + + - - - - + + + - - - + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +