Merge maintenance/mps20232 into maintenance/mps20241 #2931
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(cherry picked from commit 0343a22)
(cherry picked from commit ee29aa2)
(cherry picked from commit c926cb5)
backport actions to background thread (BGT)
…ith it If we do not do this outside of the EDT thread, the class will complain because it can't be initialized on this thread. Another similar issue in MPS: https://youtrack.jetbrains.com/issue/MPS-33812/Assertion-failed This exception is very unlikely to happen anyway because MPS probably also needs to initialize this class somewhere.
…ionsApplicationComponent
# Conflicts: # code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/doc.mpl # code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.graphstream/runtime/com.mbeddr.mpsutil.graphstream.runtime.msd # code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/models/com/mbeddr/mpsutil/plantuml/pluginSolution/plugin.mps # code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution/pluginSolution.msd # code/languages/com.mbeddr.platform.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps # subprojects/com.mbeddr/platform/build.gradle
|
merge conflicts are resolved by taking just changes from 20241 and dropping all others, because those changes do already exist on maintenance/20241. |
wsafonov
requested changes
May 13, 2025
...ions/com.mbeddr.mpsutil.process.sandbox/models/com/mbeddr/mpsutil/process/sandbox/plugin.mps
Outdated
Show resolved
Hide resolved
fixing deps.
# Conflicts: # CHANGELOG.md # code/languages/com.mbeddr.mpsutil/.mps/modules.xml # code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.process.sandbox/models/com/mbeddr/mpsutil/process/sandbox/plugin.mps # code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.wizard.sandbox/models/com.mbeddr.mpsutil.wizard.sandbox.plugin.mps # code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.wizard.sandbox/models/com/mbeddr/mpsutil/process/sandbox/plugin.mps
|
Aligned with target branch. @wsafonov please have a second look |
wsafonov
approved these changes
May 19, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge changes from
maintenance/mps20232tomaintenance/mps20241.