Skip to content

[pull] main from microsoft:main #381

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

Merged
merged 17 commits into from
Jul 17, 2025
Merged

[pull] main from microsoft:main #381

merged 17 commits into from
Jul 17, 2025

Conversation

pull[bot]
Copy link

@pull pull bot commented Jul 17, 2025

See Commits and Changes for more details.


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

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

andy0130tw and others added 17 commits July 16, 2025 21:38
* Fix advanced line wrap if decorations are present

Decorations may affect line wrapping. For example, they make make the
text bold, or increase or decrease font size. This wasn’t originally
taken into account to calculate the the break offsets.

* Support dynamic line heights using decorations

* fixing compiler errors

* placing tests in block comment

* adding logs

* limiting amount of logging

* changikng the font size and the line height directly in the code

* wip

* wip

* removing monaco editor related code

* wip

* wip

* wip

* adding wip

* setting doc as internal

* pushing to text to the bottom

* adding support for font size

* placing at the end

* fixing tests

* adding likne height setting

* adding comments

* adding todo

* overriding the font size in sticky scroll

* making sticky scroll also use the editor lines heights

* updating sticky scroll on decoration change, investigating lines

* removing changes for font size, focusing on line height changes

* adding code

* adding css changes to position text at the bottom

* adding also the chnages for demo

* adding code

* making content widgets correctly position themselves

* adding css changes to sticky scroll

* adding more methods

* adding code

* polishing

* adding code

* polishing

* adding css to sticky scroll

* fixing bug

* remove testing code

* fixing tests

* removing extension surfacing

* removing part of doc string

* removing line height from renderLineInput

* directly getting the line heights from the view context, not the viewport data

* remove special line heights from the viewModel

* adding new events for line height changes

* adding back line height into renderLineInput

* wip

* polishing

* refactore viewmodelimpl

* updating the special line height listener on model change

* clearing when model is not defined

* take into account line height in ime

* fixing the offset error

* adding height

* making the decorations render full height

* take into account line height in cursor

* fixes the context menu not showing at the correct position

* centering the folding icon

* line height

* adding code in order to continue investigation

* Revert "adding code in order to continue investigation"

This reverts commit 1a44ac3.

* updating the line heights on editing

* using view positions instead of model

* fixing compiler error

* surfacing through editor

* adding code

* adding code

* adding beginning of code

* adding code

* adding code

* adding code which commits and recaclulates the data

* allowing to insert or change a special line height

* polishing

* adding logs

* separating the logic of user insertion/deletion and decoration changes

* adding code for testing

* fixing runtime errors

* adding code

* adding elements before invalid index

* fixing indices

* adding code

* removing console logs

* adding code

* removing logs in file

* adding changes to sticky lines

* fixing line insertion

* updating correctly on insert and on delete

* adding code to send initial edit

* adding code

* fixing insertion

* adding edits

* adding content changes

* updating the indices

* polishing

* differentiating between case when actually lines are deleted and when not

* modified code for deletion to take into account new special maximum height

* fixing the indices

* adding code

* adding fix

* changing the insertion logic

* removing logs

* removing logs

* removing code that removes the decorations

* setting correct line height

* removing line height from RenderLineInput

* cleaning

* converting to string

* undoing css change, setting line height also on the folding icon

* set line height in the renderLine method

* polishing

* polishing

* changing deletion logic

* adding code to test

* removing testing code

* fixing candidate

* polishing

* adding font infos

* polishing

* adding remaining values of barefontinfo

* =choosing right line for rendering depending on if there is a special font on the given line

* rewriting font decoration logic

* setting different border for testing

* fixing scroll top

* set variable to make the font size never be larger than the line height

* adding code which sets the font size of the ghost text

* adding overflow hidden in order to fix the font size overfkiw

* updating widget height using the height of the rendered sticky lines

* aligning items in the center

* =fetching the correct font info

* computing the correct left position depending on the font siue within the div

* placing the text area also so the text aligns

* adding check so inline completions are always visible

* adding wip

* using same structure as line heights

* fixing errors

* polishing

* wip

* adding code for insert

* =refactoring

* investigating the line breaks

* save break data

* adding code to determine line breaks based on font info

* wip

* removing code because will use other approach

* adding logs

* adding back logic for font decorations on text model

* using the renderViewLine code for the line breaks

* wip

* adding monaco.ts changes

* fixing merge issues

* making line breaks work

* dom breaking now works

* adding code to reflect font info changes in the custom font manager

* using other rendering tactic

* adding code to rerender the line type

* adding code

* removing custom font manager

* using model line number instead in the constructLines method

* using model line number also for model whitespaces

* adding code in order to make the native edit context show also the same rendered line for the screen readers

* setting the correct range

* resetting the code for text area edit context and disabling custom fonts when text area is used

* cleaning the code a bit

* wip

* making the screen reader support use the font sizes from the rendered view line

* screen reader

* wip

* wip

* wip

* wip

* wip

* adding renderwhitespace from editor config

* wip

* remove the code for font

* adding code

* wip

* fetching the relevant font size in the text area code

* adding code from other pr

* wip

* writing screen reader content

* adding code

* using character mapping inthe dom line breaks computer

* wip

* removing accessibility service check

* =wip

* wip

* wip

* adding wip

* wip

* wip

* wip

* wip

* wip

* fixing bug

* adding logs

* wip

* adding code

* adding code

* wip

* wip

* adding code

* updating the editor options

* wip

* wip

* wip

* wip

* wip

* wip

* refactoring

* wip

* wip

* wip

* wip

* polish

* polish

* adding method for updating scroll top

* chaing option

* removing included value

* setting propperty

* Add new member to equality

* Avoid memory leaks

* Make sure `_accessibilityPageSize` is initialised

* Ensure _accessibilityPageSize gets initialized

* Simplify code

* Fix NPE

* Clamp lines to line count

* Do not turn on `renderRichScreenReaderContent` by default until we test it

* Add explicit reference to ISimpleModel in the IViewModel

---------

Co-authored-by: Remco Haszing <[email protected]>
Co-authored-by: Alexandru Dima <[email protected]>
Pick up TS 5.9-beta for built-in support
* Basic functionality of adding worktree

* Code refactoring and clean up

* Remove accidentally added submodules

* Specify folder destination

* Remove default worktree path, always prompt for destination instead

* create worktree only displayed in repo's worktree subcommands

* Git - handle another error condition when detecting worktrees (#256278)

* Rework creating worktree flow

* Include worktree name placeholder

---------

Co-authored-by: Ladislau Szomoru <[email protected]>
…argument-in-tsserver-web

Support the locale argument of TypeScript language server on the web version (#256252)
Makes the `userSelectedTools` passed into the chat agent service
observable such that the tools of the ongoing request update as new
tools come in. The benefit of this versus other (previous) approaches
is that it reflects the enablement/disablement state of the picker
(which is likely to get additional controls in the future) and works
without special tagging.

@roblourens / @DonJayamanne I think with this we can get rid of

https://github.com/microsoft/vscode-copilot-chat/blob/0d6f5516d2fef455340228fd7bc34a4f501725d3/src/extension/tools/vscode-node/toolsService.ts#L118-L122

which was added for Jupyter iirc.

Closes #254684
@pull pull bot locked and limited conversation to collaborators Jul 17, 2025
@pull pull bot added the ⤵️ pull label Jul 17, 2025
@pull pull bot merged commit d86855a into zys-contrib:main Jul 17, 2025
3 of 6 checks passed
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.

8 participants