Skip to content

Comments

[pull] main from microsoft:main#897

Merged
pull[bot] merged 8 commits intocode:mainfrom
microsoft:main
Feb 5, 2026
Merged

[pull] main from microsoft:main#897
pull[bot] merged 8 commits intocode:mainfrom
microsoft:main

Conversation

@pull
Copy link

@pull pull bot commented Feb 5, 2026

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

alexdima and others added 8 commits February 5, 2026 09:29
…e processed immediately (#292846)

* Refactor view model to directly receive model events

Simplify how the view model receives and processes model events by establishing a more direct connection between the model and view model layers.

Co-authored-by: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>

* Fix post-merge errors

* Add jsdoc comments

* Fix cursor position during undo/redo with immediate viewModel events

Pass resultingSelection through the call chain during undo/redo:
- _applyUndoRedoEdits -> _doApplyEdits -> _emitContentChangedEvent

This ensures viewModels receive the correct cursor selection immediately
when processing content changes, rather than falling back to marker
recovery which places the cursor at the end of inserted text.

Fixes issue #42783

* Update src/vs/editor/test/browser/viewModel/viewModelImpl.test.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update src/vs/editor/test/common/model/model.test.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Fix formatting

---------

Co-authored-by: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…9457)

* vscode-dts: Add LineCommentConfig interface & update lineComment

* rename config to rule

---------

Co-authored-by: Aiday Marlen Kyzy <aidaymarlenkyzy@gmail.com>
Revert "fix: associate extHost lifecycle to window (#292672)"

This reverts commit b22bccf.
* do not update agent status inicator bg color when debugging

* actually this

* Add themeable agentStatusIndicator.background color to avoid debug override (#292944)

* Initial plan

* Add themeable agentStatusIndicator.background color to avoid debug override

Co-authored-by: joshspicer <23246594+joshspicer@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: joshspicer <23246594+joshspicer@users.noreply.github.com>

* update known variables

---------

Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
* Fix typo: accomodate -> accommodate

Fix spelling of "accommodate" in comments across multiple files:
- src/vs/editor/common/viewLayout/viewLayout.ts
- src/vs/platform/files/node/watcher/parcel/parcelWatcher.ts
- src/vs/workbench/common/editor/editorGroupModel.ts

* fix: close file handle in getOSReleaseInfo to prevent resource leak

The FileHandle opened for reading os-release files was never closed,
which could lead to file descriptor leaks. Added a finally block to
ensure the handle is properly closed regardless of success or error.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
@pull pull bot locked and limited conversation to collaborators Feb 5, 2026
@pull pull bot added the ⤵️ pull label Feb 5, 2026
@pull pull bot merged commit f696579 into code:main Feb 5, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants