MPS-extensions icon indicating copy to clipboard operation
MPS-extensions copied to clipboard

Published 20 hours ago • verified publisher icon JetBrains

Merge maintenance/mps20222 into maintenance/mps20223

Open github-actions[bot] opened this issue 10 months ago • 5 comments

Merge changes from maintenance/mps20222 to maintenance/mps20223.

github-actions[bot] avatar Apr 16 '24 07:04 github-actions[bot]

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 avatar Apr 30 '24 12:04 sergej-koscejev

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?

sergej-koscejev avatar Apr 30 '24 14:04 sergej-koscejev

Okay, then maybe I messed up the merge.

alexanderpann avatar Apr 30 '24 14:04 alexanderpann

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?

sergej-koscejev avatar May 03 '24 17:05 sergej-koscejev

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

alexanderpann avatar May 03 '24 18:05 alexanderpann

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

sergej-koscejev avatar May 20 '24 15:05 sergej-koscejev

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

sergej-koscejev avatar May 20 '24 15:05 sergej-koscejev