Cascading merge from 2021.2 to 2021.3 + update MPS version to 2021.3.5 #714
Conversation
This file contains 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
Fix wrong version number for local build (#630)
Add a changelog to document user-facing changes
(cherry picked from commit 19722d1)
`replaceAll()` was removing all `\` in paths on windows leading to wrong paths
#651 (comment) and #651 (review) (cherry picked from commit d313aeb)
Fixing build
…able-migrations Executed rerunnable migrations
…2021.2 # Conflicts: # code/languages/de.itemis.model.merge/de.itemis.model.merge.mpl # code/languages/de.itemis.model.simple.demo.collection.keeper/de.itemis.model.simple.demo.collection.keeper.mpl # code/languages/de.itemis.model.simple.demo.collection/de.itemis.model.simple.demo.collection.mpl # code/languages/de.itemis.model.simple.demo.reference/de.itemis.model.simple.demo.reference.mpl # code/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/de.q60.mps.shadowmodels.runtime.msd # code/treenotation/com.mbeddr.mpsutil.treenotation.runtime/models/com/mbeddr/mpsutil/treenotation/runtime.mps
- Force Save Project - Update Dependencies Versions in Descriptors
…21.2 Cascading merge from 2021.1 into 2021.2 with migration maintenance
The comments illustrate how the merge algorithm is "biased" towards the right list.
Elements are never implicitly dropped.
…lmerger2_involving_list_ordering_#659 Feature/add testcases for modelmerger2 involving list ordering #659
Extend diagrams with a select-all plugin
…onal cells The generator of the MPS editor language generates an additional collection cell around cells inside an alternation cell that also have a rendering condition. The problem with that is, that it has a horizontal layout which breaks surrounding indent layouts.
…round-optionals fix(celllayout): additional horizontal cell was generated around optional cells
…re/cascade_20211_20212_1211
…re/cascade_20212_20213_1211 # Conflicts: # CHANGELOG.md # build.gradle # code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps # code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps # code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/editor.mps # code/grammarcells/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/structure.mps # code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.tests/com.mbeddr.mpsutil.grammarcells.tests.msd # code/grammarcells/solutions/com.mbeddr.mpsutil.grammarcells.tests/models/com/mbeddr/mpsutil/grammarcells/[email protected] # code/languages/de.itemis.model.merge.baselang/sandbox/models/de.itemis.model.merge.baselang.mergers.mps # code/model-api/org.modelix.model.mpsadapters/models/org.modelix.model.mpsadapters.mps.mps # code/solutions/de.itemis.model.merge.runtime/models/de.itemis.model.merge.runtime.runtime.mps # code/solutions/de.itemis.model.merge.simple.demo/models/de.itemis.model.merge.simple.demo.plugin.mps # code/solutions/de.itemis.model.merge.test/models/[email protected] # code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.plugin.mps # code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.plugin2.mps
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.
No description provided.