From e7ce5f54f1ab93b4030335a15a3eaa1c5b64a0b7 Mon Sep 17 00:00:00 2001 From: Roman Cinis <52065414+tsinis@users.noreply.github.com> Date: Mon, 23 Mar 2026 09:35:48 +0100 Subject: [PATCH 1/2] extension_api: expose preferred_line_length in LanguageSettings --- crates/extension_api/wit/since_v0.0.6/settings.rs | 2 ++ crates/extension_api/wit/since_v0.1.0/settings.rs | 2 ++ crates/extension_api/wit/since_v0.2.0/settings.rs | 2 ++ crates/extension_api/wit/since_v0.3.0/settings.rs | 2 ++ crates/extension_api/wit/since_v0.4.0/settings.rs | 2 ++ crates/extension_api/wit/since_v0.5.0/settings.rs | 2 ++ crates/extension_api/wit/since_v0.6.0/settings.rs | 2 ++ crates/extension_api/wit/since_v0.8.0/settings.rs | 2 ++ crates/extension_host/src/wasm_host/wit/since_v0_1_0.rs | 1 + crates/extension_host/src/wasm_host/wit/since_v0_8_0.rs | 1 + 10 files changed, 18 insertions(+) diff --git a/crates/extension_api/wit/since_v0.0.6/settings.rs b/crates/extension_api/wit/since_v0.0.6/settings.rs index 5c6cae70649840..3443333fe92296 100644 --- a/crates/extension_api/wit/since_v0.0.6/settings.rs +++ b/crates/extension_api/wit/since_v0.0.6/settings.rs @@ -6,6 +6,8 @@ use std::num::NonZeroU32; pub struct LanguageSettings { /// How many columns a tab should occupy. pub tab_size: NonZeroU32, + /// The preferred line length (column at which to wrap). + pub preferred_line_length: u32, } /// The settings for a particular language server. diff --git a/crates/extension_api/wit/since_v0.1.0/settings.rs b/crates/extension_api/wit/since_v0.1.0/settings.rs index 5c6cae70649840..3443333fe92296 100644 --- a/crates/extension_api/wit/since_v0.1.0/settings.rs +++ b/crates/extension_api/wit/since_v0.1.0/settings.rs @@ -6,6 +6,8 @@ use std::num::NonZeroU32; pub struct LanguageSettings { /// How many columns a tab should occupy. pub tab_size: NonZeroU32, + /// The preferred line length (column at which to wrap). + pub preferred_line_length: u32, } /// The settings for a particular language server. diff --git a/crates/extension_api/wit/since_v0.2.0/settings.rs b/crates/extension_api/wit/since_v0.2.0/settings.rs index 19e28c1ba955a9..7c77dc79baf7ab 100644 --- a/crates/extension_api/wit/since_v0.2.0/settings.rs +++ b/crates/extension_api/wit/since_v0.2.0/settings.rs @@ -6,6 +6,8 @@ use std::{collections::HashMap, num::NonZeroU32}; pub struct LanguageSettings { /// How many columns a tab should occupy. pub tab_size: NonZeroU32, + /// The preferred line length (column at which to wrap). + pub preferred_line_length: u32, } /// The settings for a particular language server. diff --git a/crates/extension_api/wit/since_v0.3.0/settings.rs b/crates/extension_api/wit/since_v0.3.0/settings.rs index 19e28c1ba955a9..7c77dc79baf7ab 100644 --- a/crates/extension_api/wit/since_v0.3.0/settings.rs +++ b/crates/extension_api/wit/since_v0.3.0/settings.rs @@ -6,6 +6,8 @@ use std::{collections::HashMap, num::NonZeroU32}; pub struct LanguageSettings { /// How many columns a tab should occupy. pub tab_size: NonZeroU32, + /// The preferred line length (column at which to wrap). + pub preferred_line_length: u32, } /// The settings for a particular language server. diff --git a/crates/extension_api/wit/since_v0.4.0/settings.rs b/crates/extension_api/wit/since_v0.4.0/settings.rs index 19e28c1ba955a9..7c77dc79baf7ab 100644 --- a/crates/extension_api/wit/since_v0.4.0/settings.rs +++ b/crates/extension_api/wit/since_v0.4.0/settings.rs @@ -6,6 +6,8 @@ use std::{collections::HashMap, num::NonZeroU32}; pub struct LanguageSettings { /// How many columns a tab should occupy. pub tab_size: NonZeroU32, + /// The preferred line length (column at which to wrap). + pub preferred_line_length: u32, } /// The settings for a particular language server. diff --git a/crates/extension_api/wit/since_v0.5.0/settings.rs b/crates/extension_api/wit/since_v0.5.0/settings.rs index 19e28c1ba955a9..7c77dc79baf7ab 100644 --- a/crates/extension_api/wit/since_v0.5.0/settings.rs +++ b/crates/extension_api/wit/since_v0.5.0/settings.rs @@ -6,6 +6,8 @@ use std::{collections::HashMap, num::NonZeroU32}; pub struct LanguageSettings { /// How many columns a tab should occupy. pub tab_size: NonZeroU32, + /// The preferred line length (column at which to wrap). + pub preferred_line_length: u32, } /// The settings for a particular language server. diff --git a/crates/extension_api/wit/since_v0.6.0/settings.rs b/crates/extension_api/wit/since_v0.6.0/settings.rs index 19e28c1ba955a9..7c77dc79baf7ab 100644 --- a/crates/extension_api/wit/since_v0.6.0/settings.rs +++ b/crates/extension_api/wit/since_v0.6.0/settings.rs @@ -6,6 +6,8 @@ use std::{collections::HashMap, num::NonZeroU32}; pub struct LanguageSettings { /// How many columns a tab should occupy. pub tab_size: NonZeroU32, + /// The preferred line length (column at which to wrap). + pub preferred_line_length: u32, } /// The settings for a particular language server. diff --git a/crates/extension_api/wit/since_v0.8.0/settings.rs b/crates/extension_api/wit/since_v0.8.0/settings.rs index 19e28c1ba955a9..7c77dc79baf7ab 100644 --- a/crates/extension_api/wit/since_v0.8.0/settings.rs +++ b/crates/extension_api/wit/since_v0.8.0/settings.rs @@ -6,6 +6,8 @@ use std::{collections::HashMap, num::NonZeroU32}; pub struct LanguageSettings { /// How many columns a tab should occupy. pub tab_size: NonZeroU32, + /// The preferred line length (column at which to wrap). + pub preferred_line_length: u32, } /// The settings for a particular language server. diff --git a/crates/extension_host/src/wasm_host/wit/since_v0_1_0.rs b/crates/extension_host/src/wasm_host/wit/since_v0_1_0.rs index 0caaa86c2413f1..3dd5f7f2fc1f1e 100644 --- a/crates/extension_host/src/wasm_host/wit/since_v0_1_0.rs +++ b/crates/extension_host/src/wasm_host/wit/since_v0_1_0.rs @@ -444,6 +444,7 @@ impl ExtensionImports for WasmState { ); Ok(serde_json::to_string(&settings::LanguageSettings { tab_size: settings.tab_size, + preferred_line_length: settings.preferred_line_length, })?) } "lsp" => { diff --git a/crates/extension_host/src/wasm_host/wit/since_v0_8_0.rs b/crates/extension_host/src/wasm_host/wit/since_v0_8_0.rs index d7cf29ad0a3fcc..324a572f40c980 100644 --- a/crates/extension_host/src/wasm_host/wit/since_v0_8_0.rs +++ b/crates/extension_host/src/wasm_host/wit/since_v0_8_0.rs @@ -941,6 +941,7 @@ impl ExtensionImports for WasmState { ); Ok(serde_json::to_string(&settings::LanguageSettings { tab_size: settings.tab_size, + preferred_line_length: settings.preferred_line_length, })?) } "lsp" => { From 40e6027770daf0e7b838397c11f43f05b9a2d981 Mon Sep 17 00:00:00 2001 From: Roman Cinis <52065414+tsinis@users.noreply.github.com> Date: Tue, 24 Mar 2026 17:58:01 +0100 Subject: [PATCH 2/2] extension_api: Revert preferred_line_length in the old language settings This change removes the `preferred_line_length` field from the `LanguageSettings` struct across multiple versions to streamline settings management. --- crates/extension_api/src/settings.rs | 2 +- crates/extension_api/wit/since_v0.0.6/settings.rs | 2 -- crates/extension_api/wit/since_v0.1.0/settings.rs | 2 -- crates/extension_api/wit/since_v0.2.0/settings.rs | 2 -- crates/extension_api/wit/since_v0.3.0/settings.rs | 2 -- crates/extension_api/wit/since_v0.4.0/settings.rs | 2 -- crates/extension_api/wit/since_v0.5.0/settings.rs | 2 -- crates/extension_api/wit/since_v0.6.0/settings.rs | 2 -- crates/extension_host/src/wasm_host/wit/since_v0_1_0.rs | 1 - 9 files changed, 1 insertion(+), 16 deletions(-) diff --git a/crates/extension_api/src/settings.rs b/crates/extension_api/src/settings.rs index a133a8027a4361..bb9f2e20b23efd 100644 --- a/crates/extension_api/src/settings.rs +++ b/crates/extension_api/src/settings.rs @@ -1,6 +1,6 @@ //! Provides access to Zed settings. -#[path = "../wit/since_v0.2.0/settings.rs"] +#[path = "../wit/since_v0.8.0/settings.rs"] mod types; use crate::{Project, Result, SettingsLocation, Worktree, wit}; diff --git a/crates/extension_api/wit/since_v0.0.6/settings.rs b/crates/extension_api/wit/since_v0.0.6/settings.rs index 3443333fe92296..5c6cae70649840 100644 --- a/crates/extension_api/wit/since_v0.0.6/settings.rs +++ b/crates/extension_api/wit/since_v0.0.6/settings.rs @@ -6,8 +6,6 @@ use std::num::NonZeroU32; pub struct LanguageSettings { /// How many columns a tab should occupy. pub tab_size: NonZeroU32, - /// The preferred line length (column at which to wrap). - pub preferred_line_length: u32, } /// The settings for a particular language server. diff --git a/crates/extension_api/wit/since_v0.1.0/settings.rs b/crates/extension_api/wit/since_v0.1.0/settings.rs index 3443333fe92296..5c6cae70649840 100644 --- a/crates/extension_api/wit/since_v0.1.0/settings.rs +++ b/crates/extension_api/wit/since_v0.1.0/settings.rs @@ -6,8 +6,6 @@ use std::num::NonZeroU32; pub struct LanguageSettings { /// How many columns a tab should occupy. pub tab_size: NonZeroU32, - /// The preferred line length (column at which to wrap). - pub preferred_line_length: u32, } /// The settings for a particular language server. diff --git a/crates/extension_api/wit/since_v0.2.0/settings.rs b/crates/extension_api/wit/since_v0.2.0/settings.rs index 7c77dc79baf7ab..19e28c1ba955a9 100644 --- a/crates/extension_api/wit/since_v0.2.0/settings.rs +++ b/crates/extension_api/wit/since_v0.2.0/settings.rs @@ -6,8 +6,6 @@ use std::{collections::HashMap, num::NonZeroU32}; pub struct LanguageSettings { /// How many columns a tab should occupy. pub tab_size: NonZeroU32, - /// The preferred line length (column at which to wrap). - pub preferred_line_length: u32, } /// The settings for a particular language server. diff --git a/crates/extension_api/wit/since_v0.3.0/settings.rs b/crates/extension_api/wit/since_v0.3.0/settings.rs index 7c77dc79baf7ab..19e28c1ba955a9 100644 --- a/crates/extension_api/wit/since_v0.3.0/settings.rs +++ b/crates/extension_api/wit/since_v0.3.0/settings.rs @@ -6,8 +6,6 @@ use std::{collections::HashMap, num::NonZeroU32}; pub struct LanguageSettings { /// How many columns a tab should occupy. pub tab_size: NonZeroU32, - /// The preferred line length (column at which to wrap). - pub preferred_line_length: u32, } /// The settings for a particular language server. diff --git a/crates/extension_api/wit/since_v0.4.0/settings.rs b/crates/extension_api/wit/since_v0.4.0/settings.rs index 7c77dc79baf7ab..19e28c1ba955a9 100644 --- a/crates/extension_api/wit/since_v0.4.0/settings.rs +++ b/crates/extension_api/wit/since_v0.4.0/settings.rs @@ -6,8 +6,6 @@ use std::{collections::HashMap, num::NonZeroU32}; pub struct LanguageSettings { /// How many columns a tab should occupy. pub tab_size: NonZeroU32, - /// The preferred line length (column at which to wrap). - pub preferred_line_length: u32, } /// The settings for a particular language server. diff --git a/crates/extension_api/wit/since_v0.5.0/settings.rs b/crates/extension_api/wit/since_v0.5.0/settings.rs index 7c77dc79baf7ab..19e28c1ba955a9 100644 --- a/crates/extension_api/wit/since_v0.5.0/settings.rs +++ b/crates/extension_api/wit/since_v0.5.0/settings.rs @@ -6,8 +6,6 @@ use std::{collections::HashMap, num::NonZeroU32}; pub struct LanguageSettings { /// How many columns a tab should occupy. pub tab_size: NonZeroU32, - /// The preferred line length (column at which to wrap). - pub preferred_line_length: u32, } /// The settings for a particular language server. diff --git a/crates/extension_api/wit/since_v0.6.0/settings.rs b/crates/extension_api/wit/since_v0.6.0/settings.rs index 7c77dc79baf7ab..19e28c1ba955a9 100644 --- a/crates/extension_api/wit/since_v0.6.0/settings.rs +++ b/crates/extension_api/wit/since_v0.6.0/settings.rs @@ -6,8 +6,6 @@ use std::{collections::HashMap, num::NonZeroU32}; pub struct LanguageSettings { /// How many columns a tab should occupy. pub tab_size: NonZeroU32, - /// The preferred line length (column at which to wrap). - pub preferred_line_length: u32, } /// The settings for a particular language server. diff --git a/crates/extension_host/src/wasm_host/wit/since_v0_1_0.rs b/crates/extension_host/src/wasm_host/wit/since_v0_1_0.rs index 3dd5f7f2fc1f1e..0caaa86c2413f1 100644 --- a/crates/extension_host/src/wasm_host/wit/since_v0_1_0.rs +++ b/crates/extension_host/src/wasm_host/wit/since_v0_1_0.rs @@ -444,7 +444,6 @@ impl ExtensionImports for WasmState { ); Ok(serde_json::to_string(&settings::LanguageSettings { tab_size: settings.tab_size, - preferred_line_length: settings.preferred_line_length, })?) } "lsp" => {