From bd0bcdb0edb9522eeed410daf751b07f684f1228 Mon Sep 17 00:00:00 2001
From: Finn Evers <finn@zed.dev>
Date: Tue, 28 Oct 2025 09:08:49 +0100
Subject: [PATCH] Fix line number settings migration (#41351)

Follow-up to https://github.com/zed-industries/zed/pull/39268

Also updates the documentation.

Release Notes:

- N/A
---
 .../src/migrations/m_2025_10_21/settings.rs   |  1 +
 docs/src/configuring-zed.md                   | 26 +++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/crates/migrator/src/migrations/m_2025_10_21/settings.rs b/crates/migrator/src/migrations/m_2025_10_21/settings.rs
index 6fe8814fb4..1f78f93327 100644
--- a/crates/migrator/src/migrations/m_2025_10_21/settings.rs
+++ b/crates/migrator/src/migrations/m_2025_10_21/settings.rs
@@ -9,6 +9,7 @@ pub fn make_relative_line_numbers_an_enum(value: &mut Value) -> Result<()> {
     *relative_line_numbers = match relative_line_numbers {
         Value::Bool(true) => Value::String("enabled".to_string()),
         Value::Bool(false) => Value::String("disabled".to_string()),
+        Value::String(s) if s == "enabled" || s == "disabled" || s == "wrapped" => return Ok(()),
         _ => anyhow::bail!("Expected relative_line_numbers to be a boolean"),
     };
     Ok(())
diff --git a/docs/src/configuring-zed.md b/docs/src/configuring-zed.md
index 218b25f569..3aabc05b7a 100644
--- a/docs/src/configuring-zed.md
+++ b/docs/src/configuring-zed.md
@@ -2996,11 +2996,33 @@ List of `string` glob patterns
 
 - Description: Whether to show relative line numbers in the gutter
 - Setting: `relative_line_numbers`
-- Default: `false`
+- Default: `"disabled"`
 
 **Options**
 
-`boolean` values
+1. Show relative line numbers in the gutter whilst counting wrapped lines as one line:
+
+```json [settings]
+{
+  "relative_line_numbers": "enabled"
+}
+```
+
+2. Show relative line numbers in the gutter, including wrapped lines in the counting:
+
+```json [settings]
+{
+  "relative_line_numbers": "wrapped"
+}
+```
+
+2. Do not use relative line numbers:
+
+```json [settings]
+{
+  "relative_line_numbers": "disabled"
+}
+```
 
 ## Remove Trailing Whitespace On Save