Remember computed content type in CompareConfiguration #1294
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
Remember detected content type id in CompareConfiguration with the CONTENT_TYPE key. This value can be picked up as a hint by TextMergeViewer implementations (like GenericEditorMergeViewer) that need to know which content type was detected by compare editor. Most TextMergeViewer implementations don't need that hint because they aren't generic and usually always know which content type they will have - not so for GenericEditorMergeViewer which is generic. The hint allows GenericEditorMergeViewer to know for which content type was it actually created and so use that in cases where the content type can't be always derived from the input (like data from git revisions that don't have regular files or buffers associated to the viewer). See eclipse-platform/eclipse.platform.ui#1747
iloveeclipse
added a commit
to iloveeclipse/eclipse.platform.ui
that referenced
this pull request
Apr 8, 2024
Detected content type id could be retrieved now from the CompareConfiguration with the CONTENT_TYPE key (see eclipse-platform/eclipse.platform#1294). Use this value (if available) as fallbackContentTypes in ExtensionBasedTextViewerConfiguration. The allows GenericEditorMergeViewer to know for which content type was it actually created and so use that in cases where the content type can't be derived from the input (like data from git revisions that don't have regular files or buffers associated to the viewer). Fixes eclipse-platform#1747
iloveeclipse
added a commit
to eclipse-platform/eclipse.platform.ui
that referenced
this pull request
Apr 9, 2024
Detected content type id could be retrieved now from the CompareConfiguration with the CONTENT_TYPE key (see eclipse-platform/eclipse.platform#1294). Use this value (if available) as fallbackContentTypes in ExtensionBasedTextViewerConfiguration. The allows GenericEditorMergeViewer to know for which content type was it actually created and so use that in cases where the content type can't be derived from the input (like data from git revisions that don't have regular files or buffers associated to the viewer). Fixes #1747
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.
Remember detected content type id in CompareConfiguration with the CONTENT_TYPE key. This value can be picked up as a hint by TextMergeViewer implementations (like GenericEditorMergeViewer) that need to know which content type was detected by compare editor.
Most TextMergeViewer implementations don't need that hint because they aren't generic and usually always know which content type they will have
The hint allows GenericEditorMergeViewer to know for which content type was it actually created and so use that in cases where the content type can't be always derived from the input (like data from git revisions that don't have regular files or buffers associated to the viewer).
See eclipse-platform/eclipse.platform.ui#1747