editor: Add support for customizable soft wrap indentation by arusahni · Pull Request #63468 · zed-industries/zed

arusahni · 2026-08-31T01:26:18Z

Objective

Soft wrapped lines currently inherit the indentation of their first line. This can be challenging for those coming from different editors, or with different expectations.
Allow users to customize the soft wrap behavior to wrap with extra indent, or no indent at all.
Fixes Extra indent for soft-wrapped lines #18687

Solution

Introduce 3 soft-wrap indent configuration values (in addition to the default of same): none, extra_one, and extra_two (where they are multiples of the indent column width).
Plumb indent configuration through to the various gpui and editor components that are concerned with wrapping.
Update code action icon placement to accommodate none-level wrap indentation (preceded by a refactor of the function used to calculate its display row).
Fixed an existing bug in WrapSnapshot::soft_wrap_indent where querying a 0-indent wrap returned None instead of Some(0)

Testing

Added tests to wrap_map.rs for all indentation levels.
Updated the random wrap tests to include indent setting combinations.
Added tests for code action icon placement.
Validated locally by toggling between the various settings and observing how the wrap behaved.

Self-Review Checklist:

I've reviewed my own diff for quality, security, and reliability
Unsafe blocks (if any) have justifying comments
The content adheres to Zed's UI standards (UX/UI and icon guidelines)
Tests cover the new/changed behavior
Performance impact has been considered and is acceptable

Showcase

Changes are grouped by commit to ease review.

Screenshots below!

Click to view showcase

same indent (current Zed behavior)

none indent

extra_one indent

extra_two indent

the setting

Release Notes:

Added a soft_wrap_indent setting ("none", "same", "extra_one", "extra_two") to configure indentation for soft-wrapped continuation lines.
Fixed soft-wrap continuation line indentation calculation for unindented lines starting at column 0.
[GPUI] Added IndentAdjustment enum to LineWrapper to control indentation of soft-wrapped continuation lines.

SomeoneToIgnore

Thank you, needs some more work.

arusahni · 2026-09-04T23:42:03Z

@SomeoneToIgnore thanks for the review! I believe I have addressed all your comments. There is an open question I have around the names for the setting values, but thankfully it shouldn't be a huge lift if we decide to go with different nomenclature.

SomeoneToIgnore

Getting closer, thank you.

arusahni · 2026-09-08T00:34:39Z

Thanks for the second review! I won't be able to address these comments until next week because I'll be at RustConf.

This allows callers to specify how indentation for soft-wrapped lines should function. For now this uses the existing default of same-level indentation.

Also add soft_wrap_indent tests.

This is a 1:1 refactor of the existing calculation. A subsequent commit will introduce the change that necessitated this refactor.

Because soft-wrapped display rows now can start on a *lower* indent column than the first display row, we cannot rely on the first row's indent for code action placement, and instead need to check to see if there's enough space to display the code action glyph. If not, use the buffer's first display row for the calculating code action placement.

arusahni · 2026-09-20T14:31:43Z

I've addressed all additional feedback as discrete commits and rebased this over main, addressing a merge conflict in editor_tests.rs.

zed-industries-bot · 2026-09-20T15:38:32Z

	Fails
🚫	This PR modifies GPUI crates (`gpui`), which requires a GPUI release notes entry. Please add at least one entry prefixed with `[GPUI]` to the "Release Notes" section: `Release Notes: - Added/Fixed/Improved ... - [GPUI] Added/Fixed/Improved ...` If the change is not user-facing for GPUI users, use "- [GPUI] N/A" for that entry.

Generated by 🚫 dangerJS against cd6417c

SomeoneToIgnore

Seems that we need to deal with line_wrapper code better, also added a few more notes.

SomeoneToIgnore · 2026-09-20T15:41:09Z

+                            IndentAdjustment::ExtraColumns(extra) => {
+                                Self::MAX_INDENT.min(base_indent + extra)
+                            }


