🔄 Sync stable → main#3537
Conversation
feat: comments and tc on small screen (#3446)
### What's New - **Comments display modes** — Control how comment and tracked-change bubbles render on small screens with `displayMode: 'auto'` (switches sidebar/inline based on width), `'sidebar'` (always right panel), or `'inline'` (always compact). Optional `compactBreakpointPx` and `compactMeasurementSelector` fine-tune measurement behavior for custom layouts. ### Fixes - **Table width overflow from cell preferences** — Tables with auto-width semantics no longer expand beyond their authored grid width when cells have width preferences (`tcW`). - **Missing-grid table width budget** — Tables without a complete authored column grid now respect the width budget set by their partial column widths instead of expanding to fill available space.
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 205449ac5e
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
| "displayName": "SuperDoc - Word Document Editor", | ||
| "description": "Open and edit Word documents (.docx) directly in VS Code using SuperDoc", | ||
| "version": "2.8.0", | ||
| "version": "2.8.1", |
There was a problem hiding this comment.
For this stable→main sync, bumping the extension to the stable version without also preserving the stable commit as a parent leaves main's history unaware of the stable release. I checked git rev-list --parents -n1 36bf7adf31c391c4b4ae751f44efa6713ddef9c2, and this commit has only e00469c... as its parent, while the corresponding real merge in the workspace includes the stable release commit 2f5187e... as a second parent. In the next prerelease path described by the commit message, semantic-release can still calculate from stale stable ancestry, so this needs to land as the real merge commit rather than a single-parent version-only change.
Useful? React with 👍 / 👎.
|
🎉 This PR is included in vscode-ext v2.10.0 |
3 participants
Summary
Merges latest stable patches into main with a real merge commit so stable release tags remain reachable from main.
This keeps
@nextprerelease version calculation ahead of the latest published stable release.Merge requirement
This PR must be merged with GitHub's merge-commit option. Squash or rebase merging will discard stable ancestry and break
@nextversion calculation again.Conflict handling
Merge status:
clean.Version-only release artifact conflicts are auto-resolved to keep stable's already-published versions. Non-version conflicts fail this workflow instead of committing conflict markers.
Auto-created by sync-patches workflow.