Skip to content

feat: show title head info & implement the apply actions#2095

Merged
Ricbet merged 5 commits intofeat/implement-3-way-editorfrom
feat/improve-merge-editor
Dec 19, 2022
Merged

feat: show title head info & implement the apply actions#2095
Ricbet merged 5 commits intofeat/implement-3-way-editorfrom
feat/improve-merge-editor

Conversation

@Ricbet
Copy link
Copy Markdown
Member

@Ricbet Ricbet commented Dec 19, 2022 •
edited
Loading

Types

  • 🎉 New Features
  • 🐛 Bug Fixes

Background or solution

  • 修复上下滚动视图时的顿感问题
  • 修复点击 conflict action 操作后视图页面会滚动的问题
  • 修复切换 tab 后，decoration 状态会重复渲染的问题
  • 新增 title head 展示
    image
  • 实现 apply 操作，点击后将 result 视图的代码覆写到真实的本地磁盘文件，表示冲突已解决完成
Kapture.2022-12-19.at.13.57.39.mp4

Changelog

新增 title head 展示分支信息和 commit 以及新增 apply 按钮

@Ricbet Ricbet requested review from Aaaaash, erha19 and hacke2 December 19, 2022 03:11
@github-actions github-actions Bot added 🎨 feature feature required 🐞 bug Something isn't working labels Dec 19, 2022
@Ricbet Ricbet changed the title WIP: feat: implement title head & fix scroll & keep view state feat: implement title head & fix scroll & keep view state Dec 19, 2022
@Ricbet Ricbet changed the title feat: implement title head & fix scroll & keep view state feat: show title head info & implement the apply actions Dec 19, 2022
erha19
erha19 requested changes Dec 19, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@erha19 erha19 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

另外，这个功能是不是加一个默认开启的开关配置？ @Ricbet

Comment thread packages/core-browser/src/monaco/merge-editor-widget.ts Outdated
Comment thread packages/core-browser/src/monaco/merge-editor-widget.ts Outdated
@Ricbet Ricbet self-assigned this Dec 19, 2022
@Ricbet
Copy link
Copy Markdown
Member Author

Ricbet commented Dec 19, 2022

另外，这个功能是不是加一个默认开启的开关配置？ @Ricbet

是有一个开关的，git.experimental.mergeEditor 这个配置项

