Skip to content

Update cosmic-text to v0.17 to fix font ligatures on Linux#48504

Merged
ConradIrwin merged 1 commit intozed-industries:mainfrom
adb-sh:ligatures
Feb 5, 2026
Merged

Update cosmic-text to v0.17 to fix font ligatures on Linux#48504
ConradIrwin merged 1 commit intozed-industries:mainfrom
adb-sh:ligatures

Conversation

@adb-sh
Copy link
Contributor

@adb-sh adb-sh commented Feb 5, 2026

Closes #12176

rebased #48161

Release Notes:

  • Updated text rendering dependency to fix and improve font ligature support

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Feb 5, 2026
@zed-community-bot zed-community-bot bot added the first contribution the author's first pull request to Zed. NOTE: the label application is automated via github actions label Feb 5, 2026
@adb-sh
Copy link
Contributor Author

adb-sh commented Feb 5, 2026

@ConradIrwin sorry messing this up the first time. i think i need some sleep

@ConradIrwin ConradIrwin enabled auto-merge (squash) February 5, 2026 20:13
@ConradIrwin
Copy link
Member

no worries; it's a challenge to get cargo changes in before something else conflicts in the lock file :D

@ConradIrwin ConradIrwin merged commit 0e29766 into zed-industries:main Feb 5, 2026
35 checks passed
naaiyy added a commit to Glass-HQ/Glass that referenced this pull request Feb 16, 2026
Key changes:
- Thermal state detection (zed-industries#45638) - GPUI detects system thermal state, throttles to ~60fps when overheating
- Checkerboard shader for side-by-side diff (zed-industries#48417) - visual pattern for diff backgrounds
- cosmic-text v0.17 (zed-industries#48504) - fixes font ligatures on Linux
- Middle click tab close (zed-industries#44916) - on_aux_click/is_middle_click API additions
- Soft wrap modes for wrap width (zed-industries#46422)
- Tab switcher mode similar to vim/helix buffer picker (zed-industries#47079)
- Multi_buffer optimization batch (zed-industries#48519)
- TreeMap for diagnostics (zed-industries#48482) - performance improvement
- Semantic token follow-up fixes (zed-industries#48485)
- Claude Opus 4.6 and 1M context window model variants (zed-industries#48508)
- Anthropic adaptive thinking types (zed-industries#48517)
- Side-by-side diff: hunk gutter highlights restored, toolbar buttons for SplittableEditor
- Shell quote bypass fix in terminal permission system (zed-industries#48436)
- Project panel: Collapse All improvements (zed-industries#47328, zed-industries#48443)
- Edit prediction: trailing newlines fix, cursor position in global coords
- Properly discard tokens on language server stop (zed-industries#48490)
- AgentTool::NAME const instead of hardcoded strings (zed-industries#48506)

Conflict resolution:
- collab/editor_tests.rs: deleted (collab removed)
- vim (helix, motion, increment): deleted (vim removed)
- GPUI (17 files): deleted from Glass (handled in Obsydian-HQ/gpui)
- editor/items.rs: merged imports (added BufferId, kept Theme)
- project_diff.rs: removed old native_button toggle (upstream uses toolbar buttons now)
- lsp_store.rs: added SemanticTokenConfig, removed GlobalLogStore/LanguageServerKind
- project_panel.rs: merged UI imports (added ContextMenuEntry, ScrollAxes)
- Keymaps: took upstream JetBrains bindings

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement first contribution the author's first pull request to Zed. NOTE: the label application is automated via github actions

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Only some ligatures are being applied

2 participants