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.

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

feat: support merge editor minimap #2859

Merged
merged 2 commits into from
Jul 12, 2023
Merged

Conversation

Ricbet
Copy link
Member

@Ricbet Ricbet commented Jun 30, 2023

Types

  • 🎉 New Features

Background or solution

🤖 Generated by Copilot at 2b5c53b

  • Add onDidMount event to MergeEditorService class to emit editor references (link, link, link)
  • Define IEditorMountParameter type to store editor references (link)
  • Import IEditorMountParameter type and BaseCodeEditor class in ./types and ./merge-editor.service.ts (link, link)
  • Implement MiniMap component to show overview of changes in code editors (link)
  • Import and render MiniMap component in Grid component for current and incoming editors (link, link, link)
  • Remove padding-left style from .editor_container_arrange class to align editors and mini maps (link)
  • Add styles for mini map components and children elements in ./view/merge-editor.module.less (link)
  • 支持在 minimap 里显示未解决的操作相对位置

image

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.

@Ricbet Ricbet requested review from hacke2, erha19, bytemain and Aaaaash June 30, 2023 08:02
@Ricbet Ricbet self-assigned this Jun 30, 2023
@codecov
Copy link

codecov bot commented Jun 30, 2023

Codecov Report

Patch coverage: 100.00% and no project coverage change.

Comparison is base (2bf2b3b) 57.62% compared to head (2b5c53b) 57.62%.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #2859   +/-   ##
=======================================
  Coverage   57.62%   57.62%           
=======================================
  Files        1336     1336           
  Lines       83975    83978    +3     
  Branches    17462    17462           
=======================================
+ Hits        48390    48394    +4     
+ Misses      32342    32341    -1     
  Partials     3243     3243           
Flag Coverage Δ
jsdom 52.65% <100.00%> (+<0.01%) ⬆️
node 16.78% <25.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...s/monaco/src/browser/contrib/merge-editor/types.ts 100.00% <ø> (ø)
...owser/contrib/merge-editor/merge-editor.service.ts 65.89% <100.00%> (+0.81%) ⬆️

... and 1 file with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@erha19 erha19 merged commit 55b3283 into main Jul 12, 2023
@erha19 erha19 deleted the feat/support-merge-editor-minimap branch July 12, 2023 07:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants