From 959a0248619d2de74eb9d3834d6a90e850960ef7 Mon Sep 17 00:00:00 2001 From: Kirill Bulatov Date: Tue, 18 Mar 2025 23:08:43 +0200 Subject: [PATCH] Omit `json-language-server` from the `scope_opt_in_language_servers` (#27023) Follow-up of https://github.com/zed-industries/zed/pull/26574/files After that PR, settings.json stopped giving completions when `"` was typed as a key: https://github.com/user-attachments/assets/5ff03863-024c-4c28-a7cd-8ef48a1695d8 This goes down to https://github.com/zed-industries/zed/blob/fb12863999e601c4ffc9afbded036e4f1f064369/crates/language/src/language.rs#L1736-L1748 which was empty before the PR, hence leading to lower `true` branch. Now, when typing `"`, there's no scope according to https://github.com/zed-industries/zed/blob/fb12863999e601c4ffc9afbded036e4f1f064369/crates/project/src/lsp_store.rs#L4529-L4532 return result. Removing `json-language-server` from `scope_opt_in_language_servers` seems to preserve the `:` fix and restore the completions behavior. Release Notes: - N/A --- crates/editor/src/persistence.rs | 2 +- crates/languages/src/json/config.toml | 2 -- crates/languages/src/jsonc/config.toml | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/crates/editor/src/persistence.rs b/crates/editor/src/persistence.rs index d8e9331c4b4ca7797d2e7a69689f264eac13ba25..ed3ea3354f5ca04863823315b16d8febb8d972ec 100644 --- a/crates/editor/src/persistence.rs +++ b/crates/editor/src/persistence.rs @@ -83,7 +83,7 @@ define_connection!( // scroll_top_row: usize, // scroll_vertical_offset: f32, // scroll_horizontal_offset: f32, - // content: Option, + // contents: Option, // language: Option, // mtime_seconds: Option, // mtime_nanos: Option, diff --git a/crates/languages/src/json/config.toml b/crates/languages/src/json/config.toml index b38ae00d7139c7aff53af618fc71460617f92e94..af9f7fb6b89a3da57a55ffad69e0a0a6f9fc2819 100644 --- a/crates/languages/src/json/config.toml +++ b/crates/languages/src/json/config.toml @@ -10,8 +10,6 @@ brackets = [ ] tab_size = 2 prettier_parser_name = "json" -scope_opt_in_language_servers = ["json-language-server"] [overrides.string] word_characters = [":"] -opt_into_language_servers = ["json-language-server"] diff --git a/crates/languages/src/jsonc/config.toml b/crates/languages/src/jsonc/config.toml index c5c146a4258440e7b09aa1d55fceb800a79d8248..360878ca8f0bda89cad644dcb9a2f178774f52cc 100644 --- a/crates/languages/src/jsonc/config.toml +++ b/crates/languages/src/jsonc/config.toml @@ -11,7 +11,5 @@ brackets = [ tab_size = 2 prettier_parser_name = "jsonc" -scope_opt_in_language_servers = ["json-language-server"] [overrides.string] word_characters = [":"] -opt_into_language_servers = ["json-language-server"]