Fix tests expecting TextMergeViewer class only #1283
Merged
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
TextMergeViewer was expected by SaveableCompareEditorInputTest but more specific implementation (subclass of it) - GenericEditorMergeViewer was seen by the test after changes made to allow more specific viewer to "win" in the compare editor for text content. See eclipse-platform/eclipse.platform.ui#1747 See eclipse-platform#1277
|
Thanks! |
|
The only issue I see is unrelated: |
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.
TextMergeViewer was expected by SaveableCompareEditorInputTest but more specific implementation (subclass of it) - GenericEditorMergeViewer was seen by the test after changes made to allow more specific viewer to "win" in the compare editor for text content.
See eclipse-platform/eclipse.platform.ui#1747
See #1277