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 overwrite when editor save #2846

Merged
merged 1 commit into from
Jun 28, 2023
Merged

Conversation

winjo
Copy link
Contributor

@winjo winjo commented Jun 28, 2023

Types

  • 🎉 New Features

Background or solution

🤖 Generated by Copilot at 5fdda6f

  • Add a new option to overwrite the document when saving conflicts occur (link, link, link)
    • Modify the message service call in editor-document-model.ts to handle the overwrite option and pass it to the document service (link)
    • Add the 'Overwrite' option to the localization bundles in en-US.lang.ts and zh-CN.lang.ts (link, link)

Changelog

🤖 Generated by Copilot at 5fdda6f

Add an option to overwrite the document when saving conflicts occur. Update the localization bundles for English and Chinese to include the new option.

截屏2023-06-28 11 44 41 保存内容时如果和磁盘文件内容有差异,提供直接覆盖的按钮 close #2470

@winjo winjo requested a review from Ricbet June 28, 2023 03:50
@opensumi opensumi bot added the 🎨 feature feature required label Jun 28, 2023
@codecov
Copy link

codecov bot commented Jun 28, 2023

Codecov Report

Patch coverage has no change and project coverage change: -0.02 ⚠️

Comparison is base (056e778) 57.67% compared to head (5fdda6f) 57.66%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2846      +/-   ##
==========================================
- Coverage   57.67%   57.66%   -0.02%     
==========================================
  Files        1336     1336              
  Lines       83923    83927       +4     
  Branches    17455    17456       +1     
==========================================
- Hits        48402    48394       -8     
- Misses      32285    32296      +11     
- Partials     3236     3237       +1     
Flag Coverage Δ
jsdom 52.68% <0.00%> (-0.02%) ⬇️
node 16.78% <0.00%> (-0.01%) ⬇️

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

Impacted Files Coverage Δ
...tor/src/browser/doc-model/editor-document-model.ts 55.21% <0.00%> (-0.69%) ⬇️
packages/i18n/src/common/en-US.lang.ts 100.00% <ø> (ø)
packages/i18n/src/common/zh-CN.lang.ts 100.00% <ø> (ø)

... and 3 files 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.

@winjo winjo merged commit ece937c into main Jun 28, 2023
@winjo winjo deleted the feat/editor-diff-overwrite branch June 28, 2023 05:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🎨 feature feature required
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[FEATURE] 与磁盘文件比较时提供 "覆写" 操作
2 participants