@Ricbet Ricbet merged commit 1ee12c1 into feat/implement-3-way-editor Dec 19, 2022
@Ricbet Ricbet deleted the feat/improve-merge-editor branch December 19, 2022 07:02
@Ricbet Ricbet mentioned this pull request Dec 19, 2022
Closed
Ricbet added a commit that referenced this pull request Dec 19, 2022
@Ricbet
feat: show title head info & implement the apply actions (#2095)
72233f7 
* feat: implement title head & fix scroll & keep view state

* feat: implement apply action

* fix: time machine record

* docs: apply button i18n

* chore: improve code
Ricbet added a commit that referenced this pull request Dec 20, 2022
@Ricbet
feat: show title head info & implement the apply actions (#2095)
6a2ff30 
* feat: implement title head & fix scroll & keep view state

* feat: implement apply action

* fix: time machine record

* docs: apply button i18n

* chore: improve code
Ricbet added a commit that referenced this pull request Dec 20, 2022
@Ricbet
feat: show title head info & implement the apply actions (#2095)
e3304f4 
* feat: implement title head & fix scroll & keep view state

* feat: implement apply action

* fix: time machine record

* docs: apply button i18n

* chore: improve code
Ricbet added a commit that referenced this pull request Dec 21, 2022
@Ricbet
feat: show title head info & implement the apply actions (#2095)
ce54eff 
* feat: implement title head & fix scroll & keep view state

* feat: implement apply action

* fix: time machine record

* docs: apply button i18n

* chore: improve code
Ricbet added a commit that referenced this pull request Dec 22, 2022
@Ricbet
feat: show title head info & implement the apply actions (#2095)
d183100 
* feat: implement title head & fix scroll & keep view state

* feat: implement apply action

* fix: time machine record

* docs: apply button i18n

* chore: improve code
Ricbet added a commit that referenced this pull request Dec 27, 2022
@Ricbet
feat: show title head info & implement the apply actions (#2095)
4fdb9c3 
* feat: implement title head & fix scroll & keep view state

* feat: implement apply action

* fix: time machine record

* docs: apply button i18n

* chore: improve code
Ricbet added a commit that referenced this pull request Dec 28, 2022
@Ricbet
feat: show title head info & implement the apply actions (#2095)
2881790 
* feat: implement title head & fix scroll & keep view state

* feat: implement apply action

* fix: time machine record

* docs: apply button i18n

* chore: improve code
erha19 pushed a commit that referenced this pull request Dec 28, 2022
@Ricbet @Aaaaash
feat: implement 3-way prototyping code (#1960)
f5edfd7 
* feat: implement 3-way prototyping code

* feat: implement compute diff

* feat: add underline widget

* fix: context key service error

* feat: improve code & implement 3 editor model

* chore: improve code & implement render different color

* chore: improve code

* chore: implement scroll change sync

* chore: improve code

* feat: implement inner changes decoration render (#1987)

* fix: result editor view line widget render error

* feat: implement inner changes char decoration render

* chore: improve code

* refactor: merge editor cyrcle deps (#1992)

* refactor: merge editor cyrcle deps

* fix: model

* feat: implement stickiness connect effect (#1994)

* feat: draw stickiness connect piece

* feat: implement stickiness-connect move position

* chore: rebase

* chore: improve code & fix zonewidget

* chore: improve code

* feat: alternate margin and code view (#1995)

* feat: render conflict actions (#2002)

* feat: implement conflict actions base code

* chore: improve code

* feat: implement conflict actions operations (#2014)

* feat: implement conflict actions operations

* feat: implement conflict actions operations

* refactor: decorations type

* fix: conflict-actions

* chore: improve code

* refactor: document mapping

* chore: rename type

* chore: add note

* fix: type

* feat: implement conflict ignore actions operations (#2031)

* feat: implement conflict ignore actions operations

* chore: remove useless file

* feat: implement dashed decorations render (#2033)

* feat: implement dashed line render

* chore: improve code

* feat: implement editing result view code update range mapping (#2042)

* fix: render dashed in accept current conflict

* feat: implement editing result view code update range mapping

* fix: result editor view update decorations

* style: beauty merge editor diff range (#2046)

* feat: implement revoke conflict actions (#2065)

* refactor: conflict actions

* feat: result view editor conflict action render

* chore: add revoke icon

* feat: implement revoke actions

* fix: delta edits

* feat: implement contiguous region merge range (#2076)

* refactor: diff line range render

* feat: improve diff merge range render

* chore: improve code

* feat: implement accept combination conflict actions (#2079)

* feat: implement accept combination render

* feat: implement accept combination actions

* chore: improve mark complete code

* chore: improve code

* feat: improve conflict action (#2082)

* fix: turn direction status

* fix: range touch condition

* chore: improve actions update render & fix revoke actions

* feat: implement append action render & fix mapping data

* chore: rename sameRange symbol

* style: improve append icon

* feat: implement accept append action

* chore: remove console

* fix: merge editor options (#2038)

* fix: merge editor options

* fix: merge editor options

Co-authored-by: qingyi.xjh <qingyi.xjh@antgroup.com>

* fix: accept combination apply edits error (#2085)

* fix: accept combination apply edits error

* chore: improve code

* feat: support open from git scm (#2094)

* feat: show title head info & implement the apply actions (#2095)

* feat: implement title head & fix scroll & keep view state

* feat: implement apply action

* fix: time machine record

* docs: apply button i18n

* chore: improve code

* fix: ci

* fix: add merge editor mock test

* fix: ci

* style: use css module (#2101)

* fix: e2e test

* chore: add test

* chore: add tst

Co-authored-by: 大表哥 <xubing.bxb@alibaba-inc.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@erha19 erha19 erha19 approved these changes

@Aaaaash Aaaaash Aaaaash approved these changes

@hacke2 hacke2 Awaiting requested review from hacke2

Assignees

@Ricbet Ricbet

Labels

🐞 bug Something isn't working 🎨 feature feature required

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Ricbet @erha19 @Aaaaash