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

fix: inline live diff zone range #3810

Merged
merged 2 commits into from
Jun 27, 2024
Merged

fix: inline live diff zone range #3810

merged 2 commits into from
Jun 27, 2024

Conversation

Ricbet
Copy link
Member

@Ricbet Ricbet commented Jun 27, 2024

Types

  • 🐛 Bug Fixes

Background or solution

zone 表示用户选中的代码区域,我们会在这个区域范围内进行流式 diff 渲染

之前的处理方式是采用 monaco 的 decoration 来进行 rang 范围计算,但这种方式偶尔会有问题,会导致流式渲染的区域超过这个 zone 的范围,不仅 diff 的对比不正确,更会导致未选中的代码部分被覆写

现在重新调整了 zone 的计算方式,在每次要 handleEdits 时实时的根据 newFullRangeTextLines 内容长度重新计算 zone

Changelog

修复 inline live 模式下流式 diff 渲染时会出现溢出覆写的情况

@Ricbet Ricbet requested review from erha19 and bytemain June 27, 2024 11:51
Copy link

railway-app bot commented Jun 27, 2024

This PR was not deployed automatically as @Ricbet does not have access to the Railway project.

In order to get automatic PR deploys, please add @Ricbet to the project inside the project settings page.

@opensumi opensumi bot added the 🐞 bug Something isn't working label Jun 27, 2024
Copy link

codecov bot commented Jun 27, 2024

Codecov Report

Attention: Patch coverage is 0% with 1 line in your changes missing coverage. Please review.

Project coverage is 55.09%. Comparing base (07a6f8a) to head (1c80241).

Files Patch % Lines
...rowser/widget/inline-diff/inline-diff-previewer.ts 0.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3810      +/-   ##
==========================================
+ Coverage   55.08%   55.09%   +0.01%     
==========================================
  Files        1550     1550              
  Lines       94559    94558       -1     
  Branches    19363    19371       +8     
==========================================
+ Hits        52085    52095      +10     
+ Misses      35277    35268       -9     
+ Partials     7197     7195       -2     
Flag Coverage Δ
jsdom 50.53% <0.00%> (+0.01%) ⬆️
node 15.56% <0.00%> (+<0.01%) ⬆️

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

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Ricbet Ricbet merged commit 84252e2 into main Jun 27, 2024
12 checks passed
@Ricbet Ricbet deleted the fix/inline-stream-diff-zone branch June 27, 2024 12:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🐞 bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants