Skip to content

feat: improve conflict action#2082

Merged
Ricbet merged 8 commits intofeat/implement-3-way-editorfrom
chore/improve-edits-diff-range
Dec 14, 2022
Merged

feat: improve conflict action#2082
Ricbet merged 8 commits intofeat/implement-3-way-editorfrom
chore/improve-edits-diff-range

Conversation

@Ricbet
Copy link
Copy Markdown
Member

@Ricbet Ricbet commented Dec 14, 2022

Types

  • 🎉 New Features
  • 💄 Style Changes
  • 🪚 Refactors

Background or solution

  • 修复 decoration 重复渲染的问题（渲染的时候对 document mapping 里的数据去重）
  • 将 pushEditOperations 替换成 applyEdits，暂时不处理文档文本 undo 和 redo 的情况（放在第二期）
  • 将 conflict actions 的图标渲染和 decoration diff 区域的渲染分开处理，减少不必要的重复渲染计算
  • 修复执行 revoke 之后两边的 diff 区域颜色状态不正确的问题
  • 新增 accept append 操作，如果某一块区域两边都有 diff 变更的时候，此时执行某一视图的 accept current 后，另一视图的图标应该发生改变，且操作后是 append 代码内容而不是覆写内容
    e.g
    image
  • 将 sameRange 变量统一改成 oppositeRange 变量，更符合语义

Changelog

改进解决冲突的各种操作交互

@Ricbet Ricbet requested review from Aaaaash, erha19 and hacke2 December 14, 2022 07:56
@Ricbet Ricbet self-assigned this Dec 14, 2022
@github-actions github-actions Bot added the 🎨 feature feature required label Dec 14, 2022
@Ricbet Ricbet merged commit d691c48 into feat/implement-3-way-editor Dec 14, 2022
@Ricbet Ricbet deleted the chore/improve-edits-diff-range branch December 14, 2022 08:06
@Ricbet Ricbet mentioned this pull request Dec 15, 2022
Closed
Ricbet added a commit that referenced this pull request Dec 19, 2022
@Ricbet
feat: improve conflict action (#2082)
01a14d2 
* 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
Ricbet added a commit that referenced this pull request Dec 20, 2022
@Ricbet
feat: improve conflict action (#2082)
455d837 
* 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
Ricbet added a commit that referenced this pull request Dec 20, 2022
@Ricbet
feat: improve conflict action (#2082)
4d1b890 
* 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
Ricbet added a commit that referenced this pull request Dec 21, 2022
@Ricbet
feat: improve conflict action (#2082)
37700ad 
* 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
Ricbet added a commit that referenced this pull request Dec 22, 2022
@Ricbet
feat: improve conflict action (#2082)
189a24b 
* 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
Ricbet added a commit that referenced this pull request Dec 27, 2022
@Ricbet
feat: improve conflict action (#2082)
a8e20c6 
* 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
Ricbet added a commit that referenced this pull request Dec 28, 2022
@Ricbet
feat: improve conflict action (#2082)
b306bf2 
* 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
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

@Aaaaash Aaaaash Aaaaash approved these changes

@hacke2 hacke2 Awaiting requested review from hacke2

@erha19 erha19 Awaiting requested review from erha19

Assignees

@Ricbet Ricbet

Labels

🎨 feature feature required

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Ricbet @Aaaaash