-
Notifications
You must be signed in to change notification settings - Fork 347
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: disable minimap for diffEditor #2956
Conversation
ChatGPT Code Review: 根据提交的代码和描述,我对代码进行了审查和修改建议,并描述了代码的功能。 修改建议:
代码功能:
|
Codecov ReportPatch coverage:
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
Flags with carried forward coverage won't be shown. Click here to find out more.
☔ View full report in Codecov by Sentry. |
84eeb3f
to
df07c51
Compare
/next |
🎉 PR Next version 2.26.3-next-1690853207.0 publish successful! You can install this version via
|
Types
Background or solution
editorCollectionService 中将 DiffEditor 中左右两侧的 CodeEditor 包装为 DiffEditorPart,并在一些情况下更新它们的 options,这会将 CodeEditor 的 options 错误的更新到 DiffEditor 中,导致即使 monaco 内部已经在创建 DiffEditor 时关闭了 minimap,也会因为这段逻辑在一些情况下自动开启 minimap。
解决方式是根据 EditorType 区分不同的设置项,对于这种可能混淆的情况,新增了 diffEditor 的自定义配置项,在应用时会自动转换为 editor 配置
🤖 Generated by Copilot at 3f87b17
diffOptions
witheditorOptions
when editor type is greater thanEditorType.CODE
ineditor-collection.service.ts
(link)diffEditor.minimap
preference inconverter.ts
andschema.ts
(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
, andschema.ts
files to handle thediffOptions
,diffEditor.minimap
preference, and the minimap option of the Monaco editor.