fix: disable minimap for diffEditor

[Aaaaash]

Types

• 🐛 Bug Fixes

Background or solution

editorCollectionService 中将 DiffEditor 中左右两侧的 CodeEditor 包装为 DiffEditorPart，并在一些情况下更新它们的 options，这会将 CodeEditor 的 options 错误的更新到 DiffEditor 中，导致即使 monaco 内部已经在创建 DiffEditor 时关闭了 minimap，也会因为这段逻辑在一些情况下自动开启 minimap。

解决方式是根据 EditorType 区分不同的设置项，对于这种可能混淆的情况，新增了 diffEditor 的自定义配置项，在应用时会自动转换为 editor 配置

🤖 Generated by Copilot at 3f87b17

• Add support for diff editor feature that allows comparing two files side by side (link, link, link)

• Merge diffOptions with editorOptions when editor type is greater than EditorType.CODE in editor-collection.service.ts (link)
• Add converter and schema for diffEditor.minimap preference in converter.ts and schema.ts (link, link)
• Allow user to enable or disable minimap for diff editor through preference (link, link)

Changelog

🤖 Generated by Copilot at 3f87b17

This pull request adds support for the diff editor feature that allows comparing two files side by side. It modifies the editor-collection.service.ts, converter.ts, and schema.ts files to handle the diffOptions, diffEditor.minimap preference, and the minimap option of the Monaco editor.

[opensumi]

ChatGPT Code Review:

根据提交的代码和描述，我对代码进行了审查和修改建议，并描述了代码的功能。

修改建议：

• 在 editor-collection.service.ts 文件中的第 345 行，将 editorOptions 改为 editorOptions = basicEditorOptions。
• 在 editor-collection.service.ts 文件中的第 348 行，将 editorOptions = { ...editorOptions, ...options.diffOptions } 改为 editorOptions = { ...editorOptions, ...options.editorOptions, ...options.diffOptions }。

代码功能：

• 在 Monaco 编辑器中添加了支持两个文件进行对比的 diff 编辑器功能。
• 修改了 editor-collection.service.ts、converter.ts 和 schema.ts 文件以处理 diffOptions、diffEditor.minimap 设置和 Monaco 编辑器的小地图选项。

[codecov]

Codecov Report

Patch coverage: 75.00% and no project coverage change.

Comparison is base (0e433a4) 57.62% compared to head (df07c51) 57.63%.

Additional details and impacted files

@@           Coverage Diff           @@
##            v2.26    #2956   +/-   ##
=======================================
  Coverage   57.62%   57.63%           
=======================================
  Files        1337     1337           
  Lines       84150    84154    +4     
  Branches    17489    17490    +1     
=======================================
+ Hits        48491    48501   +10     
+ Misses      32408    32403    -5     
+ Partials     3251     3250    -1     

Flag	Coverage Δ
jsdom	52.64% <75.00%> (+<0.01%)	⬆️
node	16.80% <0.00%> (-0.01%)	⬇️

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

Files Changed	Coverage Δ
packages/editor/src/browser/preference/schema.ts	100.00% <ø> (ø)
...es/editor/src/browser/editor-collection.service.ts	65.65% <66.66%> (+<0.01%)	⬆️
...ackages/editor/src/browser/preference/converter.ts	90.54% <100.00%> (+0.12%)	⬆️

... and 1 file with indirect coverage changes

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

[Aaaaash]

/next

[opensumi]

🎉 PR Next version 2.26.3-next-1690853207.0 publish successful! You can install this version via npm install package@2.26.3-next-1690853207.0

2.26.3-next-1690853207.0