fix: merge editor conflict action error

[Ricbet]

Types

• 🐛 Bug Fixes

Background or solution

例如: 如果 diff 区域是在编辑器的最后一行，就会出现如下情况

bug.mp4

现在调整了 applyEdits 时的 range 计算方式

bugfix.mp4

Changelog

修复合并编辑器的解决冲突操作不正确的问题

[codecov]

Codecov Report

Base: 57.79% // Head: 57.78% // Decreases project coverage by -0.00% ⚠️

Coverage data is based on head (d59520a) compared to base (42ddd48).
Patch coverage: 22.22% of modified lines in pull request are covered.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #2163      +/-   ##
==========================================
- Coverage   57.79%   57.78%   -0.01%     
==========================================
  Files        1313     1313              
  Lines       82991    83006      +15     
  Branches    17253    17257       +4     
==========================================
+ Hits        47963    47968       +5     
- Misses      31837    31843       +6     
- Partials     3191     3195       +4     

Flag	Coverage Δ
jsdom	52.72% <22.22%> (-0.01%)	⬇️
node	16.52% <0.00%> (-0.01%)	⬇️

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

Impacted Files	Coverage Δ
...ser/contrib/merge-editor/model/document-mapping.ts	58.88% <0.00%> (-2.74%)	⬇️
...owser/contrib/merge-editor/view/actions-manager.ts	14.20% <12.50%> (+0.83%)	⬆️
...trib/merge-editor/view/editors/resultCodeEditor.ts	66.85% <20.00%> (ø)
...c/browser/contrib/merge-editor/model/line-range.ts	72.00% <50.00%> (-1.73%)	⬇️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

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