Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cascading merge from 2021.2 to 2021.3 + update MPS version to 2021.3.5 #714

Merged
merged 45 commits into from
Dec 11, 2023
Merged

Cascading merge from 2021.2 to 2021.3 + update MPS version to 2021.3.5 #714

merged 45 commits into from
Dec 11, 2023

Commits on Jun 1, 2023

  1. Fix wrong version number for local build (#630)

    @HeikoBecker
    HeikoBecker committed Jun 1, 2023
    Configuration menu
    Copy the full SHA
    0859f60 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #631 from JetBrains/bugfix/fix_version_number_630 

    Fix wrong version number for local build (#630)
    @HeikoBecker
    HeikoBecker authored Jun 1, 2023
    Configuration menu
    Copy the full SHA
    4932980 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2023

  1. Add a Changelog to document user-facing changes

    @HeikoBecker
    HeikoBecker committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    8ba22c8 View commit details
    Browse the repository at this point in the history

  2. Minor:passive->active wording

    @HeikoBecker
    HeikoBecker committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    be16227 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2023

  1. Merge pull request #636 from JetBrains/feature/changelog 

    Add a changelog to document user-facing changes
    @HeikoBecker
    HeikoBecker authored Jun 30, 2023
    Configuration menu
    Copy the full SHA
    7642ac0 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2023

  1. Remove build script block dependency to old nexus. 

    (cherry picked from commit 19722d1)
    @alexanderpann @AlexeiQ
    alexanderpann authored and AlexeiQ committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    3bde22b View commit details
    Browse the repository at this point in the history

  2. Fix build for windows 

    `replaceAll()` was removing all `\` in paths on windows leading to wrong paths
    @AlexeiQ
    AlexeiQ committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    9a14128 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2023

  1. remove old nexus repository and update usage according to https://git… 

    …hub.com/mbeddr/mps-gradle-plugin/tree/v1.x#configuring-the-plugin-repository

(cherry picked from commit a009734)
    @KemalSoysal @AlexeiQ
    KemalSoysal authored and AlexeiQ committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    15cd0e7 View commit details
    Browse the repository at this point in the history

  2. adopt changes encouraged by @sergej-koscejev in comments 

    #651 (comment)
and #651 (review)

(cherry picked from commit d313aeb)
    @KemalSoysal @AlexeiQ
    KemalSoysal authored and AlexeiQ committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    68211a8 View commit details
    Browse the repository at this point in the history

  3. adopt changes encouraged by @sergej-koscejev in comment 

    https://github.com/JetBrains/MPS-extensions/pull/651/files#r1280383908

(cherry picked from commit 484ed05)
    @KemalSoysal @AlexeiQ
    KemalSoysal authored and AlexeiQ committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    e3cea99 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #652 from JetBrains/bugfix/fixing-build 

    Fixing build
    @AlexeiQ
    AlexeiQ authored Aug 1, 2023
    Configuration menu
    Copy the full SHA
    4d74855 View commit details
    Browse the repository at this point in the history

  5. Executed rerunnable migrations

    @AlexeiQ
    AlexeiQ committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    801b5b6 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2023

  1. Merge pull request #653 from JetBrains/bugfix/mps20211-execute-rerunn… 

    …able-migrations

Executed rerunnable migrations
    @KemalSoysal
    KemalSoysal authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    aa22a20 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'maintenance/mps20211' into cascading-merge/2021.1-into-… 

    …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
    @AlexeiQ
    AlexeiQ committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    3f77603 View commit details
    Browse the repository at this point in the history

  3. Execute needed migrations via migration-manager 

    - Force Save Project
- Update Dependencies Versions in Descriptors
    @AlexeiQ
    AlexeiQ committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    4d7b610 View commit details
    Browse the repository at this point in the history

  4. Executed rerunnable migrations (2021.2)

    @AlexeiQ
    AlexeiQ committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    6026a63 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #656 from JetBrains/cascading-merge/2021.1-into-20… 

    …21.2

Cascading merge from 2021.1 into 2021.2 with migration maintenance
    @KemalSoysal
    KemalSoysal authored Aug 4, 2023
    Configuration menu
    Copy the full SHA
    1360a64 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2023

  1. Adds testcases for checking order of lists (#659)

    @dbinkele
    dbinkele committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    9f5f431 View commit details
    Browse the repository at this point in the history

  2. Adds further testcases for checking order of lists (#659)

    @dbinkele
    dbinkele committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    87db59d View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2023

  1. Code cosmetics (#659)

    @dbinkele
    dbinkele committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    6415373 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2023

  1. Fixing some usability glichtes (#659)

    @dbinkele
    dbinkele committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    9dd88c0 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2023

  1. Change the behavior of list merge in Modelmerger (#659)

    @dbinkele
    dbinkele committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    8bb8004 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2023

  1. Change the behavior of list merge in Modelmerger cntd + test (#659)

    @dbinkele
    dbinkele committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    6907bab View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2023

  1. Adds 'Dataflow'-Aspect to 'ModelMergerExpression' (#659)

    @dbinkele
    dbinkele committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    c678458 View commit details
    Browse the repository at this point in the history

  2. Adds ModelMergerTest for checking prefix (#659)

    @dbinkele
    dbinkele committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    6ac7d88 View commit details
    Browse the repository at this point in the history

  3. Altering ModelMergerTest for checking prefix (#659)

    @dbinkele
    dbinkele committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    a941a04 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2023

  1. Comment MetaCollectionManager for readability (#659) 

    The comments illustrate how the merge algorithm is "biased" towards the
right list.
    @HeikoBecker
    HeikoBecker committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    d0a26cc View commit details
    Browse the repository at this point in the history

  2. Updating comment (#659)

    @dbinkele
    dbinkele committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    880960f View commit details
    Browse the repository at this point in the history

  3. Remove bogus comment (#659) 

    Elements are never implicitly dropped.
    @HeikoBecker
    HeikoBecker committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    df330c7 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #660 from JetBrains/feature/Add_Testcases_for_Mode… 

    …lmerger2_involving_list_ordering_#659

Feature/add testcases for modelmerger2 involving list ordering #659
    @dbinkele
    dbinkele authored Oct 17, 2023
    Configuration menu
    Copy the full SHA
    1a3185e View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2023

  1. diagram: handle Ctrl+A when editing a cell inside the diagram

    @slisson
    slisson committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    8d42420 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2023

  1. Fix build and extend functionality of select all plugin function

    @HeikoBecker
    HeikoBecker committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    5c645e7 View commit details
    Browse the repository at this point in the history

  2. Fix catch-all case to properly run select all action

    @HeikoBecker
    HeikoBecker committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    8cb631e View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2023

  1. Fix selectAll-Logic

    @dbinkele
    dbinkele committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    b09332f View commit details
    Browse the repository at this point in the history

  2. fix model import

    @dbinkele
    dbinkele committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    2c08c3f View commit details
    Browse the repository at this point in the history

  3. Merge pull request #688 from JetBrains/diagram-select-all 

    Extend diagrams with a select-all plugin
    @dbinkele
    dbinkele authored Nov 15, 2023
    Configuration menu
    Copy the full SHA
    1cbad8d View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2023

  1. fix(celllayout): additional horizontal cell was generated around opti… 

    …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.
    @slisson
    slisson committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    8c5277a View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2023

  1. Merge pull request #697 from JetBrains/bugfix/unexpected-collection-a… 

    …round-optionals

fix(celllayout): additional horizontal cell was generated around optional cells
    @slisson
    slisson authored Nov 22, 2023
    Configuration menu
    Copy the full SHA
    b20916e View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. Merge remote-tracking branch 'origin/maintenance/mps20211' into featu… 

    …re/cascade_20211_20212_1211
    @alexanderpann
    alexanderpann committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    070fe71 View commit details
    Browse the repository at this point in the history

  2. Run migrations

    @alexanderpann
    alexanderpann committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    166e5d6 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #713 from JetBrains/feature/cascade_20211_20212_1211

    @alexanderpann
    alexanderpann authored Dec 11, 2023
    Configuration menu
    Copy the full SHA
    a6090d8 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/maintenance/mps20212' into featu… 

    …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
    @alexanderpann
    alexanderpann committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    68c4b2a View commit details
    Browse the repository at this point in the history

  5. Update to MPS 2021.3.5

    @alexanderpann
    alexanderpann committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    f59b242 View commit details
    Browse the repository at this point in the history

  6. Update the build script

    @alexanderpann
    alexanderpann committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    780a241 View commit details
    Browse the repository at this point in the history

  7. Update the readme

    @alexanderpann
    alexanderpann committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    718d261 View commit details
    Browse the repository at this point in the history