Rewrap not working on git commits

[dlight]

Summary

Rewrap doesn't work if the language is set to Git Commit.

Steps to trigger the problem:

1. Open a git commit (typically by running something like GIT_EDITOR='zeditor -w' git commit --amend)

2. Run the command editor::Rewrap (typically by Pressing ctrl+k q or ctrl+k ctrl+q)

3. See that lines don't rewrap. (Some styles enforce a maximum line width on git commits, a common value is 72 chars)

4. In despair, change the language with Ctrl+K M (language_selector::Toggle) and select "Plain Text". Now the text rewraps fine (albeit at 80 lines - I can't find a way to configure line widths per-language, which is a separate issue but relatively minor)

Actual Behavior:

Lines don't rewrap with the language is "Git Commit"

Expected Behavior:

Lines should rewrap for git commits. A bonus feature is to make 72 chars the default for git commits specifically (but let the user configure)

Zed Version and System Specs

Zed: v0.173.9 (Zed)
OS: Linux X11 arch unknown
Memory: 18.9 GiB
Architecture: x86_64
GPU: AMD Radeon Graphics (RADV RENOIR) || radv || Mesa 24.3.4-arch1.1

[dlight]

I want to fix this if possible! But I can't find what part of the code controls or influences whether a give language will rewrap properly or not.

I can find this directory that defines the Git Commit language, that was merged just 2 weeks ago in #24274 (ping @SomeoneToIgnore maybe? Sorry if that's not appropriate), and I see it uses a tree sitter grammar from here. And I think that rewrap is implemented here. But, I'm not sure how to investigate this issue further.

[SomeoneToIgnore]

Sorry, I have no clue on how rewrap in Zed works and why language selection might influence that.

And I think that rewrap is implemented here.

That place is quite deep into the impl and might not be the culprit.
I would suggest starting from the very top, in the editor,

zed/crates/editor/src/editor.rs

Line 7605 in b5d85b6

pub fn rewrap_impl(&mut self, is_vim_mode: IsVimMode, cx: &mut Context<Self>) {

and debug that further and see why things are not working for this case.
should_rewrap is something worth checking specifically, as it seems that it could be false for this case for some reason (which we might want to check).

[marcospb19]

I found this language-specific setting:

zed/crates/language/src/language_settings.rs

Lines 79 to 81 in 08e9080

	/// The column at which to soft-wrap lines, for buffers where soft-wrap
	/// is enabled.
	pub preferred_line_length: u32,

The docs say it's wired to soft wrap but it ideally would be wired to the rewrap too, I guess.

[SomeoneToIgnore]

#25173 seems very related.

[maxdeviant]

#25173 seems very related.

Indeed, it is quite related!

Once #25173 makes its way into a release you'll be able to add the following to your settings to enable rewrapping in buffers using the "Git Commit" language:

{
  "languages": {
    "Git Commit": {
      "allow_rewrap": "anywhere"
    }
  }
}

[marcospb19]

@maxdeviant shouldn't that be the default?

[dlight]

Indeed

The global default is in_comment, as it is the most conservative option and allows rewrapping comments without risking breaking other syntax.

The Markdown and Plain Text languages default to anywhere, which mirrors the previous behavior for those language that was hard-coded into the rewrap implementation.

It seems that Git Commit should also enable "anywhere" by default, using the same rationale as "Plain Text" and "Markdown"