Theme-able Vim Mode wrapper by willeyh-git · Pull Request #39813 · zed-industries/zed

willeyh-git · 2025-10-08T21:16:14Z

Closes #14093
Builds on #32279 by making it theme dependent.
Discussion #37816

Wraps the mode label indicator in a div and makes the wrapper and label theme-able. Label weight to medium
Mode indicator will render like previously if not theme colors have been set. (i.e., they match zed default- and fallbacks)
Really helps with visual confirmation of current mode.

Did not investigate further if there is a way to keep the leading and trailing -- if no theme var given.

Can be applied either by a theme itself or using theme_overrides in settings.json

Theme colors applied via theme_overrides

No theme applied

vimmodes.mov

Release Notes:

Vim make mode indicator themeable

cla-bot · 2025-10-08T21:16:18Z

We require contributors to sign our Contributor License Agreement, and we don't have @WillyHetland on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'.

willeyh-git · 2025-10-08T21:53:53Z

@cla-bot check

cla-bot · 2025-10-08T21:53:57Z

The cla-bot has been summoned, and re-checked this pull request!

maxdeviant · 2025-10-08T22:04:09Z

 pub struct ThemeColorsContent {
+    /// Background color for Vim Normal mode indicator.
+    #[serde(rename = "vim.normal.background")]
+    pub vim_normal_background: Option<String>,


Let's move these to the bottom of the struct.

ConradIrwin · 2025-10-14T18:16:03Z

Thanks for this!

I like this approach much better than re-using the git status colors; but I'm still concerned about the default un-themed version. Is there a way to build this where the padding doesn't look wrong if the colors are not set (Which will be the default)?

I'm not sure we need the --, but in your screenshots the version with the color looks spaced correctly, and the version with no colors looks too gappy.

I'm also not thrilled by how many variables a theme would have to set to use this, but I think that reflects reality somewhat...

willeyh-git · 2025-10-14T20:34:47Z

I'm not sure we need the --, but in your screenshots the version with the color looks spaced correctly, and the version with no colors looks too gappy.

Seems like it can be done if we go by the assumption that a background color system_transparent, which is the default color for every mode, is set.

If no color is set for the given mode:

leading and trailing -- are rendered, horizontal padding is removed and text color is reverted to default.

zed-industries-bot · 2025-10-16T05:06:20Z

	Messages
📖	This PR includes links to the following GitHub Issues: #14093 If this PR aims to close an issue, please include a `Closes #ISSUE` line at the top of the PR body.

Generated by 🚫 dangerJS against 2b8b97e

ConradIrwin · 2025-10-16T05:10:44Z

Thanks. It's a bit odd to have the theme change the content, but I think it's the best compromise in this case (until we figure out a better one :D).

Would you mind making the CI happy?

ConradIrwin · 2025-10-21T04:13:16Z

I spent a bit more time tidying this up:

Pending keystrokes (and ctrl-g output) are not rendered in the colored mode indicator
The indicator's background now is the same size as the buttons its rendered alongside for themes where buttons are not invisible

0x2CA · 2025-10-28T00:49:55Z

I'm not sure if this error was caused by this change.

If you force quit the app, reopening it will retain the insertion mode.

2025-10-28.08.46.35.mov

willeyh-git · 2025-10-28T07:56:30Z

I'm not sure if this error was caused by this change.

If you force quit the app, reopening it will retain the insertion mode.

Can be replicated in the current release. Don't think its related to this.

joehillen · 2026-01-13T22:50:23Z

This feature is undocumented. Is that intentional?

Closes [zed-industries#14093](zed-industries#14093) Builds on [zed-industries#32279](zed-industries#32279) by making it theme dependent. Discussion [zed-industries#37816](zed-industries#37816) Wraps the mode label indicator in a div and makes the wrapper and label theme-able. Label weight to medium Mode indicator will render like previously if not theme colors have been set. (i.e., they match zed default- and fallbacks) Really helps with visual confirmation of current mode. _Did not investigate further if there is a way to keep the leading and trailing -- if no theme var given._ Can be applied either by a theme itself or using `theme_overrides` in settings.json Theme colors applied via `theme_overrides` <img width="233" height="34" alt="Screenshot 2025-10-08 at 23 01 08" src="https://github.com/user-attachments/assets/a00d9ae4-b6db-46a0-84e2-98d2691a11ad" /> <img width="233" height="34" alt="Screenshot 2025-10-08 at 23 01 16" src="https://github.com/user-attachments/assets/f27fddab-524d-43c4-9307-46b6a656cd35" /> <img width="233" height="34" alt="Screenshot 2025-10-08 at 23 01 23" src="https://github.com/user-attachments/assets/7e477fff-7a40-4c01-95a7-fbd40fff6caa" /> No theme applied <img width="233" height="34" alt="Screenshot 2025-10-08 at 23 01 31" src="https://github.com/user-attachments/assets/8b7b2c75-007b-4074-a552-181c53f31213" /> <img width="233" height="34" alt="Screenshot 2025-10-08 at 23 01 36" src="https://github.com/user-attachments/assets/7a708d81-2033-4d72-a844-57607a0434ea" /> <img width="233" height="34" alt="Screenshot 2025-10-08 at 23 01 40" src="https://github.com/user-attachments/assets/526f9d10-4d0f-4bc5-af89-31fcca538ce4" /> https://github.com/user-attachments/assets/d0d71d4d-504f-4d18-bbd9-83d3a4b2adb7 Release Notes: - Vim make mode indicator themeable --------- Co-authored-by: willyHetland <willy.hetland@zeekit.no> Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>

WillyHetland added 9 commits October 8, 2025 21:04

wrap label in themeable container

393ee58

set fallback theme for vim modes

b66b236

make vim mode themeable

cc533ed

theme color for vim mod background

7470bfe

vim mode default colors to system.transparent

189e72e

vim mode color background color

ada2cdd

vim mode text color

ae70f53

vim mode text color

8572862

vim mode text color

e971923

cla-bot Bot added the cla-signed The user has signed the Contributor License Agreement label Oct 8, 2025

maxdeviant reviewed Oct 8, 2025

View reviewed changes

SomeoneToIgnore assigned ConradIrwin, mattermill and danilo-leal Oct 8, 2025

WillyHetland added 6 commits October 9, 2025 00:11

move vim theme props to bottom of struct

2999d32

move vim mode colors to appropriate grouping

5887fc6

move vim colors to bottom to preserve alphabetic ordering

a267362

move vim mode properties further down

ea2c012

move vim mode colors to bottom

7ba2e8b

move vim mode color to bottom

f888bd6

vim status indicator only if theme is applied

8c8bf0d

cleanup

59e3599

fix formatting

78efd89

WillyHetland and others added 3 commits October 18, 2025 13:53

remove clone call on mode

7200833

Merge branch 'main' into vimModeWrapper

673da42

Fix interaction with pending keys and ctrl-g

2b8b97e

ConradIrwin enabled auto-merge (squash) October 21, 2025 04:12

ConradIrwin merged commit 71ea133 into zed-industries:main Oct 21, 2025
21 checks passed

willeyh-git deleted the vimModeWrapper branch October 21, 2025 06:17

TyceHerrman mentioned this pull request Oct 27, 2025

Add theming for Vim Mode wrapper dracula/zed#25

Closed

thoov mentioned this pull request Jun 12, 2026

feat: add vim mode indicator colors rose-pine/zed#27

Merged

Navigation Menu

Uh oh!

Uh oh!

Theme-able Vim Mode wrapper - #39813

Theme-able Vim Mode wrapper#39813
ConradIrwin merged 21 commits into
zed-industries:mainfrom
willeyh-git:vimModeWrapper

willeyh-git commented Oct 8, 2025

Uh oh!

cla-bot Bot commented Oct 8, 2025

Uh oh!

willeyh-git commented Oct 8, 2025

Uh oh!

cla-bot Bot commented Oct 8, 2025

Uh oh!

maxdeviant Oct 8, 2025

Uh oh!

ConradIrwin commented Oct 14, 2025

Uh oh!

willeyh-git commented Oct 14, 2025

Uh oh!

zed-industries-bot commented Oct 16, 2025 •

edited

Loading

Uh oh!

ConradIrwin commented Oct 16, 2025

Uh oh!

ConradIrwin commented Oct 21, 2025

Uh oh!

Uh oh!

0x2CA commented Oct 28, 2025

Uh oh!

willeyh-git commented Oct 28, 2025

Uh oh!

joehillen commented Jan 13, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Uh oh!

Uh oh!

Conversation

willeyh-git commented Oct 8, 2025

Uh oh!

cla-bot Bot commented Oct 8, 2025

Uh oh!

willeyh-git commented Oct 8, 2025

Uh oh!

cla-bot Bot commented Oct 8, 2025

Uh oh!

maxdeviant Oct 8, 2025

Choose a reason for hiding this comment

Uh oh!

ConradIrwin commented Oct 14, 2025

Uh oh!

willeyh-git commented Oct 14, 2025

Uh oh!

zed-industries-bot commented Oct 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ConradIrwin commented Oct 16, 2025

Uh oh!

ConradIrwin commented Oct 21, 2025

Uh oh!

Uh oh!

0x2CA commented Oct 28, 2025

Uh oh!

willeyh-git commented Oct 28, 2025

Uh oh!

joehillen commented Jan 13, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

zed-industries-bot commented Oct 16, 2025 •

edited

Loading