search

JetBrains / MPS-extensions

MPS-extensions aims to ease language development within MPS.
https://jetbrains.github.io/MPS-extensions/
Apache License 2.0
80 stars 47 forks source link

Merge maintenance/mps20222 into maintenance/mps20223 #824

Closed github-actions[bot] closed 1 month ago

github-actions[bot] commented 2 months ago

Merge changes from maintenance/mps20222 to maintenance/mps20223.

sergej-koscejev commented 2 months ago

I merged the branches, resolved conflicts and ran migrations. @alexanderpann please check that I resolved conflicts in code/projectview/com.mbeddr.mpsutil.projectview.runtime/models/com/mbeddr/mpsutil/projectview/runtime.mps correctly.

sergej-koscejev commented 2 months ago

The duplicated dispose in ProjectViewManager#onUnloaded looks wrong as well as the duplicated syncViews call.

This is the same on maintenance/mps20222. Is it incorrect?

alexanderpann commented 2 months ago

Okay, then maybe I messed up the merge.

sergej-koscejev commented 2 months ago

Okay, then maybe I messed up the merge.

Will you fix it in 2022.2 or should I just fix it in this PR or how do we proceed?

alexanderpann commented 2 months ago

Just fix it in this PR and I can still cherry-pick the change if necessary.

sergej-koscejev commented 1 month ago

@alexanderpann fixed in 095bfefefc21cec4c70929b91a7021a16afe3db6, please have a look.

sergej-koscejev commented 1 month ago

I'm going to merge this anyway. If something is wrong, we can fix it in another PR.