Skip to content

sending the font token decorations in the custom line heights too#288941

Merged
aiday-mar merged 1 commit intomainfrom
agreed-shark
Jan 19, 2026
Merged

sending the font token decorations in the custom line heights too#288941
aiday-mar merged 1 commit intomainfrom
agreed-shark

Conversation

@aiday-mar
Copy link
Contributor

@aiday-mar aiday-mar commented Jan 19, 2026

fixes #288847

Copilot AI review requested due to automatic review settings January 19, 2026 17:18
@aiday-mar aiday-mar self-assigned this Jan 19, 2026
@aiday-mar aiday-mar marked this pull request as ready for review January 19, 2026 17:18
@aiday-mar aiday-mar enabled auto-merge (squash) January 19, 2026 17:19
@vs-code-engineering vs-code-engineering bot added this to the January 2026 milestone Jan 19, 2026
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR fixes an issue where font token decorations with custom line heights were not being included when retrieving custom line height decorations.

Changes:

  • Fixed getAllDecorations() in TokenizationFontDecorationProvider to include the full last line instead of just column 1
  • Updated getCustomLineHeightsDecorations() in TextModel to include font token decorations alongside decorations tree results

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File Description
src/vs/editor/common/model/tokens/tokenizationFontDecorationsProvider.ts Extended the range in getAllDecorations() to include the complete last line by using getLineMaxColumn() instead of column 1
src/vs/editor/common/model/textModel.ts Added font token decorations to the result of getCustomLineHeightsDecorations() using pushMany(), consistent with how other decoration retrieval methods combine multiple decoration sources

@aiday-mar aiday-mar merged commit 6f548f3 into main Jan 19, 2026
27 of 28 checks passed
@aiday-mar aiday-mar deleted the agreed-shark branch January 19, 2026 17:45
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.

Flicker caused by variable line heights when opening a file

3 participants