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

Merge 1.85 from upstream #1929

Merged
merged 1,413 commits into from
Dec 9, 2023
Merged

Merge 1.85 from upstream #1929

merged 1,413 commits into from
Dec 9, 2023

Conversation

jmcphers
Copy link
Collaborator

@jmcphers jmcphers commented Dec 7, 2023

Adopts VS Code 1.85 from upstream.

Aside from the usual merge conflicts, the most notable change here is due to the new floating windows feature: the LayoutService no longer has a single container. I've updated our references to the layout container element to refer to the main window where appropriate.

benibenj and others added 30 commits November 24, 2023 09:38
Updated Title Toolbar Zoom Condition
There are no commenting ranges at the current position.
Fixes #196951
Increase the target of Monaco from es6 to es2018
* Revert "merge theme rules for css/less/scss variables (#197657)"

This reverts commit cc08867.

* Revert "Adopt Better-Less grammar (#197557)"

This reverts commit ce40e7c.
* wip

* add yet another live mode which is live and live preview...

* use `renderLines` and view zones for orginal contents, render accept, discard, and compare in line

* remove LiveStrategy2 again

* render insertion diff as progressive changes happen

* implement discard

* implement explicit accept via button and implict accept via typing inside changes

* merge diff changes that are somewhat near

* pass zone, not just widget to strategies

* add `IEditorDecorationsCollection#append`

* move live3 actions into widget, don't render normal accept, discard, allow strategry to trigger accept, discard flows

* cleanup

* make sure re-run works
add azure kuberneetes service to workspace tags
fix: load data urls with fetch instead of using file service

Co-authored-by: Loïc Mangeonjean <[email protected]>
#194188 Implement auto update by extension
* fix up wholerange with diff information once all edits are there

* update summary when having changes across ranges
deepak1556 and others added 28 commits December 1, 2023 13:50
* chore: update builds for [email protected]

* chore: bump distro
Schedule animation frame runners in each editor's window (fixes #199868)
aux window - fix web (#199836)
aux window - track input focus properly (#199729)
aux window - fix action context for move/copy
* improve async data tree default collapsed state computation

fixes #199441

* unset forceExpanded flag
…tDynamicVariableModel')" (#199876)

Fix #199818
ensure hover is focused if we show accessible view hint is included
Get tooltip to show when navigating between ActionBar sections
on left/right arrow, also update focused elt
Revert: Allow non-AI actions on empty lines (for 1.85)
@jmcphers jmcphers merged commit b019bdd into main Dec 9, 2023
1 check passed
@wesm wesm deleted the merge/1.85.0 branch March 15, 2024 18:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.