Reduce errors to warnings when finding missing policies. #1079
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
Reload build scripts from disk
Merge maintenance/mps20232 into master
Merge maintenance/mps20232 into master
Bumps com.jetbrains.mps:mps-prerelease from 241.18034.10078 to 241.18034.10119. --- updated-dependencies: - dependency-name: com.jetbrains.mps:mps-prerelease dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
…s.mps-mps-prerelease-241.18034.10119 build(deps): bump com.jetbrains.mps:mps-prerelease from 241.18034.10078 to 241.18034.10119
Bumps com.jetbrains.mps:mps-prerelease from 241.18034.10119 to 241.18034.10142. --- updated-dependencies: - dependency-name: com.jetbrains.mps:mps-prerelease dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [de.itemis.mps.gradle.launcher](https://github.com/mbeddr/mps-build-backends) from 2.4.2.+ to 2.5.2.107.def8e1d. - [Changelog](https://github.com/mbeddr/mps-build-backends/blob/main/CHANGELOG.md) - [Commits](https://github.com/mbeddr/mps-build-backends/commits) --- updated-dependencies: - dependency-name: de.itemis.mps.gradle.launcher dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
Merge maintenance/mps20232 into master
…s.mps-mps-prerelease-241.18034.10142 build(deps): bump com.jetbrains.mps:mps-prerelease from 241.18034.10119 to 241.18034.10142
…s.gradle.launcher-2.5.2.107.def8e1d build(deps): bump de.itemis.mps.gradle.launcher from 2.4.2.+ to 2.5.2.107.def8e1d
Bumps com.jetbrains.mps:mps-prerelease from 241.18034.10142 to 241.19072.10175. --- updated-dependencies: - dependency-name: com.jetbrains.mps:mps-prerelease dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…s.mps-mps-prerelease-241.19072.10175
…2' into merge/mps20232
to access IDEA's Component and MPS CoreComponent in uniform way, use MPSProject.getComponent()
Use MPS EditorExtension API for replacement.
Bumps com.jetbrains.mps:mps-prerelease from 241.19072.10175 to 241.19072.10217. --- updated-dependencies: - dependency-name: com.jetbrains.mps:mps-prerelease dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
Merge maintenance/mps20243 into master
Merge maintenance/mps20232 into maintenance/mps20241
Merge maintenance/mps20241 into maintenance/mps20243
Merge maintenance/mps20243 into master
…s-prerelease-243.x
…s-prerelease-243.x fix(deps): update dependency com.jetbrains.mps:mps-prerelease to v243.21565.10033
Collaborator
Author
|
I messed up branch from the master, change code that need to merge in 2023.2. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.
For large languages or prototyping it is difficult to define and test merge policies for all concepts at the same time.
After some experiments trying to create default policies, we saw that we could not avoid the definition of merge policy at least for elements found the model, because the identity function must be defined.
As workaround I just reduce errors to warnings when finding missing policies. Additionally I added a flag to indicate an user is interesting to use a partial merge policy, so that some assertions and checks during the merge could be ignored.