SameIndent is self-bounding: base_indent is measured inside a row that fit, so it never exceeds the wrap column count.
ExtraColumns adds up to 2 × tab_size on top with only the MAX_INDENT clamp, so indent can exceed the wrap width.
After that, width = item_width + indent × space_width > wrap_width holds for every following character, and the line degrades to one character per row, each row wider than the wrap width.

Repro (EditorTestContext, soft_wrap: bounded, preferred_line_length: 10, extra_two, tab size 4, text " ab cd ef gh"):

| ab | | c| | d| | | | e| | f| | | | g| | h|

9 rows of 15 columns in a 10-column wrap; same gives 3 rows of ≤ 10 columns.
The overflow is bounded by 2 × tab_size columns, with one row per remaining character, so a 200-character line becomes ~200 rows.
This is reachable with extra_two for any line whose indent is within 8 columns of the pane width, e.g. deeply nested code in a narrow split.

VS Code guards exactly this in computeWrappedTextIndentLength: if (wrappedTextIndentLength + columnsForFullWidthChar > firstLineBreakColumn) wrappedTextIndentLength = 0.
Please add the same guard here (fall back to 0, or to base_indent) and cover it with a unit test in this file.

SomeoneToIgnore · 2026-09-20T15:41:09Z

+        self.buffer.read(cx).language_settings(cx).soft_wrap_indent
+    }
+
+    pub(super) fn apply_soft_wrap_indent(&mut self, cx: &mut Context<Self>) {


The existing precedent for a settings-driven wrap parameter is soft_wrap: element.rs calls editor.soft_wrap_mode(cx) + set_wrap_width on every prepaint (lines 8579-8589 and 11286-11290), and set_wrap_width early-returns when unchanged.
set_soft_wrap_indent already early-returns the same way.
Reading self.soft_wrap_indent(cx) inside Editor::set_wrap_width below and forwarding it to whichever map is picked there gives the indent the same freshness as soft_wrap/preferred_line_length, and removes the Editor::new, is_minimap, and five event-handler call sites.

It also closes the remaining gap: an empty multibuffer (project search before the first result) whose global soft_wrap_indent changes emits no buffer SettingsChanged, and fetch_applicable_language_settings compares two empty maps, so placeholder_display_map stays stale until an excerpt arrives.

The new tests keep working unmodified: in test mode App::flush_effects draws dirty windows (gpui/src/app.rs:1817-1830), so the poll runs before the next editor.update.
Cost is one extra MultiBuffer::language_settings per frame, which soft_wrap_mode already pays on the same frame.

SomeoneToIgnore · 2026-09-20T15:41:09Z

+    }
+
+    #[gpui::test]
+    async fn test_soft_wrap_indent_returns_some_for_zero_indent(cx: &mut gpui::TestAppContext) {


The None case in test_soft_wrap_indent above already produces a zero-indent wrap.
One assert_eq!(wrap_snapshot.soft_wrap_indent(WrapRow(1)), Some(0)) there covers this, so this test and its comment block can go.
The same 30 lines of setup are also copied into test_soft_wrap_indent_updates_on_tab_size_change; please share a helper if it stays.

SomeoneToIgnore · 2026-09-20T15:41:09Z

+    #[ztracing::instrument(skip_all)]
+    fn indent_adjustment(&self, tab_size: std::num::NonZeroU32) -> gpui::IndentAdjustment {


Nit: gpui::IndentAdjustment and std::num::NonZeroU32 are spelled out inline throughout this file, please import them.
The ztracing instrument on a one-line match is noise.

cla-bot Bot added the cla-signed The user has signed the Contributor License Agreement label Aug 31, 2026

arusahni changed the title ~~Feat/soft wrap indent~~ editor: Add support for customizable soft wrap indentation - #62099 Aug 31, 2026

arusahni changed the title ~~editor: Add support for customizable soft wrap indentation - #62099~~ editor: Add support for customizable soft wrap indentation Aug 31, 2026

This was referenced Aug 31, 2026

editor: Add support for customizable soft wrap indentation #62099

Closed

Extra indent for soft-wrapped lines #18687

Open

ChristopherBiscardi added the area:editor Feedback for code editing, formatting, editor iterations, etc label Aug 31, 2026

SomeoneToIgnore self-assigned this Aug 31, 2026

SomeoneToIgnore requested changes Aug 31, 2026

View reviewed changes

arusahni force-pushed the feat/soft-wrap-indent branch from c14a7cf to 8f38a40 Compare September 4, 2026 23:29

arusahni requested a review from SomeoneToIgnore September 4, 2026 23:40

SomeoneToIgnore requested changes Sep 7, 2026

View reviewed changes

Comment thread crates/editor/src/editor.rs

Comment thread crates/editor/src/config.rs

Comment thread crates/editor/src/editor.rs Outdated

Comment thread crates/editor/src/editor_tests.rs

Comment thread crates/editor/src/editor.rs Outdated

arusahni added 17 commits September 19, 2026 22:24

gpui: add IndentAdjustment to LineWrapper

b3adb55

This allows callers to specify how indentation for soft-wrapped lines should function. For now this uses the existing default of same-level indentation.

settings: add soft_wrap_indent configuration

3a146d0

editor: plumb soft_wrap_indent to WrapMap

cfe8ea4

Also add soft_wrap_indent tests.

editor: fix soft_wrap_indent calculation for 0-indent soft wraps

b706086

editor: refactor inline code action display row calculation

96139cc

This is a 1:1 refactor of the existing calculation. A subsequent commit will introduce the change that necessitated this refactor.

editor: fix blank line formatting issues

9a47b41

editor: fix INLINE_SLOT_CHAR_LIMIT comment in editor_tests

84ac3ca

settings: import VS Code's editor.wrappingIndent

b5e2f3b

docs: document soft_wrap_indent in all-settings.md

d456de4

editor: update soft_wrap_indent on LanguageChanged event

93c7037

editor: use incoming tab_size for soft_wrap_indent adjustment

e4bbaca

editor: guard against block rows when detecting soft-wrap continuation

40061b3

editor: update soft_wrap_indent when multibuffer excerpts change

4e73df7

editor: apply soft_wrap_indent on buffer SettingsChanged event

f3bb105

editor: test display map soft_wrap_indent updates on LanguageChanged

bdbe1e7

editor: remove redundant comments in display_row_for_inline_code_action

cd6417c

arusahni force-pushed the feat/soft-wrap-indent branch from 8f38a40 to cd6417c Compare September 20, 2026 02:35

arusahni requested a review from SomeoneToIgnore September 20, 2026 14:29

SomeoneToIgnore requested changes Sep 20, 2026

View reviewed changes

		#[ztracing::instrument(skip_all)]
		fn indent_adjustment(&self, tab_size: std::num::NonZeroU32) -> gpui::IndentAdjustment {

Uh oh!

Conversation

arusahni commented Aug 31, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Objective

Solution

Testing

Self-Review Checklist:

Showcase

Uh oh!

SomeoneToIgnore left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

arusahni commented Sep 4, 2026

Uh oh!

SomeoneToIgnore left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

arusahni commented Sep 8, 2026

Uh oh!

arusahni commented Sep 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

zed-industries-bot commented Sep 20, 2026

Uh oh!

SomeoneToIgnore left a comment

Choose a reason for hiding this comment

Uh oh!

SomeoneToIgnore Sep 20, 2026

Choose a reason for hiding this comment

Uh oh!

SomeoneToIgnore Sep 20, 2026

Choose a reason for hiding this comment

Uh oh!

SomeoneToIgnore Sep 20, 2026

Choose a reason for hiding this comment

Uh oh!

SomeoneToIgnore Sep 20, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

arusahni commented Aug 31, 2026 •

edited

Loading

arusahni commented Sep 20, 2026 •

edited

Loading