feat: support merge editor minimap #2859
Merged
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.
Types
Background or solution
🤖 Generated by Copilot at 2b5c53b
onDidMount
event toMergeEditorService
class to emit editor references (link, link, link)IEditorMountParameter
type to store editor references (link)IEditorMountParameter
type andBaseCodeEditor
class in./types
and./merge-editor.service.ts
(link, link)MiniMap
component to show overview of changes in code editors (link)MiniMap
component inGrid
component for current and incoming editors (link, link, link)padding-left
style from.editor_container_arrange
class to align editors and mini maps (link)./view/merge-editor.module.less
(link)Changelog
🤖 Generated by Copilot at 2b5c53b
Added mini maps to the merge editor view to show the merge changes in both the current and the incoming code editors. Introduced a new event and a new type in the
MergeEditorService
to expose and represent the code editors. Updated the styles and layout of the merge editor view to accommodate the mini maps.